@opentui/keymap 0.8.0 → 0.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/chunks/{index-7g381cth.js → index-0a7ve4a3.js} +3 -6
- package/chunks/{index-7g381cth.js.map → index-0a7ve4a3.js.map} +3 -4
- package/chunks/index-pjh5rp2p.js +13 -0
- package/chunks/index-pjh5rp2p.js.map +10 -0
- package/package.json +4 -4
- package/src/extras/graph.js +6 -4
- package/src/extras/graph.js.map +2 -2
- package/src/index.js +339 -116
- package/src/index.js.map +10 -10
- package/src/react/index.js +23 -45
- package/src/react/index.js.map +3 -3
- package/src/services/command-catalog.d.ts +1 -1
- package/src/services/conditions.d.ts +2 -0
- package/src/services/extension-context.d.ts +4 -1
- package/src/services/layers.d.ts +7 -1
- package/src/services/notify.d.ts +2 -0
- package/src/services/values.d.ts +6 -0
- package/src/solid/index.js +9 -19
- package/src/solid/index.js.map +3 -3
package/src/react/index.js
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
// @bun
|
|
2
|
+
import {
|
|
3
|
+
createLayerSlot
|
|
4
|
+
} from "../../chunks/index-pjh5rp2p.js";
|
|
5
|
+
|
|
2
6
|
// src/react/index.ts
|
|
3
7
|
import {
|
|
4
8
|
createElement,
|
|
5
9
|
createContext,
|
|
6
|
-
useCallback,
|
|
7
10
|
useContext,
|
|
8
11
|
useEffect,
|
|
9
12
|
useLayoutEffect,
|
|
@@ -54,55 +57,30 @@ var usePendingSequence = () => {
|
|
|
54
57
|
function useBindings(createLayer, deps = []) {
|
|
55
58
|
const keymap = useKeymap();
|
|
56
59
|
const layer = useMemo(createLayer, deps);
|
|
57
|
-
const
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
disposeRef.current = undefined;
|
|
66
|
-
registeredLayerRef.current = undefined;
|
|
67
|
-
registeredTargetModeRef.current = undefined;
|
|
68
|
-
registeredTargetRef.current = undefined;
|
|
69
|
-
}, []);
|
|
60
|
+
const replaceLayer = useMemo(() => createLayerSlot(keymap), [keymap]);
|
|
61
|
+
const registeredRef = useRef(undefined);
|
|
62
|
+
useEffect(() => {
|
|
63
|
+
return () => {
|
|
64
|
+
replaceLayer(undefined);
|
|
65
|
+
registeredRef.current = undefined;
|
|
66
|
+
};
|
|
67
|
+
}, [replaceLayer]);
|
|
70
68
|
useEffect(() => {
|
|
71
|
-
const
|
|
72
|
-
const
|
|
73
|
-
const
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
if (!hasExplicitTarget && nextTargetMode) {
|
|
69
|
+
const hasExplicitTarget = layer.targetRef !== undefined;
|
|
70
|
+
const explicitTarget = resolveBindingsTarget(layer.targetRef);
|
|
71
|
+
const targetMode = layer.targetMode ?? (hasExplicitTarget ? "focus-within" : undefined);
|
|
72
|
+
const target = targetMode ? explicitTarget : undefined;
|
|
73
|
+
if (!hasExplicitTarget && targetMode) {
|
|
77
74
|
throw new Error("useBindings local bindings need a targetRef");
|
|
78
75
|
}
|
|
79
|
-
|
|
76
|
+
const registered = registeredRef.current;
|
|
77
|
+
if (registered?.layer === layer && registered.targetMode === targetMode && registered.target === target) {
|
|
80
78
|
return;
|
|
81
79
|
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
registeredTargetModeRef.current = nextTargetMode;
|
|
86
|
-
registeredTargetRef.current = undefined;
|
|
87
|
-
return;
|
|
88
|
-
}
|
|
89
|
-
const { targetRef: _targetRef, targetMode: _targetMode, ...baseLayer } = currentLayer;
|
|
90
|
-
disposeRef.current = keymap.registerLayer(!nextTargetMode ? {
|
|
91
|
-
...baseLayer
|
|
92
|
-
} : {
|
|
93
|
-
...baseLayer,
|
|
94
|
-
target: nextTarget,
|
|
95
|
-
targetMode: nextTargetMode
|
|
96
|
-
});
|
|
97
|
-
registeredLayerRef.current = currentLayer;
|
|
98
|
-
registeredTargetModeRef.current = nextTargetMode;
|
|
99
|
-
registeredTargetRef.current = nextTarget;
|
|
80
|
+
registeredRef.current = { layer, targetMode, target };
|
|
81
|
+
const { targetRef: _targetRef, targetMode: _targetMode, ...baseLayer } = layer;
|
|
82
|
+
replaceLayer(targetMode ? target && { ...baseLayer, target, targetMode } : baseLayer);
|
|
100
83
|
});
|
|
101
|
-
useEffect(() => {
|
|
102
|
-
return () => {
|
|
103
|
-
unregister();
|
|
104
|
-
};
|
|
105
|
-
}, [unregister]);
|
|
106
84
|
}
|
|
107
85
|
function reactiveMatcherFromStore(subscribe, getSnapshot, predicate) {
|
|
108
86
|
return {
|
|
@@ -123,5 +101,5 @@ export {
|
|
|
123
101
|
usePendingSequence
|
|
124
102
|
};
|
|
125
103
|
|
|
126
|
-
//# debugId=
|
|
104
|
+
//# debugId=00DD39AA7155448964756E2164756E21
|
|
127
105
|
//# sourceMappingURL=index.js.map
|
package/src/react/index.js.map
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/react/index.ts"],
|
|
4
4
|
"sourcesContent": [
|
|
5
|
-
"import type { KeyEvent, Renderable } from \"@opentui/core\"\nimport {\n type ActiveKey,\n type ActiveKeyOptions,\n type Layer,\n type Keymap,\n type ReactiveMatcher,\n type KeySequencePart,\n type TargetMode,\n} from \"../index.js\"\nimport {\n createElement,\n createContext,\n
|
|
5
|
+
"import type { KeyEvent, Renderable } from \"@opentui/core\"\nimport {\n type ActiveKey,\n type ActiveKeyOptions,\n type Layer,\n type Keymap,\n type ReactiveMatcher,\n type KeySequencePart,\n type TargetMode,\n} from \"../index.js\"\nimport { createLayerSlot } from \"../services/extension-context.js\"\nimport {\n createElement,\n createContext,\n useContext,\n useEffect,\n useLayoutEffect,\n useMemo,\n useReducer,\n useRef,\n type DependencyList,\n type ReactNode,\n} from \"react\"\n\ntype OpenTuiKeymap = Keymap<Renderable, KeyEvent>\n\nconst KeymapContext = createContext<OpenTuiKeymap | null>(null)\n\nexport interface KeymapProviderProps {\n keymap: OpenTuiKeymap\n children?: ReactNode\n}\n\nexport function KeymapProvider({ keymap, children }: KeymapProviderProps) {\n return createElement(KeymapContext.Provider, { value: keymap }, children)\n}\n\nexport interface UseBindingsTargetRef<TRenderable extends Renderable = Renderable> {\n current: TRenderable | null\n}\n\nexport interface UseBindingsLayer<TRenderable extends Renderable = Renderable> extends Omit<\n Layer<Renderable, KeyEvent>,\n \"target\" | \"targetMode\"\n> {\n targetRef?: UseBindingsTargetRef<TRenderable>\n targetMode?: TargetMode\n}\n\nfunction resolveBindingsTarget(targetRef: UseBindingsTargetRef | undefined): Renderable | undefined {\n return targetRef?.current ?? undefined\n}\n\nexport const useKeymap = (): OpenTuiKeymap => {\n const keymap = useContext(KeymapContext)\n\n if (!keymap) {\n throw new Error(\"Keymap not found. Wrap the tree in <KeymapProvider>.\")\n }\n\n return keymap\n}\n\n// Use the batched `state` event for derived reads. Pending-sequence changes\n// already flow through `state`, so subscribing to both would duplicate work.\nfunction useKeymapStateVersion(keymap: OpenTuiKeymap): number {\n const [version, bumpVersion] = useReducer((value: number) => value + 1, 0)\n\n useLayoutEffect(() => {\n const dispose = keymap.on(\"state\", () => {\n bumpVersion()\n })\n\n return () => {\n dispose()\n }\n }, [keymap])\n\n return version\n}\n\nexport const useActiveKeys = (options?: ActiveKeyOptions): readonly ActiveKey[] => {\n const keymap = useKeymap()\n const version = useKeymapStateVersion(keymap)\n\n return useMemo(() => {\n void version\n return keymap.getActiveKeys(options)\n }, [keymap, options, version])\n}\n\nexport const usePendingSequence = (): readonly KeySequencePart[] => {\n const keymap = useKeymap()\n const version = useKeymapStateVersion(keymap)\n\n return useMemo(() => {\n void version\n return keymap.getPendingSequence()\n }, [keymap, version])\n}\n\nexport function useBindings<TRenderable extends Renderable = Renderable>(\n createLayer: () => UseBindingsLayer<TRenderable>,\n deps: DependencyList = [],\n): void {\n const keymap = useKeymap()\n const layer = useMemo(createLayer, deps)\n const replaceLayer = useMemo(() => createLayerSlot(keymap), [keymap])\n const registeredRef = useRef<{ layer: typeof layer; targetMode?: TargetMode; target?: Renderable } | undefined>(\n undefined,\n )\n\n useEffect(() => {\n return () => {\n replaceLayer(undefined)\n registeredRef.current = undefined\n }\n }, [replaceLayer])\n\n useEffect(() => {\n const hasExplicitTarget = layer.targetRef !== undefined\n const explicitTarget = resolveBindingsTarget(layer.targetRef)\n const targetMode = layer.targetMode ?? (hasExplicitTarget ? \"focus-within\" : undefined)\n const target = targetMode ? explicitTarget : undefined\n\n if (!hasExplicitTarget && targetMode) {\n throw new Error(\"useBindings local bindings need a targetRef\")\n }\n\n const registered = registeredRef.current\n if (registered?.layer === layer && registered.targetMode === targetMode && registered.target === target) {\n return\n }\n\n registeredRef.current = { layer, targetMode, target }\n const { targetRef: _targetRef, targetMode: _targetMode, ...baseLayer } = layer\n replaceLayer(targetMode ? target && { ...baseLayer, target, targetMode } : baseLayer)\n })\n}\n\n/**\n * Adapts any `subscribe` + `getSnapshot` store to\n * `ReactiveMatcher`. Pass `predicate` when the snapshot value is not\n * already boolean.\n */\nexport function reactiveMatcherFromStore<T>(\n subscribe: (onStoreChange: () => void) => () => void,\n getSnapshot: () => T,\n predicate?: (value: T) => boolean,\n): ReactiveMatcher {\n return {\n get() {\n return predicate ? predicate(getSnapshot()) : Boolean(getSnapshot())\n },\n subscribe(onChange) {\n return subscribe(onChange)\n },\n }\n}\n"
|
|
6
6
|
],
|
|
7
|
-
"mappings": "
|
|
8
|
-
"debugId": "
|
|
7
|
+
"mappings": "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",
|
|
8
|
+
"debugId": "00DD39AA7155448964756E2164756E21",
|
|
9
9
|
"names": []
|
|
10
10
|
}
|
|
@@ -14,7 +14,7 @@ interface CommandExecutionFields {
|
|
|
14
14
|
payload?: unknown;
|
|
15
15
|
}
|
|
16
16
|
export interface CommandCatalogService<TTarget extends object, TEvent extends KeymapEvent> {
|
|
17
|
-
normalizeCommands(commands: readonly Command<TTarget, TEvent>[]): CommandState<TTarget, TEvent>[];
|
|
17
|
+
normalizeCommands(commands: readonly Command<TTarget, TEvent>[], owned: boolean): CommandState<TTarget, TEvent>[];
|
|
18
18
|
prependCommandResolver(resolver: CommandResolver<TTarget, TEvent>): () => void;
|
|
19
19
|
appendCommandResolver(resolver: CommandResolver<TTarget, TEvent>): () => void;
|
|
20
20
|
clearCommandResolvers(): void;
|
|
@@ -4,5 +4,7 @@ import type { KeymapEvent, ReactiveMatcher, RuntimeMatchable, RuntimeMatcher } f
|
|
|
4
4
|
export interface ConditionService<TTarget extends object, TEvent extends KeymapEvent> {
|
|
5
5
|
buildRuntimeMatcher(matcher: (() => boolean) | ReactiveMatcher, source: string): RuntimeMatcher;
|
|
6
6
|
matchesConditions(target: RuntimeMatchable): boolean;
|
|
7
|
+
/** The results of a target with matchers read since the last `state` event: bit 1 false, bit 2 true. */
|
|
8
|
+
seenResults(target: RuntimeMatchable): number;
|
|
7
9
|
}
|
|
8
10
|
export declare function createConditionService<TTarget extends object, TEvent extends KeymapEvent>(state: State<TTarget, TEvent>, notify: NotificationService<TTarget, TEvent>): ConditionService<TTarget, TEvent>;
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { ActivationService } from "./activation.js";
|
|
2
2
|
import type { CommandCatalogService } from "./command-catalog.js";
|
|
3
3
|
import type { ConditionService } from "./conditions.js";
|
|
4
|
+
import type { LayerService } from "./layers.js";
|
|
4
5
|
import type { State } from "./state.js";
|
|
5
|
-
import type { KeymapEvent, KeymapHost } from "../types.js";
|
|
6
|
+
import type { KeymapEvent, KeymapHost, Layer, RegisteredLayer } from "../types.js";
|
|
6
7
|
export declare const KEYMAP_EXTENSION_CONTEXT: unique symbol;
|
|
7
8
|
export interface KeymapExtensionContext<TTarget extends object, TEvent extends KeymapEvent> {
|
|
8
9
|
state: State<TTarget, TEvent>;
|
|
@@ -10,7 +11,9 @@ export interface KeymapExtensionContext<TTarget extends object, TEvent extends K
|
|
|
10
11
|
conditions: ConditionService<TTarget, TEvent>;
|
|
11
12
|
catalog: CommandCatalogService<TTarget, TEvent>;
|
|
12
13
|
activation: ActivationService<TTarget, TEvent>;
|
|
14
|
+
layers: Pick<LayerService<TTarget, TEvent>, "createSlot" | "replaceLayer">;
|
|
13
15
|
}
|
|
14
16
|
export interface KeymapExtensionProvider<TTarget extends object, TEvent extends KeymapEvent> {
|
|
15
17
|
[KEYMAP_EXTENSION_CONTEXT](): KeymapExtensionContext<TTarget, TEvent>;
|
|
16
18
|
}
|
|
19
|
+
export declare function createLayerSlot<TTarget extends object, TEvent extends KeymapEvent>(keymap: KeymapExtensionProvider<TTarget, TEvent>): (layer: Layer<TTarget, TEvent> | undefined) => RegisteredLayer<TTarget, TEvent> | undefined;
|
package/src/services/layers.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { CompilerService } from "./compiler.js";
|
|
|
2
2
|
import type { CommandCatalogService } from "./command-catalog.js";
|
|
3
3
|
import type { ConditionService } from "./conditions.js";
|
|
4
4
|
import type { ActivationService } from "./activation.js";
|
|
5
|
-
import type { Binding, BindingState, KeymapEvent, KeymapHost, Layer, ResolvedKeyToken, CommandState } from "../types.js";
|
|
5
|
+
import type { Binding, BindingState, KeymapEvent, KeymapHost, Layer, ResolvedKeyToken, CommandState, RegisteredLayer } from "../types.js";
|
|
6
6
|
import type { State } from "./state.js";
|
|
7
7
|
import type { NotificationService } from "./notify.js";
|
|
8
8
|
interface LayersOptions<TTarget extends object, TEvent extends KeymapEvent> {
|
|
@@ -23,8 +23,14 @@ export interface AnalyzeLayerOptions<TTarget extends object, TEvent extends Keym
|
|
|
23
23
|
export interface LayerDiagnostics<TTarget extends object, TEvent extends KeymapEvent> {
|
|
24
24
|
analyzeLayer(options: AnalyzeLayerOptions<TTarget, TEvent>): void;
|
|
25
25
|
}
|
|
26
|
+
export interface LayerSlot<TTarget extends object, TEvent extends KeymapEvent> {
|
|
27
|
+
readonly order: number;
|
|
28
|
+
layer?: RegisteredLayer<TTarget, TEvent>;
|
|
29
|
+
}
|
|
26
30
|
export interface LayerService<TTarget extends object, TEvent extends KeymapEvent> {
|
|
27
31
|
registerLayer(layer: Layer<TTarget, TEvent>): () => void;
|
|
32
|
+
createSlot(): LayerSlot<TTarget, TEvent>;
|
|
33
|
+
replaceLayer(slot: LayerSlot<TTarget, TEvent>, layer: Layer<TTarget, TEvent> | undefined): RegisteredLayer<TTarget, TEvent> | undefined;
|
|
28
34
|
applyTokenState(nextTokens: Map<string, ResolvedKeyToken>): void;
|
|
29
35
|
recompileBindings(): void;
|
|
30
36
|
cleanup(): void;
|
package/src/services/notify.d.ts
CHANGED
|
@@ -8,6 +8,8 @@ export interface NotificationService<TTarget extends object, TEvent extends Keym
|
|
|
8
8
|
queueStateChange(options?: {
|
|
9
9
|
invalidateCaches?: boolean;
|
|
10
10
|
}): void;
|
|
11
|
+
/** Runs right before each `state` event. */
|
|
12
|
+
onStateEvent(listener: () => void): void;
|
|
11
13
|
emitWarning(code: string, warning: unknown, message: string): void;
|
|
12
14
|
emitError(code: string, error: unknown, message: string): void;
|
|
13
15
|
reportListenerError(name: HookName, error: unknown): void;
|
package/src/services/values.d.ts
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
export declare function isPlainData(value: unknown, identityKey?: string): boolean;
|
|
2
|
+
export declare function createForwarder<T>(target: T): T;
|
|
3
|
+
export declare function collectExternal<T>(objects: WeakSet<object>, compile: () => T): T;
|
|
4
|
+
export declare function markSupplied(value: unknown): void;
|
|
5
|
+
export declare function markExternal(value: unknown, depth?: number): void;
|
|
6
|
+
export declare function sameCompiledData(left: unknown, right: unknown, external: WeakSet<object>, moves: [object, string, unknown][], depth?: number): boolean;
|
|
1
7
|
export declare function getErrorMessage(error: unknown, fallback: string): string;
|
|
2
8
|
export declare function isPromiseLike(value: unknown): value is Promise<unknown>;
|
|
3
9
|
export declare function snapshotDataValue(value: unknown, options?: {
|
package/src/solid/index.js
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
// @bun
|
|
2
|
+
import {
|
|
3
|
+
createLayerSlot
|
|
4
|
+
} from "../../chunks/index-pjh5rp2p.js";
|
|
5
|
+
|
|
2
6
|
// src/solid/index.ts
|
|
3
7
|
import {
|
|
4
8
|
createComponent,
|
|
@@ -63,7 +67,8 @@ var useKeymapSelector = (selector) => {
|
|
|
63
67
|
});
|
|
64
68
|
};
|
|
65
69
|
function useBindings(createLayer) {
|
|
66
|
-
const
|
|
70
|
+
const replaceLayer = createLayerSlot(useKeymap());
|
|
71
|
+
onCleanup(() => replaceLayer(undefined));
|
|
67
72
|
createEffect(() => {
|
|
68
73
|
const layer = createLayer();
|
|
69
74
|
const hasExplicitTarget = layer.target !== undefined;
|
|
@@ -71,28 +76,13 @@ function useBindings(createLayer) {
|
|
|
71
76
|
const nextTargetMode = layer.targetMode ?? (hasExplicitTarget ? "focus-within" : undefined);
|
|
72
77
|
const { target: _target, targetMode: _targetMode, ...baseLayer } = layer;
|
|
73
78
|
if (!nextTargetMode) {
|
|
74
|
-
|
|
75
|
-
...baseLayer
|
|
76
|
-
});
|
|
77
|
-
onCleanup(() => {
|
|
78
|
-
dispose();
|
|
79
|
-
});
|
|
79
|
+
replaceLayer(baseLayer);
|
|
80
80
|
return;
|
|
81
81
|
}
|
|
82
82
|
if (!hasExplicitTarget) {
|
|
83
83
|
throw new Error("useBindings local bindings need a target accessor");
|
|
84
84
|
}
|
|
85
|
-
|
|
86
|
-
return;
|
|
87
|
-
}
|
|
88
|
-
const dispose = keymap.registerLayer({
|
|
89
|
-
...baseLayer,
|
|
90
|
-
target: explicitTarget,
|
|
91
|
-
targetMode: nextTargetMode
|
|
92
|
-
});
|
|
93
|
-
onCleanup(() => {
|
|
94
|
-
dispose();
|
|
95
|
-
});
|
|
85
|
+
replaceLayer(explicitTarget && { ...baseLayer, target: explicitTarget, targetMode: nextTargetMode });
|
|
96
86
|
});
|
|
97
87
|
}
|
|
98
88
|
function reactiveMatcherFromSignal(accessor, predicate) {
|
|
@@ -116,5 +106,5 @@ export {
|
|
|
116
106
|
useKeymapSelector
|
|
117
107
|
};
|
|
118
108
|
|
|
119
|
-
//# debugId=
|
|
109
|
+
//# debugId=390D50CA6E00FD5B64756E2164756E21
|
|
120
110
|
//# sourceMappingURL=index.js.map
|
package/src/solid/index.js.map
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/solid/index.ts"],
|
|
4
4
|
"sourcesContent": [
|
|
5
|
-
"import type { KeyEvent, Renderable } from \"@opentui/core\"\nimport { type Keymap, type Layer, type ReactiveMatcher, type TargetMode } from \"../index.js\"\nimport {\n createComponent,\n createContext,\n createEffect,\n createMemo,\n createRoot,\n createSignal,\n on,\n onCleanup,\n onMount,\n useContext,\n type Accessor,\n type JSX,\n} from \"solid-js\"\n\ntype OpenTuiKeymap = Keymap<Renderable, KeyEvent>\n\nconst KeymapContext = createContext<OpenTuiKeymap>()\n\nexport interface KeymapProviderProps {\n keymap: OpenTuiKeymap\n children: JSX.Element\n}\n\nexport function KeymapProvider(props: KeymapProviderProps): JSX.Element {\n return createComponent(KeymapContext.Provider, {\n get value() {\n return props.keymap\n },\n get children() {\n return props.children\n },\n })\n}\n\nexport type UseBindingsTarget<TRenderable extends Renderable = Renderable> = () => TRenderable | null | undefined\n\nexport interface UseBindingsLayer<TRenderable extends Renderable = Renderable> extends Omit<\n Layer<Renderable, KeyEvent>,\n \"target\" | \"targetMode\"\n> {\n target?: UseBindingsTarget<TRenderable>\n targetMode?: TargetMode\n}\n\nfunction resolveBindingsTarget(target: UseBindingsTarget | undefined): Renderable | undefined {\n return target?.() ?? undefined\n}\n\nexport const useKeymap = (): OpenTuiKeymap => {\n const keymap = useContext(KeymapContext)\n\n if (!keymap) {\n throw new Error(\"Keymap not found. Wrap the tree in <KeymapProvider>.\")\n }\n\n return keymap\n}\n\nfunction useKeymapStateVersion(keymap: OpenTuiKeymap): Accessor<number> {\n const [version, setVersion] = createSignal(0)\n let dispose: (() => void) | undefined\n\n onMount(() => {\n dispose = keymap.on(\"state\", () => {\n setVersion((value) => value + 1)\n })\n\n setVersion((value) => value + 1)\n })\n\n onCleanup(() => {\n dispose?.()\n })\n\n return version\n}\n\n/**\n * Reactively derives any view from the current keymap by re-running `selector`\n * on each batched keymap state change.\n */\nexport const useKeymapSelector = <T>(selector: (keymap: OpenTuiKeymap) => T): Accessor<T> => {\n const keymap = useKeymap()\n const version = useKeymapStateVersion(keymap)\n\n return createMemo((previous) => {\n version()\n try {\n return selector(keymap)\n } catch (error) {\n if (\n previous !== undefined &&\n error instanceof Error &&\n error.message === \"Cannot use a keymap after its host was destroyed\"\n ) {\n return previous\n }\n\n throw error\n }\n })\n}\n\nexport function useBindings<TRenderable extends Renderable = Renderable>(\n createLayer: () => UseBindingsLayer<TRenderable>,\n): void {\n const
|
|
5
|
+
"import type { KeyEvent, Renderable } from \"@opentui/core\"\nimport { type Keymap, type Layer, type ReactiveMatcher, type TargetMode } from \"../index.js\"\nimport { createLayerSlot } from \"../services/extension-context.js\"\nimport {\n createComponent,\n createContext,\n createEffect,\n createMemo,\n createRoot,\n createSignal,\n on,\n onCleanup,\n onMount,\n useContext,\n type Accessor,\n type JSX,\n} from \"solid-js\"\n\ntype OpenTuiKeymap = Keymap<Renderable, KeyEvent>\n\nconst KeymapContext = createContext<OpenTuiKeymap>()\n\nexport interface KeymapProviderProps {\n keymap: OpenTuiKeymap\n children: JSX.Element\n}\n\nexport function KeymapProvider(props: KeymapProviderProps): JSX.Element {\n return createComponent(KeymapContext.Provider, {\n get value() {\n return props.keymap\n },\n get children() {\n return props.children\n },\n })\n}\n\nexport type UseBindingsTarget<TRenderable extends Renderable = Renderable> = () => TRenderable | null | undefined\n\nexport interface UseBindingsLayer<TRenderable extends Renderable = Renderable> extends Omit<\n Layer<Renderable, KeyEvent>,\n \"target\" | \"targetMode\"\n> {\n target?: UseBindingsTarget<TRenderable>\n targetMode?: TargetMode\n}\n\nfunction resolveBindingsTarget(target: UseBindingsTarget | undefined): Renderable | undefined {\n return target?.() ?? undefined\n}\n\nexport const useKeymap = (): OpenTuiKeymap => {\n const keymap = useContext(KeymapContext)\n\n if (!keymap) {\n throw new Error(\"Keymap not found. Wrap the tree in <KeymapProvider>.\")\n }\n\n return keymap\n}\n\nfunction useKeymapStateVersion(keymap: OpenTuiKeymap): Accessor<number> {\n const [version, setVersion] = createSignal(0)\n let dispose: (() => void) | undefined\n\n onMount(() => {\n dispose = keymap.on(\"state\", () => {\n setVersion((value) => value + 1)\n })\n\n setVersion((value) => value + 1)\n })\n\n onCleanup(() => {\n dispose?.()\n })\n\n return version\n}\n\n/**\n * Reactively derives any view from the current keymap by re-running `selector`\n * on each batched keymap state change.\n */\nexport const useKeymapSelector = <T>(selector: (keymap: OpenTuiKeymap) => T): Accessor<T> => {\n const keymap = useKeymap()\n const version = useKeymapStateVersion(keymap)\n\n return createMemo((previous) => {\n version()\n try {\n return selector(keymap)\n } catch (error) {\n if (\n previous !== undefined &&\n error instanceof Error &&\n error.message === \"Cannot use a keymap after its host was destroyed\"\n ) {\n return previous\n }\n\n throw error\n }\n })\n}\n\nexport function useBindings<TRenderable extends Renderable = Renderable>(\n createLayer: () => UseBindingsLayer<TRenderable>,\n): void {\n const replaceLayer = createLayerSlot(useKeymap())\n\n onCleanup(() => replaceLayer(undefined))\n\n createEffect(() => {\n const layer = createLayer()\n const hasExplicitTarget = layer.target !== undefined\n const explicitTarget = resolveBindingsTarget(layer.target)\n const nextTargetMode: TargetMode | undefined = layer.targetMode ?? (hasExplicitTarget ? \"focus-within\" : undefined)\n\n const { target: _target, targetMode: _targetMode, ...baseLayer } = layer\n if (!nextTargetMode) {\n replaceLayer(baseLayer)\n return\n }\n\n if (!hasExplicitTarget) {\n throw new Error(\"useBindings local bindings need a target accessor\")\n }\n\n replaceLayer(explicitTarget && { ...baseLayer, target: explicitTarget, targetMode: nextTargetMode })\n })\n}\n\n/**\n * Adapts a Solid accessor to `ReactiveMatcher`. The subscription\n * lives in a disposable reactive root so unregistering the layer tears it\n * down. Pass `predicate` when the accessor value is not already boolean.\n */\nexport function reactiveMatcherFromSignal<T>(\n accessor: Accessor<T>,\n predicate?: (value: T) => boolean,\n): ReactiveMatcher {\n return {\n get() {\n return predicate ? predicate(accessor()) : Boolean(accessor())\n },\n subscribe(onChange) {\n return createRoot((dispose) => {\n createEffect(on(accessor, () => onChange(), { defer: true }))\n return dispose\n })\n },\n }\n}\n"
|
|
6
6
|
],
|
|
7
|
-
"mappings": "
|
|
8
|
-
"debugId": "
|
|
7
|
+
"mappings": ";;;;;;AAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBA,IAAM,gBAAgB,cAA6B;AAO5C,SAAS,cAAc,CAAC,OAAyC;AAAA,EACtE,OAAO,gBAAgB,cAAc,UAAU;AAAA,QACzC,KAAK,GAAG;AAAA,MACV,OAAO,MAAM;AAAA;AAAA,QAEX,QAAQ,GAAG;AAAA,MACb,OAAO,MAAM;AAAA;AAAA,EAEjB,CAAC;AAAA;AAaH,SAAS,qBAAqB,CAAC,QAA+D;AAAA,EAC5F,OAAO,SAAS,KAAK;AAAA;AAGhB,IAAM,YAAY,MAAqB;AAAA,EAC5C,MAAM,SAAS,WAAW,aAAa;AAAA,EAEvC,IAAI,CAAC,QAAQ;AAAA,IACX,MAAM,IAAI,MAAM,sDAAsD;AAAA,EACxE;AAAA,EAEA,OAAO;AAAA;AAGT,SAAS,qBAAqB,CAAC,QAAyC;AAAA,EACtE,OAAO,SAAS,cAAc,aAAa,CAAC;AAAA,EAC5C,IAAI;AAAA,EAEJ,QAAQ,MAAM;AAAA,IACZ,UAAU,OAAO,GAAG,SAAS,MAAM;AAAA,MACjC,WAAW,CAAC,UAAU,QAAQ,CAAC;AAAA,KAChC;AAAA,IAED,WAAW,CAAC,UAAU,QAAQ,CAAC;AAAA,GAChC;AAAA,EAED,UAAU,MAAM;AAAA,IACd,UAAU;AAAA,GACX;AAAA,EAED,OAAO;AAAA;AAOF,IAAM,oBAAoB,CAAI,aAAwD;AAAA,EAC3F,MAAM,SAAS,UAAU;AAAA,EACzB,MAAM,UAAU,sBAAsB,MAAM;AAAA,EAE5C,OAAO,WAAW,CAAC,aAAa;AAAA,IAC9B,QAAQ;AAAA,IACR,IAAI;AAAA,MACF,OAAO,SAAS,MAAM;AAAA,MACtB,OAAO,OAAO;AAAA,MACd,IACE,aAAa,aACb,iBAAiB,SACjB,MAAM,YAAY,oDAClB;AAAA,QACA,OAAO;AAAA,MACT;AAAA,MAEA,MAAM;AAAA;AAAA,GAET;AAAA;AAGI,SAAS,WAAwD,CACtE,aACM;AAAA,EACN,MAAM,eAAe,gBAAgB,UAAU,CAAC;AAAA,EAEhD,UAAU,MAAM,aAAa,SAAS,CAAC;AAAA,EAEvC,aAAa,MAAM;AAAA,IACjB,MAAM,QAAQ,YAAY;AAAA,IAC1B,MAAM,oBAAoB,MAAM,WAAW;AAAA,IAC3C,MAAM,iBAAiB,sBAAsB,MAAM,MAAM;AAAA,IACzD,MAAM,iBAAyC,MAAM,eAAe,oBAAoB,iBAAiB;AAAA,IAEzG,QAAQ,QAAQ,SAAS,YAAY,gBAAgB,cAAc;AAAA,IACnE,IAAI,CAAC,gBAAgB;AAAA,MACnB,aAAa,SAAS;AAAA,MACtB;AAAA,IACF;AAAA,IAEA,IAAI,CAAC,mBAAmB;AAAA,MACtB,MAAM,IAAI,MAAM,mDAAmD;AAAA,IACrE;AAAA,IAEA,aAAa,kBAAkB,KAAK,WAAW,QAAQ,gBAAgB,YAAY,eAAe,CAAC;AAAA,GACpG;AAAA;AAQI,SAAS,yBAA4B,CAC1C,UACA,WACiB;AAAA,EACjB,OAAO;AAAA,IACL,GAAG,GAAG;AAAA,MACJ,OAAO,YAAY,UAAU,SAAS,CAAC,IAAI,QAAQ,SAAS,CAAC;AAAA;AAAA,IAE/D,SAAS,CAAC,UAAU;AAAA,MAClB,OAAO,WAAW,CAAC,YAAY;AAAA,QAC7B,aAAa,GAAG,UAAU,MAAM,SAAS,GAAG,EAAE,OAAO,KAAK,CAAC,CAAC;AAAA,QAC5D,OAAO;AAAA,OACR;AAAA;AAAA,EAEL;AAAA;",
|
|
8
|
+
"debugId": "390D50CA6E00FD5B64756E2164756E21",
|
|
9
9
|
"names": []
|
|
10
10
|
}
|