giggles 0.3.8 → 0.3.9

package/dist/{chunk-OYQZHF73.js → chunk-CKA5JJ4B.js}

@@ -119,7 +119,13 @@ var FocusProvider = ({ children }) => {
       const nodes = nodesRef.current;
       const parent = nodes.get(parentId);
       if (parent && parent.childrenIds.length > 0) {
-        focusNode(parent.childrenIds[0]);
+        let target = parent.childrenIds[0];
+        let targetNode = nodes.get(target);
+        while (targetNode && targetNode.childrenIds.length > 0) {
+          target = targetNode.childrenIds[0];
+          targetNode = nodes.get(target);
+        }
+        focusNode(target);
       } else {
         pendingFocusFirstChildRef.current.add(parentId);
       }
@@ -196,16 +202,34 @@ var FocusProvider = ({ children }) => {
     return pathArray;
   }, [focusedId]);
   const navigateSibling = useCallback2(
-    (direction, wrap = true) => {
-      const currentId = focusedId;
-      if (!currentId) return;
+    (direction, wrap = true, groupId) => {
+      if (!focusedId) return;
       const nodes = nodesRef.current;
-      const currentNode = nodes.get(currentId);
-      if (!(currentNode == null ? void 0 : currentNode.parentId)) return;
-      const parent = nodes.get(currentNode.parentId);
-      if (!parent || parent.childrenIds.length === 0) return;
-      const siblings = parent.childrenIds;
-      const currentIndex = siblings.indexOf(currentId);
+      let currentChildId;
+      let siblings;
+      if (groupId) {
+        const group = nodes.get(groupId);
+        if (!group || group.childrenIds.length === 0) return;
+        siblings = group.childrenIds;
+        let cursor = focusedId;
+        while (cursor) {
+          const node = nodes.get(cursor);
+          if ((node == null ? void 0 : node.parentId) === groupId) {
+            currentChildId = cursor;
+            break;
+          }
+          cursor = (node == null ? void 0 : node.parentId) ?? null;
+        }
+        if (!currentChildId) return;
+      } else {
+        const currentNode = nodes.get(focusedId);
+        if (!(currentNode == null ? void 0 : currentNode.parentId)) return;
+        const parent = nodes.get(currentNode.parentId);
+        if (!parent || parent.childrenIds.length === 0) return;
+        siblings = parent.childrenIds;
+        currentChildId = focusedId;
+      }
+      const currentIndex = siblings.indexOf(currentChildId);
       if (currentIndex === -1) return;
       let nextIndex;
       if (wrap) {
@@ -213,9 +237,15 @@ var FocusProvider = ({ children }) => {
       } else {
         nextIndex = direction === "next" ? Math.min(currentIndex + 1, siblings.length - 1) : Math.max(currentIndex - 1, 0);
       }
-      focusNode(siblings[nextIndex]);
+      const targetId = siblings[nextIndex];
+      const target = nodes.get(targetId);
+      if (target && target.childrenIds.length > 0) {
+        focusFirstChild(targetId);
+      } else {
+        focusNode(targetId);
+      }
     },
-    [focusedId, focusNode]
+    [focusedId, focusNode, focusFirstChild]
   );
   return /* @__PURE__ */ jsx2(
     FocusContext.Provider,
@@ -311,18 +341,18 @@ function InputRouter({ children }) {
     if (!keyName) return;
     for (const nodeId of path) {
       const nodeBindings = getNodeBindings(nodeId);
-      if (!nodeBindings) continue;
-      const entry = nodeBindings.bindings.get(keyName);
-      if (entry && entry.when !== "mounted") {
-        entry.handler(input, key);
-        return;
-      }
-      if (nodeBindings.capture && nodeBindings.onKeypress) {
-        if ((_a = nodeBindings.passthrough) == null ? void 0 : _a.has(keyName)) {
-          continue;
+      if (nodeBindings) {
+        const entry = nodeBindings.bindings.get(keyName);
+        if (entry && entry.when !== "mounted") {
+          entry.handler(input, key);
+          return;
+        }
+        if (nodeBindings.capture && nodeBindings.onKeypress) {
+          if (!((_a = nodeBindings.passthrough) == null ? void 0 : _a.has(keyName))) {
+            nodeBindings.onKeypress(input, key);
+            return;
+          }
         }
-        nodeBindings.onKeypress(input, key);
-        return;
       }
       if (nodeId === trapNodeId) {
         return;
@@ -401,8 +431,8 @@ function FocusGroup({
   const bindContextValue = useMemo(() => value ? { register, unregister } : null, [value, register, unregister]);
   const navigationKeys = useMemo(() => {
     if (!navigable) return {};
-    const next = () => navigateSibling("next", wrap);
-    const prev = () => navigateSibling("prev", wrap);
+    const next = () => navigateSibling("next", wrap, focus.id);
+    const prev = () => navigateSibling("prev", wrap, focus.id);
     const base = direction === "vertical" ? {
       j: next,
       k: prev,
@@ -415,7 +445,7 @@ function FocusGroup({
       left: prev
     };
     return { ...base, tab: next, "shift+tab": prev };
-  }, [navigable, direction, wrap, navigateSibling]);
+  }, [navigable, direction, wrap, navigateSibling, focus.id]);
   const mergedBindings = useMemo(
     () => ({ ...navigationKeys, ...customBindings }),
     [navigationKeys, customBindings]

package/dist/index.js

@@ -14,7 +14,7 @@ import {
   useFocusState,
   useKeybindingRegistry,
   useKeybindings
-} from "./chunk-OYQZHF73.js";
+} from "./chunk-CKA5JJ4B.js";
 import {
   ThemeProvider,
   useTheme

package/dist/ui/index.js

@@ -4,7 +4,7 @@ import {
   useFocus,
   useKeybindingRegistry,
   useKeybindings
-} from "../chunk-OYQZHF73.js";
+} from "../chunk-CKA5JJ4B.js";
 import {
   CodeBlock
 } from "../chunk-TFYBLNEZ.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "giggles",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "license": "MIT",
   "repository": {
     "type": "git",