@noya-app/noya-designsystem 0.1.83 → 0.1.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noya-app/noya-designsystem",
-  "version": "0.1.83",
+  "version": "0.1.84",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

package/src/contexts/DialogContext.tsx

@@ -231,20 +231,27 @@ export const DialogProvider = function DialogProvider({
   const confirmButtonRef = useRef<HTMLButtonElement>(null);
   const dialogRef = useRef<IDialog>(null);
 
-  // Handle auto-focus when dialog opens
+  // Handle auto-focus when dialog opens. The `resolve` function is created
+  // once per dialog instance and preserved across state updates (e.g. typing
+  // in the input replaces `contents` but keeps the same `resolve`), so keying
+  // the effect on it ensures focus is only set when a dialog opens, not on
+  // every keystroke.
+  const contentsType = contents?.type;
+  const contentsInstance = contents?.resolve;
+
   React.useEffect(() => {
-    if (!contents) return;
+    if (!contentsType || !contentsInstance) return;
 
     // Use requestAnimationFrame to ensure the dialog is rendered
     requestAnimationFrame(() => {
-      if (contents.type === "input") {
+      if (contentsType === "input") {
         inputRef.current?.focus();
         inputRef.current?.setSelectionRange(0, inputRef.current.value.length);
-      } else if (contents.type === "confirmation") {
+      } else if (contentsType === "confirmation") {
         confirmButtonRef.current?.focus();
       }
     });
-  }, [contents]);
+  }, [contentsType, contentsInstance]);
 
   const containsElement = useCallback((element: HTMLElement) => {
     if (!dialogRef.current) return false;

package/src/contexts/__tests__/DialogContext.test.tsx

@@ -0,0 +1,142 @@
+import { afterEach, describe, expect, mock, test } from "bun:test";
+import React from "react";
+
+// `@radix-ui/react-icons` has a nested React 18 copy in node_modules, which
+// creates legacy React elements that React 19 refuses to render under
+// `bun test` (app bundlers alias react, so this only affects tests). Mock the
+// icon used by the Dialog close button so everything renders with one React.
+const actualIcons = await import("@radix-ui/react-icons");
+
+mock.module("@radix-ui/react-icons", () => ({
+  ...actualIcons,
+  Cross1Icon: (props: React.SVGProps<SVGSVGElement>) => (
+    <svg {...props} data-testid="cross-icon" />
+  ),
+}));
+
+const { cleanup, fireEvent, render, waitFor } = await import(
+  "@testing-library/react"
+);
+const { DialogProvider, useOpenInputDialog } = await import(
+  "../DialogContext"
+);
+
+const focusListeners: ((event: Event) => void)[] = [];
+
+afterEach(() => {
+  cleanup();
+
+  for (const listener of focusListeners) {
+    document.removeEventListener("focus", listener, true);
+  }
+  focusListeners.length = 0;
+});
+
+function flushAnimationFrames() {
+  return new Promise<void>((resolve) => {
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => resolve());
+    });
+  });
+}
+
+function OpenDialogButton({
+  onResult,
+}: {
+  onResult: (value: string | undefined) => void;
+}) {
+  const openInputDialog = useOpenInputDialog();
+
+  return (
+    <button
+      onClick={async () => {
+        const result = await openInputDialog({
+          title: "Rename",
+          initialValue: "hello",
+        });
+        onResult(result);
+      }}
+    >
+      Open
+    </button>
+  );
+}
+
+async function openInputDialogForTest(
+  onResult: (value: string | undefined) => void = () => {}
+) {
+  const utils = render(
+    <DialogProvider>
+      <OpenDialogButton onResult={onResult} />
+    </DialogProvider>
+  );
+
+  // Count focus events on the dialog's input, attached before the dialog
+  // opens so the initial auto-focus is captured
+  let focusCount = 0;
+  const handleFocus = (event: Event) => {
+    if ((event.target as HTMLElement).tagName === "INPUT") {
+      focusCount++;
+    }
+  };
+  document.addEventListener("focus", handleFocus, true);
+  focusListeners.push(handleFocus);
+
+  fireEvent.click(utils.getByText("Open"));
+
+  const input = await waitFor(() => {
+    const element = document.querySelector<HTMLInputElement>(
+      'input[type="text"], input:not([type])'
+    );
+    if (!element) throw new Error("Input not found");
+    return element;
+  });
+
+  await flushAnimationFrames();
+
+  return { ...utils, input, getFocusCount: () => focusCount };
+}
+
+describe("DialogProvider input dialog", () => {
+  test("focuses and selects the initial value when opened", async () => {
+    const { input, getFocusCount } = await openInputDialogForTest();
+
+    expect(getFocusCount()).toBeGreaterThanOrEqual(1);
+    expect(input.selectionStart).toEqual(0);
+    expect(input.selectionEnd).toEqual("hello".length);
+  });
+
+  test("does not re-focus or re-select on keystrokes", async () => {
+    const { input, getFocusCount } = await openInputDialogForTest();
+
+    const focusCountAfterOpen = getFocusCount();
+
+    fireEvent.change(input, { target: { value: "hello w" } });
+
+    // Simulate the caret position after typing (collapsed at the end)
+    input.setSelectionRange(input.value.length, input.value.length);
+
+    await flushAnimationFrames();
+
+    expect(input.value).toEqual("hello w");
+    // The focus side effect must not run again on a keystroke
+    expect(getFocusCount()).toEqual(focusCountAfterOpen);
+    // Selection must not be reset to cover the whole value
+    expect(input.selectionStart).toEqual(input.value.length);
+    expect(input.selectionEnd).toEqual(input.value.length);
+  });
+
+  test("submits the typed value on Enter", async () => {
+    let result: string | undefined;
+    const { input } = await openInputDialogForTest((value) => {
+      result = value;
+    });
+
+    fireEvent.change(input, { target: { value: "world" } });
+    fireEvent.keyDown(input, { key: "Enter" });
+
+    await waitFor(() => {
+      expect(result).toEqual("world");
+    });
+  });
+});