From c925bd1dc559a12fb8d65ae09641e3871c1ca2ac Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 19 Feb 2026 23:17:39 +0000
Subject: [PATCH 1/3] Remove focus conflicts and add enforceFocus={false} to
 Dialog

Co-authored-by: Trang Doan <trangdoan982@users.noreply.github.com>
---
 apps/roam/src/components/FuzzySelectInput.tsx | 1 -
 apps/roam/src/components/ModifyNodeDialog.tsx | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/roam/src/components/FuzzySelectInput.tsx b/apps/roam/src/components/FuzzySelectInput.tsx
index 16acdca1a..76d771bf8 100644
--- a/apps/roam/src/components/FuzzySelectInput.tsx
+++ b/apps/roam/src/components/FuzzySelectInput.tsx
@@ -62,7 +62,6 @@ const FuzzySelectInput = <T extends Result = Result>({
         setQuery(item.text);
         setValue(item);
         setIsOpen(false);
-        requestAnimationFrame(() => inputRef.current?.focus());
       }
     },
     [mode, initialUid, setValue, onLockedChange],
diff --git a/apps/roam/src/components/ModifyNodeDialog.tsx b/apps/roam/src/components/ModifyNodeDialog.tsx
index ebd84e473..288a9ebd5 100644
--- a/apps/roam/src/components/ModifyNodeDialog.tsx
+++ b/apps/roam/src/components/ModifyNodeDialog.tsx
@@ -491,6 +491,7 @@ const ModifyNodeDialog = ({
       onClose={onClose}
       canEscapeKeyClose
       autoFocus={false}
+      enforceFocus={false}
       className={"roamjs-canvas-dialog"}
     >
       <div

From 4a9a23598a2d1202af0e6a35d1a4cfbc4204cbd4 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 19 Feb 2026 23:18:49 +0000
Subject: [PATCH 2/3] Add focus management to move to Confirm button after node
 selection

Co-authored-by: Trang Doan <trangdoan982@users.noreply.github.com>
---
 apps/roam/src/components/FuzzySelectInput.tsx | 6 +++++-
 apps/roam/src/components/ModifyNodeDialog.tsx | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/roam/src/components/FuzzySelectInput.tsx b/apps/roam/src/components/FuzzySelectInput.tsx
index 76d771bf8..c732cfe38 100644
--- a/apps/roam/src/components/FuzzySelectInput.tsx
+++ b/apps/roam/src/components/FuzzySelectInput.tsx
@@ -21,6 +21,7 @@ type FuzzySelectInputProps<T extends Result = Result> = {
   placeholder?: string;
   autoFocus?: boolean;
   initialIsLocked?: boolean;
+  onSelectComplete?: () => void;
 };
 
 const FuzzySelectInput = <T extends Result = Result>({
@@ -33,6 +34,7 @@ const FuzzySelectInput = <T extends Result = Result>({
   placeholder = "Enter value",
   autoFocus,
   initialIsLocked,
+  onSelectComplete,
 }: FuzzySelectInputProps<T>) => {
   const [isLocked, setIsLocked] = useState(initialIsLocked || false);
   const [query, setQuery] = useState<string>(() => value?.text || "");
@@ -58,13 +60,15 @@ const FuzzySelectInput = <T extends Result = Result>({
         setValue(item);
         setIsOpen(false);
         onLockedChange?.(true);
+        onSelectComplete?.();
       } else {
         setQuery(item.text);
         setValue(item);
         setIsOpen(false);
+        onSelectComplete?.();
       }
     },
-    [mode, initialUid, setValue, onLockedChange],
+    [mode, initialUid, setValue, onLockedChange, onSelectComplete],
   );
 
   const handleClear = useCallback(() => {
diff --git a/apps/roam/src/components/ModifyNodeDialog.tsx b/apps/roam/src/components/ModifyNodeDialog.tsx
index 288a9ebd5..5f6ecfc21 100644
--- a/apps/roam/src/components/ModifyNodeDialog.tsx
+++ b/apps/roam/src/components/ModifyNodeDialog.tsx
@@ -102,6 +102,7 @@ const ModifyNodeDialog = ({
   const contentRequestIdRef = useRef(0);
   const referencedNodeRequestIdRef = useRef(0);
   const [error, setError] = useState("");
+  const confirmButtonRef = useRef<HTMLButtonElement>(null);
 
   const discourseNodes = useMemo(() => {
     const allNodes = getDiscourseNodes();
@@ -235,6 +236,10 @@ const ModifyNodeDialog = ({
     setReferencedNodeValue(r);
   }, []);
 
+  const handleSelectComplete = useCallback(() => {
+    confirmButtonRef.current?.focus();
+  }, []);
+
   const onCancelClick = useCallback(() => {
     onClose();
   }, [onClose]);
@@ -540,6 +545,7 @@ const ModifyNodeDialog = ({
               mode={mode}
               initialUid={content.uid}
               autoFocus
+              onSelectComplete={handleSelectComplete}
             />
           </div>
 
@@ -556,6 +562,7 @@ const ModifyNodeDialog = ({
                 initialUid={referencedNodeValue.uid}
                 initialIsLocked={isReferencedNodeLocked}
                 autoFocus={false}
+                onSelectComplete={handleSelectComplete}
               />
             </div>
           )}
@@ -571,6 +578,7 @@ const ModifyNodeDialog = ({
               onClick={() => void onSubmit()}
               disabled={loading || !content.text.trim()}
               className="flex-shrink-0"
+              elementRef={confirmButtonRef}
             />
             <Button
               text="Cancel"

From 8f512d348d8084e864ab82374cb46f4fa152ace9 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 19 Feb 2026 23:43:45 +0000
Subject: [PATCH 3/3] Simplify focus management by handling it in setValue
 callbacks

Co-authored-by: Trang Doan <trangdoan982@users.noreply.github.com>
---
 apps/roam/src/components/FuzzySelectInput.tsx |  6 +-----
 apps/roam/src/components/ModifyNodeDialog.tsx | 16 ++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/roam/src/components/FuzzySelectInput.tsx b/apps/roam/src/components/FuzzySelectInput.tsx
index c732cfe38..76d771bf8 100644
--- a/apps/roam/src/components/FuzzySelectInput.tsx
+++ b/apps/roam/src/components/FuzzySelectInput.tsx
@@ -21,7 +21,6 @@ type FuzzySelectInputProps<T extends Result = Result> = {
   placeholder?: string;
   autoFocus?: boolean;
   initialIsLocked?: boolean;
-  onSelectComplete?: () => void;
 };
 
 const FuzzySelectInput = <T extends Result = Result>({
@@ -34,7 +33,6 @@ const FuzzySelectInput = <T extends Result = Result>({
   placeholder = "Enter value",
   autoFocus,
   initialIsLocked,
-  onSelectComplete,
 }: FuzzySelectInputProps<T>) => {
   const [isLocked, setIsLocked] = useState(initialIsLocked || false);
   const [query, setQuery] = useState<string>(() => value?.text || "");
@@ -60,15 +58,13 @@ const FuzzySelectInput = <T extends Result = Result>({
         setValue(item);
         setIsOpen(false);
         onLockedChange?.(true);
-        onSelectComplete?.();
       } else {
         setQuery(item.text);
         setValue(item);
         setIsOpen(false);
-        onSelectComplete?.();
       }
     },
-    [mode, initialUid, setValue, onLockedChange, onSelectComplete],
+    [mode, initialUid, setValue, onLockedChange],
   );
 
   const handleClear = useCallback(() => {
diff --git a/apps/roam/src/components/ModifyNodeDialog.tsx b/apps/roam/src/components/ModifyNodeDialog.tsx
index 5f6ecfc21..ef44564c8 100644
--- a/apps/roam/src/components/ModifyNodeDialog.tsx
+++ b/apps/roam/src/components/ModifyNodeDialog.tsx
@@ -230,15 +230,17 @@ const ModifyNodeDialog = ({
 
   const setValue = useCallback((r: Result) => {
     setContent(r);
-  }, []);
+    if (r.uid && r.uid !== initialValue.uid) {
+      confirmButtonRef.current?.focus();
+    }
+  }, [initialValue.uid]);
 
   const setReferencedNodeValueCallback = useCallback((r: Result) => {
     setReferencedNodeValue(r);
-  }, []);
-
-  const handleSelectComplete = useCallback(() => {
-    confirmButtonRef.current?.focus();
-  }, []);
+    if (r.uid && r.uid !== initialReferencedNode?.uid) {
+      confirmButtonRef.current?.focus();
+    }
+  }, [initialReferencedNode?.uid]);
 
   const onCancelClick = useCallback(() => {
     onClose();
@@ -545,7 +547,6 @@ const ModifyNodeDialog = ({
               mode={mode}
               initialUid={content.uid}
               autoFocus
-              onSelectComplete={handleSelectComplete}
             />
           </div>
 
@@ -562,7 +563,6 @@ const ModifyNodeDialog = ({
                 initialUid={referencedNodeValue.uid}
                 initialIsLocked={isReferencedNodeLocked}
                 autoFocus={false}
-                onSelectComplete={handleSelectComplete}
               />
             </div>
           )}