The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Let Escape close the side panel from form fields (#26540)
Thomas Trompette4368cb65c424
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsxindex bb99e70ee92..d02d445fc1d 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx@@ -275,6 +275,7 @@ export const FormDateFieldInput = ({<FormFieldInputInnerContainerref={refs.setReference}formFieldInputInstanceId={instanceId}+ enableGlobalEscapeHotkeysConflictingWithKeyboard={false}hasRightElement={isDefined(VariablePicker) && !readonly}variant={variant}>diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsxindex 68c7d879370..b67b4bc178f 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx@@ -270,6 +270,7 @@ export const FormDateTimeFieldInput = ({<FormFieldInputInnerContainerref={refs.setReference}formFieldInputInstanceId={instanceId}+ enableGlobalEscapeHotkeysConflictingWithKeyboard={false}hasRightElement={isDefined(VariablePicker) && !readonly}variant={variant}>diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsxindex f3f9c8e6c0f..4dcdf396c49 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx@@ -1,6 +1,7 @@import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';+import { useRemoveFocusItemFromFocusStackOnUnmount } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackOnUnmount';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';import { styled } from '@linaria/react';import { forwardRef, type HTMLAttributes, type Ref } from 'react';@@ -12,6 +13,7 @@ type FormFieldInputInnerContainerProps = {multiline?: boolean;readonly?: boolean;preventFocusStackUpdate?: boolean;+ enableGlobalEscapeHotkeysConflictingWithKeyboard?: boolean;formFieldInputInstanceId: string;variant?: FormFieldInputVariant;};@@ -87,6 +89,7 @@ export const FormFieldInputInnerContainer = forwardRef(multiline,readonly,preventFocusStackUpdate = false,+ enableGlobalEscapeHotkeysConflictingWithKeyboard = true,onClick,formFieldInputInstanceId,variant = 'default',@@ -97,6 +100,11 @@ export const FormFieldInputInnerContainer = forwardRef(const { removeFocusItemFromFocusStackById } =useRemoveFocusItemFromFocusStackById();+ useRemoveFocusItemFromFocusStackOnUnmount({+ focusId: formFieldInputInstanceId,+ isEnabled: !preventFocusStackUpdate,+ });+const handleFocus = (e: React.FocusEvent<HTMLDivElement>) => {onFocus?.(e);@@ -109,6 +117,7 @@ export const FormFieldInputInnerContainer = forwardRef(},globalHotkeysConfig: {enableGlobalHotkeysConflictingWithKeyboard: false,+ enableGlobalEscapeHotkeysConflictingWithKeyboard,},});}diff --git a/packages/twenty-front/src/modules/ui/utilities/focus/hooks/usePushFocusItemToFocusStack.ts b/packages/twenty-front/src/modules/ui/utilities/focus/hooks/usePushFocusItemToFocusStack.tsindex a2a0c43f301..2f9febdc512 100644--- a/packages/twenty-front/src/modules/ui/utilities/focus/hooks/usePushFocusItemToFocusStack.ts+++ b/packages/twenty-front/src/modules/ui/utilities/focus/hooks/usePushFocusItemToFocusStack.ts@@ -50,6 +50,8 @@ export const usePushFocusItemToFocusStack = () => {enableGlobalHotkeysConflictingWithKeyboard:globalHotkeysConfig?.enableGlobalHotkeysConflictingWithKeyboard ??true,+ enableGlobalEscapeHotkeysConflictingWithKeyboard:+ globalHotkeysConfig?.enableGlobalEscapeHotkeysConflictingWithKeyboard,},};diff --git a/packages/twenty-front/src/modules/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackOnUnmount.ts b/packages/twenty-front/src/modules/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackOnUnmount.tsnew file mode 100644index 00000000000..a109c865832--- /dev/null+++ b/packages/twenty-front/src/modules/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackOnUnmount.ts@@ -0,0 +1,24 @@+import { useEffect } from 'react';++import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';++export const useRemoveFocusItemFromFocusStackOnUnmount = ({+ focusId,+ isEnabled,+}: {+ focusId: string;+ isEnabled: boolean;+}) => {+ const { removeFocusItemFromFocusStackById } =+ useRemoveFocusItemFromFocusStackById();++ useEffect(() => {+ if (!isEnabled) {+ return;+ }++ return () => {+ removeFocusItemFromFocusStackById({ focusId });+ };+ }, [focusId, isEnabled, removeFocusItemFromFocusStackById]);+};diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeysCallback.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeysCallback.tsindex 8bd9d26bc84..2c794b1ec3d 100644--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeysCallback.ts+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeysCallback.ts@@ -2,7 +2,9 @@ import { useCallback } from 'react';import { DEBUG_FOCUS_STACK } from '@/ui/utilities/focus/constants/DebugFocusStack';import { currentGlobalHotkeysConfigSelector } from '@/ui/utilities/focus/states/currentGlobalHotkeysConfigSelector';+import { isKeyboardEventComposing } from '@/ui/utilities/hotkey/utils/isKeyboardEventComposing';import { useStore } from 'jotai';+import { Key } from 'ts-key-enum';import {type Hotkey,type OptionsOrDependencyArray,@@ -50,9 +52,16 @@ export const useGlobalHotkeysCallback = (return;}+ const isAllowedGlobalEscapeHotkey =+ currentGlobalHotkeysConfig.enableGlobalEscapeHotkeysConflictingWithKeyboard ===+ true &&+ keyboardEvent.key === Key.Escape &&+ !isKeyboardEventComposing(keyboardEvent);+if (!containsModifier &&- !currentGlobalHotkeysConfig.enableGlobalHotkeysConflictingWithKeyboard+ !currentGlobalHotkeysConfig.enableGlobalHotkeysConflictingWithKeyboard &&+ !isAllowedGlobalEscapeHotkey) {if (DEBUG_FOCUS_STACK) {logDebug(diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement.tsindex 5b9a1102713..f8d0f0364a2 100644--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement.ts+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement.ts@@ -1,5 +1,6 @@import { useHotkeysOnFocusedElementCallback } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElementCallback';import { pendingHotkeyState } from '@/ui/utilities/hotkey/states/internal/pendingHotkeysState';+import { isKeyboardEventComposing } from '@/ui/utilities/hotkey/utils/isKeyboardEventComposing';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useHotkeys } from 'react-hotkeys-hook';import {@@ -48,7 +49,7 @@ export const useHotkeysOnFocusedElement = ({return useHotkeys(keys,(keyboardEvent, hotkeysEvent) => {- if (keyboardEvent.isComposing || keyboardEvent.keyCode === 229) {+ if (isKeyboardEventComposing(keyboardEvent)) {return;}diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/types/GlobalHotkeysConfig.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/types/GlobalHotkeysConfig.tsindex 05f6191138d..dbd96150111 100644--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/types/GlobalHotkeysConfig.ts+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/types/GlobalHotkeysConfig.ts@@ -1,4 +1,5 @@export type GlobalHotkeysConfig = {enableGlobalHotkeysWithModifiers: boolean;enableGlobalHotkeysConflictingWithKeyboard: boolean;+ enableGlobalEscapeHotkeysConflictingWithKeyboard?: boolean;};diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/utils/isKeyboardEventComposing.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/utils/isKeyboardEventComposing.tsnew file mode 100644index 00000000000..433c4aa3841--- /dev/null+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/utils/isKeyboardEventComposing.ts@@ -0,0 +1,2 @@+export const isKeyboardEventComposing = (keyboardEvent: KeyboardEvent) =>+ keyboardEvent.isComposing || keyboardEvent.keyCode === 229;