feat: improve tab navigation and cycling

src/browser/base/content/zen-commands.inc.xhtml

@@ -53,6 +53,10 @@
   <command id="cmd_zenCopyCurrentURL" />
   <command id="cmd_zenCopyCurrentURLMarkdown" />
 
+  <command id="cmd_zenTabNext" />
+  <command id="cmd_zenTabPrev" />
+  <command id="cmd_zenToggleUnloadedCycling" />
+
   <command id="cmd_zenGlanceClose" />
   <command id="cmd_zenGlanceExpand" />
   <command id="cmd_zenGlanceSplit" />

src/browser/components/preferences/zen-settings.js

@@ -764,6 +764,10 @@ var zenMissingKeyboardShortcutL10n = {
   key_wrToggleCaptureSequenceCmd: 'zen-key-wr-toggle-capture-sequence-cmd',
   key_undoCloseWindow: 'zen-key-undo-close-window',
 
+  key_zenTabNext: 'zen-tab-next-shortcut',
+  key_zenTabPrevious: 'zen-tab-prev-shortcut',
+  key_toggleUnloadedCycling: 'zen-toggle-unloaded-cycling-shortcut',
+
   'zen-glance-expand': 'zen-glance-expand',
 
   key_selectTab1: 'zen-key-select-tab-1',
@@ -1161,6 +1165,11 @@ Preferences.addAll([
     type: 'bool',
     default: true,
   },
+  {
+    id: 'zen.tabs.unloaded-navigation-mode',
+    type: 'string',
+    default: 'always',
+  },
   {
     id: 'zen.tabs.ctrl-tab.ignore-essential-tabs',
     type: 'bool',

src/browser/components/preferences/zenTabsManagement.inc.xhtml

@@ -79,6 +79,33 @@
       </hbox>
 </groupbox>
 
-</html:template>
+      <hbox id="zenTabsUnloadCategory" class="subcategory" hidden="true" data-category="paneZenTabManagement">
+            <html:h1 data-l10n-id="pane-zen-tabs-unloader-title" />
+      </hbox>
+
+      <hbox id="zenPinnedTabsManagerCategory" class="subcategory" hidden="true" data-category="paneZenTabManagement">
+            <html:h1 data-l10n-id="pane-zen-tab-navigation-title" />
+      </hbox>
+
+      <groupbox id="zenTabsUnloadedNavigationGroup" data-category="paneZenTabManagement" hidden="true"
+            class="highlighting-group">
+            <label>
+                  <html:h2 data-l10n-id="zen-tabs-unloaded-navigation-mode-label" />
+            </label>
+            <description class="description-deemphasized"
+                  data-l10n-id="zen-tabs-unloaded-navigation-mode-description" />
 
+            <radiogroup id="zenTabsUnloadedNavigationMode" preference="zen.tabs.unloaded-navigation-mode"
+                  oncommand="onZenTabsUnloadedNavigationModeChanged(this.value);">
+                  <hbox align="center">
+                        <radio id="zenTabsUnloadedNavigationModeAlways" value="always" />
+                        <description data-l10n-id="zen-tabs-unloaded-navigation-mode-always" />
+                  </hbox>
+                  <hbox align="center">
+                        <radio id="zenTabsUnloadedNavigationModeNever" value="never" />
+                        <description data-l10n-id="zen-tabs-unloaded-navigation-mode-never" />
+                  </hbox>
+            </radiogroup>
+      </groupbox>
 
+</html:template>

src/toolkit/content/widgets/tabbox-js.patch

@@ -5,7 +5,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a07226
 @@ -11,6 +11,23 @@
      "resource://gre/modules/AppConstants.sys.mjs"
    );
- 
+
 +  const { XPCOMUtils } = ChromeUtils.importESModule(
 +    "resource://gre/modules/XPCOMUtils.sys.mjs"
 +  );
@@ -73,7 +73,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a07226
 +        startTab = gZenGlanceManager.getFocusedTab(aDir) || this.selectedItem;
        }
        let newTab = null;
- 
+
 +      const tabFilter = tab => {
 +        if (!tab.visible) {
 +          return false
@@ -101,4 +101,4 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a07226
 +          filter: tabFilter,
          });
        }
- 
+

src/zen/common/ZenCommonUtils.mjs

