Merge branch 'fix/shortcuts-tab-bug' into v2

gisce · Aug 9, 2024 · 978be04 · 978be04
2 parents c4dc72b + 666242a
commit 978be04
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/src/actionbar/FormActionBar.tsx b/src/actionbar/FormActionBar.tsx
@@ -66,46 +66,59 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
     previousView,
     setPreviousView,
     goToResourceId,
+    isActive,
   } = useContext(ActionViewContext) as ActionViewContextType;
 
   useHotkeys(
     "pagedown",
     () => {
+      if (!isActive) {
+        return;
+      }
       tryNavigate(onNextClick);
     },
     { enableOnFormTags: true, preventDefault: true },
-    [tryNavigate, onNextClick],
+    [tryNavigate, onNextClick, isActive],
   );
 
   useHotkeys(
     "pageup",
     () => {
+      if (!isActive) {
+        return;
+      }
       tryNavigate(onPreviousClick);
     },
     { enableOnFormTags: true, preventDefault: true },
-    [tryNavigate, onNextClick],
+    [tryNavigate, onNextClick, isActive],
   );
 
   useHotkeys(
     "ctrl+s,command+s",
     () => {
+      if (!isActive) {
+        return;
+      }
       onFormSave?.();
     },
     { enableOnFormTags: true, preventDefault: true },
-    [onFormSave],
+    [onFormSave, isActive],
   );
 
   // Shortcut ctl+l to change to previous view
   useHotkeys(
     "ctrl+l,command+l",
-    (event) => {
+    () => {
+      if (!isActive) {
+        return;
+      }
       if (previousView) {
         setPreviousView?.(currentView);
         setCurrentView?.(previousView);
       }
     },
     { enableOnFormTags: true, preventDefault: true },
-    [previousView, currentView],
+    [previousView, currentView, isActive],
   );
 
   const { t } = useLocale();

diff --git a/src/actionbar/TreeActionBar.tsx b/src/actionbar/TreeActionBar.tsx
@@ -64,6 +64,7 @@ function TreeActionBar(props: Props) {
     results,
     limit,
     totalItems,
+    isActive,
   } = useContext(ActionViewContext) as ActionViewContextType;
 
   const { parentContext = {}, treeExpandable, toolbar } = props;
@@ -80,18 +81,24 @@ function TreeActionBar(props: Props) {
   useHotkeys(
     "ctrl+l,command+l",
     () => {
+      if (!isActive) {
+        return;
+      }
       if (previousView) {
         setPreviousView?.(currentView);
         setCurrentView?.(previousView);
       }
     },
     { enableOnFormTags: true, preventDefault: true },
-    [previousView, currentView],
+    [previousView, currentView, isActive],
   );
 
   useHotkeys(
     "ctrl+f,command+f",
     () => {
+      if (!isActive) {
+        return;
+      }
       setSearchVisible?.(!searchVisible);
     },
     { enableOnFormTags: true, preventDefault: true },

diff --git a/src/context/ActionViewContext.tsx b/src/context/ActionViewContext.tsx
@@ -54,6 +54,7 @@ export type ActionViewContextType = {
   limit?: number;
   setLimit?: (value: number) => void;
   setTitle?: (value: string) => void;
+  isActive: boolean;
 };
 
 export const ActionViewContext = createContext<ActionViewContextType | null>(
@@ -91,6 +92,7 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
     setSearchTreeNameSearch,
     goToResourceId,
     limit: limitProps,
+    isActive,
   } = props;
 
   const [formIsSaving, setFormIsSaving] = useState<boolean>(false);
@@ -204,6 +206,7 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
         limit,
         setLimit,
         setTitle,
+        isActive,
       }}
     >
       {children}

diff --git a/src/views/ActionView.tsx b/src/views/ActionView.tsx
@@ -519,6 +519,7 @@ function ActionView(props: Props, ref: any) {
       searchTreeNameSearch={searchTreeNameSearch}
       goToResourceId={goToResourceId}
       limit={limit}
+      isActive={tabKey === activeKey}
     >
       {content()}
       <GoToResourceModal