From 7d1f58ce5e089d210c6439396d260cf7542bfb0d Mon Sep 17 00:00:00 2001
From: abaevbog <bogdan@zotero.org>
Date: Fri, 5 Jan 2024 07:10:54 -0500
Subject: [PATCH] fixed to keyboard tab navigation regressions

- make sure the visible zotero-pane tab is selected to focus on
- make sure lastFocusedElement is not set to be another tab or
<window> to not move focus on them when Enter is pressed on zotero-pane
tab
- refocus the lastFocusedElement from zoteroPane after a timeout
to make sure focus does not stay on the actual tab after mouse click
- save lastFocusedElement before closing and reopening and unloaded reader
tab so that if we move from zoteroPane to a reader tab that will be loaded
and then go back, the orignially focused element is refocused
---
 chrome/content/zotero/tabs.js | 55 +++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/chrome/content/zotero/tabs.js b/chrome/content/zotero/tabs.js
index 26fb688b85..2b38227eea 100644
--- a/chrome/content/zotero/tabs.js
+++ b/chrome/content/zotero/tabs.js
@@ -403,16 +403,34 @@ var Zotero_Tabs = new function () {
 	 * @param {String} id
 	 * @param {Boolean} reopening
 	 */
-	this.select = function (id, reopening, options) {
+	this.select = function (id, reopening, options = {}) {
 		var { tab, tabIndex } = this._getTab(id);
+		// Move focus to the last focused element of zoteroPane if any or itemTree otherwise
+		let focusZoteroPane = () => {
+			if (tab.id !== 'zotero-pane') return;
+			// Small delay to make sure the focus does not remain on the actual
+			// tab after mouse click
+			setTimeout(() => {
+				if (tab.lastFocusedElement) {
+					tab.lastFocusedElement.focus();
+				}
+				if (document.activeElement !== tab.lastFocusedElement) {
+					ZoteroPane_Local.itemsView.focus();
+				}
+				tab.lastFocusedElement = null;
+			});
+		};
 		if (!tab || tab.id === this._selectedID) {
-			// Focus on reader when keepTabFocused is explicitly false
+			// Focus on reader or zotero pane when keepTabFocused is explicitly false
 			// E.g. when a tab is selected via Space or Enter
-			if (options?.keepTabFocused === false && tab?.id === this._selectedID) {
+			if (options.keepTabFocused === false && tab?.id === this._selectedID) {
 				var reader = Zotero.Reader.getByTabID(this._selectedID);
 				if (reader) {
 					reader.focus();
 				}
+				if (tab.id == 'zotero-pane') {
+					focusZoteroPane();
+				}
 			}
 			return;
 		}
@@ -425,15 +443,20 @@ var Zotero_Tabs = new function () {
 		}
 		
 		// If the last focus data was recorded for a different item, discard it
-		if (this._focusOptions.itemID && this._focusOptions.itemID != tab?.data?.itemID) {
+		if (!this._focusOptions.itemID || this._focusOptions.itemID != tab?.data?.itemID) {
 			this._focusOptions = {};
 		}
 		// Save focus option for this item to tell reader and contextPane how to handle focus
-		if (options && selectedTab) {
+		if (Object.keys(options).length && selectedTab) {
 			this._focusOptions.keepTabFocused = !!options.keepTabFocused;
 			this._focusOptions.itemID = tab?.data?.itemID;
 		}
-
+		if (this._selectedID === 'zotero-pane'
+		&& !document.activeElement.classList.contains("tab")
+		&& document.activeElement.tagName !== 'window') {
+			// never return focus to another tab or <window>
+			selectedTab.lastFocusedElement = document.activeElement;
+		}
 		if (tab.type === 'reader-unloaded') {
 			this.close(tab.id);
 			Zotero.Reader.open(tab.data.itemID, options && options.location, {
@@ -446,25 +469,25 @@ var Zotero_Tabs = new function () {
 			});
 			return;
 		}
-		if (this._selectedID === 'zotero-pane') {
-			selectedTab.lastFocusedElement = document.activeElement;
-		}
 		this._prevSelectedID = reopening ? this._selectedID : null;
 		this._selectedID = id;
 		this.deck.selectedIndex = Array.from(this.deck.children).findIndex(x => x.id == id);
 		this._update();
 		Zotero.Notifier.trigger('select', 'tab', [tab.id], { [tab.id]: { type: tab.type } }, true);
-		if (tab.id === 'zotero-pane' && tab.lastFocusedElement) {
-			tab.lastFocusedElement.focus();
-			if (document.activeElement !== tab.lastFocusedElement) {
-				ZoteroPane_Local.itemsView.focus();
-			}
-			tab.lastFocusedElement = null;
+		if (tab.id === 'zotero-pane' && (options.keepTabFocused !== true)) {
+			focusZoteroPane();
 		}
 		let tabNode = document.querySelector(`.tab[data-id="${tab.id}"]`);
 		if (this._focusOptions.keepTabFocused && document.activeElement.getAttribute('data-id') != tabNode.getAttribute('data-id')) {
 			// Keep focus on the currently selected tab during keyboard navigation
-			tabNode.focus();
+			if (tab.id == 'zotero-pane') {
+				// Since there is more than one zotero-pane tab (pinned and not pinned),
+				// use moveFocus() to focus on the visible one
+				this.moveFocus('first');
+			}
+			else {
+				tabNode.focus();
+			}
 		}
 		// Allow React to create a tab node
 		setTimeout(() => {