@tooee/search 0.2.1 → 0.2.3

package/dist/index.d.ts

@@ -1,4 +1,8 @@
 export { useSearch } from "./search-hook.js";
+export { useNavSearchStore, useSearchBindings } from "./search-hook.js";
+export { createNavSearchStore } from "./nav-search-store.js";
+export type { NavSearchStore, NavSearchContext, NavSearchEvents, RowKey, } from "./nav-search-store.js";
+export { selectCursor, selectRowKeys, selectSelectionAnchor, selectToggledKeys, selectSearchStatus, selectSearchActive, selectSearchQuery, selectMatches, selectCurrentMatchIndex, deriveSelection, resolveIndex, } from "./nav-search-store.js";
 export type { UseSearchOptions, SearchState } from "./search-hook.js";
 export { findMatchingLines } from "./search.js";
 export { SearchBar } from "./SearchBar.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,YAAY,EACV,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,MAAM,GACP,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACL,YAAY,EACZ,aAAa,EACb,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,eAAe,EACf,YAAY,GACb,MAAM,uBAAuB,CAAA;AAC9B,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/index.js

@@ -1,4 +1,7 @@
 export { useSearch } from "./search-hook.js";
+export { useNavSearchStore, useSearchBindings } from "./search-hook.js";
+export { createNavSearchStore } from "./nav-search-store.js";
+export { selectCursor, selectRowKeys, selectSelectionAnchor, selectToggledKeys, selectSearchStatus, selectSearchActive, selectSearchQuery, selectMatches, selectCurrentMatchIndex, deriveSelection, resolveIndex, } from "./nav-search-store.js";
 export { findMatchingLines } from "./search.js";
 export { SearchBar } from "./SearchBar.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAO5D,OAAO,EACL,YAAY,EACZ,aAAa,EACb,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,eAAe,EACf,YAAY,GACb,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/nav-search-store.d.ts

@@ -0,0 +1,82 @@
+import type { Mode } from "@tooee/commands";
+export type RowKey = string | number | bigint;
+export type SearchStatus = "idle" | "editing" | "committed";
+export interface NavSearchContext {
+    rowKeys: readonly RowKey[];
+    cursor: number | null;
+    selectionAnchor: number | null;
+    toggledKeys: ReadonlySet<RowKey>;
+    search: {
+        status: SearchStatus;
+        query: string;
+        committedQuery: string;
+        matches: readonly number[];
+        currentMatchIndex: number;
+        preSearchMode: Mode;
+    };
+}
+export interface NavSearchDeps {
+    isSelectable(index: number): boolean;
+}
+export type NavSearchEvents = {
+    rowsChanged: {
+        keys: readonly RowKey[];
+        preserveCursorByKey?: boolean;
+    };
+    move: {
+        delta: number;
+    };
+    jump: {
+        index: number;
+        direction: 1 | -1;
+    };
+    setCursor: {
+        index: number;
+    };
+    enterSelect: {};
+    cancelSelect: {};
+    toggleCurrent: {};
+    toggleAndMove: {
+        delta: number;
+    };
+    searchStarted: {
+        mode: Mode;
+    };
+    searchChanged: {
+        query: string;
+        matches: readonly number[];
+    };
+    searchSubmitted: {};
+    searchCancelled: {};
+    searchNext: {};
+    searchPrevious: {};
+};
+type NavSearchEmitted = {
+    restoreMode: {
+        mode: Mode;
+    };
+    jumped: {
+        index: number;
+    };
+};
+export declare function resolveIndex(target: number, direction: 1 | -1, rowCount: number, isSelectable: (index: number) => boolean): number | null;
+export declare function createNavSearchStore(options?: {
+    keys?: readonly RowKey[];
+    deps?: NavSearchDeps;
+}): import("@xstate/store").Store<NavSearchContext, NavSearchEvents, import("@xstate/store").ExtractEvents<NavSearchEmitted>>;
+export type NavSearchStore = ReturnType<typeof createNavSearchStore>;
+export declare const selectCursor: (ctx: NavSearchContext) => number | null;
+export declare const selectRowKeys: (ctx: NavSearchContext) => readonly RowKey[];
+export declare const selectSelectionAnchor: (ctx: NavSearchContext) => number | null;
+export declare const selectToggledKeys: (ctx: NavSearchContext) => ReadonlySet<RowKey>;
+export declare const selectSearchStatus: (ctx: NavSearchContext) => SearchStatus;
+export declare const selectSearchActive: (ctx: NavSearchContext) => boolean;
+export declare const selectSearchQuery: (ctx: NavSearchContext) => string;
+export declare const selectMatches: (ctx: NavSearchContext) => readonly number[];
+export declare const selectCurrentMatchIndex: (ctx: NavSearchContext) => number;
+export declare function deriveSelection(ctx: NavSearchContext, mode: Mode): {
+    start: number;
+    end: number;
+} | null;
+export {};
+//# sourceMappingURL=nav-search-store.d.ts.map

package/dist/nav-search-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nav-search-store.d.ts","sourceRoot":"","sources":["../src/nav-search-store.ts"],"names":[],"mappings":"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"}

package/dist/nav-search-store.js

