fix(ui): disable hotkeys on modals (#342)

kouprlabs · Sep 27, 2024 · f9113a1 · f9113a1
1 parent db439ea
commit f9113a1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/ui/src/client/api/file.ts b/ui/src/client/api/file.ts
@@ -60,13 +60,13 @@ export type List = {
 export type UserPermission = {
   id: string
   user: User
-  permission: string
+  permission: PermissionType
 }
 
 export type GroupPermission = {
   id: string
   group: Group
-  permission: string
+  permission: PermissionType
 }
 
 export type Query = {

diff --git a/ui/src/client/api/permission.ts b/ui/src/client/api/permission.ts
@@ -13,7 +13,7 @@ export const VIEWER_PERMISSION = 'viewer'
 export const EDITOR_PERMISSION = 'editor'
 export const OWNER_PERMISSION = 'owner'
 
-export type PermissionType = 'viewer' | 'editor' | 'owner'
+export type PermissionType = 'viewer' | 'editor' | 'owner' | 'none'
 
 export function gtViewerPermission(permission: string): boolean {
   return (

diff --git a/ui/src/components/file/list/index.tsx b/ui/src/components/file/list/index.tsx
@@ -55,6 +55,15 @@ const FileList = ({ list, scale }: FileListProps) => {
     (state) => state.ui.files.isSelectionMode,
   )
   const selection = useAppSelector((state) => state.ui.files.selection)
+  const isModalOpen = useAppSelector(
+    (state) =>
+      state.ui.files.isCopyModalOpen ||
+      state.ui.files.isMoveModalOpen ||
+      state.ui.files.isDeleteModalOpen ||
+      state.ui.files.isCreateModalOpen ||
+      state.ui.files.isShareModalOpen ||
+      state.ui.files.isRenameModalOpen,
+  )
   const [activeId, setActiveId] = useState<string | null>(null)
   const [isMenuOpen, setIsMenuOpen] = useState(false)
   const [menuPosition, setMenuPosition] = useState<FileMenuPosition>()
@@ -136,6 +145,9 @@ const FileList = ({ list, scale }: FileListProps) => {
 
   const handleKeyDown = useCallback(
     (keyName: string, event: KeyboardEvent) => {
+      if (isModalOpen) {
+        return
+      }
       event.preventDefault()
       if (
         (keyName === 'command+a' && isMacOS()) ||
@@ -172,7 +184,7 @@ const FileList = ({ list, scale }: FileListProps) => {
         }
       }
     },
-    [selection],
+    [selection, isModalOpen],
   )
 
   return (