@dxos/react-ui-editor 0.3.10 → 0.3.11-main.00a28cb
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 +1724 -1105
- 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 +24 -13
- package/dist/types/src/components/TextEditor/MarkdownEditor.stories.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/TextEditor.d.ts +15 -19
- package/dist/types/src/components/TextEditor/TextEditor.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/TextEditor.stories.d.ts +6 -3
- package/dist/types/src/components/TextEditor/TextEditor.stories.d.ts.map +1 -1
- package/dist/types/src/{hooks/automerge → components/TextEditor}/automerge.stories.d.ts +6 -2
- package/dist/types/src/components/TextEditor/automerge.stories.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/codemirror.stories.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/comments.stories.d.ts +26 -0
- package/dist/types/src/components/TextEditor/comments.stories.d.ts.map +1 -0
- package/dist/types/src/components/TextEditor/index.d.ts +0 -2
- package/dist/types/src/components/TextEditor/index.d.ts.map +1 -1
- package/dist/types/src/{hooks/yjs → components/TextEditor}/yjs.stories.d.ts +1 -1
- package/dist/types/src/components/TextEditor/yjs.stories.d.ts.map +1 -0
- package/dist/types/src/extensions/autocomplete.d.ts.map +1 -0
- package/dist/types/src/extensions/automerge/automerge.d.ts +9 -0
- package/dist/types/src/extensions/automerge/automerge.d.ts.map +1 -0
- package/dist/types/src/extensions/automerge/cursor.d.ts +5 -0
- package/dist/types/src/extensions/automerge/cursor.d.ts.map +1 -0
- package/dist/types/src/extensions/automerge/defs.d.ts +26 -0
- package/dist/types/src/extensions/automerge/defs.d.ts.map +1 -0
- package/dist/types/src/extensions/automerge/index.d.ts +3 -0
- package/dist/types/src/extensions/automerge/index.d.ts.map +1 -0
- package/dist/types/src/extensions/automerge/semaphore.d.ts +14 -0
- package/dist/types/src/extensions/automerge/semaphore.d.ts.map +1 -0
- package/dist/types/src/extensions/automerge/update-automerge.d.ts +5 -0
- package/dist/types/src/extensions/automerge/update-automerge.d.ts.map +1 -0
- package/dist/types/src/extensions/automerge/update-codemirror.d.ts +5 -0
- package/dist/types/src/extensions/automerge/update-codemirror.d.ts.map +1 -0
- package/dist/types/src/extensions/awareness.d.ts +46 -0
- package/dist/types/src/extensions/awareness.d.ts.map +1 -0
- package/dist/types/src/extensions/basic.d.ts.map +1 -0
- package/dist/types/src/extensions/blast.d.ts.map +1 -0
- package/dist/types/src/extensions/code.d.ts.map +1 -0
- package/dist/types/src/extensions/comments.d.ts +59 -0
- package/dist/types/src/extensions/comments.d.ts.map +1 -0
- package/dist/types/src/extensions/cursor.d.ts +25 -0
- package/dist/types/src/extensions/cursor.d.ts.map +1 -0
- package/dist/types/src/extensions/hr.d.ts +2 -0
- package/dist/types/src/extensions/hr.d.ts.map +1 -0
- package/dist/types/src/extensions/image.d.ts.map +1 -0
- package/dist/types/src/{components/TextEditor/extensions → extensions}/index.d.ts +7 -3
- package/dist/types/src/extensions/index.d.ts.map +1 -0
- package/dist/types/src/{components/TextEditor/extensions → extensions}/link.d.ts +1 -0
- package/dist/types/src/extensions/link.d.ts.map +1 -0
- package/dist/types/src/extensions/listener.d.ts +10 -0
- package/dist/types/src/extensions/listener.d.ts.map +1 -0
- package/dist/types/src/extensions/markdown/bundle.d.ts.map +1 -0
- package/dist/types/src/{components/TextEditor/extensions → extensions}/markdown/highlight.d.ts +0 -1
- package/dist/types/src/extensions/markdown/highlight.d.ts.map +1 -0
- package/dist/types/src/extensions/markdown/index.d.ts.map +1 -0
- package/dist/types/src/extensions/mention.d.ts.map +1 -0
- package/dist/types/src/extensions/outliner.d.ts +4 -0
- package/dist/types/src/extensions/outliner.d.ts.map +1 -0
- package/dist/types/src/extensions/table.d.ts.map +1 -0
- package/dist/types/src/extensions/tasklist.d.ts +7 -0
- package/dist/types/src/extensions/tasklist.d.ts.map +1 -0
- package/dist/types/src/{components/TextEditor/extensions/demo.d.ts → extensions/typewriter.d.ts} +2 -3
- package/dist/types/src/extensions/typewriter.d.ts.map +1 -0
- package/dist/types/src/extensions/yjs/cursor.d.ts +4 -0
- package/dist/types/src/extensions/yjs/cursor.d.ts.map +1 -0
- package/dist/types/src/extensions/yjs/index.d.ts +2 -0
- package/dist/types/src/extensions/yjs/index.d.ts.map +1 -0
- package/dist/types/src/extensions/yjs/yjs.d.ts +4 -0
- package/dist/types/src/extensions/yjs/yjs.d.ts.map +1 -0
- package/dist/types/src/extensions/yjs/yjs.test.d.ts +2 -0
- package/dist/types/src/extensions/yjs/yjs.test.d.ts.map +1 -0
- package/dist/types/src/hooks/automerge.d.ts +3 -0
- package/dist/types/src/hooks/automerge.d.ts.map +1 -0
- package/dist/types/src/hooks/awareness-provider.d.ts +28 -0
- package/dist/types/src/hooks/awareness-provider.d.ts.map +1 -0
- package/dist/types/src/hooks/index.d.ts +3 -1
- package/dist/types/src/hooks/index.d.ts.map +1 -1
- package/dist/types/src/hooks/useTextModel.d.ts +15 -11
- package/dist/types/src/hooks/useTextModel.d.ts.map +1 -1
- package/dist/types/src/hooks/{yjs/space-provider.d.ts → yjs.d.ts} +8 -8
- package/dist/types/src/hooks/yjs.d.ts.map +1 -0
- package/dist/types/src/index.d.ts +6 -0
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/styles/cursors.d.ts.map +1 -0
- package/dist/types/src/styles/index.d.ts +1 -0
- package/dist/types/src/styles/index.d.ts.map +1 -1
- package/dist/types/src/styles/markdown.d.ts.map +1 -1
- package/dist/types/src/styles/tokens.d.ts +1 -0
- package/dist/types/src/styles/tokens.d.ts.map +1 -1
- package/dist/types/src/testing/replicator.d.ts +2 -2
- package/dist/types/src/testing/replicator.d.ts.map +1 -1
- package/dist/types/src/{components/TextEditor/themes → themes}/default.d.ts +5 -13
- package/dist/types/src/themes/default.d.ts.map +1 -0
- package/dist/types/src/themes/index.d.ts.map +1 -0
- package/dist/types/src/util.d.ts +5 -0
- package/dist/types/src/util.d.ts.map +1 -0
- package/package.json +28 -22
- package/src/components/TextEditor/MarkdownEditor.stories.tsx +150 -87
- package/src/components/TextEditor/TextEditor.stories.tsx +14 -35
- package/src/components/TextEditor/TextEditor.tsx +87 -79
- package/src/{hooks/automerge → components/TextEditor}/automerge.stories.tsx +67 -8
- package/src/components/TextEditor/codemirror.stories.ts +3 -2
- package/src/components/TextEditor/comments.stories.tsx +355 -0
- package/src/components/TextEditor/index.ts +0 -3
- package/src/{hooks/yjs → components/TextEditor}/yjs.stories.tsx +1 -1
- package/src/{components/TextEditor/extensions → extensions}/autocomplete.ts +18 -17
- package/src/extensions/automerge/automerge.ts +92 -0
- package/src/extensions/automerge/cursor.ts +52 -0
- package/src/extensions/automerge/defs.ts +66 -0
- package/src/extensions/automerge/index.ts +6 -0
- package/src/{hooks/automerge/PatchSemaphore.ts → extensions/automerge/semaphore.ts} +26 -25
- package/src/{hooks/automerge/translation/codemirror-to-automerge.ts → extensions/automerge/update-automerge.ts} +6 -7
- package/src/{hooks/automerge/translation/automerge-to-codemirror.ts → extensions/automerge/update-codemirror.ts} +14 -11
- package/src/extensions/awareness.ts +310 -0
- package/src/extensions/code.ts +104 -0
- package/src/extensions/comments.ts +408 -0
- package/src/extensions/cursor.ts +46 -0
- package/src/extensions/hr.ts +72 -0
- package/src/extensions/image.ts +87 -0
- package/src/{components/TextEditor/extensions → extensions}/index.ts +7 -3
- package/src/{components/TextEditor/extensions → extensions}/link.ts +116 -62
- package/src/extensions/listener.ts +35 -0
- package/src/{components/TextEditor/extensions → extensions}/markdown/highlight.ts +4 -16
- package/src/extensions/outliner.ts +12 -0
- package/src/{components/TextEditor/extensions → extensions}/table.ts +23 -4
- package/src/extensions/tasklist.ts +96 -0
- package/src/{components/TextEditor/extensions/demo.ts → extensions/typewriter.ts} +2 -3
- package/src/extensions/yjs/cursor.ts +22 -0
- package/src/extensions/yjs/index.ts +5 -0
- package/src/extensions/yjs/yjs.test.ts +35 -0
- package/src/extensions/yjs/yjs.ts +16 -0
- package/src/hooks/automerge.ts +52 -0
- package/src/hooks/awareness-provider.ts +120 -0
- package/src/hooks/index.ts +4 -1
- package/src/hooks/useTextModel.ts +40 -79
- package/src/hooks/{yjs/space-provider.ts → yjs.ts} +49 -19
- package/src/index.ts +6 -0
- package/src/styles/index.ts +1 -0
- package/src/styles/markdown.ts +0 -2
- package/src/styles/tokens.ts +3 -0
- package/src/testing/replicator.ts +10 -16
- package/src/themes/default.ts +275 -0
- package/src/util.ts +18 -0
- package/dist/types/src/components/TextEditor/extensions/autocomplete.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/basic.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/blast.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/code.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/comments.d.ts +0 -18
- package/dist/types/src/components/TextEditor/extensions/comments.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/demo.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/experimental.d.ts +0 -10
- package/dist/types/src/components/TextEditor/extensions/experimental.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/highlight.d.ts +0 -24
- package/dist/types/src/components/TextEditor/extensions/highlight.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/image.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/index.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/link.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/listener.d.ts +0 -9
- package/dist/types/src/components/TextEditor/extensions/listener.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/bundle.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/highlight.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/index.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/mention.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/table.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/tasklist.d.ts +0 -3
- package/dist/types/src/components/TextEditor/extensions/tasklist.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/tooltip.d.ts +0 -12
- package/dist/types/src/components/TextEditor/extensions/tooltip.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/themes/default.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/themes/index.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/PatchSemaphore.d.ts +0 -19
- package/dist/types/src/hooks/automerge/PatchSemaphore.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/automerge.stories.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/handle.d.ts +0 -9
- package/dist/types/src/hooks/automerge/handle.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/index.d.ts +0 -3
- package/dist/types/src/hooks/automerge/index.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/plugin.d.ts +0 -26
- package/dist/types/src/hooks/automerge/plugin.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/translation/automerge-to-codemirror.d.ts +0 -5
- package/dist/types/src/hooks/automerge/translation/automerge-to-codemirror.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/translation/codemirror-to-automerge.d.ts +0 -6
- package/dist/types/src/hooks/automerge/translation/codemirror-to-automerge.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/translation/index.d.ts +0 -3
- package/dist/types/src/hooks/automerge/translation/index.d.ts.map +0 -1
- package/dist/types/src/hooks/yjs/cursors.d.ts.map +0 -1
- package/dist/types/src/hooks/yjs/index.d.ts +0 -3
- package/dist/types/src/hooks/yjs/index.d.ts.map +0 -1
- package/dist/types/src/hooks/yjs/space-provider.d.ts.map +0 -1
- package/dist/types/src/hooks/yjs/yjs.stories.d.ts.map +0 -1
- package/src/components/TextEditor/extensions/code.ts +0 -99
- package/src/components/TextEditor/extensions/comments.ts +0 -173
- package/src/components/TextEditor/extensions/experimental.tsx +0 -114
- package/src/components/TextEditor/extensions/highlight.ts +0 -128
- package/src/components/TextEditor/extensions/image.ts +0 -67
- package/src/components/TextEditor/extensions/listener.ts +0 -23
- package/src/components/TextEditor/extensions/tasklist.ts +0 -121
- package/src/components/TextEditor/extensions/tooltip.tsx +0 -61
- package/src/components/TextEditor/themes/default.ts +0 -279
- package/src/hooks/automerge/handle.ts +0 -14
- package/src/hooks/automerge/index.ts +0 -6
- package/src/hooks/automerge/plugin.ts +0 -134
- package/src/hooks/automerge/translation/index.ts +0 -6
- package/src/hooks/yjs/index.ts +0 -6
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/autocomplete.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/basic.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/blast.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/code.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/image.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/markdown/bundle.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/markdown/index.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/mention.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/table.d.ts +0 -0
- /package/dist/types/src/{hooks/yjs → styles}/cursors.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/themes → themes}/index.d.ts +0 -0
- /package/src/{components/TextEditor/extensions → extensions}/basic.ts +0 -0
- /package/src/{components/TextEditor/extensions → extensions}/blast.ts +0 -0
- /package/src/{components/TextEditor/extensions → extensions}/markdown/bundle.ts +0 -0
- /package/src/{components/TextEditor/extensions → extensions}/markdown/index.ts +0 -0
- /package/src/{components/TextEditor/extensions → extensions}/mention.ts +0 -0
- /package/src/{hooks/yjs → styles}/cursors.ts +0 -0
- /package/src/{components/TextEditor/themes → themes}/index.ts +0 -0
|
@@ -1,99 +0,0 @@
|
|
|
1
|
-
//
|
|
2
|
-
// Copyright 2023 DXOS.org
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
import { type Range } from '@codemirror/state';
|
|
6
|
-
import {
|
|
7
|
-
ViewPlugin,
|
|
8
|
-
type DecorationSet,
|
|
9
|
-
EditorView,
|
|
10
|
-
type ViewUpdate,
|
|
11
|
-
Decoration,
|
|
12
|
-
type BlockInfo,
|
|
13
|
-
} from '@codemirror/view';
|
|
14
|
-
import get from 'lodash.get';
|
|
15
|
-
|
|
16
|
-
import { mx } from '@dxos/react-ui-theme';
|
|
17
|
-
|
|
18
|
-
import { tokens } from '../../../styles';
|
|
19
|
-
|
|
20
|
-
const CODE_REGEX = /```[\s\S]*?```/gs;
|
|
21
|
-
|
|
22
|
-
// TODO(burdon): Reconcile with theme.
|
|
23
|
-
const styles = EditorView.baseTheme({
|
|
24
|
-
'& .cm-code-block': {
|
|
25
|
-
display: 'block',
|
|
26
|
-
paddingInline: '4px !important',
|
|
27
|
-
},
|
|
28
|
-
'&light .cm-code-block': {
|
|
29
|
-
background: get(tokens, 'extend.colors.neutral.50'),
|
|
30
|
-
},
|
|
31
|
-
'&dark .cm-code-block': {
|
|
32
|
-
background: get(tokens, 'extend.colors.neutral.850'),
|
|
33
|
-
},
|
|
34
|
-
'& .cm-code-block-first': {
|
|
35
|
-
paddingTop: '4px !important',
|
|
36
|
-
borderTopLeftRadius: '4px',
|
|
37
|
-
borderTopRightRadius: '4px',
|
|
38
|
-
},
|
|
39
|
-
'& .cm-code-block-last': {
|
|
40
|
-
paddingBottom: '4px !important',
|
|
41
|
-
borderBottomLeftRadius: '4px',
|
|
42
|
-
borderBottomRightRadius: '4px',
|
|
43
|
-
},
|
|
44
|
-
});
|
|
45
|
-
|
|
46
|
-
const getLineRange = (lines: BlockInfo[], from: number, to: number) => {
|
|
47
|
-
const start = lines.findIndex((line) => line.from >= from);
|
|
48
|
-
const end = lines.findIndex((line) => line.to >= to);
|
|
49
|
-
return [start, end];
|
|
50
|
-
};
|
|
51
|
-
|
|
52
|
-
export const code = () => {
|
|
53
|
-
const getDecorations = (view: EditorView) => {
|
|
54
|
-
const decorations: Range<Decoration>[] = [];
|
|
55
|
-
if (view.state.readOnly) {
|
|
56
|
-
const text = view.state.doc.sliceString(0);
|
|
57
|
-
const matches = text.matchAll(CODE_REGEX);
|
|
58
|
-
const blocks = view.viewportLineBlocks;
|
|
59
|
-
for (const match of matches) {
|
|
60
|
-
const range = getLineRange(blocks, match.index!, match.index! + match[0].length);
|
|
61
|
-
for (let i = range[0]; i <= range[1]; i++) {
|
|
62
|
-
const block = blocks[i];
|
|
63
|
-
decorations.push(
|
|
64
|
-
Decoration.line({
|
|
65
|
-
class: mx(
|
|
66
|
-
'cm-code-block',
|
|
67
|
-
i === range[0] && 'cm-code-block-first',
|
|
68
|
-
i === range[1] && 'cm-code-block-last',
|
|
69
|
-
),
|
|
70
|
-
}).range(block.from),
|
|
71
|
-
);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
return Decoration.set(decorations);
|
|
77
|
-
};
|
|
78
|
-
|
|
79
|
-
return [
|
|
80
|
-
ViewPlugin.fromClass(
|
|
81
|
-
class {
|
|
82
|
-
decorations: DecorationSet;
|
|
83
|
-
constructor(view: EditorView) {
|
|
84
|
-
this.decorations = getDecorations(view);
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
update(update: ViewUpdate) {
|
|
88
|
-
if (update.docChanged || update.viewportChanged) {
|
|
89
|
-
this.decorations = getDecorations(update.view);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
},
|
|
93
|
-
{
|
|
94
|
-
decorations: (value) => value.decorations,
|
|
95
|
-
},
|
|
96
|
-
),
|
|
97
|
-
styles,
|
|
98
|
-
];
|
|
99
|
-
};
|
|
@@ -1,173 +0,0 @@
|
|
|
1
|
-
//
|
|
2
|
-
// Copyright 2023 DXOS.org
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
import { type Extension } from '@codemirror/state';
|
|
6
|
-
import {
|
|
7
|
-
keymap,
|
|
8
|
-
type DecorationSet,
|
|
9
|
-
type Rect,
|
|
10
|
-
type ViewUpdate,
|
|
11
|
-
Decoration,
|
|
12
|
-
EditorView,
|
|
13
|
-
MatchDecorator,
|
|
14
|
-
ViewPlugin,
|
|
15
|
-
WidgetType,
|
|
16
|
-
} from '@codemirror/view';
|
|
17
|
-
|
|
18
|
-
import { debounce } from '@dxos/async';
|
|
19
|
-
import { invariant } from '@dxos/invariant';
|
|
20
|
-
|
|
21
|
-
// TODO(burdon): Reconcile with theme.
|
|
22
|
-
const styles = EditorView.baseTheme({
|
|
23
|
-
'& .cm-bookmark': {
|
|
24
|
-
cursor: 'pointer',
|
|
25
|
-
margin: '4px',
|
|
26
|
-
padding: '4px',
|
|
27
|
-
backgroundColor: 'yellow',
|
|
28
|
-
},
|
|
29
|
-
'& .cm-bookmark-selected': {
|
|
30
|
-
backgroundColor: 'orange',
|
|
31
|
-
},
|
|
32
|
-
});
|
|
33
|
-
|
|
34
|
-
class BookmarkWidget extends WidgetType {
|
|
35
|
-
constructor(private readonly _pos: number, private readonly _id: string, private readonly _handleClick: () => void) {
|
|
36
|
-
super();
|
|
37
|
-
invariant(this._id);
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
override eq(other: BookmarkWidget) {
|
|
41
|
-
return this._id === other._id;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
override toDOM() {
|
|
45
|
-
const span = document.createElement('span');
|
|
46
|
-
span.className = 'cm-bookmark';
|
|
47
|
-
span.textContent = '§';
|
|
48
|
-
span.onclick = () => this._handleClick();
|
|
49
|
-
return span;
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
type CommentsInfo = {
|
|
54
|
-
active?: string;
|
|
55
|
-
items?: { id: string; pos: number; location: Rect | null }[];
|
|
56
|
-
};
|
|
57
|
-
|
|
58
|
-
export type CommentsOptions = {
|
|
59
|
-
key?: string;
|
|
60
|
-
onCreate?: (from: number, to: number) => string | void;
|
|
61
|
-
onUpdate?: (info: CommentsInfo) => void;
|
|
62
|
-
};
|
|
63
|
-
|
|
64
|
-
// https://www.markdownguide.org/extended-syntax/#footnotes
|
|
65
|
-
// TODO(burdon): Record span in automerge model?
|
|
66
|
-
// TODO(burdon): Extended markdown: https://www.markdownguide.org/extended-syntax
|
|
67
|
-
export const comments = (options: CommentsOptions = {}): Extension => {
|
|
68
|
-
let active: string | undefined;
|
|
69
|
-
|
|
70
|
-
const bookmarkMatcher = new MatchDecorator({
|
|
71
|
-
regexp: /\[\^(\w+)\]/g,
|
|
72
|
-
decoration: (match, view, pos) => {
|
|
73
|
-
const id = match[1];
|
|
74
|
-
return Decoration.replace({
|
|
75
|
-
id,
|
|
76
|
-
widget: new BookmarkWidget(pos, id, () => handleUpdate({ active: id })),
|
|
77
|
-
});
|
|
78
|
-
},
|
|
79
|
-
});
|
|
80
|
-
|
|
81
|
-
const bookmarks = ViewPlugin.fromClass(
|
|
82
|
-
class {
|
|
83
|
-
bookmarks: DecorationSet;
|
|
84
|
-
constructor(view: EditorView) {
|
|
85
|
-
this.bookmarks = bookmarkMatcher.createDeco(view);
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
update(update: ViewUpdate) {
|
|
89
|
-
this.bookmarks = bookmarkMatcher.updateDeco(update, this.bookmarks);
|
|
90
|
-
}
|
|
91
|
-
},
|
|
92
|
-
{
|
|
93
|
-
decorations: (instance) => instance.bookmarks,
|
|
94
|
-
provide: (plugin) =>
|
|
95
|
-
EditorView.atomicRanges.of((view) => {
|
|
96
|
-
return view.plugin(plugin)?.bookmarks || Decoration.none;
|
|
97
|
-
}),
|
|
98
|
-
},
|
|
99
|
-
);
|
|
100
|
-
|
|
101
|
-
const handleUpdate = debounce((data: CommentsInfo) => {
|
|
102
|
-
options.onUpdate?.(data);
|
|
103
|
-
}, 200);
|
|
104
|
-
|
|
105
|
-
return [
|
|
106
|
-
keymap.of([
|
|
107
|
-
{
|
|
108
|
-
key: options?.key ?? 'shift-meta-c',
|
|
109
|
-
run: (view) => {
|
|
110
|
-
// Insert footnote.
|
|
111
|
-
const { from, to, head } = view.state.selection.main;
|
|
112
|
-
const id = options.onCreate?.(from, to);
|
|
113
|
-
if (id) {
|
|
114
|
-
const tag = `[^${id}]`;
|
|
115
|
-
// TODO(burdon): Add selection.
|
|
116
|
-
view.dispatch({
|
|
117
|
-
changes: { from: head, insert: tag },
|
|
118
|
-
selection: { anchor: head + tag.length },
|
|
119
|
-
});
|
|
120
|
-
|
|
121
|
-
return true;
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
return false;
|
|
125
|
-
},
|
|
126
|
-
},
|
|
127
|
-
]),
|
|
128
|
-
|
|
129
|
-
bookmarks,
|
|
130
|
-
|
|
131
|
-
// Monitor cursor movement.
|
|
132
|
-
EditorView.updateListener.of((update) => {
|
|
133
|
-
active = undefined;
|
|
134
|
-
if (!options.onUpdate) {
|
|
135
|
-
return;
|
|
136
|
-
}
|
|
137
|
-
|
|
138
|
-
const { view, state } = update;
|
|
139
|
-
const pos = state.selection.main.head;
|
|
140
|
-
|
|
141
|
-
const decorations: { from: number; to: number; value: Decoration }[] = [];
|
|
142
|
-
const rangeSet = view.plugin(bookmarks)?.bookmarks;
|
|
143
|
-
let closest = Infinity;
|
|
144
|
-
// TODO(burdon): Handle multiple visible ranges in large documents.
|
|
145
|
-
const { from, to } = /* view.visibleRanges?.[0] ?? */ { from: 0, to: state.doc.length };
|
|
146
|
-
rangeSet?.between(from, to, (from, to, value) => {
|
|
147
|
-
decorations.push({ from, to, value });
|
|
148
|
-
const d = Math.min(Math.abs(pos - from), Math.abs(pos - to));
|
|
149
|
-
if (d < closest) {
|
|
150
|
-
// TODO(burdon): Update class of selected.
|
|
151
|
-
active = value.spec.id;
|
|
152
|
-
closest = d;
|
|
153
|
-
}
|
|
154
|
-
});
|
|
155
|
-
|
|
156
|
-
if (decorations.length) {
|
|
157
|
-
handleUpdate({
|
|
158
|
-
active,
|
|
159
|
-
items: decorations.map(
|
|
160
|
-
({
|
|
161
|
-
from,
|
|
162
|
-
value: {
|
|
163
|
-
spec: { id },
|
|
164
|
-
},
|
|
165
|
-
}) => ({ id: id as string, pos: from, location: view.coordsAtPos(from) }),
|
|
166
|
-
),
|
|
167
|
-
});
|
|
168
|
-
}
|
|
169
|
-
}),
|
|
170
|
-
|
|
171
|
-
styles,
|
|
172
|
-
];
|
|
173
|
-
};
|
|
@@ -1,114 +0,0 @@
|
|
|
1
|
-
//
|
|
2
|
-
// Copyright 2023 DXOS.org
|
|
3
|
-
// Adapted from: https://github.com/uiwjs/react-codemirror/blob/master/extensions/hyper-link/src/index.ts
|
|
4
|
-
//
|
|
5
|
-
|
|
6
|
-
import { type Extension } from '@codemirror/state';
|
|
7
|
-
import {
|
|
8
|
-
Decoration,
|
|
9
|
-
type DecorationSet,
|
|
10
|
-
EditorView,
|
|
11
|
-
MatchDecorator,
|
|
12
|
-
ViewPlugin,
|
|
13
|
-
type ViewUpdate,
|
|
14
|
-
} from '@codemirror/view';
|
|
15
|
-
|
|
16
|
-
// TODO(burdon): Reconcile with theme.
|
|
17
|
-
export const styles = EditorView.baseTheme({
|
|
18
|
-
'.cm-hyperlink-label': {
|
|
19
|
-
cursor: 'pointer',
|
|
20
|
-
textDecoration: 'underline',
|
|
21
|
-
},
|
|
22
|
-
'.cm-hyperlink-bracket': {
|
|
23
|
-
opacity: 0.2,
|
|
24
|
-
},
|
|
25
|
-
'.cm-hyperlink-url': {
|
|
26
|
-
opacity: 0.5,
|
|
27
|
-
fontFamily: 'monospace',
|
|
28
|
-
},
|
|
29
|
-
});
|
|
30
|
-
|
|
31
|
-
const markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)(!?)/gi;
|
|
32
|
-
|
|
33
|
-
/**
|
|
34
|
-
* Custom link decorator.
|
|
35
|
-
* NOTE: The default markdown extension formats links by default.
|
|
36
|
-
* @deprecated
|
|
37
|
-
*/
|
|
38
|
-
const linkDecorator = () =>
|
|
39
|
-
new MatchDecorator({
|
|
40
|
-
regexp: markdownLinkRegexp,
|
|
41
|
-
decorate: (add, from, to, match, view) => {
|
|
42
|
-
const [_, label, url] = match;
|
|
43
|
-
const p0 = {
|
|
44
|
-
start: from,
|
|
45
|
-
end: from + 1,
|
|
46
|
-
};
|
|
47
|
-
|
|
48
|
-
const p1 = {
|
|
49
|
-
start: from + 1,
|
|
50
|
-
end: from + 1 + label.length,
|
|
51
|
-
};
|
|
52
|
-
|
|
53
|
-
const p2 = {
|
|
54
|
-
start: p1.end,
|
|
55
|
-
end: p1.end + 1,
|
|
56
|
-
};
|
|
57
|
-
|
|
58
|
-
const p3 = {
|
|
59
|
-
start: p1.end + 1,
|
|
60
|
-
end: p1.end + 1 + url.length + 2,
|
|
61
|
-
};
|
|
62
|
-
|
|
63
|
-
add(
|
|
64
|
-
p0.start,
|
|
65
|
-
p0.end,
|
|
66
|
-
Decoration.mark({ class: 'cm-hyperlink-bracket', _attributes: { style: 'display: none' } }),
|
|
67
|
-
);
|
|
68
|
-
add(p1.start, p1.end, Decoration.mark({ class: 'cm-hyperlink-label' }));
|
|
69
|
-
add(
|
|
70
|
-
p2.start,
|
|
71
|
-
p2.end,
|
|
72
|
-
Decoration.mark({ class: 'cm-hyperlink-bracket', _attributes: { style: 'display: none' } }),
|
|
73
|
-
);
|
|
74
|
-
add(p3.start, p3.end, Decoration.mark({ class: 'cm-hyperlink-url', _attributes: { style: 'display: none' } }));
|
|
75
|
-
},
|
|
76
|
-
});
|
|
77
|
-
|
|
78
|
-
export function hyperLinkExtension() {
|
|
79
|
-
return ViewPlugin.fromClass(
|
|
80
|
-
class HyperLinkView {
|
|
81
|
-
readonly decorator: MatchDecorator;
|
|
82
|
-
decorations: DecorationSet;
|
|
83
|
-
constructor(view: EditorView) {
|
|
84
|
-
this.decorator = linkDecorator();
|
|
85
|
-
this.decorations = this.decorator.createDeco(view);
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
update(update: ViewUpdate) {
|
|
89
|
-
if (update.docChanged || update.viewportChanged) {
|
|
90
|
-
this.decorations = this.decorator.updateDeco(update, this.decorations);
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
},
|
|
94
|
-
{
|
|
95
|
-
decorations: (value) => value.decorations,
|
|
96
|
-
eventHandlers: {
|
|
97
|
-
// TODO(burdon): CLick to expand link.
|
|
98
|
-
// https://discuss.codemirror.net/t/decorator-iteration-on-click-event/4226/2
|
|
99
|
-
mousedown: function (event, view) {
|
|
100
|
-
const pos = view.posAtDOM(event.target as Node);
|
|
101
|
-
if (pos !== 0) {
|
|
102
|
-
console.log(this);
|
|
103
|
-
}
|
|
104
|
-
},
|
|
105
|
-
// TODO(burdon): Hide when cursor moves away.
|
|
106
|
-
keydown: (event, view) => {
|
|
107
|
-
view.update([]);
|
|
108
|
-
},
|
|
109
|
-
},
|
|
110
|
-
},
|
|
111
|
-
);
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
export const hyperlinkWidget: Extension = [hyperLinkExtension(), styles];
|
|
@@ -1,128 +0,0 @@
|
|
|
1
|
-
//
|
|
2
|
-
// Copyright 2023 DXOS.org
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
import { type Extension, StateEffect, StateField } from '@codemirror/state';
|
|
6
|
-
import { Decoration, EditorView } from '@codemirror/view';
|
|
7
|
-
import sortBy from 'lodash.sortby';
|
|
8
|
-
import { useEffect } from 'react';
|
|
9
|
-
|
|
10
|
-
import { type DocumentRange } from '../../../hooks';
|
|
11
|
-
|
|
12
|
-
// TODO(burdon): Detect click, or cursor proximity.
|
|
13
|
-
|
|
14
|
-
// TODO(burdon): Reconcile with theme.
|
|
15
|
-
const styles = EditorView.baseTheme({
|
|
16
|
-
'& .cm-highlight': {
|
|
17
|
-
backgroundColor: 'yellow', // TODO(burdon): Reconcile with tailwind theme.
|
|
18
|
-
},
|
|
19
|
-
'& .cm-highlight::before': {
|
|
20
|
-
content: ']',
|
|
21
|
-
},
|
|
22
|
-
'& .cm-highlight-active': {
|
|
23
|
-
backgroundColor: 'lime',
|
|
24
|
-
},
|
|
25
|
-
});
|
|
26
|
-
|
|
27
|
-
const marks = {
|
|
28
|
-
highlight: Decoration.mark({ class: 'cm-highlight' }),
|
|
29
|
-
HighlightActive: Decoration.mark({ class: 'cm-highlight-active' }),
|
|
30
|
-
};
|
|
31
|
-
|
|
32
|
-
type HighlightRange = DocumentRange & { active?: boolean };
|
|
33
|
-
|
|
34
|
-
// TODO(burdon): Make configurable to support multiple layers.
|
|
35
|
-
const setHighlights = StateEffect.define<HighlightRange[]>();
|
|
36
|
-
|
|
37
|
-
/**
|
|
38
|
-
* Update field set.
|
|
39
|
-
*/
|
|
40
|
-
// TODO(burdon): Reconcile range from data model, vs. in-markdown characters.
|
|
41
|
-
export const useHighlights = (view: EditorView | undefined, ranges: HighlightRange[] = []) => {
|
|
42
|
-
useEffect(() => {
|
|
43
|
-
view?.dispatch({
|
|
44
|
-
effects: setHighlights.of(ranges),
|
|
45
|
-
});
|
|
46
|
-
}, [view, ranges]);
|
|
47
|
-
};
|
|
48
|
-
|
|
49
|
-
/**
|
|
50
|
-
* State field that tracks highlight ranges.
|
|
51
|
-
*/
|
|
52
|
-
export const highlightStateField = StateField.define<HighlightRange[]>({
|
|
53
|
-
create: () => [],
|
|
54
|
-
update: (threads, tr) => {
|
|
55
|
-
for (const effect of tr.effects) {
|
|
56
|
-
if (effect.is(setHighlights)) {
|
|
57
|
-
return effect.value;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
return threads;
|
|
62
|
-
},
|
|
63
|
-
});
|
|
64
|
-
|
|
65
|
-
/**
|
|
66
|
-
* Decorate ranges.
|
|
67
|
-
*/
|
|
68
|
-
// TODO(burdon): Pass in field to make reusable (e.g., comments, search).
|
|
69
|
-
export const highlightDecorations = EditorView.decorations.compute([highlightStateField], (state) => {
|
|
70
|
-
const selectionRanges = state.field(highlightStateField);
|
|
71
|
-
const decorations =
|
|
72
|
-
sortBy(selectionRanges ?? [], (selection) => selection.from)?.flatMap((selection) => {
|
|
73
|
-
const range = { from: selection.from, to: selection.to + 1 };
|
|
74
|
-
if (selection.to > selection.from) {
|
|
75
|
-
if (selection.active) {
|
|
76
|
-
return marks.HighlightActive.range(range.from, range.to);
|
|
77
|
-
} else {
|
|
78
|
-
return marks.highlight.range(range.from, range.to);
|
|
79
|
-
}
|
|
80
|
-
} else {
|
|
81
|
-
return [];
|
|
82
|
-
}
|
|
83
|
-
}) ?? [];
|
|
84
|
-
|
|
85
|
-
return Decoration.set(decorations);
|
|
86
|
-
});
|
|
87
|
-
|
|
88
|
-
// TODO(burdon): Use current range to create comment.
|
|
89
|
-
// TODO(burdon): Allow/prevent overlapping?
|
|
90
|
-
|
|
91
|
-
/**
|
|
92
|
-
* Track cursor entering and existing ranges.
|
|
93
|
-
*/
|
|
94
|
-
const listener = (options: HighlightOptions) => {
|
|
95
|
-
return EditorView.updateListener.of((update) => {
|
|
96
|
-
const { view, state } = update;
|
|
97
|
-
const { /* from, to, */ head } = state.selection.main;
|
|
98
|
-
const ranges = state.field(highlightStateField);
|
|
99
|
-
|
|
100
|
-
// TODO(burdon): Modify range if editing.
|
|
101
|
-
// console.log('::::', update);
|
|
102
|
-
|
|
103
|
-
// Set active.
|
|
104
|
-
let mod = false;
|
|
105
|
-
const newRanges = ranges.map((range) => {
|
|
106
|
-
const active = head >= range.from && head <= range.to;
|
|
107
|
-
if (active !== range.active) {
|
|
108
|
-
mod = true;
|
|
109
|
-
return { ...range, active };
|
|
110
|
-
} else {
|
|
111
|
-
return range;
|
|
112
|
-
}
|
|
113
|
-
});
|
|
114
|
-
|
|
115
|
-
if (mod) {
|
|
116
|
-
view.dispatch({ effects: setHighlights.of(newRanges) });
|
|
117
|
-
options?.onChange?.(newRanges.find((range) => range.active)?.id);
|
|
118
|
-
}
|
|
119
|
-
});
|
|
120
|
-
};
|
|
121
|
-
|
|
122
|
-
export type HighlightOptions = {
|
|
123
|
-
onChange?: (active?: string) => {};
|
|
124
|
-
};
|
|
125
|
-
|
|
126
|
-
export const highlight = (options: HighlightOptions = {}): Extension => {
|
|
127
|
-
return [highlightStateField, highlightDecorations, listener(options), styles];
|
|
128
|
-
};
|
|
@@ -1,67 +0,0 @@
|
|
|
1
|
-
//
|
|
2
|
-
// Copyright 2023 DXOS.org
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
import { syntaxTree } from '@codemirror/language';
|
|
6
|
-
import {
|
|
7
|
-
type EditorState,
|
|
8
|
-
type Extension,
|
|
9
|
-
type RangeSet,
|
|
10
|
-
RangeSetBuilder,
|
|
11
|
-
StateField,
|
|
12
|
-
type Transaction,
|
|
13
|
-
} from '@codemirror/state';
|
|
14
|
-
import { Decoration, EditorView, WidgetType } from '@codemirror/view';
|
|
15
|
-
|
|
16
|
-
export type ImageOptions = {};
|
|
17
|
-
|
|
18
|
-
export const image = (options: ImageOptions = {}): Extension => {
|
|
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
|
-
const update = (state: EditorState, options: ImageOptions) => {
|
|
27
|
-
const builder = new RangeSetBuilder();
|
|
28
|
-
const cursor = state.selection.main.head;
|
|
29
|
-
|
|
30
|
-
syntaxTree(state).iterate({
|
|
31
|
-
enter: (node) => {
|
|
32
|
-
if (node.name === 'Image') {
|
|
33
|
-
const urlNode = node.node.getChild('URL');
|
|
34
|
-
if (urlNode) {
|
|
35
|
-
const hide = state.readOnly || cursor < node.from || cursor > node.to;
|
|
36
|
-
const url = state.sliceDoc(urlNode.from, urlNode.to);
|
|
37
|
-
builder.add(
|
|
38
|
-
hide ? node.from : node.to,
|
|
39
|
-
node.to,
|
|
40
|
-
Decoration.replace({
|
|
41
|
-
widget: new ImageWidget(url),
|
|
42
|
-
}),
|
|
43
|
-
);
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
},
|
|
47
|
-
});
|
|
48
|
-
|
|
49
|
-
return builder.finish();
|
|
50
|
-
};
|
|
51
|
-
|
|
52
|
-
class ImageWidget extends WidgetType {
|
|
53
|
-
constructor(readonly _url: string) {
|
|
54
|
-
super();
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
override eq(other: WidgetType) {
|
|
58
|
-
return this._url === (other as any as ImageWidget)?._url;
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
toDOM(view: EditorView) {
|
|
62
|
-
const img = document.createElement('img');
|
|
63
|
-
img.setAttribute('src', this._url);
|
|
64
|
-
img.setAttribute('class', 'cm-image');
|
|
65
|
-
return img;
|
|
66
|
-
}
|
|
67
|
-
}
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
//
|
|
2
|
-
// Copyright 2023 DXOS.org
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
import { StateField } from '@codemirror/state';
|
|
6
|
-
|
|
7
|
-
export type ListenerOptions = { onChange: (text: string) => void };
|
|
8
|
-
|
|
9
|
-
/**
|
|
10
|
-
* Based on https://github.com/codemirror/dev/issues/44#issuecomment-789093799
|
|
11
|
-
*/
|
|
12
|
-
export const listener = ({ onChange }: ListenerOptions) => {
|
|
13
|
-
return StateField.define({
|
|
14
|
-
create: () => null,
|
|
15
|
-
update: (_value, transaction) => {
|
|
16
|
-
if (transaction.docChanged && onChange) {
|
|
17
|
-
onChange(transaction.newDoc.toString());
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
return null;
|
|
21
|
-
},
|
|
22
|
-
});
|
|
23
|
-
};
|