From df6d0a2750b6e29bd198fea534dce0f15537bf4c Mon Sep 17 00:00:00 2001
From: JimmFly <447268514@qq.com>
Date: Mon, 13 May 2024 07:15:40 +0000
Subject: [PATCH] fix(core): navigation shortcut keys can't be used when the
 sidebar is collapsed (#6903)

close #6877
---
 packages/frontend/core/src/layouts/workspace-layout.tsx        | 2 ++
 .../core/src/modules/navigation/view/navigation-buttons.tsx    | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/core/src/layouts/workspace-layout.tsx b/packages/frontend/core/src/layouts/workspace-layout.tsx
index 4f64f9e7a..8b5162fc4 100644
--- a/packages/frontend/core/src/layouts/workspace-layout.tsx
+++ b/packages/frontend/core/src/layouts/workspace-layout.tsx
@@ -40,6 +40,7 @@ import {
 } from '../hooks/affine/use-global-dnd-helper';
 import { useNavigateHelper } from '../hooks/use-navigate-helper';
 import { useRegisterWorkspaceCommands } from '../hooks/use-register-workspace-commands';
+import { useRegisterNavigationCommands } from '../modules/navigation/view/use-register-navigation-commands';
 import { WorkbenchService } from '../modules/workbench';
 import {
   AllWorkspaceModals,
@@ -122,6 +123,7 @@ export const WorkspaceLayoutInner = ({ children }: PropsWithChildren) => {
   );
 
   useRegisterWorkspaceCommands();
+  useRegisterNavigationCommands();
 
   useEffect(() => {
     // hotfix for blockVersions
diff --git a/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx b/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx
index d703915ed..e1389deed 100644
--- a/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx
+++ b/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx
@@ -7,15 +7,12 @@ import { useCallback, useEffect, useMemo } from 'react';
 import { useGeneralShortcuts } from '../../../hooks/affine/use-shortcuts';
 import { NavigatorService } from '../services/navigator';
 import * as styles from './navigation-buttons.css';
-import { useRegisterNavigationCommands } from './use-register-navigation-commands';
 
 export const NavigationButtons = () => {
   const t = useAFFiNEI18N();
 
   const shortcuts = useGeneralShortcuts().shortcuts;
 
-  useRegisterNavigationCommands();
-
   const shortcutsObject = useMemo(() => {
     const goBack = t['com.affine.keyboardShortcuts.goBack']();
     const goBackShortcut = shortcuts?.[goBack];