@tooee/view 0.1.22 → 0.2.0

package/README.md

@@ -4,11 +4,42 @@ Terminal content viewer for markdown, code, text, and tables.
 
 Part of the [Tooee](https://github.com/gingerhendrix/tooee) monorepo. See the main repo for documentation.
 
+## Command context
+
+A `View` screen publishes two command-context slices.
+
+`ctx.document` is the generic row-document contract from `@tooee/shell`, owned by
+the document controller: `rowCount`, `cursor`, `activeKey`, `activeRow`,
+`selection`, `selectedRows` and `toggledIndices`. Every row document has it, so
+row actions read the cursor from there:
+
+```ts
+handler: (ctx) => open(ctx.document?.activeRow)
+```
+
+`ctx.view` is content-only — what the viewer knows and the controller does not:
+
+```ts
+interface ViewCommandContext {
+  content: AnyContent
+  format: string
+  title?: string
+  data?: unknown
+  reload: () => void
+  marks: {
+    setMarkSet(set: MarkSet): void
+    clearNamespace(namespace: string): void
+    clearAll(): void
+    userMarks: MarkSet[]
+    providerMarks: MarkSet[]
+  }
+}
+```
+
 ## Headless view command context
 
 Custom surfaces that behave like a view, but do not render the built-in `View`
-component, can publish the standard `ctx.view` command-context slice with
-`useProvideViewCommandContext`:
+component, can publish the `ctx.view` slice with `useProvideViewCommandContext`:
 
 ```tsx
 import { useProvideViewCommandContext } from "@tooee/view"
@@ -16,18 +47,42 @@ import { useProvideViewCommandContext } from "@tooee/view"
 useProvideViewCommandContext({
   format: "stream-dashboard",
   title: "Stream Dashboard",
-  nav,
   data: { rowCount: rows.length },
-  extras: { activeRow, rowCount: rows.length },
 })
 ```
 
-The hook injects the live command mode and fills safe defaults for headless
-surfaces: synthetic custom content, empty marks, an empty toggled-index set, and
-no-op reload/mark mutators. Register only the view commands your custom surface
-can actually honor; unsupported capabilities are intentionally inert defaults
-rather than full feature implementations.
+The hook fills safe defaults for headless surfaces: synthetic custom content,
+empty marks, and a no-op reload. Row state comes from `useDocumentController`,
+whose `DocumentScreen` provides `ctx.document` — do not synthesize it here.
+
+For tests or non-React integrations, `createViewCommandContext({ ... })` creates
+the same object shape directly.
+
+## Custom renderers
+
+A custom renderer receives the content and the host's document controller. Its
+rows are the content's plain-text lines — the unit navigation, search and copy
+work in.
+
+```tsx
+const KanbanRenderer: ContentRenderer = ({ content, document }) => (
+  <box onMouseDown={() => document.selectRow(0)}>
+    <text content={`cursor: ${document.activeIndex}`} />
+  </box>
+)
+```
+
+A renderer that owns a `<row-document>` binds the controller directly — it
+satisfies `DocumentBindings`, the same `{ ref, decorations, onMouseDown }` the
+built-in `CodeView`, `MarkdownView` and `Table` renderers take:
+
+```tsx
+<row-document
+  ref={document.ref}
+  decorations={document.decorations}
+  onMouseDown={document.onMouseDown}
+>
+```
 
-For tests or non-React integrations, `createViewCommandContext({ mode, ... })`
-creates the same object shape directly. The builder requires the caller to own
-the `mode` value; prefer the hook in React so mode cannot go stale.
+`selectRow` stands down while a modal overlay is open, so it can be wired
+unconditionally.

package/dist/View.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"View.d.ts","sourceRoot":"","sources":["../src/View.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAmB,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAA;AASxF,UAAU,SAAS;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC3C;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CACvD;AAED,wBAAgB,IAAI,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,EAAE,SAAS,6BAqE1F"}
+{"version":3,"file":"View.d.ts","sourceRoot":"","sources":["../src/View.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAmB,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAA;AASxF,UAAU,SAAS;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC3C;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CACvD;AAED,wBAAgB,IAAI,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,EAAE,SAAS,6BA0E1F"}

package/dist/View.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "@opentui/react/jsx-runtime";
-import { useState, useCallback } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { useTheme } from "@tooee/themes";
 import { isCustomContent } from "./types.js";
 import { useContentLoader } from "./hooks/useContentLoader.js";
@@ -22,6 +22,9 @@ export function View({ contentProvider, actions, renderers, codeBlockRenderers }
     const clearAllUserMarks = useCallback(() => {
         setUserMarks([]);
     }, []);
+    // Mark sets are decoration layers; the controller composes them with the
+    // interaction layers it generates, ordered by each set's own priority.
+    const decorations = useMemo(() => [...providerMarks, ...userMarks], [providerMarks, userMarks]);
     if (error) {
         return (_jsx("box", { style: { flexDirection: "column" }, children: _jsx("text", { content: `Error: ${error}`, fg: theme.error }) }));
     }
@@ -29,6 +32,7 @@ export function View({ contentProvider, actions, renderers, codeBlockRenderers }
         return (_jsx("box", { children: _jsx("text", { content: "Loading...", fg: theme.textMuted }) }));
     }
     const shared = {
+        decorations,
         providerMarks,
         userMarks,
         setMarkSet,

package/dist/View.js.map

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

package/dist/components/ViewScreen.d.ts

@@ -0,0 +1,28 @@
+import type { ReactNode } from "react";
+import type { ActionDefinition } from "@tooee/commands";
+import type { StatusBarItem } from "@tooee/layout";
+import type { MarkSet } from "@tooee/marks";
+import { type DocumentController } from "@tooee/shell";
+import type { AnyContent } from "../types.js";
+export interface ViewScreenProps<T> {
+    content: AnyContent;
+    controller: DocumentController<T>;
+    streaming: boolean;
+    actions?: ActionDefinition[];
+    /** Content-shaped status (format, line/row counts), rendered before Mode. */
+    statusItems?: StatusBarItem[];
+    reload: () => void;
+    providerMarks: MarkSet[];
+    userMarks: MarkSet[];
+    setMarkSet: (set: MarkSet) => void;
+    clearMarkNamespace: (namespace: string) => void;
+    clearAllUserMarks: () => void;
+    children: ReactNode;
+}
+/**
+ * The chrome every subview shares: `DocumentScreen` for the row-document half
+ * (theme/quit commands, actions, `ctx.document`, layout, standard status) plus
+ * the content-only `ctx.view` slice that viewers contribute on top.
+ */
+export declare function ViewScreen<T>({ content, controller, streaming, actions, statusItems, reload, providerMarks, userMarks, setMarkSet, clearMarkNamespace, clearAllUserMarks, children, }: ViewScreenProps<T>): ReactNode;
+//# sourceMappingURL=ViewScreen.d.ts.map

package/dist/components/ViewScreen.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewScreen.d.ts","sourceRoot":"","sources":["../../src/components/ViewScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAEtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,OAAO,EAAE,UAAU,CAAA;IACnB,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAA;IACjC,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC5B,6EAA6E;IAC7E,WAAW,CAAC,EAAE,aAAa,EAAE,CAAA;IAC7B,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,aAAa,EAAE,OAAO,EAAE,CAAA;IACxB,SAAS,EAAE,OAAO,EAAE,CAAA;IACpB,UAAU,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;IAClC,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/C,iBAAiB,EAAE,MAAM,IAAI,CAAA;IAC7B,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,EAC5B,OAAO,EACP,UAAU,EACV,SAAS,EACT,OAAO,EACP,WAAW,EACX,MAAM,EACN,aAAa,EACb,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,QAAQ,GACT,EAAE,eAAe,CAAC,CAAC,CAAC,aAiCpB"}

package/dist/components/ViewScreen.js

@@ -0,0 +1,29 @@
+import { jsx as _jsx } from "@opentui/react/jsx-runtime";
+import { DocumentScreen } from "@tooee/shell";
+import { useProvideViewCommandContext } from "../hooks/useViewCommandContext.js";
+/**
+ * The chrome every subview shares: `DocumentScreen` for the row-document half
+ * (theme/quit commands, actions, `ctx.document`, layout, standard status) plus
+ * the content-only `ctx.view` slice that viewers contribute on top.
+ */
+export function ViewScreen({ content, controller, streaming, actions, statusItems, reload, providerMarks, userMarks, setMarkSet, clearMarkNamespace, clearAllUserMarks, children, }) {
+    useProvideViewCommandContext({
+        content,
+        reload,
+        marks: {
+            setMarkSet,
+            clearNamespace: clearMarkNamespace,
+            clearAll: clearAllUserMarks,
+            userMarks,
+            providerMarks,
+        },
+    });
+    const items = [
+        ...(statusItems ?? []),
+        ...(streaming ? [{ label: "Status:", value: "streaming" }] : []),
+    ];
+    return (_jsx(DocumentScreen, { controller: controller, titleBar: content.title
+            ? { title: content.title, subtitle: content.format }
+            : { title: content.format }, statusItems: items, actions: actions, context: { kind: content.format, title: content.title, reload }, children: children }));
+}
+//# sourceMappingURL=ViewScreen.js.map

package/dist/components/ViewScreen.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewScreen.js","sourceRoot":"","sources":["../../src/components/ViewScreen.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,cAAc,EAA2B,MAAM,cAAc,CAAA;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAA;AAmBhF;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAI,EAC5B,OAAO,EACP,UAAU,EACV,SAAS,EACT,OAAO,EACP,WAAW,EACX,MAAM,EACN,aAAa,EACb,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,QAAQ,GACW;IACnB,4BAA4B,CAAC;QAC3B,OAAO;QACP,MAAM;QACN,KAAK,EAAE;YACL,UAAU;YACV,cAAc,EAAE,kBAAkB;YAClC,QAAQ,EAAE,iBAAiB;YAC3B,SAAS;YACT,aAAa;SACd;KACF,CAAC,CAAA;IAEF,MAAM,KAAK,GAAoB;QAC7B,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;QACtB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACjE,CAAA;IAED,OAAO,CACL,KAAC,cAAc,IACb,UAAU,EAAE,UAAU,EACtB,QAAQ,EACN,OAAO,CAAC,KAAK;YACX,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,EAAE;YACpD,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,EAE/B,WAAW,EAAE,KAAK,EAClB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,YAE9D,QAAQ,GACM,CAClB,CAAA;AACH,CAAC"}

package/dist/components/subviews/CodeSubview.d.ts

@@ -3,6 +3,6 @@ import type { SubviewProps } from "./types.js";
 interface CodeSubviewProps extends SubviewProps {
     content: CodeContent | TextContent;
 }
-export declare function CodeSubview({ content, providerMarks, userMarks, setMarkSet, clearMarkNamespace, clearAllUserMarks, reload, streaming, actions, }: CodeSubviewProps): import("react").ReactNode;
+export declare function CodeSubview({ content, decorations, actions, ...screen }: CodeSubviewProps): import("react").ReactNode;
 export {};
 //# sourceMappingURL=CodeSubview.d.ts.map

package/dist/components/subviews/CodeSubview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CodeSubview.d.ts","sourceRoot":"","sources":["../../../src/components/subviews/CodeSubview.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,UAAU,gBAAiB,SAAQ,YAAY;IAC7C,OAAO,EAAE,WAAW,GAAG,WAAW,CAAA;CACnC;AAED,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,aAAa,EACb,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,gBAAgB,6BAkHlB"}
+{"version":3,"file":"CodeSubview.d.ts","sourceRoot":"","sources":["../../../src/components/subviews/CodeSubview.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAG9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,UAAU,gBAAiB,SAAQ,YAAY;IAC7C,OAAO,EAAE,WAAW,GAAG,WAAW,CAAA;CACnC;AAED,wBAAgB,WAAW,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,EAAE,gBAAgB,6BAwCzF"}

package/dist/components/subviews/CodeSubview.js

@@ -1,95 +1,26 @@
 import { jsx as _jsx } from "@opentui/react/jsx-runtime";
-import { useCallback, useEffect, useMemo, useRef } from "react";
-import { CodeView } from "@tooee/renderers";
-import { useTheme } from "@tooee/themes";
-import { useCommandContext } from "@tooee/commands";
-import { useHasModalOverlay } from "@tooee/overlays";
-import { useViewCommandContext } from "../../hooks/useViewCommandContext.js";
-import { actionsToContextMenuEntries, useContextMenu, useCopy, useNavigation } from "@tooee/shell";
-import { findMatchingLines, useSearch } from "@tooee/search";
-import { useMarkState } from "../../hooks/useMarkState.js";
-import { useViewCommands } from "../../hooks/useViewCommands.js";
-import { SubviewLayout } from "../SubviewLayout.js";
-export function CodeSubview({ content, providerMarks, userMarks, setMarkSet, clearMarkNamespace, clearAllUserMarks, reload, streaming, actions, }) {
-    const { theme } = useTheme();
-    const docRef = useRef(null);
-    const hasModalOverlay = useHasModalOverlay();
-    const contextMenu = useContextMenu();
-    const { invoke } = useCommandContext();
+import { useMemo } from "react";
+import { CodeView, sourceLines, sourceLineAdapter } from "@tooee/renderers";
+import { actionsToContextMenuEntries, useDocumentController } from "@tooee/shell";
+import { useContentCommands } from "../../hooks/useContentCommands.js";
+import { ViewScreen } from "../ViewScreen.js";
+export function CodeSubview({ content, decorations, actions, ...screen }) {
     const textContent = content.format === "code" ? content.code : content.text;
-    const lines = useMemo(() => textContent.split("\n"), [textContent]);
-    const lineCount = lines.length;
-    const nav = useNavigation({
-        rowCount: lineCount,
+    // One navigation row per physical source line; row index is the source line.
+    const lineRows = useMemo(() => sourceLines(textContent), [textContent]);
+    const { showLineNumbers } = useContentCommands({ content, textContent });
+    const contextMenu = useMemo(() => actionsToContextMenuEntries(actions), [actions]);
+    const document = useDocumentController({
+        rows: lineRows,
+        adapter: sourceLineAdapter,
         multiSelect: true,
+        decorations,
+        contextMenu,
     });
-    const search = useSearch({
-        match: (query) => findMatchingLines(textContent, query),
-        onJump: nav.setCursor,
-    });
-    useCopy({
-        getRowText: (index) => lines[index] ?? "",
-        cursor: nav.cursor,
-        selection: nav.selection,
-        toggledIndices: nav.toggledIndices,
-    });
-    const layoutNav = { ...nav, ...search };
-    useEffect(() => {
-        if (nav.cursor !== null) {
-            docRef.current?.scrollToRow(nav.cursor, "nearest");
-        }
-    }, [nav.cursor]);
-    const { themeName, showLineNumbers } = useViewCommands({ content, textContent, actions });
-    const markState = useMarkState({
-        nav,
-        search,
-        theme,
-        providerMarks,
-        userMarks,
-    });
-    useViewCommandContext({
-        content,
-        nav,
-        reload,
-        providerMarks,
-        userMarks,
-        setMarkSet,
-        clearMarkNamespace,
-        clearAllUserMarks,
-    });
-    const text = content.format === "code" ? content.code : content.text;
-    const menuEntries = useMemo(() => actionsToContextMenuEntries(actions), [actions]);
-    // Left-click selects the clicked line; right-click selects it and opens the
-    // same app-provided action menu as table rows. Both stand down while a modal
-    // overlay is up (theme picker, command palette, Ask/Choose), matching the
-    // keyboard stand-down and avoiding covered-app mutations.
-    const setCursor = nav.setCursor;
-    const openContextMenu = contextMenu.open;
-    const handleRowClick = useCallback((index) => {
-        if (hasModalOverlay)
-            return;
-        setCursor(index);
-    }, [hasModalOverlay, setCursor]);
-    const handleRowContextMenu = useCallback((index, x, y) => {
-        if (hasModalOverlay)
-            return;
-        setCursor(index);
-        openContextMenu(x, y, menuEntries, invoke);
-    }, [hasModalOverlay, setCursor, openContextMenu, menuEntries, invoke]);
-    const extraStatusItems = useMemo(() => {
-        const selectionCount = nav.selection != null ? nav.selection.end - nav.selection.start + 1 : 0;
-        const toggledCount = nav.toggledIndices.size;
-        const selectionItems = toggledCount > 0
-            ? [{ label: "Selected:", value: String(toggledCount) }]
-            : selectionCount > 0
-                ? [{ label: "Selected:", value: String(selectionCount) }]
-                : [];
-        return [
-            { label: "Format:", value: content.format },
-            { label: "Lines:", value: String(lineCount) },
-            ...selectionItems,
-        ];
-    }, [content.format, lineCount, nav.selection, nav.toggledIndices]);
-    return (_jsx(SubviewLayout, { content: content, nav: layoutNav, streaming: streaming, themeName: themeName, extraStatusItems: extraStatusItems, children: _jsx(CodeView, { content: text, language: content.format === "code" ? content.language : undefined, showLineNumbers: showLineNumbers, marks: markState, docRef: docRef, onRowClick: handleRowClick, onRowContextMenu: handleRowContextMenu }) }));
+    const statusItems = useMemo(() => [
+        { label: "Format:", value: content.format },
+        { label: "Lines:", value: String(lineRows.length) },
+    ], [content.format, lineRows.length]);
+    return (_jsx(ViewScreen, { content: content, controller: document, actions: actions, statusItems: statusItems, ...screen, children: _jsx(CodeView, { content: textContent, language: content.format === "code" ? content.language : undefined, showLineNumbers: showLineNumbers, document: document }) }));
 }
 //# sourceMappingURL=CodeSubview.js.map

package/dist/components/subviews/CodeSubview.js.map

@@ -1 +1 @@
-{"version":3,"file":"CodeSubview.js","sourceRoot":"","sources":["../../../src/components/subviews/CodeSubview.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CodeSubview.js","sourceRoot":"","sources":["../../../src/components/subviews/CodeSubview.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAsB,MAAM,kBAAkB,CAAA;AAC/F,OAAO,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAO7C,MAAM,UAAU,WAAW,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,MAAM,EAAoB;IACxF,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAA;IAC3E,6EAA6E;IAC7E,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;IAEvE,MAAM,EAAE,eAAe,EAAE,GAAG,kBAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAA;IACxE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;IAElF,MAAM,QAAQ,GAAG,qBAAqB,CAAgB;QACpD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,iBAAiB;QAC1B,WAAW,EAAE,IAAI;QACjB,WAAW;QACX,WAAW;KACZ,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC;QACJ,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE;QAC3C,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;KACpD,EACD,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAClC,CAAA;IAED,OAAO,CACL,KAAC,UAAU,IACT,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,QAAQ,EACpB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,KACpB,MAAM,YAEV,KAAC,QAAQ,IACP,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EAClE,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,QAAQ,GAClB,GACS,CACd,CAAA;AACH,CAAC"}

package/dist/components/subviews/CustomSubview.d.ts

@@ -4,6 +4,6 @@ interface CustomSubviewProps extends SubviewProps {
     content: CustomContent;
     renderers?: Record<string, ContentRenderer>;
 }
-export declare function CustomSubview({ content, providerMarks, userMarks, setMarkSet, clearMarkNamespace, clearAllUserMarks, reload, streaming, actions, renderers, }: CustomSubviewProps): import("react").ReactNode;
+export declare function CustomSubview({ content, decorations, actions, renderers, ...screen }: CustomSubviewProps): import("react").ReactNode;
 export {};
 //# sourceMappingURL=CustomSubview.d.ts.map

package/dist/components/subviews/CustomSubview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomSubview.d.ts","sourceRoot":"","sources":["../../../src/components/subviews/CustomSubview.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,UAAU,kBAAmB,SAAQ,YAAY;IAC/C,OAAO,EAAE,aAAa,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;CAC5C;AAED,wBAAgB,aAAa,CAAC,EAC5B,OAAO,EACP,aAAa,EACb,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,MAAM,EACN,SAAS,EACT,OAAO,EACP,SAAS,GACV,EAAE,kBAAkB,6BAyHpB"}
+{"version":3,"file":"CustomSubview.d.ts","sourceRoot":"","sources":["../../../src/components/subviews/CustomSubview.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,UAAU,kBAAmB,SAAQ,YAAY;IAC/C,OAAO,EAAE,aAAa,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;CAC5C;AAED,wBAAgB,aAAa,CAAC,EAC5B,OAAO,EACP,WAAW,EACX,OAAO,EACP,SAAS,EACT,GAAG,MAAM,EACV,EAAE,kBAAkB,6BAwCpB"}

package/dist/components/subviews/CustomSubview.js

@@ -1,102 +1,27 @@
 import { jsx as _jsx } from "@opentui/react/jsx-runtime";
-import { useCallback, useEffect, useMemo, useRef } from "react";
-import { CodeView } from "@tooee/renderers";
-import { useTheme } from "@tooee/themes";
-import { useHasModalOverlay } from "@tooee/overlays";
-import { useViewCommandContext } from "../../hooks/useViewCommandContext.js";
-import { useCopy, useNavigation } from "@tooee/shell";
-import { findMatchingLines, useSearch } from "@tooee/search";
+import { useMemo } from "react";
+import { CodeView, sourceLines, sourceLineAdapter } from "@tooee/renderers";
+import { useDocumentController } from "@tooee/shell";
 import { getTextContent } from "../../types.js";
-import { useMarkState } from "../../hooks/useMarkState.js";
-import { useViewCommands } from "../../hooks/useViewCommands.js";
-import { SubviewLayout } from "../SubviewLayout.js";
-export function CustomSubview({ content, providerMarks, userMarks, setMarkSet, clearMarkNamespace, clearAllUserMarks, reload, streaming, actions, renderers, }) {
-    const { theme } = useTheme();
-    const docRef = useRef(null);
-    const hasModalOverlay = useHasModalOverlay();
+import { useContentCommands } from "../../hooks/useContentCommands.js";
+import { ViewScreen } from "../ViewScreen.js";
+export function CustomSubview({ content, decorations, actions, renderers, ...screen }) {
     const textContent = useMemo(() => getTextContent(content), [content]);
-    const lines = useMemo(() => textContent.split("\n"), [textContent]);
-    const lineCount = lines.length;
-    const nav = useNavigation({
-        rowCount: lineCount,
+    // Fallback rows are source lines; row index is the source line.
+    const lineRows = useMemo(() => sourceLines(textContent), [textContent]);
+    useContentCommands({ content, textContent });
+    // Custom content has no action rows of its own, so no context menu is bound.
+    const document = useDocumentController({
+        rows: lineRows,
+        adapter: sourceLineAdapter,
         multiSelect: true,
+        decorations,
     });
-    const search = useSearch({
-        match: (query) => findMatchingLines(textContent, query),
-        onJump: nav.setCursor,
-    });
-    useCopy({
-        getRowText: (index) => lines[index] ?? "",
-        cursor: nav.cursor,
-        selection: nav.selection,
-        toggledIndices: nav.toggledIndices,
-    });
-    const layoutNav = { ...nav, ...search };
-    useEffect(() => {
-        if (nav.cursor !== null) {
-            docRef.current?.scrollToRow(nav.cursor, "nearest");
-        }
-    }, [nav.cursor]);
-    const { themeName } = useViewCommands({ content, textContent, actions });
-    const markState = useMarkState({
-        nav,
-        search,
-        theme,
-        providerMarks,
-        userMarks,
-    });
-    useViewCommandContext({
-        content,
-        nav,
-        reload,
-        providerMarks,
-        userMarks,
-        setMarkSet,
-        clearMarkNamespace,
-        clearAllUserMarks,
-    });
-    const extraStatusItems = useMemo(() => {
-        const selectionCount = nav.selection != null ? nav.selection.end - nav.selection.start + 1 : 0;
-        const toggledCount = nav.toggledIndices.size;
-        const selectionItems = toggledCount > 0
-            ? [{ label: "Selected:", value: String(toggledCount) }]
-            : selectionCount > 0
-                ? [{ label: "Selected:", value: String(selectionCount) }]
-                : [];
-        return [
-            { label: "Format:", value: content.format },
-            { label: "Lines:", value: String(lineCount) },
-            ...selectionItems,
-        ];
-    }, [content.format, lineCount, nav.selection, nav.toggledIndices]);
-    // Left-click selection for custom renderers. The framework does not own the
-    // renderer's markup, so it cannot map clicks to rows itself; instead it hands
-    // the renderer this callback (the mouse equivalent of the keyboard cursor
-    // move) to call from its own handlers. Guarded like the built-in views so a
-    // click never mutates the covered app while a modal overlay is up.
-    const setCursor = nav.setCursor;
-    const handleSelectRow = useCallback((index) => {
-        if (hasModalOverlay)
-            return;
-        setCursor(index);
-    }, [hasModalOverlay, setCursor]);
+    const statusItems = useMemo(() => [
+        { label: "Format:", value: content.format },
+        { label: "Lines:", value: String(lineRows.length) },
+    ], [content.format, lineRows.length]);
     const customRenderer = renderers?.[content.format];
-    if (customRenderer) {
-        const cursorLine = nav.cursor ?? undefined;
-        const selectionStart = nav.selection?.start ?? undefined;
-        const selectionEnd = nav.selection?.end ?? undefined;
-        return (_jsx(SubviewLayout, { content: content, nav: layoutNav, streaming: streaming, themeName: themeName, extraStatusItems: extraStatusItems, children: customRenderer({
-                content,
-                lineCount,
-                cursor: cursorLine,
-                selectionStart,
-                selectionEnd,
-                marks: markState,
-                onSelectRow: handleSelectRow,
-            }) }));
-    }
-    // No renderer for this custom format -- fall back to text
-    const text = getTextContent(content);
-    return (_jsx(SubviewLayout, { content: content, nav: layoutNav, streaming: streaming, themeName: themeName, extraStatusItems: extraStatusItems, children: _jsx(CodeView, { content: text, showLineNumbers: false, marks: markState, docRef: docRef }) }));
+    return (_jsx(ViewScreen, { content: content, controller: document, actions: actions, statusItems: statusItems, ...screen, children: customRenderer ? (customRenderer({ content, document })) : (_jsx(CodeView, { content: textContent, showLineNumbers: false, document: document })) }));
 }
 //# sourceMappingURL=CustomSubview.js.map

package/dist/components/subviews/CustomSubview.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomSubview.js","sourceRoot":"","sources":["../../../src/components/subviews/CustomSubview.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CustomSubview.js","sourceRoot":"","sources":["../../../src/components/subviews/CustomSubview.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAsB,MAAM,kBAAkB,CAAA;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,cAAc,EAA4C,MAAM,gBAAgB,CAAA;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAQ7C,MAAM,UAAU,aAAa,CAAC,EAC5B,OAAO,EACP,WAAW,EACX,OAAO,EACP,SAAS,EACT,GAAG,MAAM,EACU;IACnB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;IACrE,gEAAgE;IAChE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;IAEvE,kBAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAA;IAE5C,6EAA6E;IAC7E,MAAM,QAAQ,GAAG,qBAAqB,CAAgB;QACpD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,iBAAiB;QAC1B,WAAW,EAAE,IAAI;QACjB,WAAW;KACZ,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC;QACJ,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE;QAC3C,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;KACpD,EACD,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAClC,CAAA;IAED,MAAM,cAAc,GAAG,SAAS,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAElD,OAAO,CACL,KAAC,UAAU,IACT,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,QAAQ,EACpB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,KACpB,MAAM,YAET,cAAc,CAAC,CAAC,CAAC,CAChB,cAAc,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CACtC,CAAC,CAAC,CAAC,CACF,KAAC,QAAQ,IAAC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAI,CAC/E,GACU,CACd,CAAA;AACH,CAAC"}

package/dist/components/subviews/MarkdownSubview.d.ts

@@ -5,6 +5,6 @@ interface MarkdownSubviewProps extends SubviewProps {
     content: MarkdownContent;
     codeBlockRenderers?: Record<string, CodeBlockRenderer>;
 }
-export declare function MarkdownSubview({ content, codeBlockRenderers, providerMarks, userMarks, setMarkSet, clearMarkNamespace, clearAllUserMarks, reload, streaming, actions, }: MarkdownSubviewProps): import("react").ReactNode;
+export declare function MarkdownSubview({ content, codeBlockRenderers, decorations, actions, ...screen }: MarkdownSubviewProps): import("react").ReactNode;
 export {};
 //# sourceMappingURL=MarkdownSubview.d.ts.map

package/dist/components/subviews/MarkdownSubview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkdownSubview.d.ts","sourceRoot":"","sources":["../../../src/components/subviews/MarkdownSubview.tsx"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,iBAAiB,EAEvB,MAAM,kBAAkB,CAAA;AAOzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,UAAU,oBAAqB,SAAQ,YAAY;IACjD,OAAO,EAAE,eAAe,CAAA;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CACvD;AAKD,wBAAgB,eAAe,CAAC,EAC9B,OAAO,EACP,kBAAkB,EAClB,aAAa,EACb,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,oBAAoB,6BA2JtB"}
+{"version":3,"file":"MarkdownSubview.d.ts","sourceRoot":"","sources":["../../../src/components/subviews/MarkdownSubview.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,iBAAiB,EAEvB,MAAM,kBAAkB,CAAA;AAOzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,UAAU,oBAAqB,SAAQ,YAAY;IACjD,OAAO,EAAE,eAAe,CAAA;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CACvD;AAeD,wBAAgB,eAAe,CAAC,EAC9B,OAAO,EACP,kBAAkB,EAClB,WAAW,EACX,OAAO,EACP,GAAG,MAAM,EACV,EAAE,oBAAoB,6BAsEtB"}