From 0504427f802f80e73b587cb81364c3a5eba93d25 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 1 Dec 2022 17:31:59 +0800
Subject: [PATCH 1/2] feat(nc-gui): add $e for shortcuts

---
 packages/nc-gui/components/dashboard/TreeView.vue        | 1 +
 packages/nc-gui/components/general/FullScreen.vue        | 5 ++++-
 packages/nc-gui/components/general/ShareBaseButton.vue   | 5 ++++-
 packages/nc-gui/components/smartsheet/Grid.vue           | 9 +++++++++
 .../nc-gui/pages/[projectType]/[projectId]/index.vue     | 2 ++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView.vue b/packages/nc-gui/components/dashboard/TreeView.vue
index bf05399189..6a4c1f3e76 100644
--- a/packages/nc-gui/components/dashboard/TreeView.vue
+++ b/packages/nc-gui/components/dashboard/TreeView.vue
@@ -241,6 +241,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
         if (isCreateTableAllowed.value && !isDrawerOrModalExist()) {
           // prevent the key `T` is inputted to table title input
           e.preventDefault()
+          $e('a:shortcut', { key: 'ALT + T' })
           openTableCreateDialog()
         }
         break
diff --git a/packages/nc-gui/components/general/FullScreen.vue b/packages/nc-gui/components/general/FullScreen.vue
index 6c3fe32bd6..0562df692b 100644
--- a/packages/nc-gui/components/general/FullScreen.vue
+++ b/packages/nc-gui/components/general/FullScreen.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
-import { computed, isDrawerOrModalExist, isMac, useSidebar } from '#imports'
+import { computed, isDrawerOrModalExist, isMac, useNuxtApp, useSidebar } from '#imports'
 
 const rightSidebar = useSidebar('nc-right-sidebar')
 
 const leftSidebar = useSidebar('nc-left-sidebar')
 
