@jini-ai/ui 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @jini-ai/ui
 
+## 0.4.1 — 2026-10-04
+
+- `useFocusTrap` returns focus to the element that held it when the trap activated (the dialog's opener) once the trap closes or deactivates, if that element is still in the document.
+
 ## 0.4.0 — 2026-10-02
 
 ### BREAKING

package/dist/features/panel-kit/hooks/use-focus-trap.hooks.d.ts

@@ -1,5 +1,8 @@
 import { type RefObject } from "react";
-/** Trap Tab/Shift+Tab in the most recently activated container; outer traps resume on cleanup. */
+/**
+ * Trap Tab/Shift+Tab in the most recently activated container; outer traps resume on cleanup, and
+ * focus goes back to whatever held it when the trap activated (the dialog's opener).
+ */
 export declare function useFocusTrap({ containerRef }: {
     containerRef: RefObject<HTMLElement | null>;
 }, { active }?: {

package/dist/features/panel-kit/hooks/use-focus-trap.hooks.js

@@ -38,11 +38,19 @@ function redirectTarget(container, shiftKey) {
         return first;
     return null;
 }
-/** Trap Tab/Shift+Tab in the most recently activated container; outer traps resume on cleanup. */
+/**
+ * Trap Tab/Shift+Tab in the most recently activated container; outer traps resume on cleanup, and
+ * focus goes back to whatever held it when the trap activated (the dialog's opener).
+ */
 export function useFocusTrap({ containerRef }, { active = true } = {}) {
     useEffect(() => {
         if (!active)
             return;
+        // Captured before anything inside the dialog takes focus, so keyboard users land back on the
+        // control they opened it from instead of at the top of the page. An element already inside the
+        // container (an autoFocus child committed first) is not the opener, so nothing is restored then.
+        const previous = document.activeElement;
+        const opener = previous instanceof HTMLElement && !containerRef.current?.contains(previous) ? previous : null;
         activeTraps.push(containerRef);
         function onKeyDown(event) {
             if (event.key !== "Tab" || activeTraps[activeTraps.length - 1] !== containerRef)
@@ -60,6 +68,8 @@ export function useFocusTrap({ containerRef }, { active = true } = {}) {
         return () => {
             document.removeEventListener("keydown", onKeyDown);
             activeTraps.splice(activeTraps.lastIndexOf(containerRef), 1);
+            if (opener?.isConnected)
+                opener.focus();
         };
     }, [containerRef, active]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jini-ai/ui",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Generic, product-neutral React UI primitives and feature domains. Framework-free types, decision rules, catalogs, and host port contracts live behind ./core (no React, no DOM). The Excalidraw and Lexical editors live behind ./sketch-editor and ./lexical-rich-text-editor; the GrapesJS-backed inline HTML editor lives behind ./html-editor.",
   "license": "Apache-2.0",
   "repository": {
@@ -162,8 +162,8 @@
     "shiki": "^1.24.4",
     "tailwind-merge": "^2.6.0",
     "zod": "^3.25.76",
-    "@jini-ai/core": "0.4.0",
-    "@jini-ai/agentic": "0.4.0"
+    "@jini-ai/agentic": "0.4.0",
+    "@jini-ai/core": "0.4.0"
   },
   "devDependencies": {
     "@excalidraw/excalidraw": "0.18.1",