Fix actions setter when opening the command menu (#8263)
Fix standard actions overriding navigate and create commands when opening the command menu. Before fix: <img width="493" alt="Capture d’écran 2024-10-31 à 18 08 56" src="https://github.com/user-attachments/assets/015bd798-baa4-4f84-8886-e355c0ef1455"> After fix: <img width="499" alt="Capture d’écran 2024-10-31 à 18 08 34" src="https://github.com/user-attachments/assets/02ba7fc4-ec90-4c13-9830-d884c0da37d9"> --------- Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
@ -43,6 +43,8 @@ export const useCommandMenu = () => {
|
||||
}),
|
||||
);
|
||||
|
||||
const commands = Object.values(COMMAND_MENU_COMMANDS);
|
||||
|
||||
const actionCommands = actionMenuEntries
|
||||
.getValue()
|
||||
?.map((actionMenuEntry) => ({
|
||||
@ -53,7 +55,7 @@ export const useCommandMenu = () => {
|
||||
type: CommandType.Action,
|
||||
}));
|
||||
|
||||
setCommands(actionCommands);
|
||||
setCommands([...commands, ...actionCommands]);
|
||||
}
|
||||
|
||||
setIsCommandMenuOpened(true);
|
||||
@ -76,11 +78,17 @@ export const useCommandMenu = () => {
|
||||
|
||||
if (isCommandMenuOpened) {
|
||||
setIsCommandMenuOpened(false);
|
||||
setCommands([]);
|
||||
resetSelectedItem();
|
||||
goBackToPreviousHotkeyScope();
|
||||
}
|
||||
},
|
||||
[goBackToPreviousHotkeyScope, resetSelectedItem, setIsCommandMenuOpened],
|
||||
[
|
||||
goBackToPreviousHotkeyScope,
|
||||
resetSelectedItem,
|
||||
setCommands,
|
||||
setIsCommandMenuOpened,
|
||||
],
|
||||
);
|
||||
|
||||
const toggleCommandMenu = useRecoilCallback(
|
||||
|
||||
Reference in New Issue
Block a user