From 04687e02ae70146a282ef0e2a17ef3f4a0846bbb Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 28 Nov 2022 18:58:13 +0800
Subject: [PATCH] feat(nc-gui): prevent shift / cntOrCtrl key is pressing for
 altKey cases

---
 packages/nc-gui/components/dashboard/TreeView.vue            | 4 +++-
 packages/nc-gui/components/general/FullScreen.vue            | 5 +++--
 packages/nc-gui/components/general/ShareBaseButton.vue       | 5 +++--
 .../nc-gui/components/smartsheet/expanded-form/Header.vue    | 1 +
 packages/nc-gui/pages/[projectType]/[projectId]/index.vue    | 4 +++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView.vue b/packages/nc-gui/components/dashboard/TreeView.vue
index 06356f3ef0..23090adc02 100644
--- a/packages/nc-gui/components/dashboard/TreeView.vue
+++ b/packages/nc-gui/components/dashboard/TreeView.vue
@@ -7,6 +7,7 @@ import type { VNodeRef } from '#imports'
 import {
   Empty,
   computed,
+  isMac,
   reactive,
   ref,
   resolveComponent,
@@ -218,7 +219,8 @@ const onSearchCloseIconClick = () => {
 }
 
 useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
-  if (e.altKey) {
+  const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
+  if (e.altKey && !e.shiftKey && !cmdOrCtrl) {
     switch (e.keyCode) {
       case 84: {
         // ALT + T
diff --git a/packages/nc-gui/components/general/FullScreen.vue b/packages/nc-gui/components/general/FullScreen.vue
index 34d01ecf73..5b7816e838 100644
--- a/packages/nc-gui/components/general/FullScreen.vue
+++ b/packages/nc-gui/components/general/FullScreen.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, useSidebar } from '#imports'
+import { computed, isMac, useSidebar } from '#imports'
 
 const rightSidebar = useSidebar('nc-right-sidebar')
 
@@ -14,7 +14,8 @@ const isSidebarsOpen = computed({
 })
 
 useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
-  if (e.altKey) {
+  const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
+  if (e.altKey && !e.shiftKey && !cmdOrCtrl) {
     switch (e.keyCode) {
       case 70: {
         // ALT + F
diff --git a/packages/nc-gui/components/general/ShareBaseButton.vue b/packages/nc-gui/components/general/ShareBaseButton.vue
index e1dfe2ab49..4eeb37a3b9 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 { useRoute, useUIPermission } from '#imports'
+import { isMac, useRoute, useUIPermission } from '#imports'
 
 const route = useRoute()
 
@@ -17,7 +17,8 @@ const isShareBaseAllowed = computed(
 )
 
 useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
-  if (e.altKey) {
+  const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
+  if (e.altKey && !e.shiftKey && !cmdOrCtrl) {
     switch (e.keyCode) {
       case 73: {
         // ALT + I
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index 875d8cab10..a9c5107a66 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -3,6 +3,7 @@ import { message } from 'ant-design-vue'
 import type { ViewType } from 'nocodb-sdk'
 import {
   ReloadRowDataHookInj,
+  isMac,
   useExpandedFormStoreOrThrow,
   useSmartsheetRowStoreOrThrow,
   useSmartsheetStoreOrThrow,
diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
index eef8e7710a..645bc5c5d8 100644
--- a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
+++ b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
@@ -3,6 +3,7 @@ import tinycolor from 'tinycolor2'
 import {
   computed,
   definePageMeta,
+  isMac,
   message,
   navigateTo,
   onBeforeMount,
@@ -184,7 +185,8 @@ onMounted(() => {
 onBeforeUnmount(reset)
 
 useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
-  if (e.altKey) {
+  const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
+  if (e.altKey && !e.shiftKey && !cmdOrCtrl) {
     switch (e.keyCode) {
       case 188: {
         // ALT + ,