From 15254e2dfc7757077d13af88617f94d421936ed4 Mon Sep 17 00:00:00 2001
From: Zack Rauen <rauenzi@outlook.com>
Date: Fri, 8 Sep 2023 22:53:21 -0400
Subject: [PATCH 1/2] Add keyboard shortcuts for tabs

---
 src/public/app/widgets/tab_row.js | 20 +++++++++++
 src/services/keyboard_actions.js  | 60 +++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js
index 85ab7e3c5..07c581056 100644
--- a/src/public/app/widgets/tab_row.js
+++ b/src/public/app/widgets/tab_row.js
@@ -267,8 +267,28 @@ export default class TabRowWidget extends BasicWidget {
                 }
             });
         });
+
+        keyboardActionService.setupActionsForElement('tabs', $(document), this);
     }
 
+    goToTab(tabNumber) {
+        const index = tabNumber === 0 ? this.tabEls.length - 1 : tabNumber - 1;
+        const tab = this.tabEls[index];
+        if (!tab) return;
+        appContext.tabManager.activateNoteContext(tab.getAttribute('data-ntx-id'));
+    }
+
+    firstTabCommand() {this.goToTab(1);}
+    secondTabCommand() {this.goToTab(2);}
+    thirdTabCommand() {this.goToTab(3);}
+    fourthTabCommand() {this.goToTab(4);}
+    fifthTabCommand() {this.goToTab(5);}
+    sixthTabCommand() {this.goToTab(6);}
+    seventhTabCommand() {this.goToTab(7);}
+    eigthTabCommand() {this.goToTab(8);}
+    ninthTabCommand() {this.goToTab(9);}
+    lastTabCommand() {this.goToTab(0);}
+
     setupStyle() {
         this.$style = $("<style>");
         this.$widget.append(this.$style);
diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js
index 94cc7fe17..a2c1cae26 100644
--- a/src/services/keyboard_actions.js
+++ b/src/services/keyboard_actions.js
@@ -231,6 +231,66 @@ const DEFAULT_KEYBOARD_ACTIONS = [
         description: "Open new empty window",
         scope: "window"
     },
+    {
+        actionName: "firstTab",
+        defaultShortcuts: ["CommandOrControl+1"],
+        description: "Activates the first tab in the list",
+        scope: "tabs"
+    },
+    {
+        actionName: "secondTab",
+        defaultShortcuts: ["CommandOrControl+2"],
+        description: "Activates the second tab in the list",
+        scope: "tabs"
+    },
+    {
+        actionName: "thirdTab",
+        defaultShortcuts: ["CommandOrControl+3"],
+        description: "Activates the third tab in the list",
+        scope: "tabs"
+    },
+    {
+        actionName: "fourthTab",
+        defaultShortcuts: ["CommandOrControl+4"],
+        description: "Activates the fourth tab in the list",
+        scope: "tabs"
+    },
+    {
+        actionName: "fifthTab",
+        defaultShortcuts: ["CommandOrControl+5"],
+        description: "Activates the fifth tab in the list",
+        scope: "tabs"
+    },
+    {
+        actionName: "sixthTab",
+        defaultShortcuts: ["CommandOrControl+6"],
+        description: "Activates the sixth tab in the list",
+        scope: "tabs"
+    },
+    {
+        actionName: "seventhTab",
+        defaultShortcuts: ["CommandOrControl+7"],
+        description: "Activates the seventh tab in the list",
+        scope: "tabs"
+    },
+    {
+        actionName: "eigthTab",
+        defaultShortcuts: ["CommandOrControl+8"],
+        description: "Activates the eigth tab in the list",
+        scope: "tabs"
+    },
+    {
+        actionName: "ninthTab",
+        defaultShortcuts: ["CommandOrControl+9"],
+        description: "Activates the ninth tab in the list",
+        scope: "tabs"
+    },
+    {
+        actionName: "lastTab",
+        defaultShortcuts: ["CommandOrControl+0"],
+        description: "Activates the last tab in the list",
+        scope: "tabs"
+    },
 
 
     {

From a83e8ff91a997e74b0060b8fa29e9a35aafd5d57 Mon Sep 17 00:00:00 2001
From: Zack Rauen <rauenzi@outlook.com>
Date: Mon, 11 Sep 2023 18:03:49 -0400
Subject: [PATCH 2/2] Switch back to window scope

---
 src/public/app/widgets/tab_row.js |  6 +++---
 src/services/keyboard_actions.js  | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js
index 07c581056..4172052d5 100644
--- a/src/public/app/widgets/tab_row.js
+++ b/src/public/app/widgets/tab_row.js
@@ -268,11 +268,11 @@ export default class TabRowWidget extends BasicWidget {
             });
         });
 
