@dxos/react-ui-editor 0.3.10-next.ef70620 → 0.3.11-main.1caa3af
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 +2174 -935
- 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 +66 -0
- package/dist/types/src/components/TextEditor/MarkdownEditor.stories.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/TextEditor.d.ts +9 -4
- package/dist/types/src/components/TextEditor/TextEditor.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/TextEditor.stories.d.ts +12 -4
- package/dist/types/src/components/TextEditor/TextEditor.stories.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/autocomplete.d.ts +10 -0
- package/dist/types/src/components/TextEditor/extensions/autocomplete.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/{basic/bundle.d.ts → basic.d.ts} +3 -2
- package/dist/types/src/components/TextEditor/extensions/basic.d.ts.map +1 -0
- 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/code.d.ts +2 -0
- package/dist/types/src/components/TextEditor/extensions/code.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/comments.d.ts +48 -0
- package/dist/types/src/components/TextEditor/extensions/comments.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/hr.d.ts +2 -0
- package/dist/types/src/components/TextEditor/extensions/hr.d.ts.map +1 -0
- 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 +14 -2
- package/dist/types/src/components/TextEditor/extensions/index.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/extensions/link.d.ts +11 -0
- package/dist/types/src/components/TextEditor/extensions/link.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/listener.d.ts +9 -0
- package/dist/types/src/components/TextEditor/extensions/listener.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/markdown/bundle.d.ts +10 -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 +36 -0
- package/dist/types/src/components/TextEditor/extensions/markdown/highlight.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/markdown/index.d.ts +1 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/index.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/mermaid.d.ts +3 -0
- package/dist/types/src/components/TextEditor/extensions/mermaid.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 +3 -0
- package/dist/types/src/components/TextEditor/extensions/tasklist.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/tooltip.d.ts +12 -0
- package/dist/types/src/components/TextEditor/extensions/tooltip.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/typewriter.d.ts +10 -0
- package/dist/types/src/components/TextEditor/extensions/typewriter.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/extensions/util.d.ts +5 -0
- package/dist/types/src/components/TextEditor/extensions/util.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/index.d.ts +2 -0
- package/dist/types/src/components/TextEditor/index.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/themes/default.d.ts +17 -0
- package/dist/types/src/components/TextEditor/themes/default.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/themes/index.d.ts +2 -0
- package/dist/types/src/components/TextEditor/themes/index.d.ts.map +1 -0
- package/dist/types/src/hooks/automerge/automerge.stories.d.ts +15 -0
- package/dist/types/src/hooks/automerge/automerge.stories.d.ts.map +1 -0
- package/dist/types/src/hooks/automerge/handle.d.ts.map +1 -0
- package/dist/types/src/{automerge/automerge-plugin → hooks/automerge}/index.d.ts +1 -1
- package/dist/types/src/hooks/automerge/index.d.ts.map +1 -0
- package/dist/types/src/hooks/automerge/plugin.d.ts.map +1 -0
- package/dist/types/src/{automerge/automerge-plugin/PatchSemaphore.d.ts → hooks/automerge/semaphore.d.ts} +4 -1
- package/dist/types/src/hooks/automerge/semaphore.d.ts.map +1 -0
- package/dist/types/src/{automerge/automerge-plugin/codeMirrorToAm.d.ts → hooks/automerge/update-automerge.d.ts} +2 -3
- package/dist/types/src/hooks/automerge/update-automerge.d.ts.map +1 -0
- package/dist/types/src/hooks/automerge/update-codemirror.d.ts +5 -0
- package/dist/types/src/hooks/automerge/update-codemirror.d.ts.map +1 -0
- package/dist/types/src/hooks/index.d.ts +0 -1
- package/dist/types/src/hooks/index.d.ts.map +1 -1
- package/dist/types/src/hooks/useTextModel.d.ts +19 -5
- package/dist/types/src/hooks/useTextModel.d.ts.map +1 -1
- package/dist/types/src/{components/TextEditor → hooks/yjs}/yjs.stories.d.ts +2 -1
- package/dist/types/src/hooks/yjs/yjs.stories.d.ts.map +1 -0
- package/dist/types/src/hooks/yjs/yjs.test.d.ts +2 -0
- package/dist/types/src/hooks/yjs/yjs.test.d.ts.map +1 -0
- package/dist/types/src/index.d.ts +1 -0
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/styles/markdown.d.ts +14 -11
- package/dist/types/src/styles/markdown.d.ts.map +1 -1
- package/dist/types/src/testing/replicator.d.ts.map +1 -1
- package/package.json +28 -33
- package/src/components/TextEditor/MarkdownEditor.stories.tsx +428 -0
- package/src/components/TextEditor/TextEditor.stories.tsx +57 -43
- package/src/components/TextEditor/TextEditor.tsx +98 -52
- package/src/components/TextEditor/extensions/autocomplete.ts +59 -0
- package/src/components/TextEditor/extensions/{basic/bundle.ts → basic.ts} +8 -4
- package/src/components/TextEditor/extensions/blast.ts +373 -0
- package/src/components/TextEditor/extensions/code.ts +99 -0
- package/src/components/TextEditor/extensions/comments.ts +388 -0
- package/src/components/TextEditor/extensions/hr.ts +74 -0
- package/src/components/TextEditor/extensions/image.ts +69 -0
- package/src/components/TextEditor/extensions/index.ts +14 -2
- package/src/components/TextEditor/extensions/{hyperlink/hyperlinkDecoration.ts → link.ts} +75 -38
- package/src/components/TextEditor/extensions/{change.ts → listener.ts} +5 -4
- package/src/components/TextEditor/extensions/markdown/bundle.ts +56 -49
- package/src/components/TextEditor/extensions/markdown/highlight.ts +204 -0
- package/src/components/TextEditor/extensions/markdown/index.ts +1 -1
- package/src/components/TextEditor/extensions/mention.ts +31 -0
- package/src/components/TextEditor/extensions/mermaid.ts +11 -0
- package/src/components/TextEditor/extensions/table.ts +132 -0
- package/src/components/TextEditor/extensions/tasklist.ts +121 -0
- package/src/components/TextEditor/extensions/{hyperlink/hyperlinkTooltip.tsx → tooltip.ts} +9 -9
- package/src/components/TextEditor/extensions/typewriter.ts +68 -0
- package/src/components/TextEditor/extensions/util.ts +18 -0
- package/src/components/TextEditor/index.ts +3 -0
- package/src/components/TextEditor/themes/default.ts +302 -0
- package/src/components/TextEditor/themes/index.ts +5 -0
- package/src/{automerge → hooks/automerge}/automerge.stories.tsx +7 -5
- package/src/{automerge/automerge-plugin → hooks/automerge}/plugin.ts +2 -1
- package/src/{automerge/automerge-plugin/PatchSemaphore.ts → hooks/automerge/semaphore.ts} +13 -9
- package/src/{automerge/automerge-plugin/codeMirrorToAm.ts → hooks/automerge/update-automerge.ts} +5 -2
- package/src/{automerge/automerge-plugin/amToCodemirror.ts → hooks/automerge/update-codemirror.ts} +4 -1
- package/src/hooks/index.ts +0 -1
- package/src/hooks/useTextModel.ts +101 -42
- package/src/{components/TextEditor → hooks/yjs}/yjs.stories.tsx +2 -1
- package/src/hooks/yjs/yjs.test.ts +59 -0
- package/src/index.ts +1 -0
- package/src/styles/markdown.ts +33 -24
- package/src/testing/replicator.ts +6 -6
- package/dist/types/src/automerge/automerge-plugin/PatchSemaphore.d.ts.map +0 -1
- package/dist/types/src/automerge/automerge-plugin/amToCodemirror.d.ts +0 -6
- package/dist/types/src/automerge/automerge-plugin/amToCodemirror.d.ts.map +0 -1
- package/dist/types/src/automerge/automerge-plugin/codeMirrorToAm.d.ts.map +0 -1
- package/dist/types/src/automerge/automerge-plugin/handle.d.ts.map +0 -1
- package/dist/types/src/automerge/automerge-plugin/index.d.ts.map +0 -1
- package/dist/types/src/automerge/automerge-plugin/plugin.d.ts.map +0 -1
- package/dist/types/src/automerge/automerge.stories.d.ts +0 -9
- package/dist/types/src/automerge/automerge.stories.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/basic/bundle.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/basic/index.d.ts +0 -3
- package/dist/types/src/components/TextEditor/extensions/basic/index.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/basic/theme.d.ts +0 -10
- package/dist/types/src/components/TextEditor/extensions/basic/theme.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/change.d.ts +0 -7
- package/dist/types/src/components/TextEditor/extensions/change.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/hyperlink/hyperlinkDecoration.d.ts +0 -11
- package/dist/types/src/components/TextEditor/extensions/hyperlink/hyperlinkDecoration.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/hyperlink/hyperlinkTooltip.d.ts +0 -8
- package/dist/types/src/components/TextEditor/extensions/hyperlink/hyperlinkTooltip.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/hyperlink/hyperlinkWidget.d.ts +0 -10
- package/dist/types/src/components/TextEditor/extensions/hyperlink/hyperlinkWidget.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/hyperlink/index.d.ts +0 -4
- package/dist/types/src/components/TextEditor/extensions/hyperlink/index.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/tags.d.ts +0 -17
- package/dist/types/src/components/TextEditor/extensions/markdown/tags.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/theme.d.ts +0 -21
- package/dist/types/src/components/TextEditor/extensions/markdown/theme.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/yjs.stories.d.ts.map +0 -1
- package/dist/types/src/hooks/useCollaboration.d.ts +0 -9
- package/dist/types/src/hooks/useCollaboration.d.ts.map +0 -1
- package/src/components/TextEditor/extensions/basic/index.ts +0 -6
- package/src/components/TextEditor/extensions/basic/theme.ts +0 -49
- package/src/components/TextEditor/extensions/hyperlink/hyperlinkWidget.tsx +0 -119
- package/src/components/TextEditor/extensions/hyperlink/index.ts +0 -7
- package/src/components/TextEditor/extensions/markdown/tags.ts +0 -38
- package/src/components/TextEditor/extensions/markdown/theme.ts +0 -265
- package/src/hooks/useCollaboration.ts +0 -45
- package/dist/types/src/{automerge/automerge-plugin → hooks/automerge}/handle.d.ts +0 -0
- package/dist/types/src/{automerge/automerge-plugin → hooks/automerge}/plugin.d.ts +0 -0
- package/src/{automerge/automerge-plugin → hooks/automerge}/handle.ts +0 -0
- package/src/{automerge/automerge-plugin → hooks/automerge}/index.ts +1 -1
|
@@ -4,28 +4,64 @@
|
|
|
4
4
|
//
|
|
5
5
|
|
|
6
6
|
import { syntaxTree } from '@codemirror/language';
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
type EditorState,
|
|
9
|
+
type Extension,
|
|
10
|
+
type RangeSet,
|
|
11
|
+
RangeSetBuilder,
|
|
12
|
+
StateField,
|
|
13
|
+
type Transaction,
|
|
14
|
+
} from '@codemirror/state';
|
|
8
15
|
import { Decoration, EditorView, WidgetType } from '@codemirror/view';
|
|
9
16
|
|
|
10
17
|
// Adapted from:
|
|
11
18
|
// https://codemirror.net/try/?c=aW1wb3J0IHsgYmFzaWNTZXR1cCwgRWRpdG9yVmlldyB9IGZyb20gImNvZGVtaXJyb3IiCmltcG9ydCB7IG1hcmtkb3duIH0gZnJvbSAiQGNvZGVtaXJyb3IvbGFuZy1tYXJrZG93biIKaW1wb3J0IHsgc3ludGF4VHJlZSB9IGZyb20gIkBjb2RlbWlycm9yL2xhbmd1YWdlIjsKaW1wb3J0IHsgRWRpdG9yU3RhdGUsIFJhbmdlU2V0QnVpbGRlciwgU3RhdGVGaWVsZCB9IGZyb20gIkBjb2RlbWlycm9yL3N0YXRlIjsKaW1wb3J0IHsgRGVjb3JhdGlvbiwgV2lkZ2V0VHlwZSB9IGZyb20gIkBjb2RlbWlycm9yL3ZpZXciOwoKY2xhc3MgTGluayBleHRlbmRzIFdpZGdldFR5cGUgewogIGNvbnN0cnVjdG9yKHRleHQsIHVybCkgewogICAgc3VwZXIoKQogICAgdGhpcy50ZXh0ID0gdGV4dAogICAgdGhpcy51cmwgPSB1cmwKICB9CiAgZXEob3RoZXIpIHsgcmV0dXJuIHRoaXMudGV4dCA9PSBvdGhlci50ZXh0ICYmIHRoaXMudXJsID09IG90aGVyLnVybCB9CiAgdG9ET00oKSB7CiAgICBsZXQgbGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImEiKQogICAgbGluay50ZXh0Q29udGVudCA9IHRoaXMudGV4dAogICAgbGluay5ocmVmID0gdGhpcy51cmwKICAgIHJldHVybiBsaW5rOwogIH0KfQoKbGV0IGRlY29yYXRpb25zRmllbGQgPSBTdGF0ZUZpZWxkLmRlZmluZSh7CiAgY3JlYXRlKCkgewogICAgcmV0dXJuIERlY29yYXRpb24ubm9uZTsKICB9LAogIHVwZGF0ZShfLCB0cikgewogICAgY29uc3QgYnVpbGRlciA9IG5ldyBSYW5nZVNldEJ1aWxkZXIoKTsKICAgIGxldCBjdXJzb3IgPSB0ci5zdGF0ZS5zZWxlY3Rpb24ubWFpbi5oZWFkOwogICAgc3ludGF4VHJlZSh0ci5zdGF0ZSkuaXRlcmF0ZSh7CiAgICAgIGVudGVyOiAobm9kZSkgPT4gewogICAgICAgIGlmICgoY3Vyc29yIDwgbm9kZS5mcm9tIHx8IGN1cnNvciA+IG5vZGUudG8pICYmIG5vZGUubmFtZSA9PSAiTGluayIpIHsKICAgICAgICAgIGxldCBtYXJrcyA9IG5vZGUubm9kZS5nZXRDaGlsZHJlbigiTGlua01hcmsiKTsKICAgICAgICAgIGxldCB0ZXh0ID0gbWFya3MubGVuZ3RoID49IDIgPyB0ci5zdGF0ZS5zbGljZURvYyhtYXJrc1swXS50bywgbWFya3NbMV0uZnJvbSkgOiAiIgoKICAgICAgICAgIGxldCB1cmxOb2RlID0gbm9kZS5ub2RlLmdldENoaWxkKCJVUkwiKTsKICAgICAgICAgIGxldCB1cmwgPSB1cmxOb2RlID8gdHIuc3RhdGUuc2xpY2VEb2ModXJsTm9kZS5mcm9tLCB1cmxOb2RlLnRvKSA6ICIiCiAgICAgICAgICBidWlsZGVyLmFkZChub2RlLmZyb20sIG5vZGUudG8sIERlY29yYXRpb24ucmVwbGFjZSh7CiAgICAgICAgICAgIHdpZGdldDogbmV3IExpbmsodGV4dCwgdXJsKSwKICAgICAgICAgIH0pLAogICAgICAgICAgICAgICAgICAgICApOwogICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgIH0KICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgfSwKICAgIH0pOwogICAgcmV0dXJuIGJ1aWxkZXIuZmluaXNoKCk7CiAgfSwKICBwcm92aWRlOiAoZikgPT4gRWRpdG9yVmlldy5kZWNvcmF0aW9ucy5mcm9tKGYpLAp9KTsKCmxldCB2aWV3ID0gbmV3IEVkaXRvclZpZXcoewogIGRvYzogIiMgSGVsbG8gV29ybGRcblxuW1Rlc3RdKGh0dHBzOi8vZXhhbXBsZS5jb20pXG5cblxuIiwKICBleHRlbnNpb25zOiBbZGVjb3JhdGlvbnNGaWVsZCwgbWFya2Rvd24oKV0sCiAgcGFyZW50OiBkb2N1bWVudC5ib2R5LAp9KTsKCnZpZXcuZm9jdXMoKTs=
|
|
12
19
|
// https://discuss.codemirror.net/t/link-widget-is-clicked-only-if-editor-is-out-of-focus/7433
|
|
13
20
|
|
|
14
|
-
|
|
21
|
+
export type LinkOptions = {
|
|
22
|
+
link?: boolean;
|
|
23
|
+
onRender?: (el: Element, url: string) => void;
|
|
24
|
+
};
|
|
25
|
+
|
|
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
|
+
};
|
|
15
37
|
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
38
|
+
class LinkButton extends WidgetType {
|
|
39
|
+
constructor(
|
|
40
|
+
private readonly _pos: number,
|
|
41
|
+
private readonly _url: string,
|
|
42
|
+
private readonly _onAttach: LinkOptions['onRender'],
|
|
43
|
+
) {
|
|
44
|
+
super();
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
override eq(other: LinkButton) {
|
|
48
|
+
return this._pos === other._pos && this._url === other._url;
|
|
49
|
+
}
|
|
21
50
|
|
|
22
|
-
|
|
23
|
-
|
|
51
|
+
toDOM(view: EditorView) {
|
|
52
|
+
const el = document.createElement('span');
|
|
53
|
+
this._onAttach!(el, this._url);
|
|
54
|
+
return el;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
class LinkText extends WidgetType {
|
|
59
|
+
constructor(private readonly _pos: number, private readonly _text: string, private readonly _url?: string) {
|
|
24
60
|
super();
|
|
25
61
|
}
|
|
26
62
|
|
|
27
|
-
override eq(other:
|
|
28
|
-
return this.
|
|
63
|
+
override eq(other: LinkText) {
|
|
64
|
+
return this._pos === other._pos && this._url === other._url;
|
|
29
65
|
}
|
|
30
66
|
|
|
31
67
|
toDOM(view: EditorView) {
|
|
@@ -33,13 +69,14 @@ class Link extends WidgetType {
|
|
|
33
69
|
link.setAttribute('class', 'cm-link');
|
|
34
70
|
link.textContent = this._text;
|
|
35
71
|
if (this._url) {
|
|
72
|
+
link.setAttribute('rel', 'noreferrer');
|
|
36
73
|
link.setAttribute('target', '_blank');
|
|
37
74
|
link.href = this._url;
|
|
38
75
|
} else {
|
|
39
76
|
link.onclick = () => {
|
|
40
77
|
view.dispatch({
|
|
41
78
|
selection: {
|
|
42
|
-
anchor: this.
|
|
79
|
+
anchor: this._pos,
|
|
43
80
|
},
|
|
44
81
|
});
|
|
45
82
|
};
|
|
@@ -49,49 +86,49 @@ class Link extends WidgetType {
|
|
|
49
86
|
}
|
|
50
87
|
}
|
|
51
88
|
|
|
52
|
-
type HyperlinkDecorationConfig = {
|
|
53
|
-
link?: boolean;
|
|
54
|
-
};
|
|
55
|
-
|
|
56
89
|
/**
|
|
57
|
-
*
|
|
58
|
-
*
|
|
90
|
+
* Range sets provide a data structure that can hold a collection of tagged,
|
|
91
|
+
* possibly overlapping ranges in such a way that they can efficiently be mapped though document changes.
|
|
92
|
+
* https://codemirror.net/docs/ref/#state
|
|
59
93
|
*/
|
|
60
|
-
|
|
61
|
-
return StateField.define<RangeSet<any>>({
|
|
62
|
-
create: (state) => update(state, link),
|
|
63
|
-
update: (_: RangeSet<any>, tr: Transaction) => update(tr.state, link),
|
|
64
|
-
provide: (field) => EditorView.decorations.from(field),
|
|
65
|
-
});
|
|
66
|
-
};
|
|
67
|
-
|
|
68
|
-
const update = (state: EditorState, link?: boolean) => {
|
|
94
|
+
const update = (state: EditorState, options: LinkOptions) => {
|
|
69
95
|
const builder = new RangeSetBuilder();
|
|
70
96
|
const cursor = state.selection.main.head;
|
|
97
|
+
|
|
71
98
|
syntaxTree(state).iterate({
|
|
72
99
|
enter: (node) => {
|
|
73
100
|
// Check if cursor is inside text.
|
|
74
|
-
if (
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
101
|
+
if (node.name === 'Link') {
|
|
102
|
+
const marks = node.node.getChildren('LinkMark');
|
|
103
|
+
const text = marks.length >= 2 ? state.sliceDoc(marks[0].to, marks[1].from) : '';
|
|
104
|
+
const urlNode = node.node.getChild('URL');
|
|
105
|
+
const url = urlNode ? state.sliceDoc(urlNode.from, urlNode.to) : '';
|
|
106
|
+
if (!url) {
|
|
107
|
+
return false;
|
|
108
|
+
}
|
|
81
109
|
|
|
110
|
+
if (state.readOnly || cursor < node.from || cursor > node.to) {
|
|
82
111
|
builder.add(
|
|
83
112
|
node.from,
|
|
84
113
|
node.to,
|
|
85
114
|
Decoration.replace({
|
|
86
|
-
widget: new
|
|
115
|
+
widget: new LinkText(node.from, text, options.link ? url : undefined),
|
|
87
116
|
}),
|
|
88
117
|
);
|
|
118
|
+
}
|
|
89
119
|
|
|
90
|
-
|
|
120
|
+
if (options.onRender) {
|
|
121
|
+
builder.add(
|
|
122
|
+
node.to,
|
|
123
|
+
node.to,
|
|
124
|
+
Decoration.replace({
|
|
125
|
+
widget: new LinkButton(node.from, url, options.onRender),
|
|
126
|
+
}),
|
|
127
|
+
);
|
|
91
128
|
}
|
|
92
|
-
}
|
|
93
129
|
|
|
94
|
-
|
|
130
|
+
return false;
|
|
131
|
+
}
|
|
95
132
|
},
|
|
96
133
|
});
|
|
97
134
|
|
|
@@ -4,13 +4,13 @@
|
|
|
4
4
|
|
|
5
5
|
import { StateField } from '@codemirror/state';
|
|
6
6
|
|
|
7
|
+
export type ListenerOptions = { onChange: (text: string) => void };
|
|
8
|
+
|
|
7
9
|
/**
|
|
8
10
|
* Based on https://github.com/codemirror/dev/issues/44#issuecomment-789093799
|
|
9
|
-
* @param onChange
|
|
10
11
|
*/
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
StateField.define({
|
|
12
|
+
export const listener = ({ onChange }: ListenerOptions) => {
|
|
13
|
+
return StateField.define({
|
|
14
14
|
create: () => null,
|
|
15
15
|
update: (_value, transaction) => {
|
|
16
16
|
if (transaction.docChanged && onChange) {
|
|
@@ -20,3 +20,4 @@ export const onChangeExtension = (onChange: (text: string) => void) =>
|
|
|
20
20
|
return null;
|
|
21
21
|
},
|
|
22
22
|
});
|
|
23
|
+
};
|
|
@@ -3,18 +3,11 @@
|
|
|
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
|
-
import {
|
|
9
|
-
bracketMatching,
|
|
10
|
-
defaultHighlightStyle,
|
|
11
|
-
foldKeymap,
|
|
12
|
-
indentOnInput,
|
|
13
|
-
syntaxHighlighting,
|
|
14
|
-
} from '@codemirror/language';
|
|
8
|
+
import { bracketMatching, defaultHighlightStyle, indentOnInput, syntaxHighlighting } from '@codemirror/language';
|
|
15
9
|
import { languages } from '@codemirror/language-data';
|
|
16
|
-
import {
|
|
17
|
-
import { highlightSelectionMatches, searchKeymap } from '@codemirror/search';
|
|
10
|
+
import { searchKeymap } from '@codemirror/search';
|
|
18
11
|
import { EditorState, type Extension } from '@codemirror/state';
|
|
19
12
|
import { oneDarkHighlightStyle } from '@codemirror/theme-one-dark';
|
|
20
13
|
import {
|
|
@@ -23,77 +16,91 @@ import {
|
|
|
23
16
|
dropCursor,
|
|
24
17
|
EditorView,
|
|
25
18
|
highlightActiveLine,
|
|
26
|
-
highlightActiveLineGutter,
|
|
27
|
-
highlightSpecialChars,
|
|
28
19
|
keymap,
|
|
29
20
|
placeholder,
|
|
30
|
-
rectangularSelection,
|
|
31
21
|
} from '@codemirror/view';
|
|
32
|
-
// import { GFM } from '@lezer/markdown';
|
|
33
22
|
|
|
34
23
|
import type { ThemeMode } from '@dxos/react-ui';
|
|
35
24
|
|
|
36
|
-
import {
|
|
37
|
-
import { markdownHighlightStyle } from './theme';
|
|
25
|
+
import { markdownHighlightStyle, markdownTagsExtensions } from './highlight';
|
|
38
26
|
|
|
39
27
|
export type MarkdownBundleOptions = {
|
|
28
|
+
readonly?: boolean;
|
|
40
29
|
themeMode?: ThemeMode;
|
|
41
30
|
placeholder?: string;
|
|
42
31
|
};
|
|
43
32
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
33
|
+
/**
|
|
34
|
+
* Markdown bundle.
|
|
35
|
+
* Refs:
|
|
36
|
+
* https://github.com/codemirror/basic-setup
|
|
37
|
+
* https://github.com/codemirror/basic-setup/blob/main/src/codemirror.ts#L50
|
|
38
|
+
* https://codemirror.net/docs/community
|
|
39
|
+
* https://codemirror.net/docs/ref/#codemirror.basicSetup
|
|
40
|
+
*/
|
|
41
|
+
// TODO(burdon): Add Composer here: https://codemirror.net/docs/community
|
|
42
|
+
export const markdownBundle = ({
|
|
43
|
+
readonly,
|
|
44
|
+
themeMode,
|
|
45
|
+
placeholder: _placeholder,
|
|
46
|
+
}: MarkdownBundleOptions): Extension[] => {
|
|
47
47
|
return [
|
|
48
|
-
bracketMatching(),
|
|
49
|
-
closeBrackets(),
|
|
50
|
-
_placeholder && placeholder(_placeholder),
|
|
51
|
-
|
|
52
48
|
EditorState.allowMultipleSelections.of(true),
|
|
49
|
+
EditorState.tabSize.of(2),
|
|
53
50
|
EditorView.lineWrapping,
|
|
54
51
|
|
|
55
|
-
|
|
52
|
+
customKeymap(),
|
|
53
|
+
|
|
54
|
+
bracketMatching(),
|
|
55
|
+
closeBrackets(),
|
|
56
56
|
crosshairCursor(),
|
|
57
57
|
dropCursor(),
|
|
58
58
|
drawSelection(),
|
|
59
59
|
highlightActiveLine(),
|
|
60
|
-
highlightActiveLineGutter(),
|
|
61
|
-
highlightSelectionMatches(),
|
|
62
|
-
highlightSpecialChars(),
|
|
63
60
|
history(),
|
|
64
61
|
indentOnInput(),
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
keymap.of([
|
|
68
|
-
...closeBracketsKeymap,
|
|
69
|
-
// ...completionKeymap,
|
|
70
|
-
...defaultKeymap,
|
|
71
|
-
...foldKeymap,
|
|
72
|
-
...historyKeymap,
|
|
73
|
-
...lintKeymap,
|
|
74
|
-
...searchKeymap,
|
|
75
|
-
indentWithTab,
|
|
76
|
-
]),
|
|
62
|
+
_placeholder && placeholder(_placeholder),
|
|
77
63
|
|
|
78
64
|
// Main extension.
|
|
79
65
|
// https://github.com/codemirror/lang-markdown
|
|
66
|
+
// https://codemirror.net/5/mode/markdown/index.html (demo).
|
|
80
67
|
markdown({
|
|
68
|
+
// GRM by default (vs strict CommonMark):
|
|
69
|
+
// Table, TaskList, Strikethrough, and Autolink.
|
|
70
|
+
// NOTE: This extends the parser; it doesn't affect rendering.
|
|
71
|
+
// https://github.github.com/gfm
|
|
72
|
+
// https://github.com/lezer-parser/markdown?tab=readme-ov-file#github-flavored-markdown
|
|
81
73
|
base: markdownLanguage,
|
|
74
|
+
|
|
75
|
+
// Languages for syntax highlighting fenced code blocks.
|
|
82
76
|
codeLanguages: languages,
|
|
83
|
-
extensions: [
|
|
84
|
-
// TODO(burdon): This seems to upgrade the parser.
|
|
85
|
-
// GitHub flavored markdown bundle: Table, TaskList, Strikethrough, and Autolink.
|
|
86
|
-
// https://github.com/lezer-parser/markdown?tab=readme-ov-file#github-flavored-markdown
|
|
87
|
-
// https://github.github.com/gfm
|
|
88
|
-
// GFM,
|
|
89
77
|
|
|
90
|
-
|
|
91
|
-
|
|
78
|
+
// Parser extensions.
|
|
79
|
+
extensions: [
|
|
80
|
+
// GFM provided by default.
|
|
81
|
+
markdownTagsExtensions,
|
|
92
82
|
],
|
|
93
83
|
}),
|
|
94
84
|
|
|
95
|
-
//
|
|
96
|
-
syntaxHighlighting(markdownHighlightStyle),
|
|
85
|
+
// https://github.com/codemirror/theme-one-dark
|
|
97
86
|
themeMode === 'dark' ? syntaxHighlighting(oneDarkHighlightStyle) : syntaxHighlighting(defaultHighlightStyle),
|
|
87
|
+
|
|
88
|
+
// Custom styles.
|
|
89
|
+
syntaxHighlighting(markdownHighlightStyle(readonly)),
|
|
98
90
|
].filter(Boolean) as Extension[];
|
|
99
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
|
+
]);
|
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2023 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { markdownLanguage } from '@codemirror/lang-markdown';
|
|
6
|
+
import { HighlightStyle } from '@codemirror/language';
|
|
7
|
+
import { tags, styleTags, Tag } from '@lezer/highlight';
|
|
8
|
+
import { type MarkdownConfig, Table } from '@lezer/markdown';
|
|
9
|
+
import get from 'lodash.get';
|
|
10
|
+
|
|
11
|
+
import {
|
|
12
|
+
blockquote,
|
|
13
|
+
bold,
|
|
14
|
+
code,
|
|
15
|
+
codeMark,
|
|
16
|
+
heading,
|
|
17
|
+
inlineUrl,
|
|
18
|
+
italic,
|
|
19
|
+
mark,
|
|
20
|
+
strikethrough,
|
|
21
|
+
tokens,
|
|
22
|
+
} from '../../../../styles';
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Custom tags defined and processed by the GFM lezer extension.
|
|
26
|
+
* https://github.com/lezer-parser/markdown
|
|
27
|
+
* https://github.com/lezer-parser/markdown/blob/main/src/markdown.ts
|
|
28
|
+
*/
|
|
29
|
+
export const markdownTags = {
|
|
30
|
+
Blockquote: Tag.define(),
|
|
31
|
+
CodeMark: Tag.define(),
|
|
32
|
+
CodeText: Tag.define(),
|
|
33
|
+
EmphasisMark: Tag.define(),
|
|
34
|
+
HeaderMark: Tag.define(),
|
|
35
|
+
// HorizontalRule: Tag.define(),
|
|
36
|
+
InlineCode: Tag.define(),
|
|
37
|
+
LinkLabel: Tag.define(),
|
|
38
|
+
LinkReference: Tag.define(),
|
|
39
|
+
ListMark: Tag.define(),
|
|
40
|
+
QuoteMark: Tag.define(),
|
|
41
|
+
URL: Tag.define(),
|
|
42
|
+
|
|
43
|
+
// Custom.
|
|
44
|
+
TableCell: Tag.define(),
|
|
45
|
+
};
|
|
46
|
+
|
|
47
|
+
// TODO(burdon): Customize table parser (make all content monospace).
|
|
48
|
+
// https://github.com/lezer-parser/markdown/blob/main/src/extension.ts
|
|
49
|
+
Table.defineNodes?.forEach((node: any) => {
|
|
50
|
+
switch (node?.name) {
|
|
51
|
+
case 'TableCell': {
|
|
52
|
+
node.style = markdownTags.TableCell;
|
|
53
|
+
break;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
export const markdownTagsExtensions: MarkdownConfig[] = [
|
|
59
|
+
Table,
|
|
60
|
+
{
|
|
61
|
+
props: [styleTags(markdownTags)],
|
|
62
|
+
},
|
|
63
|
+
];
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* Styling based on `lezer` parser tags.
|
|
67
|
+
* https://codemirror.net/examples/styling
|
|
68
|
+
* https://github.com/lezer-parser/highlight
|
|
69
|
+
* https://github.com/lezer-parser/highlight/blob/main/src/highlight.ts#L427
|
|
70
|
+
* https://lezer.codemirror.net/docs/ref/#highlight.tags (list of tags)
|
|
71
|
+
*
|
|
72
|
+
* Examples:
|
|
73
|
+
* - https://github.com/codemirror/language/blob/main/src/highlight.ts#L194
|
|
74
|
+
* - https://github.com/codemirror/theme-one-dark/blob/main/src/one-dark.ts#L115
|
|
75
|
+
*/
|
|
76
|
+
export const markdownHighlightStyle = (readonly?: boolean) => {
|
|
77
|
+
return HighlightStyle.define(
|
|
78
|
+
[
|
|
79
|
+
{
|
|
80
|
+
tag: [
|
|
81
|
+
tags.keyword,
|
|
82
|
+
tags.name,
|
|
83
|
+
tags.deleted,
|
|
84
|
+
tags.character,
|
|
85
|
+
tags.propertyName,
|
|
86
|
+
tags.macroName,
|
|
87
|
+
tags.color,
|
|
88
|
+
tags.constant(tags.name),
|
|
89
|
+
tags.standard(tags.name),
|
|
90
|
+
tags.definition(tags.name),
|
|
91
|
+
tags.separator,
|
|
92
|
+
tags.typeName,
|
|
93
|
+
tags.className,
|
|
94
|
+
tags.number,
|
|
95
|
+
tags.changed,
|
|
96
|
+
tags.annotation,
|
|
97
|
+
tags.modifier,
|
|
98
|
+
tags.self,
|
|
99
|
+
tags.namespace,
|
|
100
|
+
tags.operator,
|
|
101
|
+
tags.operatorKeyword,
|
|
102
|
+
tags.escape,
|
|
103
|
+
tags.regexp,
|
|
104
|
+
tags.special(tags.string),
|
|
105
|
+
tags.meta,
|
|
106
|
+
tags.comment,
|
|
107
|
+
tags.atom,
|
|
108
|
+
tags.bool,
|
|
109
|
+
tags.special(tags.variableName),
|
|
110
|
+
tags.processingInstruction,
|
|
111
|
+
tags.string,
|
|
112
|
+
tags.inserted,
|
|
113
|
+
tags.invalid,
|
|
114
|
+
],
|
|
115
|
+
color: 'inherit !important',
|
|
116
|
+
},
|
|
117
|
+
|
|
118
|
+
// Markdown marks.
|
|
119
|
+
{
|
|
120
|
+
tag: [
|
|
121
|
+
tags.meta,
|
|
122
|
+
tags.processingInstruction,
|
|
123
|
+
markdownTags.LinkLabel,
|
|
124
|
+
markdownTags.LinkReference,
|
|
125
|
+
markdownTags.ListMark,
|
|
126
|
+
],
|
|
127
|
+
class: mark,
|
|
128
|
+
},
|
|
129
|
+
|
|
130
|
+
// Markdown marks.
|
|
131
|
+
{
|
|
132
|
+
tag: [markdownTags.CodeMark, markdownTags.HeaderMark, markdownTags.QuoteMark, markdownTags.EmphasisMark],
|
|
133
|
+
class: readonly ? 'hidden' : mark,
|
|
134
|
+
},
|
|
135
|
+
|
|
136
|
+
// E.g., code block language (after ```).
|
|
137
|
+
{
|
|
138
|
+
tag: [tags.function(tags.variableName), tags.labelName],
|
|
139
|
+
class: readonly ? 'hidden' : codeMark,
|
|
140
|
+
},
|
|
141
|
+
|
|
142
|
+
{
|
|
143
|
+
tag: [tags.monospace],
|
|
144
|
+
class: 'font-mono',
|
|
145
|
+
},
|
|
146
|
+
|
|
147
|
+
// Headings.
|
|
148
|
+
{ tag: tags.heading1, class: heading(1, readonly) },
|
|
149
|
+
{ tag: tags.heading2, class: heading(2, readonly) },
|
|
150
|
+
{ tag: tags.heading3, class: heading(3, readonly) },
|
|
151
|
+
{ tag: tags.heading4, class: heading(4, readonly) },
|
|
152
|
+
{ tag: tags.heading5, class: heading(5, readonly) },
|
|
153
|
+
{ tag: tags.heading6, class: heading(6, readonly) },
|
|
154
|
+
|
|
155
|
+
// Emphasis.
|
|
156
|
+
{ tag: tags.emphasis, class: italic },
|
|
157
|
+
{ tag: tags.strong, class: bold },
|
|
158
|
+
{ tag: tags.strikethrough, class: strikethrough },
|
|
159
|
+
|
|
160
|
+
// Naked URLs.
|
|
161
|
+
{
|
|
162
|
+
tag: [markdownTags.URL],
|
|
163
|
+
class: inlineUrl,
|
|
164
|
+
},
|
|
165
|
+
|
|
166
|
+
// NOTE: The `markdown` extension configures extensions for `lezer` to parse markdown tokens (incl. below).
|
|
167
|
+
// However, since `codeLanguages` is also defined, the `lezer` will not parse fenced code blocks,
|
|
168
|
+
// when a language is specified. In this case, the syntax highlighting extensions will colorize
|
|
169
|
+
// the code, but all other CSS properties will be inherited.
|
|
170
|
+
// IMPORTANT: Therefore, the fenced code block will use the base editor font.
|
|
171
|
+
{
|
|
172
|
+
tag: [markdownTags.CodeText, markdownTags.InlineCode],
|
|
173
|
+
class: code,
|
|
174
|
+
},
|
|
175
|
+
|
|
176
|
+
{
|
|
177
|
+
tag: [markdownTags.QuoteMark],
|
|
178
|
+
class: blockquote,
|
|
179
|
+
},
|
|
180
|
+
|
|
181
|
+
// TODO(burdon): Replace with extension.
|
|
182
|
+
// {
|
|
183
|
+
// tag: [markdownTags.HorizontalRule],
|
|
184
|
+
// class: mx(horizontalRule, readonly && '-indent-[100rem]'),
|
|
185
|
+
// },
|
|
186
|
+
|
|
187
|
+
// TODO(burdon): Only if being edited.
|
|
188
|
+
{
|
|
189
|
+
tag: [markdownTags.TableCell],
|
|
190
|
+
class: 'font-mono',
|
|
191
|
+
},
|
|
192
|
+
|
|
193
|
+
// Main content, paragraphs, etc.
|
|
194
|
+
// {
|
|
195
|
+
// tag: [tags.content],
|
|
196
|
+
// fontFamily: get(tokens, 'fontFamily.body', []).join(','),
|
|
197
|
+
// },
|
|
198
|
+
],
|
|
199
|
+
{
|
|
200
|
+
scope: markdownLanguage,
|
|
201
|
+
all: { fontFamily: get(tokens, 'fontFamily.body', []).join(',') },
|
|
202
|
+
},
|
|
203
|
+
);
|
|
204
|
+
};
|
|
@@ -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,11 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2024 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { type Extension } from '@codemirror/state';
|
|
6
|
+
|
|
7
|
+
// TODO(burdon): How will this interact with the code extension?
|
|
8
|
+
// TODO(burdon): Move to mermaid-plugin (which should contribute this extension).
|
|
9
|
+
export const mermaid = (): Extension => {
|
|
10
|
+
return [];
|
|
11
|
+
};
|