@@ -0,0 +1,193 @@
+import { createStore } from "@xstate/store";
+export function resolveIndex(target, direction, rowCount, isSelectable) {
+    if (rowCount <= 0)
+        return null;
+    const max = rowCount - 1;
+    const clamped = Math.max(0, Math.min(target, max));
+    if (isSelectable(clamped))
+        return clamped;
+    for (let index = clamped + direction; direction === 1 ? index <= max : index >= 0; index += direction) {
+        if (isSelectable(index))
+            return index;
+    }
+    for (let index = clamped - direction; direction === 1 ? index >= 0 : index <= max; index -= direction) {
+        if (isSelectable(index))
+            return index;
+    }
+    return null;
+}
+const EMPTY_KEYS = [];
+export function createNavSearchStore(options = {}) {
+    const deps = options.deps ?? { isSelectable: () => true };
+    const keys = options.keys ?? EMPTY_KEYS;
+    const resolve = (index, direction, count = keys.length) => resolveIndex(index, direction, count, deps.isSelectable);
+    return createStore({
+        context: {
+            rowKeys: keys,
+            cursor: resolve(0, 1),
+            selectionAnchor: null,
+            toggledKeys: new Set(),
+            search: {
+                status: "idle",
+                query: "",
+                committedQuery: "",
+                matches: [],
+                currentMatchIndex: 0,
+                preSearchMode: "cursor",
+            },
+        },
+        on: {
+            rowsChanged: (ctx, event) => {
+                const previousKey = ctx.cursor === null ? undefined : ctx.rowKeys[ctx.cursor];
+                let cursor = ctx.cursor;
+                if (event.keys.length === 0)
+                    cursor = null;
+                else if (event.preserveCursorByKey && previousKey !== undefined) {
+                    const preserved = event.keys.indexOf(previousKey);
+                    cursor =
+                        preserved >= 0
+                            ? resolveIndex(preserved, 1, event.keys.length, deps.isSelectable)
+                            : resolveIndex(Math.min(ctx.cursor, event.keys.length - 1), 1, event.keys.length, deps.isSelectable);
+                }
+                else if (cursor === null || cursor >= event.keys.length) {
+                    cursor = resolveIndex(cursor === null ? 0 : event.keys.length - 1, cursor === null ? 1 : -1, event.keys.length, deps.isSelectable);
+                }
+                else if (!deps.isSelectable(cursor)) {
+                    cursor = resolveIndex(cursor, 1, event.keys.length, deps.isSelectable);
+                }
+                const available = new Set(event.keys);
+                const filtered = new Set([...ctx.toggledKeys].filter((key) => available.has(key)));
+                const toggledKeys = filtered.size === ctx.toggledKeys.size ? ctx.toggledKeys : filtered;
+                return { ...ctx, rowKeys: event.keys, cursor, toggledKeys };
+            },
+            move: (ctx, event) => {
+                if (ctx.cursor === null)
+                    return ctx;
+                const direction = event.delta < 0 ? -1 : 1;
+                const cursor = resolveIndex(ctx.cursor + event.delta, direction, ctx.rowKeys.length, deps.isSelectable);
+                return cursor === null || cursor === ctx.cursor ? ctx : { ...ctx, cursor };
+            },
+            jump: (ctx, event) => ({
+                ...ctx,
+                cursor: resolveIndex(event.index, event.direction, ctx.rowKeys.length, deps.isSelectable),
+            }),
+            setCursor: (ctx, event) => {
+                const direction = ctx.cursor !== null && event.index < ctx.cursor ? -1 : 1;
+                const cursor = resolveIndex(event.index, direction, ctx.rowKeys.length, deps.isSelectable);
+                return cursor === null ? ctx : { ...ctx, cursor };
+            },
+            enterSelect: (ctx) => ({ ...ctx, selectionAnchor: ctx.cursor }),
+            cancelSelect: (ctx) => ctx.selectionAnchor === null ? ctx : { ...ctx, selectionAnchor: null },
+            toggleCurrent: (ctx) => toggle(ctx),
+            toggleAndMove: (ctx, event) => {
+                const toggled = toggle(ctx);
+                if (toggled.cursor === null)
+                    return toggled;
+                const direction = event.delta < 0 ? -1 : 1;
+                const cursor = resolveIndex(toggled.cursor + event.delta, direction, toggled.rowKeys.length, deps.isSelectable);
+                return cursor === null ? toggled : { ...toggled, cursor };
+            },
+            searchStarted: (ctx, event) => ({
+                ...ctx,
+                search: {
+                    ...ctx.search,
+                    status: "editing",
+                    query: "",
+                    matches: [],
+                    currentMatchIndex: 0,
+                    preSearchMode: event.mode,
+                },
+            }),
+            searchChanged: (ctx, event, enqueue) => {
+                const first = event.matches[0];
+                if (first !== undefined)
+                    enqueue.emit.jumped({ index: first });
+                return {
+                    ...ctx,
+                    cursor: first === undefined
+                        ? ctx.cursor
+                        : resolveIndex(first, 1, ctx.rowKeys.length, deps.isSelectable),
+                    search: {
+                        ...ctx.search,
+                        query: event.query,
+                        matches: event.matches,
+                        currentMatchIndex: 0,
+                    },
+                };
+            },
+            searchSubmitted: (ctx, _event, enqueue) => {
+                const first = ctx.search.matches[0];
+                if (first !== undefined)
+                    enqueue.emit.jumped({ index: first });
+                enqueue.emit.restoreMode({ mode: ctx.search.preSearchMode });
+                return {
+                    ...ctx,
+                    cursor: first === undefined
+                        ? ctx.cursor
+                        : resolveIndex(first, 1, ctx.rowKeys.length, deps.isSelectable),
+                    search: {
+                        ...ctx.search,
+                        status: "committed",
+                        committedQuery: ctx.search.query,
+                        currentMatchIndex: 0,
+                    },
+                };
+            },
+            searchCancelled: (ctx, _event, enqueue) => {
+                enqueue.emit.restoreMode({ mode: ctx.search.preSearchMode });
+                return {
+                    ...ctx,
+                    search: {
+                        ...ctx.search,
+                        status: "idle",
+                        query: "",
+                        committedQuery: "",
+                        matches: [],
+                        currentMatchIndex: 0,
+                    },
+                };
+            },
+            searchNext: (ctx, _event, enqueue) => searchStep(ctx, 1, enqueue),
+            searchPrevious: (ctx, _event, enqueue) => searchStep(ctx, -1, enqueue),
+        },
+    });
+}
+function toggle(ctx) {
+    if (ctx.cursor === null)
+        return ctx;
+    const key = ctx.rowKeys[ctx.cursor];
+    if (key === undefined)
+        return ctx;
+    const toggledKeys = new Set(ctx.toggledKeys);
+    if (toggledKeys.has(key))
+        toggledKeys.delete(key);
+    else
+        toggledKeys.add(key);
+    return { ...ctx, toggledKeys };
+}
+function searchStep(ctx, delta, enqueue) {
+    if (ctx.search.matches.length === 0)
+        return ctx;
+    const currentMatchIndex = (ctx.search.currentMatchIndex + delta + ctx.search.matches.length) % ctx.search.matches.length;
+    const cursor = ctx.search.matches[currentMatchIndex];
+    enqueue.emit.jumped({ index: cursor });
+    return { ...ctx, cursor, search: { ...ctx.search, currentMatchIndex } };
+}
+export const selectCursor = (ctx) => ctx.cursor;
+export const selectRowKeys = (ctx) => ctx.rowKeys;
+export const selectSelectionAnchor = (ctx) => ctx.selectionAnchor;
+export const selectToggledKeys = (ctx) => ctx.toggledKeys;
+export const selectSearchStatus = (ctx) => ctx.search.status;
+export const selectSearchActive = (ctx) => ctx.search.status === "editing";
+export const selectSearchQuery = (ctx) => ctx.search.status === "editing" ? ctx.search.query : ctx.search.committedQuery;
+export const selectMatches = (ctx) => ctx.search.matches;
+export const selectCurrentMatchIndex = (ctx) => ctx.search.currentMatchIndex;
+export function deriveSelection(ctx, mode) {
+    return mode === "select" && ctx.selectionAnchor !== null && ctx.cursor !== null
+        ? {
+            start: Math.min(ctx.selectionAnchor, ctx.cursor),
+            end: Math.max(ctx.selectionAnchor, ctx.cursor),
+        }
+        : null;
+}
+//# sourceMappingURL=nav-search-store.js.map