-        keyboardActionService.setupActionsForElement('tabs', $(document), this);
+        keyboardActionService.setupActionsForElement('window', $(document), this);
     }
 
     goToTab(tabNumber) {
-        const index = tabNumber === 0 ? this.tabEls.length - 1 : tabNumber - 1;
+        const index = tabNumber === Number.POSITIVE_INFINITY ? this.tabEls.length - 1 : tabNumber - 1;
         const tab = this.tabEls[index];
         if (!tab) return;
         appContext.tabManager.activateNoteContext(tab.getAttribute('data-ntx-id'));
@@ -287,7 +287,7 @@ export default class TabRowWidget extends BasicWidget {
     seventhTabCommand() {this.goToTab(7);}
     eigthTabCommand() {this.goToTab(8);}
     ninthTabCommand() {this.goToTab(9);}
-    lastTabCommand() {this.goToTab(0);}
+    lastTabCommand() {this.goToTab(Number.POSITIVE_INFINITY);}
 
     setupStyle() {
         this.$style = $("<style>");
diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js
index a2c1cae26..6b6cb558e 100644
--- a/src/services/keyboard_actions.js
+++ b/src/services/keyboard_actions.js
@@ -235,61 +235,61 @@ const DEFAULT_KEYBOARD_ACTIONS = [
         actionName: "firstTab",
         defaultShortcuts: ["CommandOrControl+1"],
         description: "Activates the first tab in the list",
-        scope: "tabs"
+        scope: "window"
     },
     {
         actionName: "secondTab",
         defaultShortcuts: ["CommandOrControl+2"],
         description: "Activates the second tab in the list",
-        scope: "tabs"
+        scope: "window"
     },
     {
         actionName: "thirdTab",
         defaultShortcuts: ["CommandOrControl+3"],
         description: "Activates the third tab in the list",
-        scope: "tabs"
+        scope: "window"
     },
     {
         actionName: "fourthTab",
         defaultShortcuts: ["CommandOrControl+4"],
         description: "Activates the fourth tab in the list",
-        scope: "tabs"
+        scope: "window"
     },
     {
         actionName: "fifthTab",
         defaultShortcuts: ["CommandOrControl+5"],
         description: "Activates the fifth tab in the list",
-        scope: "tabs"
+        scope: "window"
     },
     {
         actionName: "sixthTab",
         defaultShortcuts: ["CommandOrControl+6"],
         description: "Activates the sixth tab in the list",
-        scope: "tabs"
+        scope: "window"
     },
     {
         actionName: "seventhTab",
         defaultShortcuts: ["CommandOrControl+7"],
         description: "Activates the seventh tab in the list",
-        scope: "tabs"
+        scope: "window"
     },
     {
         actionName: "eigthTab",
         defaultShortcuts: ["CommandOrControl+8"],
         description: "Activates the eigth tab in the list",
-        scope: "tabs"
+        scope: "window"
     },
     {
         actionName: "ninthTab",
         defaultShortcuts: ["CommandOrControl+9"],
         description: "Activates the ninth tab in the list",
-        scope: "tabs"
+        scope: "window"
     },
     {
         actionName: "lastTab",
         defaultShortcuts: ["CommandOrControl+0"],
         description: "Activates the last tab in the list",
-        scope: "tabs"
+        scope: "window"
     },