Skip to content

A local-first personal finance app

πŸ› Fix `Make Transfer` closing the Popover when clicked (#4697)

lelemm77949ad2760b
diff --git a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
index 81f2764a06..5a9bdb839e 100644
--- a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
@@ -24,6 +24,8 @@ import Downshift, { type StateChangeTypes } from 'downshift';
import { getNormalisedString } from 'loot-core/shared/normalisation';
+import { useProperFocus } from '../../hooks/useProperFocus';
+
type CommonAutocompleteProps<T extends Item> = {
focused?: boolean;
embedded?: boolean;
@@ -299,6 +301,8 @@ function SingleAutocomplete<T extends Item>({
}
const filtered = isChanged ? filteredSuggestions || suggestions : suggestions;
+ const inputRef = useRef(null);
+ useProperFocus(inputRef, focused);
return (
<Downshift
@@ -458,6 +462,7 @@ function SingleAutocomplete<T extends Item>({
{renderInput(
getInputProps({
focused,
+ inputRef,
...inputProps,
onFocus: e => {
inputProps.onFocus?.(e);
@@ -661,6 +666,8 @@ function MultiAutocomplete<T extends Item>({
}: MultiAutocompleteProps<T>) {
const [focused, setFocused] = useState(false);
const selectedItemIds = selectedItems.map(getItemId);
+ const inputRef = useRef(null);
+ useProperFocus(inputRef, focused);
function onRemoveItem(id: T['id']) {
const items = selectedItemIds.filter(i => i !== id);
@@ -728,6 +735,7 @@ function MultiAutocomplete<T extends Item>({
})}
<Input
{...inputProps}
+ inputRef={inputRef}
onKeyDown={e => onKeyDown(e, inputProps.onKeyDown)}
onFocus={e => {
setFocused(true);
diff --git a/upcoming-release-notes/4697.md b/upcoming-release-notes/4697.md
new file mode 100644
index 0000000000..59caf6987f
--- /dev/null
+++ b/upcoming-release-notes/4697.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [lelemm]
+---
+
+πŸ› Fix `Make Transfer` closing the Popover when clicked