tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix combobox menu not closing after a selection (#39595)

Browse Source
This commit is contained in:
diondiondion 2026-06-24 14:59:34 +02:00 committed by Claire
parent 8fe3dbad2e
commit 2abd442c64
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/mastodon/components/form_fields/combobox_field.tsx
View File

@ -239,6 +239,11 @@ const ComboboxWithRef = <Item extends ComboboxItem, GroupKey extends string>(
const inputRef = useRef<HTMLInputElement | null>();
const popoverRef = useRef<HTMLDivElement>(null);
// This ref tracks whether the menu was just closed following a
// selection, and prevents the menu from re-opening again
// when focus is returned to the input.
const wasMenuJustClosedRef = useRef(false);
const [highlightedItemId, setHighlightedItemId] = useState<string | null>(
null,
);
@ -304,7 +309,7 @@ const ComboboxWithRef = <Item extends ComboboxItem, GroupKey extends string>(
const handleFocus: React.FocusEventHandler<HTMLInputElement> = useCallback(
(e) => {
if (openOnFocus) {
if (openOnFocus && !wasMenuJustClosedRef.current) {
setShouldMenuOpen(true);
}
onFocus?.(e);
@ -341,6 +346,10 @@ const ComboboxWithRef = <Item extends ComboboxItem, GroupKey extends string>(
if (closeOnSelect) {
closeMenu();
wasMenuJustClosedRef.current = true;
setTimeout(() => {
wasMenuJustClosedRef.current = false;
}, 50);
}
}
}