package/dist/nav-search-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nav-search-store.js","sourceRoot":"","sources":["../src/nav-search-store.ts"],"names":[],"mappings":"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"}

package/dist/search-hook.d.ts

@@ -1,17 +1,8 @@
+import { type NavSearchStore, type RowKey } from "./nav-search-store.js";
 export interface UseSearchOptions {
     match: (query: string) => number[];
     onJump: (index: number) => void;
-    /**
-     * Register the search commands (default true). `false` leaves the state
-     * inert: no `/`, `n`, `shift+n` or cancel command exists.
-     */
     enabled?: boolean;
-    /**
-     * Values the searched content is derived from. Matches are memoized on the
-     * query, so a committed query goes stale when the content changes underneath
-     * it (streaming or reloaded documents). List the content here to re-match.
-     * The array length must be stable across renders.
-     */
     deps?: readonly unknown[];
 }
 export interface SearchState {
@@ -22,5 +13,13 @@ export interface SearchState {
     currentMatchIndex: number;
     submitSearch: () => void;
 }
-export declare function useSearch({ match, onJump, enabled, deps, }: UseSearchOptions): SearchState;
+export declare function useNavSearchStore(options: {
+    keys: readonly RowKey[];
+    isSelectable?: (index: number) => boolean;
+    preserveCursorByKey?: boolean;
+}): NavSearchStore;
+export declare function useSearchBindings(store: NavSearchStore, { match, onJump, enabled, deps, }: Omit<UseSearchOptions, "onJump"> & {
+    onJump?: (index: number) => void;
+}): SearchState;
+export declare function useSearch(options: UseSearchOptions): SearchState;
 //# sourceMappingURL=search-hook.d.ts.map

package/dist/search-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-hook.d.ts","sourceRoot":"","sources":["../src/search-hook.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,EAAE,CAAA;IAClC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,SAAS,OAAO,EAAE,CAAA;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,OAAO,CAAA;IACrB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB;AAkBD,wBAAgB,SAAS,CAAC,EACxB,KAAK,EACL,MAAM,EACN,OAAc,EACd,IAAiB,GAClB,EAAE,gBAAgB,GAAG,WAAW,CA6IhC"}
+{"version":3,"file":"search-hook.d.ts","sourceRoot":"","sources":["../src/search-hook.ts"],"names":[],"mappings":"AAGA,OAAO,EAOL,KAAK,cAAc,EACnB,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAA;AAE9B,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,EAAE,CAAA;IAClC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,SAAS,OAAO,EAAE,CAAA;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,OAAO,CAAA;IACrB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB;AAKD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IACvB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAA;IACzC,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,GAAG,cAAc,CAmBjB;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,cAAc,EACrB,EACE,KAAK,EACL,MAAM,EACN,OAAc,EACd,IAAS,GACV,EAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,GACzE,WAAW,CA6Fb;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,WAAW,CAGhE"}

package/dist/search-hook.js

@@ -1,56 +1,59 @@
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useSelector } from "@xstate/store-react";
 import { useCommand, useMode, useSetMode } from "@tooee/commands";
-const EMPTY = [];
-const EMPTY_DEPS = [];
-function sameDeps(left, right) {
-    if (left.length !== right.length)
-        return false;
-    return left.every((value, index) => Object.is(value, right[index]));
-}
+import { createNavSearchStore, selectCurrentMatchIndex, selectMatches, selectSearchActive, selectSearchQuery, } from "./nav-search-store.js";
 const CURSOR_MODES = ["cursor"];
 const ALL_MODES = ["cursor", "select", "insert"];
