diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts
index 5e5a8e5bf..881496624 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts
+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts
@@ -43,41 +43,41 @@ export const useCommandMenuHotKeys = () => {
COMMAND_MENU_COMPONENT_INSTANCE_ID,
);
- useGlobalHotkeys(
- 'ctrl+k,meta+k',
- () => {
+ useGlobalHotkeys({
+ keys: ['ctrl+k', 'meta+k'],
+ callback: () => {
closeKeyboardShortcutMenu();
toggleCommandMenu();
},
- true,
- [closeKeyboardShortcutMenu, toggleCommandMenu],
- );
+ containsModifier: true,
+ dependencies: [closeKeyboardShortcutMenu, toggleCommandMenu],
+ });
- useGlobalHotkeys(
- ['/'],
- () => {
+ useGlobalHotkeys({
+ keys: ['/'],
+ callback: () => {
openRecordsSearchPage();
},
- false,
- [openRecordsSearchPage],
- {
+ containsModifier: false,
+ dependencies: [openRecordsSearchPage],
+ options: {
ignoreModifiers: true,
},
- );
+ });
- useGlobalHotkeys(
- ['@'],
- () => {
+ useGlobalHotkeys({
+ keys: ['@'],
+ callback: () => {
if (isAiEnabled) {
openAskAIPage();
}
},
- false,
- [openAskAIPage, isAiEnabled],
- {
+ containsModifier: false,
+ dependencies: [openAskAIPage, isAiEnabled],
+ options: {
ignoreModifiers: true,
},
- );
+ });
useHotkeysOnFocusedElement({
keys: [Key.Escape],
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenu.tsx b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenu.tsx
index a6463df60..d9ccbea01 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenu.tsx
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenu.tsx
@@ -15,15 +15,15 @@ export const KeyboardShortcutMenu = () => {
);
const { closeCommandMenu } = useCommandMenu();
- useGlobalHotkeys(
- 'shift+?,meta+?',
- () => {
+ useGlobalHotkeys({
+ keys: ['shift+?', 'meta+?'],
+ callback: () => {
closeCommandMenu();
toggleKeyboardShortcutMenu();
},
- true,
- [toggleKeyboardShortcutMenu],
- );
+ containsModifier: false,
+ dependencies: [toggleKeyboardShortcutMenu],
+ });
return (
<>{isKeyboardShortcutMenuOpened && }>
diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx
index 0a37942b3..87dec9fa9 100644
--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleFullNameFieldDisplay.tsx
@@ -66,6 +66,9 @@ export const RecordTitleFullNameFieldDisplay = ({
type: FocusComponentType.OPENED_FIELD_INPUT,
instanceId: recordTitleCellId,
},
+ globalHotkeysConfig: {
+ enableGlobalHotkeysConflictingWithKeyboard: false,
+ },
});
openInlineCell();
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeys.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeys.ts
index 5bcd9b7f5..f4fd7dca7 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeys.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeys.ts
@@ -7,13 +7,19 @@ import { isDefined } from 'twenty-shared/utils';
type UseHotkeysOptionsWithoutBuggyOptions = Omit;
-export const useGlobalHotkeys = (
- keys: Keys,
- callback: HotkeyCallback,
- containsModifier: boolean,
- dependencies?: unknown[],
- options?: UseHotkeysOptionsWithoutBuggyOptions,
-) => {
+export const useGlobalHotkeys = ({
+ keys,
+ callback,
+ containsModifier,
+ dependencies,
+ options,
+}: {
+ keys: Keys;
+ callback: HotkeyCallback;
+ containsModifier: boolean;
+ dependencies?: unknown[];
+ options?: UseHotkeysOptionsWithoutBuggyOptions;
+}) => {
const callGlobalHotkeysCallback = useGlobalHotkeysCallback(dependencies);
const enableOnContentEditable = isDefined(options?.enableOnContentEditable)