giggles 0.5.1 → 0.6.0

package/dist/{chunk-LXNKSYJT.js → chunk-QV7GQTKO.js}

@@ -48,7 +48,6 @@ function useKeybindingRegistry(focus) {
     return trapIndex >= 0 ? new Set(branchPath.slice(0, trapIndex + 1)) : null;
   })();
   const available = all.filter((b) => {
-    if (b.when === "mounted") return withinTrapSet ? withinTrapSet.has(b.nodeId) : true;
     return (withinTrapSet ?? branchSet).has(b.nodeId);
   });
   const local = focus ? all.filter((b) => b.nodeId === focus.id) : [];
@@ -397,14 +396,12 @@ var FocusStore = class {
       if (typeof def === "function") {
         return [key, { handler: def }];
       }
-      return [key, { handler: def.action, name: def.name, when: def.when }];
+      return [key, { handler: def.action, name: def.name }];
     });
     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,
-      layer: options == null ? void 0 : options.layer
+      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());
@@ -424,33 +421,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 finalLayer;
+    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);
-        }
-      }
-      if (registration.capture) {
-        finalCapture = true;
-        finalOnKeypress = registration.onKeypress;
-        finalPassthrough = registration.passthrough;
+      for (const [key, entry] of registration.bindings) {
+        mergedBindings.set(key, entry);
       }
-      if (registration.layer) {
-        finalLayer = registration.layer;
+      if (registration.fallback) {
+        finalFallback = registration.fallback;
+        finalBubble = registration.bubble;
       }
     }
     return {
       bindings: mergedBindings,
-      capture: finalCapture,
-      onKeypress: finalOnKeypress,
-      passthrough: finalPassthrough,
-      layer: finalLayer
+      fallback: finalFallback,
+      bubble: finalBubble
     };
   }
   getAllBindings() {
@@ -462,9 +447,7 @@ var FocusStore = class {
             nodeId,
             key,
             handler: entry.handler,
-            name: entry.name,
-            when: entry.when,
-            layer: registration.layer
+            name: entry.name
           });
         }
       }
@@ -475,39 +458,42 @@ 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. 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 pendingFallback;
     for (const nodeId of path) {
       if (this.passiveSet.has(nodeId)) continue;
       const nodeBindings = this.getNodeBindings(nodeId);
       if (nodeBindings) {
-        if (nodeBindings.capture && nodeBindings.onKeypress) {
-          if (!((_a = nodeBindings.passthrough) == null ? void 0 : _a.has(keyName))) {
-            nodeBindings.onKeypress(input, key);
-            return;
-          }
-        }
         const entry = nodeBindings.bindings.get(keyName);
-        if (entry && entry.when !== "mounted") {
+        if (entry) {
           entry.handler(input, key);
           return;
         }
+        if (!pendingFallback && nodeBindings.fallback) {
+          if ((_a = nodeBindings.bubble) == null ? void 0 : _a.has(keyName)) {
+            continue;
+          }
+          pendingFallback = nodeBindings.fallback;
+        }
       }
       if (nodeId === trapNodeId) {
-        return;
-      }
-    }
-    for (const binding of this.getAllBindings()) {
-      if (binding.key === keyName && binding.when === "mounted") {
-        binding.handler(input, key);
-        return;
+        break;
       }
     }
+    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-Dmw9TKt4.js';
-export { b as KeyHandler } from './types-Dmw9TKt4.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

@@ -14,7 +14,7 @@ import {
   useKeybindingRegistry,
   useKeybindings,
   useStore
-} from "./chunk-LXNKSYJT.js";
+} from "./chunk-QV7GQTKO.js";
 import {
   ThemeProvider,
   useTheme

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

@@ -6,22 +6,17 @@ type KeyName = SpecialKey | (string & {});
 type KeybindingDefinition = KeyHandler | {
     action: KeyHandler;
     name: string;
-    when?: 'focused' | 'mounted';
 };
 type Keybindings = Partial<Record<KeyName, KeybindingDefinition>>;
 type KeybindingOptions = {
-    capture?: boolean;
-    onKeypress?: (input: string, key: Key) => void;
-    passthrough?: string[];
-    layer?: string;
+    fallback?: (input: string, key: Key) => void;
+    bubble?: string[];
 };
 type RegisteredKeybinding = {
     nodeId: string;
     key: string;
     handler: KeyHandler;
     name?: string;
-    when?: 'focused' | 'mounted';
-    layer?: string;
 };
 
 export type { Keybindings as K, RegisteredKeybinding as R, KeybindingOptions as a, KeyHandler as b };

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-Dmw9TKt4.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-LXNKSYJT.js";
+} from "../chunk-QV7GQTKO.js";
 import {
   CodeBlock
 } from "../chunk-SKSDNDQF.js";
@@ -77,9 +77,7 @@ function Inner({ onClose, render }) {
       }
     },
     {
-      capture: true,
-      passthrough: ["escape", "enter", "left", "right", "backspace"],
-      onKeypress: (input, key) => {
+      fallback: (input, key) => {
         if (input.length === 1 && !key.ctrl) {
           setQuery((q) => q + input);
           setSelectedIndex(0);
@@ -179,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);
@@ -643,28 +640,14 @@ function Autocomplete({
       }
     },
     {
-      capture: true,
-      passthrough: [
-        "tab",
-        "shift+tab",
-        "escape",
-        "backspace",
-        "delete",
-        "left",
-        "right",
-        "home",
-        "end",
-        "up",
-        "down",
-        "enter"
-      ],
-      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.1",
+  "version": "0.6.0",
   "license": "MIT",
   "repository": {
     "type": "git",