+const { $e } = useNuxtApp()
+
 const isSidebarsOpen = computed({
   get: () => rightSidebar.isOpen.value || leftSidebar.isOpen.value,
   set: (value) => {
@@ -20,6 +22,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
       case 70: {
         // ALT + F
         if (!isDrawerOrModalExist()) {
+          $e('a:shortcut', { key: 'ALT + F' })
           isSidebarsOpen.value = !isSidebarsOpen.value
         }
         break
diff --git a/packages/nc-gui/components/general/ShareBaseButton.vue b/packages/nc-gui/components/general/ShareBaseButton.vue
index eb44eb6632..96e687cf3e 100644
--- a/packages/nc-gui/components/general/ShareBaseButton.vue
+++ b/packages/nc-gui/components/general/ShareBaseButton.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { isDrawerOrModalExist, isMac, useRoute, useUIPermission } from '#imports'
+import { isDrawerOrModalExist, isMac, useNuxtApp, useRoute, useUIPermission } from '#imports'
 
 const route = useRoute()
 
@@ -7,6 +7,8 @@ const showUserModal = ref(false)
 
 const { isUIAllowed } = useUIPermission()
 
+const { $e } = useNuxtApp()
+
 const isShareBaseAllowed = computed(
   () =>
     isUIAllowed('newUser') &&
@@ -24,6 +26,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
       case 73: {
         // ALT + I
         if (isShareBaseAllowed.value && !isDrawerOrModalExist()) {
+          $e('a:shortcut', { key: 'ALT + I' })
           showUserModal.value = true
         }
         break
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 69f6a49dc7..e785bfc7bb 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -37,6 +37,7 @@ import {
   useI18n,
   useMetas,
   useMultiSelect,
+  useNuxtApp,
   useRoles,
   useRoute,
   useSmartsheetStoreOrThrow,
@@ -52,6 +53,8 @@ const meta = inject(MetaInj, ref())
 
 const view = inject(ActiveViewInj, ref())
 
+const { $e } = useNuxtApp()
+
 // keep a root fields variable and will get modified from
 // fields menu and get used in grid and gallery
 const fields = inject(FieldsInj, ref([]))
@@ -223,6 +226,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
         switch (e.key) {
           case 'ArrowUp':
             e.preventDefault()
+            $e('a:shortcut', { key: 'CTRL + ArrowUp' })
             selectedCell.row = 0
             selectedCell.col = selectedCell.col ?? 0
             scrollToCell?.()
@@ -230,6 +234,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
             return true
           case 'ArrowDown':
             e.preventDefault()
+            $e('a:shortcut', { key: 'CTRL + ArrowDown' })
             selectedCell.row = data.value.length - 1
             selectedCell.col = selectedCell.col ?? 0
             scrollToCell?.()
@@ -237,6 +242,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
             return true
           case 'ArrowRight':
             e.preventDefault()
+            $e('a:shortcut', { key: 'CTRL + ArrowRight' })
             selectedCell.row = selectedCell.row ?? 0
             selectedCell.col = fields.value?.length - 1
             scrollToCell?.()
@@ -244,6 +250,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
             return true
           case 'ArrowLeft':
             e.preventDefault()
+            $e('a:shortcut', { key: 'CTRL + ArrowLeft' })
             selectedCell.row = selectedCell.row ?? 0
             selectedCell.col = 0
             scrollToCell?.()
@@ -257,6 +264,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
           case 82: {
             // ALT + R
             if (isAddingEmptyRowAllowed) {
+              $e('a:shortcut', { key: 'ALT + R' })
               addEmptyRow()
             }
             break
@@ -264,6 +272,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
           case 67: {
             // ALT + C
             if (isAddingColumnAllowed) {
+              $e('a:shortcut', { key: 'ALT + C' })
               addColumnDropdown.value = true
             }
             break
diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
index 71af000752..edc83e18b7 100644
--- a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
+++ b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
@@ -213,6 +213,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
         // ALT + ,
         if (isUIAllowed('settings') && !isDrawerOrModalExist()) {
           e.preventDefault()
+          $e('a:shortcut', { key: 'ALT + ,' })
           toggleDialog(true, 'teamAndAuth')
         }
         break
@@ -223,6 +224,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
     switch (e.key) {
       case '/':
         if (!isDrawerOrModalExist()) {
+          $e('a:shortcut', { key: 'CTRL + /' })
           openKeyboardShortcutDialog()
         }
         break

From ac65ec7f8c74d5242c888ce663575339aa50afbd Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 1 Dec 2022 18:02:20 +0800
Subject: [PATCH 2/2] fix(nc-gui): change $e type from a -> c

---
 packages/nc-gui/components/dashboard/TreeView.vue    |  2 +-
 packages/nc-gui/components/general/FullScreen.vue    |  2 +-
 .../nc-gui/components/general/ShareBaseButton.vue    |  2 +-
 packages/nc-gui/components/smartsheet/Grid.vue       | 12 ++++++------
 .../nc-gui/pages/[projectType]/[projectId]/index.vue |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView.vue b/packages/nc-gui/components/dashboard/TreeView.vue
index 6a4c1f3e76..8a4f6a4523 100644
--- a/packages/nc-gui/components/dashboard/TreeView.vue
+++ b/packages/nc-gui/components/dashboard/TreeView.vue
@@ -241,7 +241,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
         if (isCreateTableAllowed.value && !isDrawerOrModalExist()) {
           // prevent the key `T` is inputted to table title input
           e.preventDefault()
-          $e('a:shortcut', { key: 'ALT + T' })
+          $e('c:shortcut', { key: 'ALT + T' })
           openTableCreateDialog()
         }
         break
diff --git a/packages/nc-gui/components/general/FullScreen.vue b/packages/nc-gui/components/general/FullScreen.vue
index 0562df692b..c779635125 100644
--- a/packages/nc-gui/components/general/FullScreen.vue
+++ b/packages/nc-gui/components/general/FullScreen.vue
@@ -22,7 +22,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
       case 70: {
         // ALT + F
         if (!isDrawerOrModalExist()) {
-          $e('a:shortcut', { key: 'ALT + F' })
+          $e('c:shortcut', { key: 'ALT + F' })
           isSidebarsOpen.value = !isSidebarsOpen.value
         }
         break
diff --git a/packages/nc-gui/components/general/ShareBaseButton.vue b/packages/nc-gui/components/general/ShareBaseButton.vue
index 96e687cf3e..b010809848 100644
--- a/packages/nc-gui/components/general/ShareBaseButton.vue
+++ b/packages/nc-gui/components/general/ShareBaseButton.vue
@@ -26,7 +26,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
       case 73: {
         // ALT + I
         if (isShareBaseAllowed.value && !isDrawerOrModalExist()) {
-          $e('a:shortcut', { key: 'ALT + I' })
+          $e('c:shortcut', { key: 'ALT + I' })
           showUserModal.value = true
         }
         break
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index e785bfc7bb..aadfaa2539 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -226,7 +226,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
         switch (e.key) {
           case 'ArrowUp':
             e.preventDefault()
-            $e('a:shortcut', { key: 'CTRL + ArrowUp' })
+            $e('c:shortcut', { key: 'CTRL + ArrowUp' })
             selectedCell.row = 0
             selectedCell.col = selectedCell.col ?? 0
             scrollToCell?.()
@@ -234,7 +234,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
             return true
           case 'ArrowDown':
             e.preventDefault()
-            $e('a:shortcut', { key: 'CTRL + ArrowDown' })
+            $e('c:shortcut', { key: 'CTRL + ArrowDown' })
             selectedCell.row = data.value.length - 1
             selectedCell.col = selectedCell.col ?? 0
             scrollToCell?.()
@@ -242,7 +242,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
             return true
           case 'ArrowRight':
             e.preventDefault()
-            $e('a:shortcut', { key: 'CTRL + ArrowRight' })
+            $e('c:shortcut', { key: 'CTRL + ArrowRight' })
             selectedCell.row = selectedCell.row ?? 0
             selectedCell.col = fields.value?.length - 1
             scrollToCell?.()
@@ -250,7 +250,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
             return true
           case 'ArrowLeft':
             e.preventDefault()
-            $e('a:shortcut', { key: 'CTRL + ArrowLeft' })
+            $e('c:shortcut', { key: 'CTRL + ArrowLeft' })
             selectedCell.row = selectedCell.row ?? 0
             selectedCell.col = 0
             scrollToCell?.()
@@ -264,7 +264,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
           case 82: {
             // ALT + R
             if (isAddingEmptyRowAllowed) {
-              $e('a:shortcut', { key: 'ALT + R' })
+              $e('c:shortcut', { key: 'ALT + R' })
               addEmptyRow()
             }
             break
@@ -272,7 +272,7 @@ const { selectCell, startSelectRange, endSelectRange, clearSelectedRange, copyVa
           case 67: {
             // ALT + C
             if (isAddingColumnAllowed) {
-              $e('a:shortcut', { key: 'ALT + C' })
+              $e('c:shortcut', { key: 'ALT + C' })
               addColumnDropdown.value = true
             }
             break
diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
index edc83e18b7..983090343d 100644
--- a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
+++ b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
@@ -213,7 +213,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
         // ALT + ,
         if (isUIAllowed('settings') && !isDrawerOrModalExist()) {
           e.preventDefault()
-          $e('a:shortcut', { key: 'ALT + ,' })
+          $e('c:shortcut', { key: 'ALT + ,' })
           toggleDialog(true, 'teamAndAuth')
         }
         break
@@ -224,7 +224,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
     switch (e.key) {
       case '/':
         if (!isDrawerOrModalExist()) {
-          $e('a:shortcut', { key: 'CTRL + /' })
+          $e('c:shortcut', { key: 'CTRL + /' })
           openKeyboardShortcutDialog()
         }
         break