giggles 0.5.3 → 0.6.1

package/dist/{chunk-RO3ZD423.js → chunk-A7BRQXWE.js}

@@ -36,8 +36,13 @@ function useKeybindings(focus, bindings, options) {
 }
 
 // src/core/input/useKeybindingRegistry.ts
+import { useSyncExternalStore } from "react";
 function useKeybindingRegistry(focus) {
   const store = useStore();
+  useSyncExternalStore(
+    (cb) => store.subscribe(cb),
+    () => store.getVersion()
+  );
   const all = store.getAllBindings().filter((b) => b.name != null);
   const branchPath = store.getActiveBranchPath();
   const branchSet = new Set(branchPath);
@@ -47,15 +52,24 @@ function useKeybindingRegistry(focus) {
     const trapIndex = branchPath.indexOf(trapNodeId);
     return trapIndex >= 0 ? new Set(branchPath.slice(0, trapIndex + 1)) : null;
   })();
-  const available = all.filter((b) => {
-    return (withinTrapSet ?? branchSet).has(b.nodeId);
-  });
+  const availableSet = withinTrapSet ?? branchSet;
+  const seenKeys = /* @__PURE__ */ new Set();
+  const available = [];
+  for (const nodeId of branchPath) {
+    if (!availableSet.has(nodeId)) continue;
+    for (const b of all) {
+      if (b.nodeId === nodeId && !seenKeys.has(b.key)) {
+        seenKeys.add(b.key);
+        available.push(b);
+      }
+    }
+  }
   const local = focus ? all.filter((b) => b.nodeId === focus.id) : [];
   return { all, available, local };
 }
 
 // src/core/focus/useFocusNode.ts
-import { useContext as useContext2, useEffect as useEffect2, useId as useId2, useMemo, useSyncExternalStore } from "react";
+import { useContext as useContext2, useEffect as useEffect2, useId as useId2, useMemo, useSyncExternalStore as useSyncExternalStore2 } from "react";
 function useFocusNode(options) {
   var _a;
   const id = useId2();
@@ -69,7 +83,7 @@ function useFocusNode(options) {
       store.unregisterNode(id);
     };
   }, [id, parentId, store]);
-  const hasFocus = useSyncExternalStore(subscribe, () => store.isFocused(id));
+  const hasFocus = useSyncExternalStore2(subscribe, () => store.isFocused(id));
   return { id, hasFocus };
 }
 
@@ -106,7 +120,7 @@ function InputRouter({ children }) {
 }
 
 // src/core/focus/useFocusScope.ts
-import { useCallback, useContext as useContext3, useEffect as useEffect4, useId as useId3, useMemo as useMemo2, useSyncExternalStore as useSyncExternalStore2 } from "react";
+import { useCallback, useContext as useContext3, useEffect as useEffect4, useId as useId3, useMemo as useMemo2, useSyncExternalStore as useSyncExternalStore3 } from "react";
 function useFocusScope(options) {
   var _a;
   const id = useId3();
@@ -121,8 +135,8 @@ function useFocusScope(options) {
       store.unregisterNode(id);
     };
   }, [id, parentId, store]);
-  const hasFocus = useSyncExternalStore2(subscribe, () => store.isFocused(id));
-  const isPassive = useSyncExternalStore2(subscribe, () => store.isPassive(id));
+  const hasFocus = useSyncExternalStore3(subscribe, () => store.isFocused(id));
+  const isPassive = useSyncExternalStore3(subscribe, () => store.isPassive(id));
   const next = useCallback(() => store.navigateSibling("next", true, id), [store, id]);
   const prev = useCallback(() => store.navigateSibling("prev", true, id), [store, id]);
   const nextShallow = useCallback(() => store.navigateSibling("next", true, id, true), [store, id]);
