@tooee/renderers 0.2.4 → 0.3.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/dist/code-blocks.d.ts +6 -6
- package/dist/code-blocks.d.ts.map +1 -1
- package/dist/code-blocks.js +52 -42
- package/dist/code-blocks.js.map +1 -1
- package/dist/{CodeView.d.ts → code-view.d.ts} +3 -3
- package/dist/code-view.d.ts.map +1 -0
- package/dist/{CodeView.js → code-view.js} +5 -5
- package/dist/code-view.js.map +1 -0
- package/dist/{CommandPalette.d.ts → command-palette.d.ts} +2 -2
- package/dist/command-palette.d.ts.map +1 -0
- package/dist/{CommandPalette.js → command-palette.js} +27 -24
- package/dist/command-palette.js.map +1 -0
- package/dist/{ContextMenu.d.ts → context-menu.d.ts} +2 -2
- package/dist/context-menu.d.ts.map +1 -0
- package/dist/{ContextMenu.js → context-menu.js} +24 -14
- package/dist/context-menu.js.map +1 -0
- package/dist/{DecorationLayer.d.ts → decoration-layer.d.ts} +2 -2
- package/dist/decoration-layer.d.ts.map +1 -0
- package/dist/decoration-layer.js +2 -0
- package/dist/decoration-layer.js.map +1 -0
- package/dist/{DocumentBindings.d.ts → document-bindings.d.ts} +4 -4
- package/dist/document-bindings.d.ts.map +1 -0
- package/dist/document-bindings.js +2 -0
- package/dist/document-bindings.js.map +1 -0
- package/dist/index.d.ts +16 -15
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -9
- package/dist/index.js.map +1 -1
- package/dist/markdown-blocks.d.ts +9 -13
- package/dist/markdown-blocks.d.ts.map +1 -1
- package/dist/markdown-blocks.js +98 -79
- package/dist/markdown-blocks.js.map +1 -1
- package/dist/{MarkdownView.d.ts → markdown-view.d.ts} +13 -13
- package/dist/markdown-view.d.ts.map +1 -0
- package/dist/markdown-view.js +455 -0
- package/dist/markdown-view.js.map +1 -0
- package/dist/mermaid.d.ts +6 -6
- package/dist/mermaid.d.ts.map +1 -1
- package/dist/mermaid.js +56 -26
- package/dist/mermaid.js.map +1 -1
- package/dist/parsers.d.ts +5 -5
- package/dist/parsers.d.ts.map +1 -1
- package/dist/parsers.js +64 -44
- package/dist/parsers.js.map +1 -1
- package/dist/{RowDocumentRenderable.d.ts → row-document-renderable.d.ts} +15 -11
- package/dist/row-document-renderable.d.ts.map +1 -0
- package/dist/{RowDocumentRenderable.js → row-document-renderable.js} +110 -62
- package/dist/row-document-renderable.js.map +1 -0
- package/dist/row-document.d.ts +1 -1
- package/dist/row-document.d.ts.map +1 -1
- package/dist/row-document.js +1 -1
- package/dist/row-document.js.map +1 -1
- package/dist/source.d.ts +6 -6
- package/dist/source.d.ts.map +1 -1
- package/dist/source.js +35 -26
- package/dist/source.js.map +1 -1
- package/dist/table-types.d.ts.map +1 -1
- package/dist/{Table.d.ts → table.d.ts} +6 -6
- package/dist/table.d.ts.map +1 -0
- package/dist/{Table.js → table.js} +65 -35
- package/dist/table.js.map +1 -0
- package/dist/text-table.d.ts.map +1 -1
- package/dist/text-table.js.map +1 -1
- package/dist/use-gutter-palette.d.ts +3 -0
- package/dist/use-gutter-palette.d.ts.map +1 -0
- package/dist/{useGutterPalette.js → use-gutter-palette.js} +4 -4
- package/dist/use-gutter-palette.js.map +1 -0
- package/package.json +5 -5
- package/src/code-blocks.tsx +122 -106
- package/src/{CodeView.tsx → code-view.tsx} +19 -14
- package/src/command-palette.tsx +163 -0
- package/src/context-menu.tsx +157 -0
- package/src/decoration-layer.ts +11 -0
- package/src/document-bindings.ts +16 -0
- package/src/index.ts +24 -23
- package/src/markdown-blocks.ts +178 -138
- package/src/markdown-view.tsx +853 -0
- package/src/mermaid.ts +122 -70
- package/src/parsers.ts +141 -103
- package/src/row-document-renderable.ts +672 -0
- package/src/row-document.ts +4 -4
- package/src/source.ts +92 -72
- package/src/table-types.ts +4 -4
- package/src/table.tsx +346 -0
- package/src/text-table.ts +4 -4
- package/src/use-gutter-palette.ts +15 -0
- package/dist/CodeView.d.ts.map +0 -1
- package/dist/CodeView.js.map +0 -1
- package/dist/CommandPalette.d.ts.map +0 -1
- package/dist/CommandPalette.js.map +0 -1
- package/dist/ContextMenu.d.ts.map +0 -1
- package/dist/ContextMenu.js.map +0 -1
- package/dist/DecorationLayer.d.ts.map +0 -1
- package/dist/DecorationLayer.js +0 -2
- package/dist/DecorationLayer.js.map +0 -1
- package/dist/DocumentBindings.d.ts.map +0 -1
- package/dist/DocumentBindings.js +0 -2
- package/dist/DocumentBindings.js.map +0 -1
- package/dist/MarkdownView.d.ts.map +0 -1
- package/dist/MarkdownView.js +0 -360
- package/dist/MarkdownView.js.map +0 -1
- package/dist/RowDocumentRenderable.d.ts.map +0 -1
- package/dist/RowDocumentRenderable.js.map +0 -1
- package/dist/Table.d.ts.map +0 -1
- package/dist/Table.js.map +0 -1
- package/dist/useGutterPalette.d.ts +0 -3
- package/dist/useGutterPalette.d.ts.map +0 -1
- package/dist/useGutterPalette.js.map +0 -1
- package/src/CommandPalette.tsx +0 -147
- package/src/ContextMenu.tsx +0 -132
- package/src/DecorationLayer.ts +0 -11
- package/src/DocumentBindings.ts +0 -16
- package/src/MarkdownView.tsx +0 -738
- package/src/RowDocumentRenderable.ts +0 -593
- package/src/Table.tsx +0 -300
- package/src/useGutterPalette.ts +0 -15
package/src/code-blocks.tsx
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { useCallback,
|
|
2
|
-
import type {
|
|
3
|
-
import type {
|
|
4
|
-
import type {
|
|
5
|
-
import {
|
|
1
|
+
import { useCallback, useRef } from "react";
|
|
2
|
+
import type { ReactNode, RefObject } from "react";
|
|
3
|
+
import type { ResolvedTheme } from "@tooee/themes";
|
|
4
|
+
import type { MouseEvent, SyntaxStyle, TextBufferRenderable } from "@opentui/core";
|
|
5
|
+
import type { Tokens } from "marked";
|
|
6
|
+
import { renderMermaidForTerminal } from "./mermaid.js";
|
|
6
7
|
|
|
7
8
|
// ---------------------------------------------------------------------------
|
|
8
9
|
// Public custom code block renderer API
|
|
@@ -14,9 +15,9 @@ import { renderMermaidForTerminal } from "./mermaid.js"
|
|
|
14
15
|
* Matches common Markdown behavior (marked may include extra info-string
|
|
15
16
|
* content after the language).
|
|
16
17
|
*/
|
|
17
|
-
export function getFenceType(info?: string): string {
|
|
18
|
-
return (info ?? "").trim().split(/\s+/)[0]?.toLowerCase() ?? ""
|
|
19
|
-
}
|
|
18
|
+
export const getFenceType = function getFenceType(info?: string): string {
|
|
19
|
+
return (info ?? "").trim().split(/\s+/u)[0]?.toLowerCase() ?? "";
|
|
20
|
+
};
|
|
20
21
|
|
|
21
22
|
/**
|
|
22
23
|
* Opt-in horizontal panning hooks for wide block content. Attach `register`
|
|
@@ -26,28 +27,28 @@ export function getFenceType(info?: string): string {
|
|
|
26
27
|
* mermaid blocks: h/l in cursor mode and shift+wheel pan via `scrollX`.
|
|
27
28
|
*/
|
|
28
29
|
export interface CodeBlockHScroll {
|
|
29
|
-
register: (node: TextBufferRenderable | null) => void
|
|
30
|
-
onMouseScroll: (event: MouseEvent) => void
|
|
30
|
+
register: (node: TextBufferRenderable | null) => void;
|
|
31
|
+
onMouseScroll: (event: MouseEvent) => void;
|
|
31
32
|
}
|
|
32
33
|
|
|
33
34
|
export interface CodeBlockRendererProps {
|
|
34
35
|
/** Fence body text. */
|
|
35
|
-
text: string
|
|
36
|
+
text: string;
|
|
36
37
|
/**
|
|
37
38
|
* Matched fence type: the first whitespace-separated word of the fence
|
|
38
39
|
* info string, lowercased ("" for bare fences).
|
|
39
40
|
*/
|
|
40
|
-
lang: string
|
|
41
|
+
lang: string;
|
|
41
42
|
/** Full raw fence info string ("" when absent), for renderer options. */
|
|
42
|
-
info: string
|
|
43
|
-
theme: ResolvedTheme
|
|
44
|
-
syntax: SyntaxStyle
|
|
43
|
+
info: string;
|
|
44
|
+
theme: ResolvedTheme;
|
|
45
|
+
syntax: SyntaxStyle;
|
|
45
46
|
/** Left indentation (columns) when the block is nested inside a list. */
|
|
46
|
-
indent: number
|
|
47
|
+
indent: number;
|
|
47
48
|
/** Index of this block in the flattened block list. */
|
|
48
|
-
blockIndex: number
|
|
49
|
+
blockIndex: number;
|
|
49
50
|
/** Horizontal panning hooks for wide content (optional to use). */
|
|
50
|
-
hScroll: CodeBlockHScroll
|
|
51
|
+
hScroll: CodeBlockHScroll;
|
|
51
52
|
}
|
|
52
53
|
|
|
53
54
|
/**
|
|
@@ -63,38 +64,38 @@ export interface CodeBlockRendererProps {
|
|
|
63
64
|
* renderer registered for a given fence type must call the same hooks on
|
|
64
65
|
* every render.
|
|
65
66
|
*/
|
|
66
|
-
export type CodeBlockRenderer = (props: CodeBlockRendererProps) => ReactNode
|
|
67
|
+
export type CodeBlockRenderer = (props: CodeBlockRendererProps) => ReactNode;
|
|
67
68
|
|
|
68
69
|
/**
|
|
69
70
|
* The standard bordered-box chrome used by built-in code and mermaid blocks.
|
|
70
71
|
* Custom renderers can wrap their content in this to match the default look.
|
|
71
72
|
*/
|
|
72
|
-
export function CodeBlockChrome({
|
|
73
|
+
export const CodeBlockChrome = function CodeBlockChrome({
|
|
73
74
|
theme,
|
|
74
75
|
indent,
|
|
75
76
|
children,
|
|
76
77
|
}: {
|
|
77
|
-
theme: ResolvedTheme
|
|
78
|
-
indent: number
|
|
79
|
-
children?: ReactNode
|
|
80
|
-
}) {
|
|
78
|
+
theme: ResolvedTheme;
|
|
79
|
+
indent: number;
|
|
80
|
+
children?: ReactNode;
|
|
81
|
+
}): ReactNode {
|
|
81
82
|
return (
|
|
82
83
|
<box
|
|
83
84
|
style={{
|
|
84
|
-
|
|
85
|
-
marginBottom: 1,
|
|
86
|
-
marginLeft: 1 + indent,
|
|
87
|
-
marginRight: 1,
|
|
85
|
+
backgroundColor: theme.backgroundElement,
|
|
88
86
|
border: true,
|
|
89
87
|
borderColor: theme.border,
|
|
90
|
-
backgroundColor: theme.backgroundElement,
|
|
91
88
|
flexDirection: "column",
|
|
89
|
+
marginBottom: 1,
|
|
90
|
+
marginLeft: 1 + indent,
|
|
91
|
+
marginRight: 1,
|
|
92
|
+
marginTop: 0,
|
|
92
93
|
}}
|
|
93
94
|
>
|
|
94
95
|
{children}
|
|
95
96
|
</box>
|
|
96
|
-
)
|
|
97
|
-
}
|
|
97
|
+
);
|
|
98
|
+
};
|
|
98
99
|
|
|
99
100
|
// ---------------------------------------------------------------------------
|
|
100
101
|
// Default renderer (syntax-highlighted code block)
|
|
@@ -111,8 +112,9 @@ export const defaultCodeBlockRenderer: CodeBlockRenderer = ({
|
|
|
111
112
|
syntax,
|
|
112
113
|
indent,
|
|
113
114
|
hScroll,
|
|
114
|
-
}) => {
|
|
115
|
-
const
|
|
115
|
+
}): ReactNode => {
|
|
116
|
+
const { register, onMouseScroll: handleMouseScroll } = hScroll;
|
|
117
|
+
const lineCount = text.split("\n").length;
|
|
116
118
|
// Code lines never wrap (wrapMode "none") — wide code blocks and ASCII
|
|
117
119
|
// diagrams pan horizontally via the renderable's own viewport (`scrollX`)
|
|
118
120
|
// instead of word-wrapping into an unreadable mess. Blocks that fit render
|
|
@@ -120,17 +122,17 @@ export const defaultCodeBlockRenderer: CodeBlockRenderer = ({
|
|
|
120
122
|
return (
|
|
121
123
|
<CodeBlockChrome theme={theme} indent={indent}>
|
|
122
124
|
<code
|
|
123
|
-
ref={
|
|
125
|
+
ref={register}
|
|
124
126
|
content={text}
|
|
125
127
|
filetype={info}
|
|
126
128
|
syntaxStyle={syntax}
|
|
127
129
|
wrapMode="none"
|
|
128
|
-
onMouseScroll={
|
|
130
|
+
onMouseScroll={handleMouseScroll}
|
|
129
131
|
style={{ height: lineCount }}
|
|
130
132
|
/>
|
|
131
133
|
</CodeBlockChrome>
|
|
132
|
-
)
|
|
133
|
-
}
|
|
134
|
+
);
|
|
135
|
+
};
|
|
134
136
|
|
|
135
137
|
// ---------------------------------------------------------------------------
|
|
136
138
|
// Built-in mermaid renderer
|
|
@@ -142,28 +144,30 @@ export const defaultCodeBlockRenderer: CodeBlockRenderer = ({
|
|
|
142
144
|
* the diagram cannot be rendered. Registered by default under "mermaid";
|
|
143
145
|
* user entries for "mermaid" override it.
|
|
144
146
|
*/
|
|
145
|
-
export const mermaidCodeBlockRenderer: CodeBlockRenderer = ({
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
)
|
|
147
|
+
export const mermaidCodeBlockRenderer: CodeBlockRenderer = ({
|
|
148
|
+
text,
|
|
149
|
+
theme,
|
|
150
|
+
indent,
|
|
151
|
+
hScroll,
|
|
152
|
+
}): ReactNode => {
|
|
153
|
+
const { register, onMouseScroll: handleMouseScroll } = hScroll;
|
|
154
|
+
const mermaidTheme = {
|
|
155
|
+
accent: theme.accent,
|
|
156
|
+
arrow: theme.accent,
|
|
157
|
+
bg: theme.backgroundElement,
|
|
158
|
+
border: theme.border,
|
|
159
|
+
corner: theme.borderActive,
|
|
160
|
+
fg: theme.markdownText,
|
|
161
|
+
junction: theme.borderSubtle,
|
|
162
|
+
line: theme.textMuted,
|
|
163
|
+
};
|
|
164
|
+
const result = renderMermaidForTerminal(text, { mode: "ansi", theme: mermaidTheme });
|
|
163
165
|
|
|
164
|
-
if (!result.ok)
|
|
166
|
+
if (!result.ok) {
|
|
167
|
+
return null;
|
|
168
|
+
}
|
|
165
169
|
|
|
166
|
-
const lineCount = result.text.split("\n").length
|
|
170
|
+
const lineCount = result.text.split("\n").length;
|
|
167
171
|
// Diagram lines never wrap (wrapMode "none"). Wide diagrams pan via the
|
|
168
172
|
// text renderable's own viewport (`scrollX`), which the native renderer
|
|
169
173
|
// clips with correct style-run alignment. Translating a natural-width text
|
|
@@ -174,20 +178,20 @@ export const mermaidCodeBlockRenderer: CodeBlockRenderer = ({ text, theme, inden
|
|
|
174
178
|
return (
|
|
175
179
|
<CodeBlockChrome theme={theme} indent={indent}>
|
|
176
180
|
<text
|
|
177
|
-
ref={
|
|
181
|
+
ref={register}
|
|
178
182
|
content={result.content}
|
|
179
183
|
wrapMode="none"
|
|
180
|
-
onMouseScroll={
|
|
184
|
+
onMouseScroll={handleMouseScroll}
|
|
181
185
|
style={{ fg: theme.markdownText, height: lineCount }}
|
|
182
186
|
/>
|
|
183
187
|
</CodeBlockChrome>
|
|
184
|
-
)
|
|
185
|
-
}
|
|
188
|
+
);
|
|
189
|
+
};
|
|
186
190
|
|
|
187
191
|
/** Built-in code block renderers, merged under user-provided entries. */
|
|
188
192
|
export const DEFAULT_CODE_BLOCK_RENDERERS: Record<string, CodeBlockRenderer> = {
|
|
189
193
|
mermaid: mermaidCodeBlockRenderer,
|
|
190
|
-
}
|
|
194
|
+
};
|
|
191
195
|
|
|
192
196
|
// ---------------------------------------------------------------------------
|
|
193
197
|
// Horizontal panning registration
|
|
@@ -206,32 +210,42 @@ export const DEFAULT_CODE_BLOCK_RENDERERS: Record<string, CodeBlockRenderer> = {
|
|
|
206
210
|
* stopped, so plain vertical wheel keeps bubbling to the surrounding
|
|
207
211
|
* row-document.
|
|
208
212
|
*/
|
|
209
|
-
function useHScrollableBlock(
|
|
213
|
+
const useHScrollableBlock = function useHScrollableBlock(
|
|
210
214
|
blockIndex: number,
|
|
211
215
|
hScrollableBlocksRef?: RefObject<Map<number, TextBufferRenderable>>,
|
|
212
216
|
) {
|
|
213
|
-
const nodeRef = useRef<TextBufferRenderable | null>(null)
|
|
217
|
+
const nodeRef = useRef<TextBufferRenderable | null>(null);
|
|
214
218
|
const register = useCallback(
|
|
215
219
|
(node: TextBufferRenderable | null) => {
|
|
216
|
-
nodeRef.current = node
|
|
217
|
-
const map = hScrollableBlocksRef?.current
|
|
218
|
-
if (!map)
|
|
219
|
-
|
|
220
|
-
|
|
220
|
+
nodeRef.current = node;
|
|
221
|
+
const map = hScrollableBlocksRef?.current;
|
|
222
|
+
if (!map) {
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
if (node) {
|
|
226
|
+
map.set(blockIndex, node);
|
|
227
|
+
} else {
|
|
228
|
+
map.delete(blockIndex);
|
|
229
|
+
}
|
|
221
230
|
},
|
|
222
231
|
[hScrollableBlocksRef, blockIndex],
|
|
223
|
-
)
|
|
232
|
+
);
|
|
224
233
|
|
|
225
234
|
const handleMouseScroll = useCallback((event: MouseEvent) => {
|
|
226
|
-
const node = nodeRef.current
|
|
227
|
-
if (!node || !event.scroll || !event.modifiers.shift)
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
235
|
+
const node = nodeRef.current;
|
|
236
|
+
if (!node || !event.scroll || !event.modifiers.shift) {
|
|
237
|
+
return;
|
|
238
|
+
}
|
|
239
|
+
const { direction, delta } = event.scroll;
|
|
240
|
+
if (direction === "up") {
|
|
241
|
+
node.scrollX -= delta;
|
|
242
|
+
} else if (direction === "down") {
|
|
243
|
+
node.scrollX += delta;
|
|
244
|
+
}
|
|
245
|
+
}, []);
|
|
232
246
|
|
|
233
|
-
return {
|
|
234
|
-
}
|
|
247
|
+
return { handleMouseScroll, register };
|
|
248
|
+
};
|
|
235
249
|
|
|
236
250
|
// ---------------------------------------------------------------------------
|
|
237
251
|
// Dispatching block component
|
|
@@ -243,7 +257,7 @@ function useHScrollableBlock(
|
|
|
243
257
|
* syntax-highlighted code block when there is no match, the renderer
|
|
244
258
|
* returns `null`, or the renderer throws.
|
|
245
259
|
*/
|
|
246
|
-
export function CodeBlock({
|
|
260
|
+
export const CodeBlock = function CodeBlock({
|
|
247
261
|
token,
|
|
248
262
|
blockIndex,
|
|
249
263
|
theme,
|
|
@@ -252,56 +266,58 @@ export function CodeBlock({
|
|
|
252
266
|
hScrollableBlocksRef,
|
|
253
267
|
renderers,
|
|
254
268
|
}: {
|
|
255
|
-
token: Tokens.Code
|
|
256
|
-
blockIndex: number
|
|
257
|
-
theme: ResolvedTheme
|
|
258
|
-
syntax: SyntaxStyle
|
|
259
|
-
indent: number
|
|
260
|
-
hScrollableBlocksRef?: RefObject<Map<number, TextBufferRenderable
|
|
261
|
-
renderers?: Record<string, CodeBlockRenderer
|
|
269
|
+
token: Tokens.Code;
|
|
270
|
+
blockIndex: number;
|
|
271
|
+
theme: ResolvedTheme;
|
|
272
|
+
syntax: SyntaxStyle;
|
|
273
|
+
indent: number;
|
|
274
|
+
hScrollableBlocksRef?: RefObject<Map<number, TextBufferRenderable>>;
|
|
275
|
+
renderers?: Record<string, CodeBlockRenderer>;
|
|
262
276
|
}): ReactNode {
|
|
263
|
-
const { register, handleMouseScroll } = useHScrollableBlock(blockIndex, hScrollableBlocksRef)
|
|
277
|
+
const { register, handleMouseScroll } = useHScrollableBlock(blockIndex, hScrollableBlocksRef);
|
|
264
278
|
|
|
265
279
|
const rendererProps: CodeBlockRendererProps = {
|
|
266
|
-
|
|
267
|
-
|
|
280
|
+
blockIndex,
|
|
281
|
+
hScroll: { onMouseScroll: handleMouseScroll, register },
|
|
282
|
+
indent,
|
|
268
283
|
info: token.lang ?? "",
|
|
269
|
-
|
|
284
|
+
lang: getFenceType(token.lang),
|
|
270
285
|
syntax,
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
}
|
|
286
|
+
text: token.text,
|
|
287
|
+
theme,
|
|
288
|
+
};
|
|
275
289
|
|
|
276
|
-
const custom = rendererProps.lang
|
|
290
|
+
const custom = rendererProps.lang === "" ? undefined : renderers?.[rendererProps.lang];
|
|
291
|
+
// oxlint-disable-next-line no-use-before-define -- Deferred(lint-sweep): preserve deliberate top-down custom renderer organization
|
|
277
292
|
if (custom && custom !== defaultCodeBlockRenderer) {
|
|
278
293
|
// Keyed by fence type so a type change remounts the custom renderer
|
|
279
294
|
// (renderers may use hooks; see CodeBlockRenderer docs).
|
|
280
295
|
return (
|
|
296
|
+
// oxlint-disable-next-line no-use-before-define -- Deferred(lint-sweep): preserve deliberate top-down custom renderer organization
|
|
281
297
|
<CustomCodeBlock key={rendererProps.lang} renderer={custom} rendererProps={rendererProps} />
|
|
282
|
-
)
|
|
298
|
+
);
|
|
283
299
|
}
|
|
284
300
|
|
|
285
|
-
return defaultCodeBlockRenderer(rendererProps)
|
|
286
|
-
}
|
|
301
|
+
return defaultCodeBlockRenderer(rendererProps);
|
|
302
|
+
};
|
|
287
303
|
|
|
288
304
|
/**
|
|
289
305
|
* Invokes a custom renderer, falling back to the default code block when it
|
|
290
306
|
* returns `null` or throws. Isolated in its own component so renderer hooks
|
|
291
307
|
* have a stable home that remounts when the fence type changes.
|
|
292
308
|
*/
|
|
293
|
-
function CustomCodeBlock({
|
|
309
|
+
const CustomCodeBlock = function CustomCodeBlock({
|
|
294
310
|
renderer,
|
|
295
311
|
rendererProps,
|
|
296
312
|
}: {
|
|
297
|
-
renderer: CodeBlockRenderer
|
|
298
|
-
rendererProps: CodeBlockRendererProps
|
|
313
|
+
renderer: CodeBlockRenderer;
|
|
314
|
+
rendererProps: CodeBlockRendererProps;
|
|
299
315
|
}): ReactNode {
|
|
300
|
-
let node: ReactNode = null
|
|
316
|
+
let node: ReactNode = null;
|
|
301
317
|
try {
|
|
302
|
-
node = renderer(rendererProps)
|
|
318
|
+
node = renderer(rendererProps);
|
|
303
319
|
} catch {
|
|
304
|
-
node = null
|
|
320
|
+
node = null;
|
|
305
321
|
}
|
|
306
|
-
return node ?? defaultCodeBlockRenderer(rendererProps)
|
|
307
|
-
}
|
|
322
|
+
return node ?? defaultCodeBlockRenderer(rendererProps);
|
|
323
|
+
};
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { useTheme } from "@tooee/themes"
|
|
2
|
-
import type { DocumentBindings } from "./
|
|
3
|
-
import { DEFAULT_SIGN_COLUMN_WIDTH } from "./
|
|
4
|
-
import { useGutterPalette } from "./
|
|
5
|
-
import "./row-document.js"
|
|
1
|
+
import { useTheme } from "@tooee/themes";
|
|
2
|
+
import type { DocumentBindings } from "./document-bindings.js";
|
|
3
|
+
import { DEFAULT_SIGN_COLUMN_WIDTH } from "./row-document-renderable.js";
|
|
4
|
+
import { useGutterPalette } from "./use-gutter-palette.js";
|
|
5
|
+
import "./row-document.js";
|
|
6
6
|
|
|
7
7
|
interface CodeViewProps {
|
|
8
|
-
content: string
|
|
9
|
-
language?: string
|
|
10
|
-
showLineNumbers?: boolean
|
|
8
|
+
content: string;
|
|
9
|
+
language?: string;
|
|
10
|
+
showLineNumbers?: boolean;
|
|
11
11
|
/**
|
|
12
12
|
* Binds the row document to a document controller: its ref, the decoration
|
|
13
13
|
* layers to paint, and the mouse handler. Rows are source lines. Omit it to
|
|
@@ -18,12 +18,17 @@ interface CodeViewProps {
|
|
|
18
18
|
* row-document, where the controller resolves screen-Y to a row (gutter
|
|
19
19
|
* clicks included).
|
|
20
20
|
*/
|
|
21
|
-
document?: DocumentBindings
|
|
21
|
+
document?: DocumentBindings;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
export
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
export const CodeView = function CodeView({
|
|
25
|
+
content,
|
|
26
|
+
language,
|
|
27
|
+
showLineNumbers = true,
|
|
28
|
+
document,
|
|
29
|
+
}: CodeViewProps): React.ReactNode {
|
|
30
|
+
const { syntax } = useTheme();
|
|
31
|
+
const palette = useGutterPalette();
|
|
27
32
|
|
|
28
33
|
return (
|
|
29
34
|
<row-document
|
|
@@ -37,5 +42,5 @@ export function CodeView({ content, language, showLineNumbers = true, document }
|
|
|
37
42
|
>
|
|
38
43
|
<code content={content} filetype={language} syntaxStyle={syntax} />
|
|
39
44
|
</row-document>
|
|
40
|
-
)
|
|
41
|
-
}
|
|
45
|
+
);
|
|
46
|
+
};
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import { useState, useMemo, useCallback } from "react";
|
|
2
|
+
import { useCommand } from "@tooee/commands";
|
|
3
|
+
import { useTheme, CloseButton } from "@tooee/themes";
|
|
4
|
+
import { fuzzyMatch } from "@tooee/fuzzy";
|
|
5
|
+
|
|
6
|
+
export interface CommandPaletteEntry {
|
|
7
|
+
id: string;
|
|
8
|
+
title: string;
|
|
9
|
+
hotkey?: string;
|
|
10
|
+
category?: string;
|
|
11
|
+
icon?: string;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
interface CommandPaletteProps {
|
|
15
|
+
commands: CommandPaletteEntry[];
|
|
16
|
+
onSelect: (commandId: string) => void;
|
|
17
|
+
onClose: () => void;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export const CommandPalette = function CommandPalette({
|
|
21
|
+
commands,
|
|
22
|
+
onSelect,
|
|
23
|
+
onClose,
|
|
24
|
+
}: CommandPaletteProps): React.ReactNode {
|
|
25
|
+
const { theme } = useTheme();
|
|
26
|
+
const [filter, setFilter] = useState("");
|
|
27
|
+
const [activeIndex, setActiveIndex] = useState(0);
|
|
28
|
+
|
|
29
|
+
const filtered = useMemo(() => {
|
|
30
|
+
if (!filter) {
|
|
31
|
+
return commands;
|
|
32
|
+
}
|
|
33
|
+
const results: { entry: CommandPaletteEntry; score: number }[] = [];
|
|
34
|
+
for (const entry of commands) {
|
|
35
|
+
const score = fuzzyMatch(filter, entry.title);
|
|
36
|
+
if (score !== null) {
|
|
37
|
+
results.push({ entry, score });
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
results.sort((a, b) => b.score - a.score);
|
|
41
|
+
return results.map((r) => r.entry);
|
|
42
|
+
}, [commands, filter]);
|
|
43
|
+
|
|
44
|
+
const handleSelect = useCallback(() => {
|
|
45
|
+
const item = filtered[activeIndex];
|
|
46
|
+
if (item !== undefined) {
|
|
47
|
+
onSelect(item.id);
|
|
48
|
+
}
|
|
49
|
+
}, [filtered, activeIndex, onSelect]);
|
|
50
|
+
|
|
51
|
+
const moveUp = useCallback(() => {
|
|
52
|
+
setActiveIndex((i) => Math.max(0, i - 1));
|
|
53
|
+
}, []);
|
|
54
|
+
|
|
55
|
+
const moveDown = useCallback(() => {
|
|
56
|
+
setActiveIndex((i) => Math.min(filtered.length - 1, i + 1));
|
|
57
|
+
}, [filtered.length]);
|
|
58
|
+
|
|
59
|
+
useCommand({
|
|
60
|
+
handler: onClose,
|
|
61
|
+
hidden: true,
|
|
62
|
+
hotkey: "Escape",
|
|
63
|
+
id: "command-palette:close",
|
|
64
|
+
modes: ["insert", "cursor"],
|
|
65
|
+
title: "Close command palette",
|
|
66
|
+
});
|
|
67
|
+
useCommand({
|
|
68
|
+
handler: handleSelect,
|
|
69
|
+
hidden: true,
|
|
70
|
+
hotkey: "Enter",
|
|
71
|
+
id: "command-palette:select",
|
|
72
|
+
modes: ["insert", "cursor"],
|
|
73
|
+
title: "Run selected command",
|
|
74
|
+
});
|
|
75
|
+
useCommand({
|
|
76
|
+
handler: moveUp,
|
|
77
|
+
hidden: true,
|
|
78
|
+
hotkey: "up",
|
|
79
|
+
id: "command-palette:move-up",
|
|
80
|
+
modes: ["insert", "cursor"],
|
|
81
|
+
title: "Move up",
|
|
82
|
+
});
|
|
83
|
+
useCommand({
|
|
84
|
+
handler: moveDown,
|
|
85
|
+
hidden: true,
|
|
86
|
+
hotkey: "down",
|
|
87
|
+
id: "command-palette:move-down",
|
|
88
|
+
modes: ["insert", "cursor"],
|
|
89
|
+
title: "Move down",
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
return (
|
|
93
|
+
<box
|
|
94
|
+
position="absolute"
|
|
95
|
+
left="20%"
|
|
96
|
+
right="20%"
|
|
97
|
+
top={2}
|
|
98
|
+
maxHeight="60%"
|
|
99
|
+
flexDirection="column"
|
|
100
|
+
backgroundColor={theme.backgroundPanel}
|
|
101
|
+
border
|
|
102
|
+
borderColor={theme.border}
|
|
103
|
+
>
|
|
104
|
+
{/* Filter row */}
|
|
105
|
+
<box flexDirection="row" paddingLeft={1} paddingRight={1} height={1}>
|
|
106
|
+
<text content=":" fg={theme.accent} />
|
|
107
|
+
<input
|
|
108
|
+
focused
|
|
109
|
+
placeholder="Filter commands..."
|
|
110
|
+
onSubmit={handleSelect}
|
|
111
|
+
onInput={(value: string) => {
|
|
112
|
+
setFilter(value);
|
|
113
|
+
setActiveIndex(0);
|
|
114
|
+
}}
|
|
115
|
+
backgroundColor="transparent"
|
|
116
|
+
focusedBackgroundColor="transparent"
|
|
117
|
+
textColor={theme.text}
|
|
118
|
+
placeholderColor={theme.textMuted}
|
|
119
|
+
cursorColor={theme.accent}
|
|
120
|
+
style={{ flexGrow: 1 }}
|
|
121
|
+
/>
|
|
122
|
+
<text content={` ${filtered.length}`} fg={theme.textMuted} />
|
|
123
|
+
<CloseButton onClose={onClose} />
|
|
124
|
+
</box>
|
|
125
|
+
|
|
126
|
+
{/* Separator */}
|
|
127
|
+
<box height={1} width="100%" backgroundColor={theme.border} />
|
|
128
|
+
|
|
129
|
+
{/* Command list */}
|
|
130
|
+
<scrollbox focused={false} style={{ flexGrow: 1 }}>
|
|
131
|
+
{filtered.map(
|
|
132
|
+
(entry, i): React.ReactNode => (
|
|
133
|
+
<box
|
|
134
|
+
key={entry.id}
|
|
135
|
+
flexDirection="row"
|
|
136
|
+
paddingLeft={1}
|
|
137
|
+
paddingRight={1}
|
|
138
|
+
height={1}
|
|
139
|
+
backgroundColor={i === activeIndex ? theme.backgroundElement : undefined}
|
|
140
|
+
onMouseDown={(event) => {
|
|
141
|
+
// Left-click runs the entry — same code path as Enter.
|
|
142
|
+
if (event.button !== 0) {
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
event.preventDefault();
|
|
146
|
+
event.stopPropagation();
|
|
147
|
+
onSelect(entry.id);
|
|
148
|
+
}}
|
|
149
|
+
>
|
|
150
|
+
<text content={entry.title} fg={theme.text} style={{ flexGrow: 1 }} />
|
|
151
|
+
{(entry.hotkey?.length ?? 0) > 0 && (
|
|
152
|
+
<text content={entry.hotkey} fg={theme.textMuted} />
|
|
153
|
+
)}
|
|
154
|
+
{(entry.category?.length ?? 0) > 0 && (
|
|
155
|
+
<text content={` ${entry.category}`} fg={theme.textMuted} />
|
|
156
|
+
)}
|
|
157
|
+
</box>
|
|
158
|
+
),
|
|
159
|
+
)}
|
|
160
|
+
</scrollbox>
|
|
161
|
+
</box>
|
|
162
|
+
);
|
|
163
|
+
};
|