diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetFocusStackToRecordIndex.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetFocusStackToRecordIndex.ts index cb7b7392dc..784bfc4d80 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetFocusStackToRecordIndex.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetFocusStackToRecordIndex.ts @@ -1,19 +1,11 @@ -import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState'; import { PageFocusId } from '@/types/PageFocusId'; import { useResetFocusStackToFocusItem } from '@/ui/utilities/focus/hooks/useResetFocusStackToFocusItem'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; -import { useStore } from 'jotai'; export const useResetFocusStackToRecordIndex = () => { const { resetFocusStackToFocusItem } = useResetFocusStackToFocusItem(); - const store = useStore(); - const resetFocusStackToRecordIndex = () => { - const isSidePanelOpen = store.get(isSidePanelOpenedState.atom); - - const shouldEnableGlobalHotkeys = !isSidePanelOpen; - resetFocusStackToFocusItem({ focusStackItem: { focusId: PageFocusId.RecordIndex, @@ -22,8 +14,8 @@ export const useResetFocusStackToRecordIndex = () => { componentInstanceId: PageFocusId.RecordIndex, }, globalHotkeysConfig: { - enableGlobalHotkeysWithModifiers: shouldEnableGlobalHotkeys, - enableGlobalHotkeysConflictingWithKeyboard: shouldEnableGlobalHotkeys, + enableGlobalHotkeysWithModifiers: true, + enableGlobalHotkeysConflictingWithKeyboard: true, }, }, }); diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useNavigateSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useNavigateSidePanel.ts index c8915bb624..edb9bc060a 100644 --- a/packages/twenty-front/src/modules/side-panel/hooks/useNavigateSidePanel.ts +++ b/packages/twenty-front/src/modules/side-panel/hooks/useNavigateSidePanel.ts @@ -1,14 +1,14 @@ import { SIDE_PANEL_COMPONENT_INSTANCE_ID } from '@/side-panel/constants/SidePanelComponentInstanceId'; import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId'; import { useSidePanelCloseAnimationCompleteCleanup } from '@/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup'; +import { hasUserSelectedSidePanelListItemState } from '@/side-panel/states/hasUserSelectedSidePanelListItemState'; +import { isSidePanelClosingState } from '@/side-panel/states/isSidePanelClosingState'; +import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState'; import { sidePanelNavigationMorphItemsByPageState } from '@/side-panel/states/sidePanelNavigationMorphItemsByPageState'; import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState'; import { sidePanelPageInfoState } from '@/side-panel/states/sidePanelPageInfoState'; import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState'; import { sidePanelShouldFocusTitleInputComponentState } from '@/side-panel/states/sidePanelShouldFocusTitleInputComponentState'; -import { hasUserSelectedSidePanelListItemState } from '@/side-panel/states/hasUserSelectedSidePanelListItemState'; -import { isSidePanelClosingState } from '@/side-panel/states/isSidePanelClosingState'; -import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState'; import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack'; import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType'; import { useStore } from 'jotai'; @@ -43,10 +43,6 @@ export const useNavigateSidePanel = () => { }); } - if (isSidePanelOpened) { - return; - } - pushFocusItemToFocusStack({ focusId: SIDE_PANEL_FOCUS_ID, component: { @@ -58,6 +54,10 @@ export const useNavigateSidePanel = () => { }, }); + if (isSidePanelOpened) { + return; + } + store.set(isSidePanelOpenedState.atom, true); store.set(hasUserSelectedSidePanelListItemState.atom, false); }, [