@@ -178,6 +192,7 @@ var FocusStore = class {
   pendingFocusFirstChild = /* @__PURE__ */ new Set();
   trapNodeId = null;
   listeners = /* @__PURE__ */ new Set();
+  version = 0;
   // nodeId → registrationId → BindingRegistration
   // Keybindings register synchronously during render; nodes register in useEffect.
   // A keybinding may exist for a node that has not yet appeared in the node tree —
@@ -191,10 +206,14 @@ var FocusStore = class {
     return () => this.listeners.delete(listener);
   }
   notify() {
+    this.version++;
     for (const listener of this.listeners) {
       listener();
     }
   }
+  getVersion() {
+    return this.version;
+  }
   // ---------------------------------------------------------------------------
   // Registration
   // ---------------------------------------------------------------------------
@@ -400,9 +419,8 @@ var FocusStore = class {
     });
     const registration = {
       bindings: new Map(entries),
-      capture: (options == null ? void 0 : options.capture) ?? false,
-      onKeypress: options == null ? void 0 : options.onKeypress,
-      passthrough: (options == null ? void 0 : options.passthrough) ? new Set(options.passthrough) : void 0
+      fallback: options == null ? void 0 : options.fallback,
+      bubble: (options == null ? void 0 : options.bubble) ? new Set(options.bubble) : void 0
     };
     if (!this.keybindings.has(nodeId)) {
       this.keybindings.set(nodeId, /* @__PURE__ */ new Map());
@@ -422,28 +440,21 @@ var FocusStore = class {
     const nodeRegistrations = this.keybindings.get(nodeId);
     if (!nodeRegistrations || nodeRegistrations.size === 0) return void 0;
     const mergedBindings = /* @__PURE__ */ new Map();
-    let finalCapture = false;
-    let finalOnKeypress;
-    let finalPassthrough;
+    let finalFallback;
+    let finalBubble;
     for (const registration of nodeRegistrations.values()) {
-      const isCaptureRegistration = registration.onKeypress !== void 0;
-      const shouldIncludeBindings = !isCaptureRegistration || registration.capture;
-      if (shouldIncludeBindings) {
-        for (const [key, entry] of registration.bindings) {
-          mergedBindings.set(key, entry);
-        }
+      for (const [key, entry] of registration.bindings) {
+        mergedBindings.set(key, entry);
       }
-      if (registration.capture) {
-        finalCapture = true;
-        finalOnKeypress = registration.onKeypress;
-        finalPassthrough = registration.passthrough;
+      if (registration.fallback) {
+        finalFallback = registration.fallback;
+        finalBubble = registration.bubble;
       }
     }
     return {
       bindings: mergedBindings,
-      capture: finalCapture,
-      onKeypress: finalOnKeypress,
-      passthrough: finalPassthrough
+      fallback: finalFallback,
+      bubble: finalBubble
     };
   }
   getAllBindings() {
@@ -466,21 +477,21 @@ var FocusStore = class {
   // Input dispatch
   // ---------------------------------------------------------------------------
   // Bridge target for InputRouter. Walks the active branch path with passive-scope
-  // skipping, capture mode, and trap boundary — the full dispatch algorithm.
+  // skipping, fallback handlers, and trap boundary — the full dispatch algorithm.
   //
   // Priority order (per node, walking focused → root):
   //   1. Named bindings — always checked first
-  //   2. Capture mode (onKeypress) — deferred until after the full path walk,
-  //      so named bindings at any ancestor still fire before capture kicks in.
-  //      Keys in `passthrough` skip capture and bubble to the next ancestor.
-  //   3. Trap boundary — stops the walk; capture inside the trap still fires.
+  //   2. Fallback handler — deferred until after the full path walk, so named
+  //      bindings at any ancestor still fire before the fallback kicks in.
+  //      Keys in `bubble` skip the fallback and continue to the next ancestor.
+  //   3. Trap boundary — stops the walk; fallback inside the trap still fires.
   dispatch(input, key) {
     var _a;
     const keyName = normalizeKey(input, key);
     if (!keyName) return;
     const path = this.getActiveBranchPath();
     const trapNodeId = this.trapNodeId;
-    let pendingCapture;
+    let pendingFallback;
     for (const nodeId of path) {
       if (this.passiveSet.has(nodeId)) continue;
       const nodeBindings = this.getNodeBindings(nodeId);
@@ -490,18 +501,18 @@ var FocusStore = class {
           entry.handler(input, key);
           return;
         }
-        if (!pendingCapture && nodeBindings.capture && nodeBindings.onKeypress) {
-          if ((_a = nodeBindings.passthrough) == null ? void 0 : _a.has(keyName)) {
+        if (!pendingFallback && nodeBindings.fallback) {
+          if ((_a = nodeBindings.bubble) == null ? void 0 : _a.has(keyName)) {
             continue;
           }
-          pendingCapture = nodeBindings.onKeypress;
+          pendingFallback = nodeBindings.fallback;
         }
       }
       if (nodeId === trapNodeId) {
         break;
       }
     }
-    pendingCapture == null ? void 0 : pendingCapture(input, key);
+    pendingFallback == null ? void 0 : pendingFallback(input, key);
   }
   // ---------------------------------------------------------------------------
   // Private helpers

package/dist/index.d.ts

@@ -2,8 +2,8 @@ import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
 import { BoxProps } from 'ink';
 export { Key } from 'ink';
-import { K as Keybindings, a as KeybindingOptions, R as RegisteredKeybinding } from './types-BODf7e7U.js';
-export { b as KeyHandler } from './types-BODf7e7U.js';
+import { K as Keybindings, a as KeybindingOptions, R as RegisteredKeybinding } from './types-HR6Vak_5.js';
+export { b as KeyHandler } from './types-HR6Vak_5.js';
 
 declare class GigglesError extends Error {
     constructor(message: string);

package/dist/index.js

@@ -1,6 +1,3 @@
-import {
-  useTerminalSize
-} from "./chunk-WNGBTD67.js";
 import {
   FocusScope,
   FocusStore,
@@ -14,11 +11,14 @@ import {
   useKeybindingRegistry,
   useKeybindings,
   useStore
-} from "./chunk-RO3ZD423.js";
+} from "./chunk-A7BRQXWE.js";
 import {
   ThemeProvider,
   useTheme
 } from "./chunk-C77VBSPK.js";
+import {
+  useTerminalSize
+} from "./chunk-WNGBTD67.js";
 
 // src/core/GigglesProvider.tsx
 import { useRef } from "react";

package/dist/{types-BODf7e7U.d.ts → types-HR6Vak_5.d.ts}

@@ -9,9 +9,8 @@ type KeybindingDefinition = KeyHandler | {
 };
 type Keybindings = Partial<Record<KeyName, KeybindingDefinition>>;
 type KeybindingOptions = {
-    capture?: boolean;
-    onKeypress?: (input: string, key: Key) => void;
-    passthrough?: string[];
+    fallback?: (input: string, key: Key) => void;
+    bubble?: string[];
 };
 type RegisteredKeybinding = {
     nodeId: string;

package/dist/ui/index.d.ts

@@ -1,5 +1,5 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { R as RegisteredKeybinding } from '../types-BODf7e7U.js';
+import { R as RegisteredKeybinding } from '../types-HR6Vak_5.js';
 import React$1 from 'react';
 import { BoxProps } from 'ink';
 

package/dist/ui/index.js

@@ -4,7 +4,7 @@ import {
   useFocusNode,
   useKeybindingRegistry,
   useKeybindings
-} from "../chunk-RO3ZD423.js";
+} from "../chunk-A7BRQXWE.js";
 import {
   CodeBlock
 } from "../chunk-SKSDNDQF.js";
@@ -77,8 +77,7 @@ function Inner({ onClose, render }) {
       }
     },
     {
-      capture: true,
-      onKeypress: (input, key) => {
+      fallback: (input, key) => {
         if (input.length === 1 && !key.ctrl) {
           setQuery((q) => q + input);
           setSelectedIndex(0);
@@ -178,15 +177,14 @@ function TextInput({ label, value, onChange, onSubmit, placeholder, render }) {
       ...onSubmit && { enter: () => onSubmit(value) }
     },
     {
-      capture: true,
-      passthrough: ["tab", "shift+tab", "enter", "escape", "backspace", "delete", "left", "right", "home", "end"],
-      onKeypress: (input, key) => {
+      fallback: (input, key) => {
         if (input.length === 1 && !key.ctrl && !key.return && !key.escape && !key.tab) {
           const c = cursorRef.current;
           cursorRef.current = c + 1;
           onChange(value.slice(0, c) + input + value.slice(c));
         }
-      }
+      },
+      bubble: ["tab", "shift+tab", "enter", "escape", "backspace", "delete", "left", "right", "home", "end"]
     }
   );
   const before = value.slice(0, cursor);
@@ -642,15 +640,14 @@ function Autocomplete({
       }
     },
     {
-      capture: true,
-      passthrough: ["tab", "shift+tab", "escape"],
-      onKeypress: (input, key) => {
+      fallback: (input, key) => {
         if (input.length === 1 && !key.ctrl && !key.return && !key.escape && !key.tab) {
           const c = cursorRef.current;
           cursorRef.current = c + 1;
           updateQuery(query.slice(0, c) + input + query.slice(c));
         }
-      }
+      },
+      bubble: ["tab", "shift+tab", "escape"]
     }
   );
   const before = query.slice(0, cursor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "giggles",
-  "version": "0.5.3",
+  "version": "0.6.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -41,6 +41,7 @@
     "build": "tsup",
     "build:watch": "nodemon --watch src --ext ts,tsx --exec tsup",
     "play": "tsx --watch",
+    "record": "vhs",
     "dev:docs": "pnpm build && concurrently --kill-others \"pnpm build:watch\" \"pnpm --filter documentation dev\"",
     "lint": "prettier --write . && eslint . --fix"
   },