admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

259 add navigation hotkeys for command menu level 2 (#10043)

Browse Source 
Closes https://github.com/twentyhq/core-team-issues/issues/259



https://github.com/user-attachments/assets/abdcb44d-fc13-4597-befc-da99c94c1ef0
This commit is contained in:
Raphaël Bosi
2025-02-06 10:07:20 +01:00
committed by GitHub
parent f6ce27b61e
commit 9838bec004
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts
View File

@ -13,9 +13,9 @@ import { Key } from 'ts-key-enum';
export const useCommandMenuHotKeys = () => { export const useCommandMenuHotKeys = () => {
const { const {
closeCommandMenu,
openRecordsSearchPage, openRecordsSearchPage,
toggleCommandMenu, toggleCommandMenu,
goBackFromCommandMenu,
setGlobalCommandMenuContext, setGlobalCommandMenuContext,
} = useCommandMenu(); } = useCommandMenu();
@ -37,7 +37,7 @@ export const useCommandMenuHotKeys = () => {
toggleCommandMenu(); toggleCommandMenu();
}, },
AppHotkeyScope.CommandMenu, AppHotkeyScope.CommandMenu,
[toggleCommandMenu], [closeKeyboardShortcutMenu, toggleCommandMenu],
); );
useScopedHotkeys( useScopedHotkeys(
@ -55,18 +55,21 @@ export const useCommandMenuHotKeys = () => {
useScopedHotkeys( useScopedHotkeys(
[Key.Escape], [Key.Escape],
() => { () => {
closeCommandMenu(); goBackFromCommandMenu();
}, },
AppHotkeyScope.CommandMenuOpen, AppHotkeyScope.CommandMenuOpen,
[closeCommandMenu], [goBackFromCommandMenu],
); );
useScopedHotkeys( useScopedHotkeys(
[Key.Backspace, Key.Delete], [Key.Backspace, Key.Delete],
() => { () => {
if (isNonEmptyString(commandMenuSearch)) {
return;
}
if ( if (
commandMenuPage === CommandMenuPages.Root && commandMenuPage === CommandMenuPages.Root &&
!isNonEmptyString(commandMenuSearch) &&
!( !(
contextStoreTargetedRecordsRuleComponent.mode === 'selection' && contextStoreTargetedRecordsRuleComponent.mode === 'selection' &&
contextStoreTargetedRecordsRuleComponent.selectedRecordIds.length === contextStoreTargetedRecordsRuleComponent.selectedRecordIds.length ===
@ -75,9 +78,18 @@ export const useCommandMenuHotKeys = () => {
) { ) {
setGlobalCommandMenuContext(); setGlobalCommandMenuContext();
} }
if (commandMenuPage !== CommandMenuPages.Root) {
goBackFromCommandMenu();
}
}, },
AppHotkeyScope.CommandMenuOpen, AppHotkeyScope.CommandMenuOpen,
[closeCommandMenu], [
commandMenuPage,
commandMenuSearch,
contextStoreTargetedRecordsRuleComponent,
goBackFromCommandMenu,
setGlobalCommandMenuContext,
],
{ {
preventDefault: false, preventDefault: false,
}, },