@@ -17,7 +17,7 @@ window.gZenOperatingSystemCommonUtils = {
 
 /* eslint-disable no-unused-vars */
 class nsZenMultiWindowFeature {
-  constructor() {}
+  constructor() { }
 
   static get browsers() {
     return Services.wm.getEnumerator('navigator:browser');
@@ -100,6 +100,31 @@ var gZenCommonActions = {
     gZenUIManager.showToast('zen-copy-current-url-confirmation', { timeout: 3000 });
   },
 
+  nextTab() {
+    gBrowser
+      .tabContainer
+      .advanceSelectedTab(1, true);
+  },
+
+  previousTab() {
+    gBrowser
+      .tabContainer
+      .advanceSelectedTab(-1, true);
+  },
+
+  toggleUnloadedCycling() {
+    try {
+      const currentMode = Services.prefs.getStringPref(
+        'zen.tabs.unloaded-navigation-mode',
+        'always'
+      );
+      const nextMode = currentMode === 'always' ? 'never' : 'always';
+      Services.prefs.setStringPref('zen.tabs.unloaded-navigation-mode', nextMode);
+    } catch (e) {
+      console.error('[gZenCommonActions] Error on unloaded cycling:', e);
+    }
+  },
+
   throttle(f, delay) {
     let timer = 0;
     return function (...args) {

src/zen/common/zen-sets.js

@@ -38,6 +38,15 @@ document.addEventListener(
           case 'cmd_zenSplitViewUnsplit':
             gZenViewSplitter.toggleShortcut('unsplit');
             break;
+          case 'cmd_zenTabNext':
+            gZenCommonActions.nextTab();
+            break;
+          case 'cmd_zenTabPrev':
+            gZenCommonActions.previousTab();
+            break;
+          case 'cmd_zenToggleUnloadedCycling':
+            gZenCommonActions.toggleUnloadedCycling();
+            break;
           case 'cmd_zenSplitViewContextMenu':
             gZenViewSplitter.contextSplitTabs();
             break;

src/zen/kbs/ZenKeyboardShortcuts.mjs

@@ -230,10 +230,10 @@ class nsKeyShortcutModifiers {
       this.#control == other.#control &&
       (AppConstants.platform == 'macosx'
         ? (this.#meta || this.#accel) == (other.#meta || other.#accel) &&
-          this.#control == other.#control
+        this.#control == other.#control
         : // In other platforms, we can have control and accel counting as the same thing
-          this.#meta == other.#meta &&
-          (this.#control || this.#accel) == (other.#control || other.#accel))
+        this.#meta == other.#meta &&
+        (this.#control || this.#accel) == (other.#control || other.#accel))
     );
   }
 
@@ -303,6 +303,7 @@ class KeyShortcut {
   #disabled = false;
   #reserved = false;
   #internal = false;
+  #isPrecedent = false;
 
   constructor(
     id,
@@ -314,7 +315,8 @@ class KeyShortcut {
     l10nId,
     disabled = false,
     reserved = false,
-    internal = false
+    internal = false,
+    isPrecedent = false
   ) {
     this.#id = id;
     this.#key = key?.toLowerCase();
@@ -331,6 +333,7 @@ class KeyShortcut {
     this.#disabled = disabled;
     this.#reserved = reserved;
     this.#internal = internal;
+    this.#isPrecedent = isPrecedent;
   }
 
   isEmpty() {
@@ -369,7 +372,8 @@ class KeyShortcut {
       json['l10nId'],
       json['disabled'],
       json['reserved'],
-      json['internal']
+      json['internal'],
+      json['isPrecedent']
     );
   }
 
@@ -379,16 +383,17 @@ class KeyShortcut {
       key.getAttribute('key'),
       key.getAttribute('keycode'),
       group ??
-        KeyShortcut.getGroupFromL10nId(
-          KeyShortcut.sanitizeL10nId(key.getAttribute('data-l10n-id')),
-          key.getAttribute('id')
-        ),
+      KeyShortcut.getGroupFromL10nId(
+        KeyShortcut.sanitizeL10nId(key.getAttribute('data-l10n-id')),
+        key.getAttribute('id')
+      ),
       nsKeyShortcutModifiers.parseFromXHTMLAttribute(key.getAttribute('modifiers')),
       key.getAttribute('command'),
       key.getAttribute('data-l10n-id'),
       key.getAttribute('disabled') == 'true',
       key.getAttribute('reserved') == 'true',
-      key.getAttribute('internal') == 'true'
+      key.getAttribute('internal') == 'true',
+      key.getAttribute('isPrecedent') == 'true'
     );
   }
 
@@ -447,6 +452,9 @@ class KeyShortcut {
     if (this.#internal) {
       key.setAttribute('internal', this.#internal);
     }
+    if (this.#isPrecedent) {
+      key.setAttribute('isPrecedent', this.#isPrecedent);
+    }
     key.setAttribute('zen-keybind', 'true');
 
     return key;
@@ -512,6 +520,10 @@ class KeyShortcut {
     return this.#internal;
   }
 
+  isPrecedent() {
+    return this.#isPrecedent;
+  }
+
   isInvalid() {
     return this.#key == '' && this.#keycode == '' && this.#l10nId == null;
   }
@@ -535,6 +547,7 @@ class KeyShortcut {
       disabled: this.#disabled,
       reserved: this.#reserved,
       internal: this.#internal,
+      isPrecedent: this.#isPrecedent,
     };
   }
 
@@ -1023,8 +1036,55 @@ class nsZenKeyboardShortcutsVersioner {
       }
     }
     if (version < 10) {
-      // Migrate from version 9 to 10
-      // 1) Add the new pin/unpin tab toggle shortcut with Ctrl+Shift+D
+      // 1) Migrate from version 9 to 10
+      // In this new version, we add customizable shortcuts for switching to the next/previous tab and toggling unloaded tab cycling.
+      data.push(
+        new KeyShortcut(
+          'zen-tab-next-shortcut',
+          'TAB',
+          'VK_TAB',
+          'windowAndTabManagement',
+          nsKeyShortcutModifiers.fromObject({ accel: true }),
+          'cmd_zenTabNext',
+          'zen-tab-next-shortcut',
+          false, // disabled
+          false, // reserved
+          false, // internal
+          true   // isPrecedent
+        )
+      );
+      data.push(
+        new KeyShortcut(
+          'zen-tab-prev-shortcut',
+          'TAB',
+          'VK_TAB',
+          'windowAndTabManagement',
+          nsKeyShortcutModifiers.fromObject({ accel: true, shift: true }),
+          'cmd_zenTabPrev',
+          'zen-tab-prev-shortcut',
+          false, // disabled
+          false, // reserved
+          false, // internal
+          true   // isPrecedent
+        )
+      );
+      data.push(
+        new KeyShortcut(
+          'zen-toggle-unloaded-cycling-shortcut',
+          '',
+          '',
+          'windowAndTabManagement',
+          nsKeyShortcutModifiers.fromObject({}),
+          'cmd_zenToggleUnloadedCycling',
+          'zen-toggle-unloaded-cycling-shortcut',
+          false, // disabled
+          false, // reserved
+          false, // internal
+          true   // isPrecedent
+        )
+      );
+
+      // 2) Add the new pin/unpin tab toggle shortcut with Ctrl+Shift+D
       data.push(
         new KeyShortcut(
           'zen-toggle-pin-tab',
@@ -1037,7 +1097,7 @@ class nsZenKeyboardShortcutsVersioner {
         )
       );
 
-      // 2) Add shortcut to expand Glance into a full tab: Default Accel+O
+      // 3) Add shortcut to expand Glance into a full tab: Default Accel+O
       data.push(
         new KeyShortcut(
           'zen-glance-expand',
@@ -1126,10 +1186,8 @@ var gZenKeyboardShortcutsManager = {
   async init() {
     if (this.inBrowserView) {
       const loadedShortcuts = await this._loadSaved();
-
-      this._currentShortcutList = this.versioner.fixedKeyboardShortcuts(loadedShortcuts);
+      this._currentShortcutList = this.versioner.fixedKeyboardShortcuts(loadedShortcuts) || [];
       this._applyShortcuts();
-
       await this._saveShortcuts();
     }
   },
@@ -1234,6 +1292,46 @@ var gZenKeyboardShortcutsManager = {
     this.triggerShortcutRebuild();
   },
 
+  _registerPrecedentShortcut(shortcut, browser) {
+    const listener = (event) => {
+      let keyMatch = false;
+      if (shortcut.getKeyName()) {
+        keyMatch = event.key.toLowerCase() === shortcut.getKeyName().toLowerCase();
+      } else if (shortcut.getKeyCode()) {
+        for (const [mapKey, mapValue] of Object.entries(KEYCODE_MAP)) {
+          if (mapValue === shortcut.getKeyCode()) {
+            if (mapKey.toLowerCase() === event.code.toLowerCase()) {
+              keyMatch = true;
+            }
+            break;
+          }
+        }
+      }
+
+      if (!keyMatch) {
+        return;
+      }
+
+      const modifiers = shortcut.getModifiers();
+      const accelPressed = AppConstants.platform === 'macosx' ? event.metaKey : event.ctrlKey;
+      const modifiersMatch =
+        modifiers.accel === accelPressed &&
+        modifiers.alt === event.altKey &&
+        modifiers.shift === event.shiftKey;
+
+      if (modifiersMatch) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+        const command = browser.document.getElementById(shortcut.getAction());
+        if (command) {
+          command.doCommand();
+        }
+      }
+    };
+
+    browser.addEventListener('keydown', listener, true);
+  },
+
   _applyShortcuts() {
     for (const browser of nsZenMultiWindowFeature.browsers) {
       let mainKeyset = browser.document.getElementById(ZEN_MAIN_KEYSET_ID);
@@ -1254,8 +1352,13 @@ var gZenKeyboardShortcutsManager = {
         if (key.isInternal()) {
           continue;
         }
-        let child = key.toXHTMLElement(browser);
-        keyset.appendChild(child);
+
+        if (key.isPrecedent()) {
+          this._registerPrecedentShortcut(key, browser);
+        } else {
+          let child = key.toXHTMLElement(browser);
+          keyset.appendChild(child);
+        }
       }
 
       this._applyDevtoolsShortcuts(browser);