Skip to content

Build your personal knowledge base with Trilium Notes

fix(autocomplete): hold an Enter pressed before the newer query's results

Claude3a6fe7521c92
diff --git a/apps/client/src/widgets/react/FormAutocomplete.tsx b/apps/client/src/widgets/react/FormAutocomplete.tsx
index 3312a45662..efa5f78a9a 100644
--- a/apps/client/src/widgets/react/FormAutocomplete.tsx
+++ b/apps/client/src/widgets/react/FormAutocomplete.tsx
@@ -275,6 +275,12 @@ export function useAutocomplete<T>({ query, source, onPick, inputRef, disabled,
// next render: a second Enter in the same task then reaches the host's form (issue #5669).
const pickedSinceRender = useRef(false);
pickedSinceRender.current = false;
+ // Whether the entries on show answer an older query than the field's text. An Enter pressed then
+ // is held in `enterHeld` and picks from the newer query's entries once they arrive.
+ const isStale = useRef(false);
+ const enterHeld = useRef(false);
+ const pickLatest = useRef(pick);
+ pickLatest.current = pick;
// Set when the keyboard or a new list moves the highlight, which the effect below scrolls into view.
// The pointer never sets it: scrolling a partly shown row under the pointer would move the list.
const scrollToActive = useRef(false);
@@ -294,6 +300,8 @@ export function useAutocomplete<T>({ query, source, onPick, inputRef, disabled,
const close = useCallback(() => {
// Invalidates in-flight queries too, so a late response cannot repopulate a closed dropdown.
latestQuery.current++;
+ isStale.current = false;
+ enterHeld.current = false;
setIsOpen(false);
setActiveIndex(-1);
setItems([]);
@@ -307,6 +315,7 @@ export function useAutocomplete<T>({ query, source, onPick, inputRef, disabled,
}
const queryId = ++latestQuery.current;
+ isStale.current = true;
const lookUp = async () => {
// A scheduler can run a lookup that a newer query (or a close) has since superseded.
if (latestQuery.current !== queryId) return;
@@ -315,9 +324,15 @@ export function useAutocomplete<T>({ query, source, onPick, inputRef, disabled,
// A newer query (or a close) happened while awaiting.
if (latestQuery.current === queryId) {
+ const index = autoActivate ? bestMatchIndex(suggestions, query, isHeading, textOf, fallbackIndex) : -1;
+ isStale.current = false;
setItems(suggestions);
scrollToActive.current = true;
- setActiveIndex(autoActivate ? bestMatchIndex(suggestions, query, isHeading, textOf, fallbackIndex) : -1);
+ setActiveIndex(index);
+ if (enterHeld.current) {
+ enterHeld.current = false;
+ if (index >= 0) pickLatest.current(suggestions[index]);
+ }
}
};
@@ -379,7 +394,11 @@ export function useAutocomplete<T>({ query, source, onPick, inputRef, disabled,
// Consume the key so it does not also reach the surrounding form or dialog.
e.preventDefault();
e.stopPropagation();
- pick(items[activeIndex]);
+ if (isStale.current) {
+ enterHeld.current = true;
+ } else {
+ pick(items[activeIndex]);
+ }
} else if (openOnEnter) {
open();
}
@@ -418,7 +437,11 @@ export function useAutocomplete<T>({ query, source, onPick, inputRef, disabled,
close,
pick,
/** Call once the field's text has changed. */
- handleInput: open,
+ handleInput() {
+ // The lookup effect runs after the next render, and a key can arrive before it.
+ isStale.current = true;
+ open();
+ },
handleFocus() {
if (openOnFocus) open();
},
diff --git a/apps/client/src/widgets/react/NoteAutocomplete.spec.tsx b/apps/client/src/widgets/react/NoteAutocomplete.spec.tsx
index 0b880eae62..8e58b667ef 100644
--- a/apps/client/src/widgets/react/NoteAutocomplete.spec.tsx
+++ b/apps/client/src/widgets/react/NoteAutocomplete.spec.tsx
@@ -327,6 +327,26 @@ describe("NoteAutocomplete's suggestion list", () => {
expect(onChange).toHaveBeenCalledWith(notes[1]);
});
+ it("holds an Enter pressed before the newer query's notes come, then picks among them", async () => {
+ const onChange = vi.fn();
+ const input = await mount({ onChange });
+ await type(input, "al");
+ expect(rows()[0].classList.contains("tn-menu-active")).toBe(true);
+
+ let resolve: (suggestions: Suggestion[]) => void = () => {};
+ getNoteSuggestions.mockImplementationOnce(() => new Promise((r) => { resolve = r; }));
+ await type(input, "be");
+ const enter = new KeyboardEvent("keydown", { key: "Enter", bubbles: true, cancelable: true });
+ await act(async () => { input.dispatchEvent(enter); });
+
+ expect(enter.defaultPrevented).toBe(true);
+ expect(onChange).not.toHaveBeenCalled();
+
+ await act(async () => { resolve([ notes[1] ]); });
+ expect(onChange).toHaveBeenCalledOnce();
+ expect(onChange).toHaveBeenCalledWith(notes[1]);
+ });
+
it("searches on the first keystroke, and paces the rest of a burst", async () => {
const input = await mount();