-export function useSearch({ match, onJump, enabled = true, deps = EMPTY_DEPS, }) {
+export function useNavSearchStore(options) {
+    const depsRef = useRef({ isSelectable: options.isSelectable ?? (() => true) });
+    depsRef.current.isSelectable = options.isSelectable ?? (() => true);
+    const [store] = useState(() => createNavSearchStore({ keys: options.keys, deps: depsRef.current }));
+    useEffect(() => {
+        const currentKeys = store.getSnapshot().context.rowKeys;
+        const keysChanged = currentKeys.length !== options.keys.length ||
+            currentKeys.some((key, index) => !Object.is(key, options.keys[index]));
+        if (keysChanged) {
+            store.trigger.rowsChanged({
+                keys: options.keys,
+                preserveCursorByKey: options.preserveCursorByKey,
+            });
+        }
+    }, [store, options.keys, options.preserveCursorByKey]);
+    return store;
+}
+export function useSearchBindings(store, { match, onJump, enabled = true, deps = [], }) {
     const mode = useMode();
     const setMode = useSetMode();
-    const [searchQuery, setSearchQuery] = useState("");
-    const [searchActive, setSearchActive] = useState(false);
-    const [currentMatchIndex, setCurrentMatchIndex] = useState(0);
-    const [committedQuery, setCommittedQuery] = useState("");
-    const preSearchModeRef = useRef("cursor");
     const matchRef = useRef(match);
     matchRef.current = match;
     const onJumpRef = useRef(onJump);
     onJumpRef.current = onJump;
-    const activeQuery = searchActive ? searchQuery : committedQuery;
-    // Memoized on the query *and* the searched content: a committed query must
-    // re-match when rows arrive or change. `deps` is caller-sized, so this is a
-    // hand-rolled cache rather than a useMemo dependency array.
-    const cacheRef = useRef(null);
-    let matchingLines;
-    if (!activeQuery) {
-        matchingLines = EMPTY;
-    }
-    else {
-        const cache = cacheRef.current;
-        if (cache && cache.query === activeQuery && sameDeps(cache.deps, deps)) {
-            matchingLines = cache.matches;
-        }
-        else {
-            matchingLines = matchRef.current(activeQuery);
-            cacheRef.current = { query: activeQuery, deps: [...deps], matches: matchingLines };
-        }
-    }
-    const matchingLinesRef = useRef(matchingLines);
-    matchingLinesRef.current = matchingLines;
-    // Imperatively set search query, reset match index, and jump to first match.
+    useEffect(() => {
+        const subscription = store.on("jumped", ({ index }) => onJumpRef.current?.(index));
+        return () => subscription.unsubscribe();
+    }, [store]);
+    useEffect(() => {
+        const subscription = store.on("restoreMode", ({ mode: restored }) => setMode(restored));
+        return () => subscription.unsubscribe();
+    }, [store, setMode]);
+    const searchQuery = useSelector(store, (snapshot) => selectSearchQuery(snapshot.context));
+    const searchActive = useSelector(store, (snapshot) => selectSearchActive(snapshot.context));
+    const matchingLines = useSelector(store, (snapshot) => selectMatches(snapshot.context));
+    const currentMatchIndex = useSelector(store, (snapshot) => selectCurrentMatchIndex(snapshot.context));
     const updateSearchQuery = useCallback((query) => {
-        setSearchQuery(query);
-        setCurrentMatchIndex(0);
-        const matches = query ? matchRef.current(query) : [];
-        if (matches[0] != null) {
-            onJumpRef.current(matches[0]);
-        }
-    }, []);
+        store.trigger.searchChanged({ query, matches: query ? matchRef.current(query) : [] });
+    }, [store]);
+    // Re-match a committed query once when the caller-declared content changes.
+    const depsRef = useRef(deps);
+    useEffect(() => {
+        if (depsRef.current.every((value, index) => Object.is(value, deps[index])) &&
+            depsRef.current.length === deps.length)
+            return;
+        depsRef.current = deps;
+        const query = selectSearchQuery(store.getSnapshot().context);
+        if (query)
+            store.trigger.searchChanged({ query, matches: matchRef.current(query) });
+    }, [deps, store]);
     useCommand({
         id: "cursor-search-start",
         title: "Search",
@@ -58,9 +61,7 @@ export function useSearch({ match, onJump, enabled = true, deps = EMPTY_DEPS, })
         modes: CURSOR_MODES,
         enabled,
         handler: () => {
-            preSearchModeRef.current = mode;
-            setSearchActive(true);
-            setSearchQuery("");
+            store.trigger.searchStarted({ mode });
             setMode("insert");
         },
     });
@@ -70,20 +71,8 @@ export function useSearch({ match, onJump, enabled = true, deps = EMPTY_DEPS, })
         hotkey: "n",
         modes: CURSOR_MODES,
         enabled,
-        when: () => !searchActive,
-        handler: () => {
-            const matches = matchingLinesRef.current;
-            if (matches.length === 0)
-                return;
-            setCurrentMatchIndex((index) => {
-                const nextIndex = (index + 1) % matches.length;
-                const nextMatch = matches[nextIndex];
-                if (nextMatch != null) {
-                    onJumpRef.current(nextMatch);
-                }
-                return nextIndex;
-            });
-        },
+        when: () => !selectSearchActive(store.getSnapshot().context),
+        handler: () => store.trigger.searchNext({}),
     });
     useCommand({
         id: "cursor-search-prev",
@@ -91,20 +80,8 @@ export function useSearch({ match, onJump, enabled = true, deps = EMPTY_DEPS, })
         hotkey: "shift+n",
         modes: CURSOR_MODES,
         enabled,
-        when: () => !searchActive,
-        handler: () => {
-            const matches = matchingLinesRef.current;
-            if (matches.length === 0)
-                return;
-            setCurrentMatchIndex((index) => {
-                const nextIndex = (index - 1 + matches.length) % matches.length;
-                const nextMatch = matches[nextIndex];
-                if (nextMatch != null) {
-                    onJumpRef.current(nextMatch);
-                }
-                return nextIndex;
-            });
-        },
+        when: () => !selectSearchActive(store.getSnapshot().context),
+        handler: () => store.trigger.searchPrevious({}),
     });
     useCommand({
         id: "search-cancel",
@@ -112,32 +89,20 @@ export function useSearch({ match, onJump, enabled = true, deps = EMPTY_DEPS, })
         hotkey: "escape",
         modes: ALL_MODES,
         enabled,
-        when: () => searchActive,
-        handler: () => {
-            setSearchActive(false);
-            setSearchQuery("");
-            setCommittedQuery("");
-            setCurrentMatchIndex(0);
-            setMode(preSearchModeRef.current);
-        },
+        when: () => selectSearchActive(store.getSnapshot().context),
+        handler: () => store.trigger.searchCancelled({}),
     });
-    const submitSearch = useCallback(() => {
-        setCommittedQuery(searchQuery);
-        setSearchActive(false);
-        setCurrentMatchIndex(0);
-        const matches = searchQuery ? matchRef.current(searchQuery) : [];
-        if (matches[0] != null) {
-            onJumpRef.current(matches[0]);
-        }
-        setMode(preSearchModeRef.current);
-    }, [searchQuery, setMode]);
     return {
         searchQuery,
         searchActive,
         setSearchQuery: updateSearchQuery,
         matchingLines,
         currentMatchIndex,
-        submitSearch,
+        submitSearch: () => store.trigger.searchSubmitted({}),
     };
 }
+export function useSearch(options) {
+    const store = useNavSearchStore({ keys: [] });
+    return useSearchBindings(store, options);
+}
 //# sourceMappingURL=search-hook.js.map

