@dxos/react-ui-editor 0.3.10-main.90b298e → 0.3.10-main.92d1f2c
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/lib/browser/index.mjs +897 -293
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/types/src/components/TextEditor/MarkdownEditor.stories.d.ts +19 -1
- package/dist/types/src/components/TextEditor/MarkdownEditor.stories.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/TextEditor.d.ts +2 -1
- package/dist/types/src/components/TextEditor/TextEditor.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/autocomplete.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/basic.d.ts +2 -1
- package/dist/types/src/components/TextEditor/extensions/basic.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/blast.d.ts +25 -0
- package/dist/types/src/components/TextEditor/extensions/blast.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/comments.d.ts +1 -1
- package/dist/types/src/components/TextEditor/extensions/comments.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/demo.d.ts +2 -1
- package/dist/types/src/components/TextEditor/extensions/demo.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/experimental.d.ts +1 -1
- package/dist/types/src/components/TextEditor/extensions/experimental.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/image.d.ts +4 -0
- package/dist/types/src/components/TextEditor/extensions/image.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/index.d.ts +4 -0
- package/dist/types/src/components/TextEditor/extensions/index.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/link.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/listener.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/bundle.d.ts +2 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/bundle.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/highlight.d.ts +9 -3
- package/dist/types/src/components/TextEditor/extensions/markdown/highlight.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/mention.d.ts +6 -0
- package/dist/types/src/components/TextEditor/extensions/mention.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/table.d.ts +8 -0
- package/dist/types/src/components/TextEditor/extensions/table.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/tasklist.d.ts +2 -1
- package/dist/types/src/components/TextEditor/extensions/tasklist.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/themes/default.d.ts +5 -0
- package/dist/types/src/components/TextEditor/themes/default.d.ts.map +1 -1
- package/dist/types/src/hooks/automerge/automerge.stories.d.ts +8 -1
- package/dist/types/src/hooks/automerge/automerge.stories.d.ts.map +1 -1
- package/dist/types/src/{components/TextEditor → hooks/yjs}/yjs.stories.d.ts +1 -1
- package/dist/types/src/hooks/yjs/yjs.stories.d.ts.map +1 -0
- package/dist/types/src/styles/markdown.d.ts +3 -2
- package/dist/types/src/styles/markdown.d.ts.map +1 -1
- package/package.json +20 -20
- package/src/components/TextEditor/MarkdownEditor.stories.tsx +102 -27
- package/src/components/TextEditor/TextEditor.tsx +13 -23
- package/src/components/TextEditor/extensions/autocomplete.ts +5 -20
- package/src/components/TextEditor/extensions/basic.ts +2 -1
- package/src/components/TextEditor/extensions/blast.ts +387 -0
- package/src/components/TextEditor/extensions/comments.ts +21 -39
- package/src/components/TextEditor/extensions/demo.ts +4 -1
- package/src/components/TextEditor/extensions/experimental.tsx +14 -35
- package/src/components/TextEditor/extensions/image.ts +67 -0
- package/src/components/TextEditor/extensions/index.ts +4 -0
- package/src/components/TextEditor/extensions/link.ts +17 -25
- package/src/components/TextEditor/extensions/listener.ts +3 -3
- package/src/components/TextEditor/extensions/markdown/bundle.ts +30 -19
- package/src/components/TextEditor/extensions/markdown/highlight.ts +147 -108
- package/src/components/TextEditor/extensions/mention.ts +31 -0
- package/src/components/TextEditor/extensions/table.ts +122 -0
- package/src/components/TextEditor/extensions/tasklist.ts +41 -27
- package/src/components/TextEditor/themes/default.ts +54 -2
- package/src/hooks/automerge/automerge.stories.tsx +3 -2
- package/src/{components/TextEditor → hooks/yjs}/yjs.stories.tsx +1 -1
- package/src/styles/markdown.ts +14 -8
- package/dist/types/src/components/TextEditor/yjs.stories.d.ts.map +0 -1
|
@@ -18,13 +18,22 @@ import { Decoration, EditorView, WidgetType } from '@codemirror/view';
|
|
|
18
18
|
// https://codemirror.net/try/?c=aW1wb3J0IHsgYmFzaWNTZXR1cCwgRWRpdG9yVmlldyB9IGZyb20gImNvZGVtaXJyb3IiCmltcG9ydCB7IG1hcmtkb3duIH0gZnJvbSAiQGNvZGVtaXJyb3IvbGFuZy1tYXJrZG93biIKaW1wb3J0IHsgc3ludGF4VHJlZSB9IGZyb20gIkBjb2RlbWlycm9yL2xhbmd1YWdlIjsKaW1wb3J0IHsgRWRpdG9yU3RhdGUsIFJhbmdlU2V0QnVpbGRlciwgU3RhdGVGaWVsZCB9IGZyb20gIkBjb2RlbWlycm9yL3N0YXRlIjsKaW1wb3J0IHsgRGVjb3JhdGlvbiwgV2lkZ2V0VHlwZSB9IGZyb20gIkBjb2RlbWlycm9yL3ZpZXciOwoKY2xhc3MgTGluayBleHRlbmRzIFdpZGdldFR5cGUgewogIGNvbnN0cnVjdG9yKHRleHQsIHVybCkgewogICAgc3VwZXIoKQogICAgdGhpcy50ZXh0ID0gdGV4dAogICAgdGhpcy51cmwgPSB1cmwKICB9CiAgZXEob3RoZXIpIHsgcmV0dXJuIHRoaXMudGV4dCA9PSBvdGhlci50ZXh0ICYmIHRoaXMudXJsID09IG90aGVyLnVybCB9CiAgdG9ET00oKSB7CiAgICBsZXQgbGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImEiKQogICAgbGluay50ZXh0Q29udGVudCA9IHRoaXMudGV4dAogICAgbGluay5ocmVmID0gdGhpcy51cmwKICAgIHJldHVybiBsaW5rOwogIH0KfQoKbGV0IGRlY29yYXRpb25zRmllbGQgPSBTdGF0ZUZpZWxkLmRlZmluZSh7CiAgY3JlYXRlKCkgewogICAgcmV0dXJuIERlY29yYXRpb24ubm9uZTsKICB9LAogIHVwZGF0ZShfLCB0cikgewogICAgY29uc3QgYnVpbGRlciA9IG5ldyBSYW5nZVNldEJ1aWxkZXIoKTsKICAgIGxldCBjdXJzb3IgPSB0ci5zdGF0ZS5zZWxlY3Rpb24ubWFpbi5oZWFkOwogICAgc3ludGF4VHJlZSh0ci5zdGF0ZSkuaXRlcmF0ZSh7CiAgICAgIGVudGVyOiAobm9kZSkgPT4gewogICAgICAgIGlmICgoY3Vyc29yIDwgbm9kZS5mcm9tIHx8IGN1cnNvciA+IG5vZGUudG8pICYmIG5vZGUubmFtZSA9PSAiTGluayIpIHsKICAgICAgICAgIGxldCBtYXJrcyA9IG5vZGUubm9kZS5nZXRDaGlsZHJlbigiTGlua01hcmsiKTsKICAgICAgICAgIGxldCB0ZXh0ID0gbWFya3MubGVuZ3RoID49IDIgPyB0ci5zdGF0ZS5zbGljZURvYyhtYXJrc1swXS50bywgbWFya3NbMV0uZnJvbSkgOiAiIgoKICAgICAgICAgIGxldCB1cmxOb2RlID0gbm9kZS5ub2RlLmdldENoaWxkKCJVUkwiKTsKICAgICAgICAgIGxldCB1cmwgPSB1cmxOb2RlID8gdHIuc3RhdGUuc2xpY2VEb2ModXJsTm9kZS5mcm9tLCB1cmxOb2RlLnRvKSA6ICIiCiAgICAgICAgICBidWlsZGVyLmFkZChub2RlLmZyb20sIG5vZGUudG8sIERlY29yYXRpb24ucmVwbGFjZSh7CiAgICAgICAgICAgIHdpZGdldDogbmV3IExpbmsodGV4dCwgdXJsKSwKICAgICAgICAgIH0pLAogICAgICAgICAgICAgICAgICAgICApOwogICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgIH0KICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgfSwKICAgIH0pOwogICAgcmV0dXJuIGJ1aWxkZXIuZmluaXNoKCk7CiAgfSwKICBwcm92aWRlOiAoZikgPT4gRWRpdG9yVmlldy5kZWNvcmF0aW9ucy5mcm9tKGYpLAp9KTsKCmxldCB2aWV3ID0gbmV3IEVkaXRvclZpZXcoewogIGRvYzogIiMgSGVsbG8gV29ybGRcblxuW1Rlc3RdKGh0dHBzOi8vZXhhbXBsZS5jb20pXG5cblxuIiwKICBleHRlbnNpb25zOiBbZGVjb3JhdGlvbnNGaWVsZCwgbWFya2Rvd24oKV0sCiAgcGFyZW50OiBkb2N1bWVudC5ib2R5LAp9KTsKCnZpZXcuZm9jdXMoKTs=
|
|
19
19
|
// https://discuss.codemirror.net/t/link-widget-is-clicked-only-if-editor-is-out-of-focus/7433
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
export type LinkOptions = {
|
|
22
|
+
link?: boolean;
|
|
23
|
+
onRender?: (el: Element, url: string) => void;
|
|
24
|
+
};
|
|
22
25
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
/**
|
|
27
|
+
* Creates a state field to replace AST elements with a hyperlink widget.
|
|
28
|
+
* https://codemirror.net/docs/ref/#state.StateField
|
|
29
|
+
*/
|
|
30
|
+
export const link = (options: LinkOptions = {}): Extension => {
|
|
31
|
+
return StateField.define<RangeSet<any>>({
|
|
32
|
+
create: (state) => update(state, options),
|
|
33
|
+
update: (_: RangeSet<any>, tr: Transaction) => update(tr.state, options),
|
|
34
|
+
provide: (field) => EditorView.decorations.from(field),
|
|
35
|
+
});
|
|
36
|
+
};
|
|
28
37
|
|
|
29
38
|
class LinkButton extends WidgetType {
|
|
30
39
|
constructor(
|
|
@@ -85,20 +94,20 @@ class LinkText extends WidgetType {
|
|
|
85
94
|
const update = (state: EditorState, options: LinkOptions) => {
|
|
86
95
|
const builder = new RangeSetBuilder();
|
|
87
96
|
const cursor = state.selection.main.head;
|
|
97
|
+
|
|
88
98
|
syntaxTree(state).iterate({
|
|
89
99
|
enter: (node) => {
|
|
90
100
|
// Check if cursor is inside text.
|
|
91
101
|
if (node.name === 'Link') {
|
|
92
102
|
const marks = node.node.getChildren('LinkMark');
|
|
93
103
|
const text = marks.length >= 2 ? state.sliceDoc(marks[0].to, marks[1].from) : '';
|
|
94
|
-
|
|
95
104
|
const urlNode = node.node.getChild('URL');
|
|
96
105
|
const url = urlNode ? state.sliceDoc(urlNode.from, urlNode.to) : '';
|
|
97
106
|
if (!url) {
|
|
98
107
|
return false;
|
|
99
108
|
}
|
|
100
109
|
|
|
101
|
-
if (cursor < node.from || cursor > node.to) {
|
|
110
|
+
if (state.readOnly || cursor < node.from || cursor > node.to) {
|
|
102
111
|
builder.add(
|
|
103
112
|
node.from,
|
|
104
113
|
node.to,
|
|
@@ -125,20 +134,3 @@ const update = (state: EditorState, options: LinkOptions) => {
|
|
|
125
134
|
|
|
126
135
|
return builder.finish();
|
|
127
136
|
};
|
|
128
|
-
|
|
129
|
-
export type LinkOptions = {
|
|
130
|
-
link?: boolean;
|
|
131
|
-
onRender?: (el: Element, url: string) => void;
|
|
132
|
-
};
|
|
133
|
-
|
|
134
|
-
/**
|
|
135
|
-
* Creates a state field to replace AST elements with a hyperlink widget.
|
|
136
|
-
* https://codemirror.net/docs/ref/#state.StateField
|
|
137
|
-
*/
|
|
138
|
-
export const link = (options: LinkOptions = {}): Extension => {
|
|
139
|
-
return StateField.define<RangeSet<any>>({
|
|
140
|
-
create: (state) => update(state, options),
|
|
141
|
-
update: (_: RangeSet<any>, tr: Transaction) => update(tr.state, options),
|
|
142
|
-
provide: (field) => EditorView.decorations.from(field),
|
|
143
|
-
});
|
|
144
|
-
};
|
|
@@ -9,9 +9,8 @@ export type ListenerOptions = { onChange: (text: string) => void };
|
|
|
9
9
|
/**
|
|
10
10
|
* Based on https://github.com/codemirror/dev/issues/44#issuecomment-789093799
|
|
11
11
|
*/
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
StateField.define({
|
|
12
|
+
export const listener = ({ onChange }: ListenerOptions) => {
|
|
13
|
+
return StateField.define({
|
|
15
14
|
create: () => null,
|
|
16
15
|
update: (_value, transaction) => {
|
|
17
16
|
if (transaction.docChanged && onChange) {
|
|
@@ -21,3 +20,4 @@ export const listener = ({ onChange }: ListenerOptions) =>
|
|
|
21
20
|
return null;
|
|
22
21
|
},
|
|
23
22
|
});
|
|
23
|
+
};
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { closeBrackets, closeBracketsKeymap } from '@codemirror/autocomplete';
|
|
6
|
-
import {
|
|
6
|
+
import { history, historyKeymap, indentWithTab, standardKeymap } from '@codemirror/commands';
|
|
7
7
|
import { markdownLanguage, markdown } from '@codemirror/lang-markdown';
|
|
8
8
|
import { bracketMatching, defaultHighlightStyle, indentOnInput, syntaxHighlighting } from '@codemirror/language';
|
|
9
9
|
import { languages } from '@codemirror/language-data';
|
|
@@ -25,14 +25,19 @@ import {
|
|
|
25
25
|
|
|
26
26
|
import type { ThemeMode } from '@dxos/react-ui';
|
|
27
27
|
|
|
28
|
-
import { markdownHighlightStyle,
|
|
28
|
+
import { markdownHighlightStyle, markdownTagsExtensions } from './highlight';
|
|
29
29
|
|
|
30
30
|
export type MarkdownBundleOptions = {
|
|
31
|
+
readonly?: boolean;
|
|
31
32
|
themeMode?: ThemeMode;
|
|
32
33
|
placeholder?: string;
|
|
33
34
|
};
|
|
34
35
|
|
|
35
|
-
export const markdownBundle = ({
|
|
36
|
+
export const markdownBundle = ({
|
|
37
|
+
readonly,
|
|
38
|
+
themeMode,
|
|
39
|
+
placeholder: _placeholder,
|
|
40
|
+
}: MarkdownBundleOptions): Extension[] => {
|
|
36
41
|
// All of https://github.com/codemirror/basic-setup minus line numbers and fold gutter.
|
|
37
42
|
// https://codemirror.net/docs/ref/#codemirror.basicSetup
|
|
38
43
|
return [
|
|
@@ -54,16 +59,7 @@ export const markdownBundle = ({ themeMode, placeholder: _placeholder }: Markdow
|
|
|
54
59
|
indentOnInput(),
|
|
55
60
|
rectangularSelection(),
|
|
56
61
|
|
|
57
|
-
|
|
58
|
-
keymap.of([
|
|
59
|
-
...closeBracketsKeymap,
|
|
60
|
-
...defaultKeymap,
|
|
61
|
-
// ...foldKeymap,
|
|
62
|
-
// ...historyKeymap,
|
|
63
|
-
// ...lintKeymap,
|
|
64
|
-
...searchKeymap,
|
|
65
|
-
indentWithTab,
|
|
66
|
-
]),
|
|
62
|
+
customkeymap(),
|
|
67
63
|
|
|
68
64
|
// Main extension.
|
|
69
65
|
// https://github.com/codemirror/lang-markdown
|
|
@@ -81,15 +77,30 @@ export const markdownBundle = ({ themeMode, placeholder: _placeholder }: Markdow
|
|
|
81
77
|
|
|
82
78
|
// Parser extensions.
|
|
83
79
|
extensions: [
|
|
84
|
-
// GFM
|
|
85
|
-
|
|
80
|
+
// GFM provided by default.
|
|
81
|
+
markdownTagsExtensions,
|
|
86
82
|
],
|
|
87
83
|
}),
|
|
88
84
|
|
|
89
|
-
//
|
|
90
|
-
syntaxHighlighting(markdownHighlightStyle),
|
|
91
|
-
|
|
92
|
-
// TODO(thure): All but one rule here apply to both themes; rename or refactor.
|
|
85
|
+
// https://github.com/codemirror/theme-one-dark
|
|
93
86
|
themeMode === 'dark' ? syntaxHighlighting(oneDarkHighlightStyle) : syntaxHighlighting(defaultHighlightStyle),
|
|
87
|
+
|
|
88
|
+
// Custom styles.
|
|
89
|
+
syntaxHighlighting(markdownHighlightStyle(readonly)),
|
|
94
90
|
].filter(Boolean) as Extension[];
|
|
95
91
|
};
|
|
92
|
+
|
|
93
|
+
// https://codemirror.net/docs/ref/#view.keymap
|
|
94
|
+
const customkeymap = () =>
|
|
95
|
+
keymap.of([
|
|
96
|
+
// https://codemirror.net/docs/ref/#commands.indentWithTab
|
|
97
|
+
indentWithTab,
|
|
98
|
+
// https://codemirror.net/docs/ref/#commands.standardKeymap
|
|
99
|
+
...standardKeymap,
|
|
100
|
+
// https://codemirror.net/docs/ref/#commands.historyKeymap
|
|
101
|
+
...historyKeymap,
|
|
102
|
+
// https://codemirror.net/docs/ref/#autocomplete.closeBracketsKeymap
|
|
103
|
+
...closeBracketsKeymap,
|
|
104
|
+
// https://codemirror.net/docs/ref/#search.searchKeymap
|
|
105
|
+
...searchKeymap,
|
|
106
|
+
]);
|
|
@@ -5,9 +5,11 @@
|
|
|
5
5
|
import { markdownLanguage } from '@codemirror/lang-markdown';
|
|
6
6
|
import { HighlightStyle } from '@codemirror/language';
|
|
7
7
|
import { tags, styleTags, Tag } from '@lezer/highlight';
|
|
8
|
-
import { type MarkdownConfig } from '@lezer/markdown';
|
|
8
|
+
import { type MarkdownConfig, Table } from '@lezer/markdown';
|
|
9
9
|
import get from 'lodash.get';
|
|
10
10
|
|
|
11
|
+
import { mx } from '@dxos/react-ui-theme';
|
|
12
|
+
|
|
11
13
|
import {
|
|
12
14
|
blockquote,
|
|
13
15
|
bold,
|
|
@@ -40,128 +42,165 @@ export const markdownTags = {
|
|
|
40
42
|
ListMark: Tag.define(),
|
|
41
43
|
QuoteMark: Tag.define(),
|
|
42
44
|
URL: Tag.define(),
|
|
43
|
-
};
|
|
44
45
|
|
|
45
|
-
|
|
46
|
-
|
|
46
|
+
// Custom.
|
|
47
|
+
TableCell: Tag.define(),
|
|
47
48
|
};
|
|
48
49
|
|
|
50
|
+
// TODO(burdon): Customize table parser (make all content monospace).
|
|
51
|
+
// https://github.com/lezer-parser/markdown/blob/main/src/extension.ts
|
|
52
|
+
Table.defineNodes?.forEach((node: any) => {
|
|
53
|
+
switch (node?.name) {
|
|
54
|
+
case 'TableCell': {
|
|
55
|
+
node.style = markdownTags.TableCell;
|
|
56
|
+
break;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
export const markdownTagsExtensions: MarkdownConfig[] = [
|
|
62
|
+
Table,
|
|
63
|
+
{
|
|
64
|
+
props: [styleTags(markdownTags)],
|
|
65
|
+
},
|
|
66
|
+
];
|
|
67
|
+
|
|
49
68
|
/**
|
|
50
69
|
* Styling based on `lezer` parser tags.
|
|
51
70
|
* https://codemirror.net/examples/styling
|
|
52
71
|
* https://github.com/lezer-parser/highlight
|
|
53
|
-
* https://
|
|
72
|
+
* https://github.com/lezer-parser/highlight/blob/main/src/highlight.ts#L427
|
|
73
|
+
* https://lezer.codemirror.net/docs/ref/#highlight.tags (list of tags)
|
|
74
|
+
*
|
|
75
|
+
* Examples:
|
|
76
|
+
* - https://github.com/codemirror/language/blob/main/src/highlight.ts#L194
|
|
77
|
+
* - https://github.com/codemirror/theme-one-dark/blob/main/src/one-dark.ts#L115
|
|
54
78
|
*/
|
|
55
|
-
export const markdownHighlightStyle =
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
79
|
+
export const markdownHighlightStyle = (readonly?: boolean) => {
|
|
80
|
+
return HighlightStyle.define(
|
|
81
|
+
[
|
|
82
|
+
{
|
|
83
|
+
tag: [
|
|
84
|
+
tags.keyword,
|
|
85
|
+
tags.name,
|
|
86
|
+
tags.deleted,
|
|
87
|
+
tags.character,
|
|
88
|
+
tags.propertyName,
|
|
89
|
+
tags.macroName,
|
|
90
|
+
tags.color,
|
|
91
|
+
tags.constant(tags.name),
|
|
92
|
+
tags.standard(tags.name),
|
|
93
|
+
tags.definition(tags.name),
|
|
94
|
+
tags.separator,
|
|
95
|
+
tags.typeName,
|
|
96
|
+
tags.className,
|
|
97
|
+
tags.number,
|
|
98
|
+
tags.changed,
|
|
99
|
+
tags.annotation,
|
|
100
|
+
tags.modifier,
|
|
101
|
+
tags.self,
|
|
102
|
+
tags.namespace,
|
|
103
|
+
tags.operator,
|
|
104
|
+
tags.operatorKeyword,
|
|
105
|
+
tags.escape,
|
|
106
|
+
tags.regexp,
|
|
107
|
+
tags.special(tags.string),
|
|
108
|
+
tags.meta,
|
|
109
|
+
tags.comment,
|
|
110
|
+
tags.atom,
|
|
111
|
+
tags.bool,
|
|
112
|
+
tags.special(tags.variableName),
|
|
113
|
+
tags.processingInstruction,
|
|
114
|
+
tags.string,
|
|
115
|
+
tags.inserted,
|
|
116
|
+
tags.invalid,
|
|
117
|
+
],
|
|
118
|
+
color: 'inherit !important',
|
|
119
|
+
},
|
|
95
120
|
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
markdownTags.QuoteMark,
|
|
108
|
-
],
|
|
109
|
-
class: mark,
|
|
110
|
-
},
|
|
121
|
+
// Markdown marks.
|
|
122
|
+
{
|
|
123
|
+
tag: [
|
|
124
|
+
tags.meta,
|
|
125
|
+
tags.processingInstruction,
|
|
126
|
+
markdownTags.LinkLabel,
|
|
127
|
+
markdownTags.LinkReference,
|
|
128
|
+
markdownTags.ListMark,
|
|
129
|
+
],
|
|
130
|
+
class: mark,
|
|
131
|
+
},
|
|
111
132
|
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
{ tag: tags.heading5, class: heading[5] },
|
|
118
|
-
{ tag: tags.heading6, class: heading[6] },
|
|
133
|
+
// Markdown marks.
|
|
134
|
+
{
|
|
135
|
+
tag: [markdownTags.CodeMark, markdownTags.HeaderMark, markdownTags.QuoteMark, markdownTags.EmphasisMark],
|
|
136
|
+
class: readonly ? 'hidden' : mark,
|
|
137
|
+
},
|
|
119
138
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
139
|
+
// E.g., code block language (after ```).
|
|
140
|
+
{
|
|
141
|
+
tag: [tags.function(tags.variableName), tags.labelName],
|
|
142
|
+
class: readonly ? 'hidden' : codeMark,
|
|
143
|
+
},
|
|
124
144
|
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
},
|
|
145
|
+
{
|
|
146
|
+
tag: [tags.monospace],
|
|
147
|
+
class: 'font-mono',
|
|
148
|
+
},
|
|
130
149
|
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
tag:
|
|
134
|
-
class:
|
|
135
|
-
|
|
150
|
+
// Headings.
|
|
151
|
+
{ tag: tags.heading1, class: heading(1, readonly) },
|
|
152
|
+
{ tag: tags.heading2, class: heading(2, readonly) },
|
|
153
|
+
{ tag: tags.heading3, class: heading(3, readonly) },
|
|
154
|
+
{ tag: tags.heading4, class: heading(4, readonly) },
|
|
155
|
+
{ tag: tags.heading5, class: heading(5, readonly) },
|
|
156
|
+
{ tag: tags.heading6, class: heading(6, readonly) },
|
|
136
157
|
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
// IMPORTANT: Therefore, the fenced code block will use the base editor font.
|
|
142
|
-
{
|
|
143
|
-
tag: [markdownTags.CodeText, markdownTags.InlineCode],
|
|
144
|
-
class: code,
|
|
145
|
-
},
|
|
158
|
+
// Emphasis.
|
|
159
|
+
{ tag: tags.emphasis, class: italic },
|
|
160
|
+
{ tag: tags.strong, class: bold },
|
|
161
|
+
{ tag: tags.strikethrough, class: strikethrough },
|
|
146
162
|
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
163
|
+
// Naked URLs.
|
|
164
|
+
{
|
|
165
|
+
tag: [markdownTags.URL],
|
|
166
|
+
class: inlineUrl,
|
|
167
|
+
},
|
|
168
|
+
|
|
169
|
+
// NOTE: The `markdown` extension configures extensions for `lezer` to parse markdown tokens (incl. below).
|
|
170
|
+
// However, since `codeLanguages` is also defined, the `lezer` will not parse fenced code blocks,
|
|
171
|
+
// when a language is specified. In this case, the syntax highlighting extensions will colorize
|
|
172
|
+
// the code, but all other CSS properties will be inherited.
|
|
173
|
+
// IMPORTANT: Therefore, the fenced code block will use the base editor font.
|
|
174
|
+
{
|
|
175
|
+
tag: [markdownTags.CodeText, markdownTags.InlineCode],
|
|
176
|
+
class: code,
|
|
177
|
+
},
|
|
178
|
+
|
|
179
|
+
{
|
|
180
|
+
tag: [markdownTags.QuoteMark],
|
|
181
|
+
class: blockquote,
|
|
182
|
+
},
|
|
151
183
|
|
|
184
|
+
{
|
|
185
|
+
tag: [markdownTags.HorizontalRule],
|
|
186
|
+
class: mx(horizontalRule, readonly && '-indent-[100rem]'),
|
|
187
|
+
},
|
|
188
|
+
|
|
189
|
+
// TODO(burdon): Only if being edited.
|
|
190
|
+
{
|
|
191
|
+
tag: [markdownTags.TableCell],
|
|
192
|
+
class: 'font-mono',
|
|
193
|
+
},
|
|
194
|
+
|
|
195
|
+
// Main content, paragraphs, etc.
|
|
196
|
+
// {
|
|
197
|
+
// tag: [tags.content],
|
|
198
|
+
// fontFamily: get(tokens, 'fontFamily.body', []).join(','),
|
|
199
|
+
// },
|
|
200
|
+
],
|
|
152
201
|
{
|
|
153
|
-
|
|
154
|
-
|
|
202
|
+
scope: markdownLanguage,
|
|
203
|
+
all: { fontFamily: get(tokens, 'fontFamily.body', []).join(',') },
|
|
155
204
|
},
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
// {
|
|
159
|
-
// tag: [tags.content],
|
|
160
|
-
// fontFamily: get(tokens, 'fontFamily.body', []).join(','),
|
|
161
|
-
// },
|
|
162
|
-
],
|
|
163
|
-
{
|
|
164
|
-
scope: markdownLanguage,
|
|
165
|
-
all: { fontFamily: get(tokens, 'fontFamily.body', []).join(',') },
|
|
166
|
-
},
|
|
167
|
-
);
|
|
205
|
+
);
|
|
206
|
+
};
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2023 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { autocompletion, type CompletionContext, type CompletionResult } from '@codemirror/autocomplete';
|
|
6
|
+
import type { Extension } from '@codemirror/state';
|
|
7
|
+
|
|
8
|
+
export type MentionOptions = {
|
|
9
|
+
onSearch: (text: string) => string[];
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
export const mention = ({ onSearch }: MentionOptions): Extension => {
|
|
13
|
+
return autocompletion({
|
|
14
|
+
closeOnBlur: false, // For debugging.
|
|
15
|
+
override: [
|
|
16
|
+
(context: CompletionContext): CompletionResult | null => {
|
|
17
|
+
const match = context.matchBefore(/@(\w+)?/);
|
|
18
|
+
if (!match || (match.from === match.to && !context.explicit)) {
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
console.log(match);
|
|
23
|
+
|
|
24
|
+
return {
|
|
25
|
+
from: match.from,
|
|
26
|
+
options: onSearch(match.text.slice(1).toLowerCase()).map((value) => ({ label: `@${value}` })),
|
|
27
|
+
};
|
|
28
|
+
},
|
|
29
|
+
],
|
|
30
|
+
});
|
|
31
|
+
};
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2023 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { syntaxTree } from '@codemirror/language';
|
|
6
|
+
import { type EditorState, type RangeSet, RangeSetBuilder, StateField, type Transaction } from '@codemirror/state';
|
|
7
|
+
import { Decoration, EditorView, WidgetType } from '@codemirror/view';
|
|
8
|
+
|
|
9
|
+
// TODO(burdon): Snippet to create basic table.
|
|
10
|
+
// https://codemirror.net/docs/ref/#autocomplete.snippet
|
|
11
|
+
|
|
12
|
+
export type TableOptions = {};
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* GFM tables.
|
|
16
|
+
* https://github.github.com/gfm/#tables-extension
|
|
17
|
+
*/
|
|
18
|
+
export const table = (options: TableOptions = {}) => {
|
|
19
|
+
return StateField.define<RangeSet<any>>({
|
|
20
|
+
create: (state) => update(state, options),
|
|
21
|
+
update: (_: RangeSet<any>, tr: Transaction) => update(tr.state, options),
|
|
22
|
+
provide: (field) => EditorView.decorations.from(field),
|
|
23
|
+
});
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
type Table = {
|
|
27
|
+
from: number;
|
|
28
|
+
to: number;
|
|
29
|
+
header?: string[];
|
|
30
|
+
rows?: string[][];
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
const update = (state: EditorState, options: TableOptions) => {
|
|
34
|
+
const builder = new RangeSetBuilder();
|
|
35
|
+
const cursor = state.selection.main.head;
|
|
36
|
+
|
|
37
|
+
const tables: Table[] = [];
|
|
38
|
+
const getTable = () => tables[tables.length - 1];
|
|
39
|
+
const getRow = () => {
|
|
40
|
+
const table = getTable();
|
|
41
|
+
return table.rows?.[table.rows.length - 1];
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
// Parse table.
|
|
45
|
+
// TODO(burdon): Use remark?: https://www.npmjs.com/package/remark-gfm
|
|
46
|
+
// TODO(burdon): Style in monospace:
|
|
47
|
+
// https://discuss.codemirror.net/t/markdown-table-highlighting/658
|
|
48
|
+
// https://github.com/lezer-parser/markdown/blob/main/src/extension.ts
|
|
49
|
+
syntaxTree(state).iterate({
|
|
50
|
+
enter: (node) => {
|
|
51
|
+
// Check if cursor is inside text.
|
|
52
|
+
switch (node.name) {
|
|
53
|
+
case 'Table': {
|
|
54
|
+
tables.push({ from: node.from, to: node.to });
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
case 'TableHeader': {
|
|
58
|
+
getTable().header = [];
|
|
59
|
+
break;
|
|
60
|
+
}
|
|
61
|
+
case 'TableRow': {
|
|
62
|
+
(getTable().rows ??= []).push([]);
|
|
63
|
+
break;
|
|
64
|
+
}
|
|
65
|
+
case 'TableCell': {
|
|
66
|
+
const row = getRow();
|
|
67
|
+
if (row) {
|
|
68
|
+
row.push(state.sliceDoc(node.from, node.to));
|
|
69
|
+
} else {
|
|
70
|
+
getTable().header?.push(state.sliceDoc(node.from, node.to));
|
|
71
|
+
}
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
},
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
tables.forEach((table) => {
|
|
79
|
+
const hide = state.readOnly || cursor < table.from || cursor > table.to;
|
|
80
|
+
hide && builder.add(table.from, table.to!, Decoration.replace({ widget: new TableWidget(table) }));
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
return builder.finish();
|
|
84
|
+
};
|
|
85
|
+
|
|
86
|
+
class TableWidget extends WidgetType {
|
|
87
|
+
constructor(readonly _table: Table) {
|
|
88
|
+
super();
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
override eq(other: WidgetType) {
|
|
92
|
+
return this._table.from === (other as any as TableWidget)?._table?.from;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
toDOM(view: EditorView) {
|
|
96
|
+
const table = document.createElement('table');
|
|
97
|
+
|
|
98
|
+
{
|
|
99
|
+
const header = table.appendChild(document.createElement('thead'));
|
|
100
|
+
const tr = header.appendChild(document.createElement('tr'));
|
|
101
|
+
this._table.header?.forEach((cell) => {
|
|
102
|
+
const th = document.createElement('th');
|
|
103
|
+
th.setAttribute('class', 'cm-table-head');
|
|
104
|
+
tr.appendChild(th).textContent = cell;
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
{
|
|
109
|
+
const body = table.appendChild(document.createElement('tbody'));
|
|
110
|
+
this._table.rows?.forEach((row) => {
|
|
111
|
+
const tr = body.appendChild(document.createElement('tr'));
|
|
112
|
+
row.forEach((cell) => {
|
|
113
|
+
const td = document.createElement('td');
|
|
114
|
+
td.setAttribute('class', 'cm-table-cell');
|
|
115
|
+
tr.appendChild(td).textContent = cell;
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
return table;
|
|
121
|
+
}
|
|
122
|
+
}
|