@nick-skriabin/glyph 0.1.33 → 0.1.35

package/dist/index.cjs

@@ -4347,54 +4347,7 @@ function DialogOverlay({ dialog, onDismiss }) {
     )
   );
 }
-function useFocusRegistry() {
-  const focusCtx = React15.useContext(FocusContext);
-  const layoutCtx = React15.useContext(LayoutContext);
-  const [elements, setElements] = React15.useState([]);
-  const updateRef = React15.useRef(() => {
-  });
-  const updateElements = React15.useCallback(() => {
-    if (!focusCtx) return;
-    const registered = focusCtx.getRegisteredElements?.() ?? [];
-    const mapped = registered.map(({ id, node }) => ({
-      id,
-      node,
-      layout: layoutCtx?.getLayout(node) ?? node.layout,
-      type: node.type
-    }));
-    mapped.sort((a, b) => {
-      if (a.layout.y !== b.layout.y) {
-        return a.layout.y - b.layout.y;
-      }
-      return a.layout.x - b.layout.x;
-    });
-    setElements(mapped);
-  }, [focusCtx, layoutCtx]);
-  updateRef.current = updateElements;
-  React15.useEffect(() => {
-    if (!focusCtx) return;
-    updateElements();
-    const unsubscribe = focusCtx.onFocusChange(() => {
-      updateElements();
-    });
-    const timer = setTimeout(updateElements, 50);
-    return () => {
-      unsubscribe();
-      clearTimeout(timer);
-    };
-  }, [focusCtx, layoutCtx, updateElements]);
-  if (!focusCtx) return null;
-  return {
-    elements,
-    focusedId: focusCtx.focusedId,
-    requestFocus: focusCtx.requestFocus,
-    focusNext: focusCtx.focusNext,
-    focusPrev: focusCtx.focusPrev,
-    refresh: () => updateRef.current()
-  };
-}
-
-// src/components/JumpNav.tsx
+var JumpNavContext = React15.createContext(null);
 function generateHints(count, chars) {
   const hints = [];
   const charList = chars.split("");
@@ -4422,8 +4375,25 @@ function JumpNav({
 }) {
   const [isActive, setIsActive] = React15.useState(false);
   const [inputBuffer, setInputBuffer] = React15.useState("");
-  const registry = useFocusRegistry();
+  const [hasChildJumpNav, setHasChildJumpNav] = React15.useState(false);
+  const [elements, setElements] = React15.useState([]);
   const inputCtx = React15.useContext(InputContext);
+  const focusCtx = React15.useContext(FocusContext);
+  const layoutCtx = React15.useContext(LayoutContext);
+  const parentJumpNav = React15.useContext(JumpNavContext);
+  const wrapperRef = React15.useRef(null);
+  React15.useEffect(() => {
+    if (parentJumpNav) {
+      return parentJumpNav.registerChildJumpNav();
+    }
+  }, [parentJumpNav]);
+  const contextValue = React15.useMemo(() => ({
+    isChildActive: hasChildJumpNav,
+    registerChildJumpNav: () => {
+      setHasChildJumpNav(true);
+      return () => setHasChildJumpNav(false);
+    }
+  }), [hasChildJumpNav]);
   const parseKey = React15.useCallback((keyStr) => {
     const parts = keyStr.toLowerCase().split("+");
     return {
@@ -4435,28 +4405,58 @@ function JumpNav({
     };
   }, []);
   const activationKeyParsed = parseKey(activationKey);
+  const findFocusableDescendants = React15.useCallback((node) => {
+    const result = [];
+    function walk(n) {
+      if (n.focusId) {
+        result.push({
+          id: n.focusId,
+          node: n,
+          layout: layoutCtx?.getLayout(n) ?? n.layout
+        });
+      }
+      for (const child of n.children) {
+        walk(child);
+      }
+    }
+    walk(node);
+    return result;
+  }, [layoutCtx]);
+  const refreshElements = React15.useCallback(() => {
+    if (!wrapperRef.current) return;
+    const descendants = findFocusableDescendants(wrapperRef.current);
+    descendants.sort((a, b) => {
+      if (a.layout.y !== b.layout.y) {
+        return a.layout.y - b.layout.y;
+      }
+      return a.layout.x - b.layout.x;
+    });
+    setElements(descendants);
+  }, [findFocusableDescendants]);
   const wasActiveRef = React15.useRef(false);
   React15.useEffect(() => {
-    if (isActive && !wasActiveRef.current && registry?.refresh) {
-      registry.refresh();
+    if (isActive && !wasActiveRef.current) {
+      refreshElements();
     }
     wasActiveRef.current = isActive;
-  }, [isActive]);
-  const elements = registry?.elements ?? [];
+  }, [isActive, refreshElements]);
   const visibleElements = elements.filter(
     (el) => el.layout.width > 0 && el.layout.height > 0
   );
   const visibleHints = generateHints(visibleElements.length, hintChars);
-  const visibleHintMap = /* @__PURE__ */ new Map();
-  visibleElements.forEach((el, i) => {
-    if (visibleHints[i]) {
-      visibleHintMap.set(visibleHints[i], el.id);
-    }
-  });
+  const visibleHintMap = React15.useMemo(() => {
+    const map = /* @__PURE__ */ new Map();
+    visibleElements.forEach((el, i) => {
+      if (visibleHints[i]) {
+        map.set(visibleHints[i], el.id);
+      }
+    });
+    return map;
+  }, [visibleElements, visibleHints]);
   React15.useEffect(() => {
     if (!inputCtx || !enabled) return;
     const handler = (key) => {
-      if (!isActive && key.name === activationKeyParsed.name && !!key.ctrl === activationKeyParsed.ctrl && !!key.alt === activationKeyParsed.alt && !!key.shift === activationKeyParsed.shift && !!key.meta === activationKeyParsed.meta) {
+      if (!isActive && !hasChildJumpNav && key.name === activationKeyParsed.name && !!key.ctrl === activationKeyParsed.ctrl && !!key.alt === activationKeyParsed.alt && !!key.shift === activationKeyParsed.shift && !!key.meta === activationKeyParsed.meta) {
         setIsActive(true);
         setInputBuffer("");
         return true;
@@ -4475,7 +4475,7 @@ function JumpNav({
           const newBuffer = inputBuffer + key.sequence.toLowerCase();
           const targetId = visibleHintMap.get(newBuffer);
           if (targetId) {
-            registry?.requestFocus(targetId);
+            focusCtx?.requestFocus(targetId);
             setIsActive(false);
             setInputBuffer("");
             return true;
@@ -4493,7 +4493,7 @@ function JumpNav({
       return false;
     };
     return inputCtx.subscribePriority(handler);
-  }, [inputCtx, enabled, isActive, activationKeyParsed, inputBuffer, visibleHintMap, registry]);
+  }, [inputCtx, enabled, isActive, activationKeyParsed, inputBuffer, visibleHintMap, focusCtx, hasChildJumpNav]);
   const hintsOverlay = isActive ? React15__default.default.createElement(
     React15__default.default.Fragment,
     null,
@@ -4541,10 +4541,24 @@ function JumpNav({
       }, inputBuffer ? `Jump: ${inputBuffer}_` : "Press a key to jump \u2022 ESC to cancel")
     )
   ) : null;
+  const wrappedChildren = React15__default.default.createElement(
+    "box",
+    {
+      ref: (node) => {
+        wrapperRef.current = node;
+      },
+      style: {
+        // Invisible wrapper - takes full size of parent
+        flexGrow: 1,
+        flexDirection: "column"
+      }
+    },
+    children
+  );
   return React15__default.default.createElement(
-    React15__default.default.Fragment,
-    null,
-    children,
+    JumpNavContext.Provider,
+    { value: contextValue },
+    wrappedChildren,
     hintsOverlay
   );
 }
@@ -4646,6 +4660,52 @@ function useApp() {
     }
   };
 }
+function useFocusRegistry() {
+  const focusCtx = React15.useContext(FocusContext);
+  const layoutCtx = React15.useContext(LayoutContext);
+  const [elements, setElements] = React15.useState([]);
+  const updateRef = React15.useRef(() => {
+  });
+  const updateElements = React15.useCallback(() => {
+    if (!focusCtx) return;
+    const registered = focusCtx.getRegisteredElements?.() ?? [];
+    const mapped = registered.map(({ id, node }) => ({
+      id,
+      node,
+      layout: layoutCtx?.getLayout(node) ?? node.layout,
+      type: node.type
+    }));
+    mapped.sort((a, b) => {
+      if (a.layout.y !== b.layout.y) {
+        return a.layout.y - b.layout.y;
+      }
+      return a.layout.x - b.layout.x;
+    });
+    setElements(mapped);
+  }, [focusCtx, layoutCtx]);
+  updateRef.current = updateElements;
+  React15.useEffect(() => {
+    if (!focusCtx) return;
+    updateElements();
+    const unsubscribe = focusCtx.onFocusChange(() => {
+      updateElements();
+    });
+    const timer = setTimeout(updateElements, 50);
+    return () => {
+      unsubscribe();
+      clearTimeout(timer);
+    };
+  }, [focusCtx, layoutCtx, updateElements]);
+  if (!focusCtx) return null;
+  return {
+    elements,
+    focusedId: focusCtx.focusedId,
+    requestFocus: focusCtx.requestFocus,
+    focusNext: focusCtx.focusNext,
+    focusPrev: focusCtx.focusPrev,
+    refresh: () => updateRef.current()
+  };
+}
 
 // src/utils/mask.ts
 function parseMask(mask) {