package/dist/search-hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-hook.js","sourceRoot":"","sources":["../src/search-hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAa,MAAM,iBAAiB,CAAA;AA4B5E,MAAM,KAAK,GAAa,EAAE,CAAA;AAC1B,MAAM,UAAU,GAAuB,EAAE,CAAA;AAQzC,SAAS,QAAQ,CAAC,IAAwB,EAAE,KAAyB;IACnE,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAC9C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AACrE,CAAC;AACD,MAAM,YAAY,GAAW,CAAC,QAAQ,CAAC,CAAA;AACvC,MAAM,SAAS,GAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AAExD,MAAM,UAAU,SAAS,CAAC,EACxB,KAAK,EACL,MAAM,EACN,OAAO,GAAG,IAAI,EACd,IAAI,GAAG,UAAU,GACA;IACjB,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;IACtB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;IAE5B,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;IAClD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACvD,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAC7D,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;IACxD,MAAM,gBAAgB,GAAG,MAAM,CAAO,QAAQ,CAAC,CAAA;IAE/C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9B,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAA;IAExB,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IAChC,SAAS,CAAC,OAAO,GAAG,MAAM,CAAA;IAE1B,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAA;IAE/D,2EAA2E;IAC3E,4EAA4E;IAC5E,4DAA4D;IAC5D,MAAM,QAAQ,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAA;IAChD,IAAI,aAAuB,CAAA;IAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,aAAa,GAAG,KAAK,CAAA;IACvB,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAA;QAC9B,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,WAAW,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YACvE,aAAa,GAAG,KAAK,CAAC,OAAO,CAAA;QAC/B,CAAC;aAAM,CAAC;YACN,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;YAC7C,QAAQ,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAA;QACpF,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAA;IAC9C,gBAAgB,CAAC,OAAO,GAAG,aAAa,CAAA;IAExC,6EAA6E;IAC7E,MAAM,iBAAiB,GAAG,WAAW,CAAC,CAAC,KAAa,EAAE,EAAE;QACtD,cAAc,CAAC,KAAK,CAAC,CAAA;QACrB,oBAAoB,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACpD,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACvB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,UAAU,CAAC;QACT,EAAE,EAAE,qBAAqB;QACzB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,YAAY;QACnB,OAAO;QACP,OAAO,EAAE,GAAG,EAAE;YACZ,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAA;YAC/B,eAAe,CAAC,IAAI,CAAC,CAAA;YACrB,cAAc,CAAC,EAAE,CAAC,CAAA;YAClB,OAAO,CAAC,QAAQ,CAAC,CAAA;QACnB,CAAC;KACF,CAAC,CAAA;IAEF,UAAU,CAAC;QACT,EAAE,EAAE,oBAAoB;QACxB,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,YAAY;QACnB,OAAO;QACP,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;QACzB,OAAO,EAAE,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAA;YACxC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAM;YAEhC,oBAAoB,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC7B,MAAM,SAAS,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAA;gBAC9C,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;gBACpC,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;oBACtB,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;gBAC9B,CAAC;gBACD,OAAO,SAAS,CAAA;YAClB,CAAC,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;IAEF,UAAU,CAAC;QACT,EAAE,EAAE,oBAAoB;QACxB,KAAK,EAAE,gBAAgB;QACvB,MAAM,EAAE,SAAS;QACjB,KAAK,EAAE,YAAY;QACnB,OAAO;QACP,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;QACzB,OAAO,EAAE,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAA;YACxC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAM;YAEhC,oBAAoB,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC7B,MAAM,SAAS,GAAG,CAAC,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAA;gBAC/D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;gBACpC,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;oBACtB,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;gBAC9B,CAAC;gBACD,OAAO,SAAS,CAAA;YAClB,CAAC,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;IAEF,UAAU,CAAC;QACT,EAAE,EAAE,eAAe;QACnB,KAAK,EAAE,eAAe;QACtB,MAAM,EAAE,QAAQ;QAChB,KAAK,EAAE,SAAS;QAChB,OAAO;QACP,IAAI,EAAE,GAAG,EAAE,CAAC,YAAY;QACxB,OAAO,EAAE,GAAG,EAAE;YACZ,eAAe,CAAC,KAAK,CAAC,CAAA;YACtB,cAAc,CAAC,EAAE,CAAC,CAAA;YAClB,iBAAiB,CAAC,EAAE,CAAC,CAAA;YACrB,oBAAoB,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;QACnC,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;QACpC,iBAAiB,CAAC,WAAW,CAAC,CAAA;QAC9B,eAAe,CAAC,KAAK,CAAC,CAAA;QACtB,oBAAoB,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAChE,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACvB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/B,CAAC;QACD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAA;IAE1B,OAAO;QACL,WAAW;QACX,YAAY;QACZ,cAAc,EAAE,iBAAiB;QACjC,aAAa;QACb,iBAAiB;QACjB,YAAY;KACb,CAAA;AACH,CAAC"}
+{"version":3,"file":"search-hook.js","sourceRoot":"","sources":["../src/search-hook.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tooee/search",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Search hook, utilities, and SearchBar component for Tooee",
   "keywords": [
     "cli",
@@ -35,8 +35,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@tooee/commands": "0.2.1",
-    "@tooee/themes": "0.2.1"
+    "@tooee/commands": "0.2.3",
+    "@tooee/themes": "0.2.3",
+    "@xstate/store": "^4",
+    "@xstate/store-react": "^2"
   },
   "devDependencies": {
     "@opentui/core": "^0.4.3",

package/src/index.ts

@@ -1,4 +1,25 @@
 export { useSearch } from "./search-hook.js"
+export { useNavSearchStore, useSearchBindings } from "./search-hook.js"
+export { createNavSearchStore } from "./nav-search-store.js"
+export type {
+  NavSearchStore,
+  NavSearchContext,
+  NavSearchEvents,
+  RowKey,
+} from "./nav-search-store.js"
+export {
+  selectCursor,
+  selectRowKeys,
+  selectSelectionAnchor,
+  selectToggledKeys,
+  selectSearchStatus,
+  selectSearchActive,
+  selectSearchQuery,
+  selectMatches,
+  selectCurrentMatchIndex,
+  deriveSelection,
+  resolveIndex,
+} from "./nav-search-store.js"
 export type { UseSearchOptions, SearchState } from "./search-hook.js"
 export { findMatchingLines } from "./search.js"
 export { SearchBar } from "./SearchBar.js"

package/src/nav-search-store.ts

@@ -0,0 +1,278 @@
+import { createStore } from "@xstate/store"
+import type { Mode } from "@tooee/commands"
+
+export type RowKey = string | number | bigint
+export type SearchStatus = "idle" | "editing" | "committed"
+
+export interface NavSearchContext {
+  rowKeys: readonly RowKey[]
+  cursor: number | null
+  selectionAnchor: number | null
+  toggledKeys: ReadonlySet<RowKey>
+  search: {
+    status: SearchStatus
+    query: string
+    committedQuery: string
+    matches: readonly number[]
+    currentMatchIndex: number
+    preSearchMode: Mode
+  }
+}
+
+export interface NavSearchDeps {
+  isSelectable(index: number): boolean
+}
+
+export type NavSearchEvents = {
+  rowsChanged: { keys: readonly RowKey[]; preserveCursorByKey?: boolean }
+  move: { delta: number }
+  jump: { index: number; direction: 1 | -1 }
+  setCursor: { index: number }
+  enterSelect: {}
+  cancelSelect: {}
+  toggleCurrent: {}
+  toggleAndMove: { delta: number }
+  searchStarted: { mode: Mode }
+  searchChanged: { query: string; matches: readonly number[] }
+  searchSubmitted: {}
+  searchCancelled: {}
+  searchNext: {}
+  searchPrevious: {}
+}
+
+type NavSearchEmitted = {
+  restoreMode: { mode: Mode }
+  jumped: { index: number }
+}
+
+export function resolveIndex(
+  target: number,
+  direction: 1 | -1,
+  rowCount: number,
+  isSelectable: (index: number) => boolean,
+): number | null {
+  if (rowCount <= 0) return null
+  const max = rowCount - 1
+  const clamped = Math.max(0, Math.min(target, max))
+  if (isSelectable(clamped)) return clamped
+  for (
+    let index = clamped + direction;
+    direction === 1 ? index <= max : index >= 0;
+    index += direction
+  ) {
+    if (isSelectable(index)) return index
+  }
+  for (
+    let index = clamped - direction;
+    direction === 1 ? index >= 0 : index <= max;
+    index -= direction
+  ) {
+    if (isSelectable(index)) return index
+  }
+  return null
+}
+
+const EMPTY_KEYS: readonly RowKey[] = []
+
+export function createNavSearchStore(
+  options: {
+    keys?: readonly RowKey[]
+    deps?: NavSearchDeps
+  } = {},
+) {
+  const deps = options.deps ?? { isSelectable: () => true }
+  const keys = options.keys ?? EMPTY_KEYS
+  const resolve = (index: number, direction: 1 | -1, count = keys.length) =>
+    resolveIndex(index, direction, count, deps.isSelectable)
+
+  return createStore<NavSearchContext, NavSearchEvents, NavSearchEmitted>({
+    context: {
+      rowKeys: keys,
+      cursor: resolve(0, 1),
+      selectionAnchor: null,
+      toggledKeys: new Set(),
+      search: {
+        status: "idle",
+        query: "",
+        committedQuery: "",
+        matches: [],
+        currentMatchIndex: 0,
+        preSearchMode: "cursor",
+      },
+    },
+    on: {
+      rowsChanged: (ctx, event) => {
+        const previousKey = ctx.cursor === null ? undefined : ctx.rowKeys[ctx.cursor]
+        let cursor = ctx.cursor
+        if (event.keys.length === 0) cursor = null
+        else if (event.preserveCursorByKey && previousKey !== undefined) {
+          const preserved = event.keys.indexOf(previousKey)
+          cursor =
+            preserved >= 0
+              ? resolveIndex(preserved, 1, event.keys.length, deps.isSelectable)
+              : resolveIndex(
+                  Math.min(ctx.cursor!, event.keys.length - 1),
+                  1,
+                  event.keys.length,
+                  deps.isSelectable,
+                )
+        } else if (cursor === null || cursor >= event.keys.length) {
+          cursor = resolveIndex(
+            cursor === null ? 0 : event.keys.length - 1,
+            cursor === null ? 1 : -1,
+            event.keys.length,
+            deps.isSelectable,
+          )
+        } else if (!deps.isSelectable(cursor)) {
+          cursor = resolveIndex(cursor, 1, event.keys.length, deps.isSelectable)
+        }
+        const available = new Set(event.keys)
+        const filtered = new Set([...ctx.toggledKeys].filter((key) => available.has(key)))
+        const toggledKeys = filtered.size === ctx.toggledKeys.size ? ctx.toggledKeys : filtered
+        return { ...ctx, rowKeys: event.keys, cursor, toggledKeys }
+      },
+      move: (ctx, event) => {
+        if (ctx.cursor === null) return ctx
+        const direction: 1 | -1 = event.delta < 0 ? -1 : 1
+        const cursor = resolveIndex(
+          ctx.cursor + event.delta,
+          direction,
+          ctx.rowKeys.length,
+          deps.isSelectable,
+        )
+        return cursor === null || cursor === ctx.cursor ? ctx : { ...ctx, cursor }
+      },
+      jump: (ctx, event) => ({
+        ...ctx,
+        cursor: resolveIndex(event.index, event.direction, ctx.rowKeys.length, deps.isSelectable),
+      }),
+      setCursor: (ctx, event) => {
+        const direction: 1 | -1 = ctx.cursor !== null && event.index < ctx.cursor ? -1 : 1
+        const cursor = resolveIndex(event.index, direction, ctx.rowKeys.length, deps.isSelectable)
+        return cursor === null ? ctx : { ...ctx, cursor }
+      },
+      enterSelect: (ctx) => ({ ...ctx, selectionAnchor: ctx.cursor }),
+      cancelSelect: (ctx) =>
+        ctx.selectionAnchor === null ? ctx : { ...ctx, selectionAnchor: null },
+      toggleCurrent: (ctx) => toggle(ctx),
+      toggleAndMove: (ctx, event) => {
+        const toggled = toggle(ctx)
+        if (toggled.cursor === null) return toggled
+        const direction: 1 | -1 = event.delta < 0 ? -1 : 1
+        const cursor = resolveIndex(
+          toggled.cursor + event.delta,
+          direction,
+          toggled.rowKeys.length,
+          deps.isSelectable,
+        )
+        return cursor === null ? toggled : { ...toggled, cursor }
+      },
+      searchStarted: (ctx, event) => ({
+        ...ctx,
+        search: {
+          ...ctx.search,
+          status: "editing",
+          query: "",
+          matches: [],
+          currentMatchIndex: 0,
+          preSearchMode: event.mode,
+        },
+      }),
+      searchChanged: (ctx, event, enqueue) => {
+        const first = event.matches[0]
+        if (first !== undefined) enqueue.emit.jumped({ index: first })
+        return {
+          ...ctx,
+          cursor:
+            first === undefined
+              ? ctx.cursor
+              : resolveIndex(first, 1, ctx.rowKeys.length, deps.isSelectable),
+          search: {
+            ...ctx.search,
+            query: event.query,
+            matches: event.matches,
+            currentMatchIndex: 0,
+          },
+        }
+      },
+      searchSubmitted: (ctx, _event, enqueue) => {
+        const first = ctx.search.matches[0]
+        if (first !== undefined) enqueue.emit.jumped({ index: first })
+        enqueue.emit.restoreMode({ mode: ctx.search.preSearchMode })
+        return {
+          ...ctx,
+          cursor:
+            first === undefined
+              ? ctx.cursor
+              : resolveIndex(first, 1, ctx.rowKeys.length, deps.isSelectable),
+          search: {
+            ...ctx.search,
+            status: "committed",
+            committedQuery: ctx.search.query,
+            currentMatchIndex: 0,
+          },
+        }
+      },
+      searchCancelled: (ctx, _event, enqueue) => {
+        enqueue.emit.restoreMode({ mode: ctx.search.preSearchMode })
+        return {
+          ...ctx,
+          search: {
+            ...ctx.search,
+            status: "idle",
+            query: "",
+            committedQuery: "",
+            matches: [],
+            currentMatchIndex: 0,
+          },
+        }
+      },
+      searchNext: (ctx, _event, enqueue) => searchStep(ctx, 1, enqueue),
+      searchPrevious: (ctx, _event, enqueue) => searchStep(ctx, -1, enqueue),
+    },
+  })
+}
+
+function toggle(ctx: NavSearchContext): NavSearchContext {
+  if (ctx.cursor === null) return ctx
+  const key = ctx.rowKeys[ctx.cursor]
+  if (key === undefined) return ctx
+  const toggledKeys = new Set(ctx.toggledKeys)
+  if (toggledKeys.has(key)) toggledKeys.delete(key)
+  else toggledKeys.add(key)
+  return { ...ctx, toggledKeys }
+}
+
+function searchStep(
+  ctx: NavSearchContext,
+  delta: 1 | -1,
+  enqueue: { emit: { jumped: (event: { index: number }) => void } },
+): NavSearchContext {
+  if (ctx.search.matches.length === 0) return ctx
+  const currentMatchIndex =
+    (ctx.search.currentMatchIndex + delta + ctx.search.matches.length) % ctx.search.matches.length
+  const cursor = ctx.search.matches[currentMatchIndex]!
+  enqueue.emit.jumped({ index: cursor })
+  return { ...ctx, cursor, search: { ...ctx.search, currentMatchIndex } }
+}
+
+export type NavSearchStore = ReturnType<typeof createNavSearchStore>
+
+export const selectCursor = (ctx: NavSearchContext) => ctx.cursor
+export const selectRowKeys = (ctx: NavSearchContext) => ctx.rowKeys
+export const selectSelectionAnchor = (ctx: NavSearchContext) => ctx.selectionAnchor
+export const selectToggledKeys = (ctx: NavSearchContext) => ctx.toggledKeys
+export const selectSearchStatus = (ctx: NavSearchContext) => ctx.search.status
+export const selectSearchActive = (ctx: NavSearchContext) => ctx.search.status === "editing"
+export const selectSearchQuery = (ctx: NavSearchContext) =>
+  ctx.search.status === "editing" ? ctx.search.query : ctx.search.committedQuery
+export const selectMatches = (ctx: NavSearchContext) => ctx.search.matches
+export const selectCurrentMatchIndex = (ctx: NavSearchContext) => ctx.search.currentMatchIndex
+export function deriveSelection(ctx: NavSearchContext, mode: Mode) {
+  return mode === "select" && ctx.selectionAnchor !== null && ctx.cursor !== null
+    ? {
+        start: Math.min(ctx.selectionAnchor, ctx.cursor),
+        end: Math.max(ctx.selectionAnchor, ctx.cursor),
+      }
+    : null
+}

package/src/search-hook.ts

@@ -1,20 +1,21 @@
-import { useCallback, useRef, useState } from "react"
+import { useCallback, useEffect, useRef, useState } from "react"
+import { useSelector } from "@xstate/store-react"
 import { useCommand, useMode, useSetMode, type Mode } from "@tooee/commands"
+import {
+  createNavSearchStore,
+  selectCurrentMatchIndex,
+  selectMatches,
+  selectSearchActive,
+  selectSearchQuery,
+  type NavSearchDeps,
+  type NavSearchStore,
+  type RowKey,
+} from "./nav-search-store.js"
 
 export interface UseSearchOptions {
   match: (query: string) => number[]
   onJump: (index: number) => void
-  /**
-   * Register the search commands (default true). `false` leaves the state
-   * inert: no `/`, `n`, `shift+n` or cancel command exists.
-   */
   enabled?: boolean
-  /**
-   * Values the searched content is derived from. Matches are memoized on the
-   * query, so a committed query goes stale when the content changes underneath
-   * it (streaming or reloaded documents). List the content here to re-match.
-   * The array length must be stable across renders.
-   */
   deps?: readonly unknown[]
 }
 
@@ -27,74 +28,87 @@ export interface SearchState {
   submitSearch: () => void
 }
 
-const EMPTY: number[] = []
-const EMPTY_DEPS: readonly unknown[] = []
-
-interface MatchCache {
-  query: string
-  deps: readonly unknown[]
-  matches: number[]
-}
-
-function sameDeps(left: readonly unknown[], right: readonly unknown[]): boolean {
-  if (left.length !== right.length) return false
-  return left.every((value, index) => Object.is(value, right[index]))
-}
 const CURSOR_MODES: Mode[] = ["cursor"]
 const ALL_MODES: Mode[] = ["cursor", "select", "insert"]
 
-export function useSearch({
-  match,
-  onJump,
-  enabled = true,
-  deps = EMPTY_DEPS,
-}: UseSearchOptions): SearchState {
+export function useNavSearchStore(options: {
+  keys: readonly RowKey[]
+  isSelectable?: (index: number) => boolean
+  preserveCursorByKey?: boolean
+}): NavSearchStore {
+  const depsRef = useRef<NavSearchDeps>({ isSelectable: options.isSelectable ?? (() => true) })
+  depsRef.current.isSelectable = options.isSelectable ?? (() => true)
+  const [store] = useState(() =>
+    createNavSearchStore({ keys: options.keys, deps: depsRef.current }),
+  )
+  useEffect(() => {
+    const currentKeys = store.getSnapshot().context.rowKeys
+    const keysChanged =
+      currentKeys.length !== options.keys.length ||
+      currentKeys.some((key, index) => !Object.is(key, options.keys[index]))
+    if (keysChanged) {
+      store.trigger.rowsChanged({
+        keys: options.keys,
+        preserveCursorByKey: options.preserveCursorByKey,
+      })
+    }
+  }, [store, options.keys, options.preserveCursorByKey])
+  return store
+}
+
+export function useSearchBindings(
+  store: NavSearchStore,
+  {
+    match,
+    onJump,
+    enabled = true,
+    deps = [],
+  }: Omit<UseSearchOptions, "onJump"> & { onJump?: (index: number) => void },
+): SearchState {
   const mode = useMode()
   const setMode = useSetMode()
-
-  const [searchQuery, setSearchQuery] = useState("")
-  const [searchActive, setSearchActive] = useState(false)
-  const [currentMatchIndex, setCurrentMatchIndex] = useState(0)
-  const [committedQuery, setCommittedQuery] = useState("")
-  const preSearchModeRef = useRef<Mode>("cursor")
-
   const matchRef = useRef(match)
   matchRef.current = match
-
   const onJumpRef = useRef(onJump)
   onJumpRef.current = onJump
 
-  const activeQuery = searchActive ? searchQuery : committedQuery
-
-  // Memoized on the query *and* the searched content: a committed query must
-  // re-match when rows arrive or change. `deps` is caller-sized, so this is a
-  // hand-rolled cache rather than a useMemo dependency array.
-  const cacheRef = useRef<MatchCache | null>(null)
-  let matchingLines: number[]
-  if (!activeQuery) {
-    matchingLines = EMPTY
-  } else {
-    const cache = cacheRef.current
-    if (cache && cache.query === activeQuery && sameDeps(cache.deps, deps)) {
-      matchingLines = cache.matches
-    } else {
-      matchingLines = matchRef.current(activeQuery)
-      cacheRef.current = { query: activeQuery, deps: [...deps], matches: matchingLines }
-    }
-  }
-
-  const matchingLinesRef = useRef(matchingLines)
-  matchingLinesRef.current = matchingLines
-
-  // Imperatively set search query, reset match index, and jump to first match.
-  const updateSearchQuery = useCallback((query: string) => {
-    setSearchQuery(query)
-    setCurrentMatchIndex(0)
-    const matches = query ? matchRef.current(query) : []
-    if (matches[0] != null) {
-      onJumpRef.current(matches[0])
-    }
-  }, [])
+  useEffect(() => {
+    const subscription = store.on("jumped", ({ index }) => onJumpRef.current?.(index))
+    return () => subscription.unsubscribe()
+  }, [store])
+  useEffect(() => {
+    const subscription = store.on("restoreMode", ({ mode: restored }) => setMode(restored))
+    return () => subscription.unsubscribe()
+  }, [store, setMode])
+
+  const searchQuery = useSelector(store, (snapshot) => selectSearchQuery(snapshot.context))
+  const searchActive = useSelector(store, (snapshot) => selectSearchActive(snapshot.context))
+  const matchingLines = useSelector(store, (snapshot) =>
+    selectMatches(snapshot.context),
+  ) as number[]
+  const currentMatchIndex = useSelector(store, (snapshot) =>
+    selectCurrentMatchIndex(snapshot.context),
+  )
+
+  const updateSearchQuery = useCallback(
+    (query: string) => {
+      store.trigger.searchChanged({ query, matches: query ? matchRef.current(query) : [] })
+    },
+    [store],
+  )
+
+  // Re-match a committed query once when the caller-declared content changes.
+  const depsRef = useRef(deps)
+  useEffect(() => {
+    if (
+      depsRef.current.every((value, index) => Object.is(value, deps[index])) &&
+      depsRef.current.length === deps.length
+    )
+      return
+    depsRef.current = deps
+    const query = selectSearchQuery(store.getSnapshot().context)
+    if (query) store.trigger.searchChanged({ query, matches: matchRef.current(query) })
+  }, [deps, store])
 
   useCommand({
     id: "cursor-search-start",
@@ -103,90 +117,49 @@ export function useSearch({
     modes: CURSOR_MODES,
     enabled,
     handler: () => {
-      preSearchModeRef.current = mode
-      setSearchActive(true)
-      setSearchQuery("")
+      store.trigger.searchStarted({ mode })
       setMode("insert")
     },
   })
-
   useCommand({
     id: "cursor-search-next",
     title: "Next match",
     hotkey: "n",
     modes: CURSOR_MODES,
     enabled,
-    when: () => !searchActive,
-    handler: () => {
-      const matches = matchingLinesRef.current
-      if (matches.length === 0) return
-
-      setCurrentMatchIndex((index) => {
-        const nextIndex = (index + 1) % matches.length
-        const nextMatch = matches[nextIndex]
-        if (nextMatch != null) {
-          onJumpRef.current(nextMatch)
-        }
-        return nextIndex
-      })
-    },
+    when: () => !selectSearchActive(store.getSnapshot().context),
+    handler: () => store.trigger.searchNext({}),
   })
-
   useCommand({
     id: "cursor-search-prev",
     title: "Previous match",
     hotkey: "shift+n",
     modes: CURSOR_MODES,
     enabled,
-    when: () => !searchActive,
-    handler: () => {
-      const matches = matchingLinesRef.current
-      if (matches.length === 0) return
-
-      setCurrentMatchIndex((index) => {
-        const nextIndex = (index - 1 + matches.length) % matches.length
-        const nextMatch = matches[nextIndex]
-        if (nextMatch != null) {
-          onJumpRef.current(nextMatch)
-        }
-        return nextIndex
-      })
-    },
+    when: () => !selectSearchActive(store.getSnapshot().context),
+    handler: () => store.trigger.searchPrevious({}),
   })
-
   useCommand({
     id: "search-cancel",
     title: "Cancel search",
     hotkey: "escape",
     modes: ALL_MODES,
     enabled,
-    when: () => searchActive,
-    handler: () => {
-      setSearchActive(false)
-      setSearchQuery("")
-      setCommittedQuery("")
-      setCurrentMatchIndex(0)
-      setMode(preSearchModeRef.current)
-    },
+    when: () => selectSearchActive(store.getSnapshot().context),
+    handler: () => store.trigger.searchCancelled({}),
   })
 
-  const submitSearch = useCallback(() => {
-    setCommittedQuery(searchQuery)
-    setSearchActive(false)
-    setCurrentMatchIndex(0)
-    const matches = searchQuery ? matchRef.current(searchQuery) : []
-    if (matches[0] != null) {
-      onJumpRef.current(matches[0])
-    }
-    setMode(preSearchModeRef.current)
-  }, [searchQuery, setMode])
-
   return {
     searchQuery,
     searchActive,
     setSearchQuery: updateSearchQuery,
     matchingLines,
     currentMatchIndex,
-    submitSearch,
+    submitSearch: () => store.trigger.searchSubmitted({}),
   }
 }
+
+export function useSearch(options: UseSearchOptions): SearchState {
+  const store = useNavSearchStore({ keys: [] })
+  return useSearchBindings(store, options)
+}