Skip to content

Fix command menu text/number inputs to commit on blur and cancel cleanly on Escape #18283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ehconitin wants to merge 2 commits into
base: main
Choose a base branch
from
+21 −24
Open

Fix command menu text/number inputs to commit on blur and cancel cleanly on Escape #18283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d384b3
fix
ehconitin Feb 26, 2026
be3cbdb
good catch grep <3
ehconitin Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions packages/twenty-front/src/modules/command-menu/components/CommandMenuItemNumberInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { TextInput } from '@/ui/input/components/TextInput';
import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
import { currentFocusIdSelector } from '@/ui/utilities/focus/states/currentFocusIdSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import styled from '@emotion/styled';
import { useStore } from 'jotai';
import { useRef, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { type IconComponent } from 'twenty-ui/display';
Expand Down Expand Up @@ -44,9 +44,7 @@ export const CommandMenuItemNumberInput = ({
const focusId = `${id}-input`;
const [draftValue, setDraftValue] = useState(value);
const [hasError, setHasError] = useState(false);

const currentFocusId = useAtomStateValue(currentFocusIdSelector);
const isNumberInputCurrentlyFocused = currentFocusId === focusId;
const store = useStore();

const { pushFocusItemToFocusStack } = usePushFocusItemToFocusStack();
const { removeFocusItemFromFocusStackById } =
Expand Down Expand Up @@ -87,20 +85,24 @@ export const CommandMenuItemNumberInput = ({
};

const handleBlur = () => {
const isInputStillFocused =
store.get(currentFocusIdSelector.atom) === focusId;

if (isInputStillFocused && draftValue !== value) {
handleCommit(draftValue);
}

removeFocusItemFromFocusStackById({ focusId });
};

const handleEscape = () => {
removeFocusItemFromFocusStackById({ focusId });
setDraftValue(value);
setHasError(false);
inputRef.current?.blur();
};

const handleClickOutside = () => {
handleCommit(draftValue);
};

const handleEnter = () => {
handleCommit(draftValue);
inputRef.current?.blur();
};

Expand All @@ -110,9 +112,6 @@ export const CommandMenuItemNumberInput = ({
inputValue: draftValue,
onEscape: handleEscape,
onEnter: handleEnter,
onClickOutside: isNumberInputCurrentlyFocused
? handleClickOutside
: undefined,
});

const handleChange = (text: string) => {
Expand Down
22 changes: 10 additions & 12 deletions packages/twenty-front/src/modules/command-menu/components/CommandMenuItemTextInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { TextInput } from '@/ui/input/components/TextInput';
import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
import { currentFocusIdSelector } from '@/ui/utilities/focus/states/currentFocusIdSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
import styled from '@emotion/styled';
import { useStore } from 'jotai';
import { useRef, useState } from 'react';
import { type IconComponent } from 'twenty-ui/display';

Expand Down Expand Up @@ -36,9 +36,7 @@ export const CommandMenuItemTextInput = ({
const inputRef = useRef<HTMLInputElement>(null);
const focusId = `${id}-input`;
const [draftValue, setDraftValue] = useState(value);

const currentFocusId = useAtomStateValue(currentFocusIdSelector);
const isTextInputCurrentlyFocused = currentFocusId === focusId;
const store = useStore();

const { pushFocusItemToFocusStack } = usePushFocusItemToFocusStack();
const { removeFocusItemFromFocusStackById } =
Expand All @@ -59,32 +57,32 @@ export const CommandMenuItemTextInput = ({
};

const handleBlur = () => {
const isInputStillFocused =
store.get(currentFocusIdSelector.atom) === focusId;

if (isInputStillFocused && draftValue !== value) {
onChange(draftValue);
}

removeFocusItemFromFocusStackById({ focusId });
};

const handleEscape = () => {
removeFocusItemFromFocusStackById({ focusId });
setDraftValue(value);
inputRef.current?.blur();
};

const handleEnter = () => {
onChange(draftValue);
inputRef.current?.blur();
};

const handleClickOutside = () => {
onChange(draftValue);
};

useRegisterInputEvents<string>({
focusId,
inputRef: inputRef,
inputValue: draftValue,
onEscape: handleEscape,
onEnter: handleEnter,
onClickOutside: isTextInputCurrentlyFocused
? handleClickOutside
: undefined,
});

const focusInput = () => {
Expand Down
Loading