@nick-skriabin/glyph 0.1.37 → 0.1.38

package/dist/index.cjs

@@ -2076,6 +2076,18 @@ function render(element, opts = {}) {
         }
       }
       return result;
+    },
+    getActiveElements() {
+      const activeIds = getActiveFocusableIds();
+      const result = [];
+      for (const id of activeIds) {
+        if (skippableIds.has(id)) continue;
+        const node = focusRegistry.get(id);
+        if (node) {
+          result.push({ id, node });
+        }
+      }
+      return result;
     }
   };
   const layoutSubscriptions = /* @__PURE__ */ new Map();
@@ -4347,7 +4359,6 @@ function DialogOverlay({ dialog, onDismiss }) {
     )
   );
 }
-var JumpNavContext = React15.createContext(null);
 function generateHints(count, chars) {
   const hints = [];
   const charList = chars.split("");
@@ -4378,25 +4389,13 @@ function JumpNav({
   };
   const [isActive, setIsActive] = React15.useState(false);
   const [inputBuffer, setInputBuffer] = React15.useState("");
-  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]);
+    log("Mounted, inputCtx:", !!inputCtx, "focusCtx:", !!focusCtx, "enabled:", enabled);
+  }, []);
   const parseKey = React15.useCallback((keyStr) => {
     const parts = keyStr.toLowerCase().split("+");
     return {
@@ -4408,45 +4407,34 @@ 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) {
-      log("refreshElements: no wrapper ref");
+    if (!focusCtx?.getActiveElements) {
+      log("refreshElements: no getActiveElements");
       return;
     }
-    const descendants = findFocusableDescendants(wrapperRef.current);
-    log("Found", descendants.length, "focusable elements");
-    descendants.sort((a, b) => {
+    const active = focusCtx.getActiveElements();
+    log("getActiveElements returned", active.length, "elements");
+    const mapped = active.map(({ id, node }) => ({
+      id,
+      node,
+      layout: layoutCtx?.getLayout(node) ?? node.layout
+    }));
+    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(descendants);
-  }, [findFocusableDescendants, log]);
+    setElements(mapped);
+  }, [focusCtx, layoutCtx, log]);
   const wasActiveRef = React15.useRef(false);
   React15.useEffect(() => {
     if (isActive && !wasActiveRef.current) {
+      log("Activated! Refreshing elements...");
       refreshElements();
     }
     wasActiveRef.current = isActive;
-  }, [isActive, refreshElements]);
+  }, [isActive, refreshElements, log]);
   const visibleElements = elements.filter(
     (el) => el.layout.width > 0 && el.layout.height > 0
   );
@@ -4460,19 +4448,19 @@ function JumpNav({
     });
     return map;
   }, [visibleElements, visibleHints]);
-  React15.useEffect(() => {
-    log("Mounted, inputCtx:", !!inputCtx, "enabled:", enabled, "activationKey:", activationKey);
-    log("Parsed key:", activationKeyParsed);
-  }, []);
   React15.useEffect(() => {
     if (!inputCtx || !enabled) {
       log("Not subscribing - inputCtx:", !!inputCtx, "enabled:", enabled);
       return;
     }
-    log("Subscribing to priority input");
+    log("Subscribing to priority input, activation key:", activationKey);
     const handler = (key) => {
-      log("Key received:", key.name, "ctrl:", key.ctrl, "isActive:", isActive, "hasChild:", hasChildJumpNav);
-      if (!isActive && !hasChildJumpNav && key.name === activationKeyParsed.name && !!key.ctrl === activationKeyParsed.ctrl && !!key.alt === activationKeyParsed.alt && !!key.shift === activationKeyParsed.shift && !!key.meta === activationKeyParsed.meta) {
+      const nameMatch = key.name === activationKeyParsed.name;
+      const ctrlMatch = !!key.ctrl === activationKeyParsed.ctrl;
+      const altMatch = !!key.alt === activationKeyParsed.alt;
+      const shiftMatch = !!key.shift === activationKeyParsed.shift;
+      const metaMatch = !!key.meta === activationKeyParsed.meta;
+      if (!isActive && nameMatch && ctrlMatch && altMatch && shiftMatch && metaMatch) {
         log("Activation key matched! Activating...");
         setIsActive(true);
         setInputBuffer("");
@@ -4480,6 +4468,7 @@ function JumpNav({
       }
       if (isActive) {
         if (key.name === "escape") {
+          log("Escape pressed, deactivating");
           setIsActive(false);
           setInputBuffer("");
           return true;
@@ -4490,8 +4479,10 @@ function JumpNav({
         }
         if (key.sequence && key.sequence.length === 1 && /[a-z]/i.test(key.sequence)) {
           const newBuffer = inputBuffer + key.sequence.toLowerCase();
+          log("Buffer:", newBuffer);
           const targetId = visibleHintMap.get(newBuffer);
           if (targetId) {
+            log("Jumping to", targetId);
             focusCtx?.requestFocus(targetId);
             setIsActive(false);
             setInputBuffer("");
@@ -4510,10 +4501,20 @@ function JumpNav({
       return false;
     };
     return inputCtx.subscribePriority(handler);
-  }, [inputCtx, enabled, isActive, activationKeyParsed, inputBuffer, visibleHintMap, focusCtx, hasChildJumpNav]);
+  }, [inputCtx, enabled, isActive, activationKeyParsed, inputBuffer, visibleHintMap, focusCtx, activationKey, log]);
   const hintsOverlay = isActive ? React15__default.default.createElement(
-    React15__default.default.Fragment,
-    null,
+    "box",
+    {
+      // Portal-like wrapper - fullscreen absolute overlay
+      style: {
+        position: "absolute",
+        top: 0,
+        left: 0,
+        width: "100%",
+        height: "100%",
+        zIndex: 99998
+      }
+    },
     ...visibleElements.map((el, i) => {
       const hint = visibleHints[i];
       if (!hint) return null;
@@ -4558,24 +4559,10 @@ 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(
-    JumpNavContext.Provider,
-    { value: contextValue },
-    wrappedChildren,
+    React15__default.default.Fragment,
+    null,
+    children,
     hintsOverlay
   );
 }
@@ -4685,7 +4672,7 @@ function useFocusRegistry() {
   });
   const updateElements = React15.useCallback(() => {
     if (!focusCtx) return;
-    const registered = focusCtx.getRegisteredElements?.() ?? [];
+    const registered = focusCtx.getActiveElements?.() ?? focusCtx.getRegisteredElements?.() ?? [];
     const mapped = registered.map(({ id, node }) => ({
       id,
       node,