@dxos/react-ui-editor 0.3.11-main.668f0ff → 0.3.11-main.836d602
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 +1586 -1113
- 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 +0 -3
- package/dist/types/src/components/TextEditor/MarkdownEditor.stories.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/TextEditor.d.ts.map +1 -1
- package/dist/types/src/components/TextEditor/TextEditor.stories.d.ts +3 -0
- 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 -1
- 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/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/{hooks → extensions}/automerge/semaphore.d.ts +4 -4
- 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.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/{components/TextEditor/extensions → extensions}/comments.d.ts +4 -2
- package/dist/types/src/extensions/comments.d.ts.map +1 -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 +3 -1
- 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.map +1 -0
- package/dist/types/src/extensions/markdown/bundle.d.ts.map +1 -0
- 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/mermaid.d.ts.map +1 -0
- package/dist/types/src/extensions/table.d.ts.map +1 -0
- package/dist/types/src/extensions/tasklist.d.ts.map +1 -0
- 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.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 +2 -0
- package/dist/types/src/hooks/index.d.ts.map +1 -1
- package/dist/types/src/hooks/useTextModel.d.ts +9 -8
- 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 +2 -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/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 +1 -1
- 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/cursor.d.ts +17 -0
- package/dist/types/src/util/cursor.d.ts.map +1 -0
- package/dist/types/src/util/index.d.ts +3 -0
- package/dist/types/src/util/index.d.ts.map +1 -0
- package/dist/types/src/util/util.d.ts.map +1 -0
- package/package.json +22 -21
- package/src/components/TextEditor/MarkdownEditor.stories.tsx +11 -13
- package/src/components/TextEditor/TextEditor.stories.tsx +14 -1
- package/src/components/TextEditor/TextEditor.tsx +3 -3
- package/src/{hooks/automerge → components/TextEditor}/automerge.stories.tsx +66 -6
- package/src/components/TextEditor/codemirror.stories.ts +3 -2
- package/src/components/TextEditor/index.ts +0 -3
- package/src/{hooks/yjs → components/TextEditor}/yjs.stories.tsx +1 -1
- package/src/extensions/automerge/automerge.ts +94 -0
- package/src/extensions/automerge/cursor.ts +51 -0
- package/src/extensions/automerge/defs.ts +62 -0
- package/src/extensions/automerge/index.ts +6 -0
- package/src/{hooks → extensions}/automerge/semaphore.ts +14 -12
- package/src/{hooks → extensions}/automerge/update-automerge.ts +5 -6
- package/src/{hooks → extensions}/automerge/update-codemirror.ts +13 -5
- package/src/extensions/awareness.ts +316 -0
- package/src/{components/TextEditor/extensions → extensions}/code.ts +1 -1
- package/src/{components/TextEditor/extensions → extensions}/comments.ts +51 -19
- package/src/{components/TextEditor/extensions → extensions}/hr.ts +1 -1
- package/src/{components/TextEditor/extensions → extensions}/index.ts +3 -1
- package/src/{components/TextEditor/extensions → extensions}/link.ts +66 -10
- package/src/extensions/listener.ts +35 -0
- package/src/{components/TextEditor/extensions → extensions}/markdown/highlight.ts +1 -1
- package/src/{components/TextEditor/extensions → extensions}/typewriter.ts +1 -1
- package/src/extensions/yjs/cursor.ts +21 -0
- package/src/extensions/yjs/index.ts +5 -0
- package/src/{hooks → extensions}/yjs/yjs.test.ts +1 -25
- 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 +2 -0
- package/src/hooks/useTextModel.ts +20 -93
- package/src/hooks/{yjs/space-provider.ts → yjs.ts} +71 -19
- package/src/index.ts +2 -0
- package/src/styles/index.ts +1 -0
- package/src/testing/replicator.ts +10 -15
- package/src/{components/TextEditor/themes → themes}/default.ts +1 -1
- package/src/util/cursor.ts +29 -0
- package/src/util/index.ts +6 -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.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/hr.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.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/mermaid.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.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/extensions/typewriter.d.ts.map +0 -1
- package/dist/types/src/components/TextEditor/extensions/util.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/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/semaphore.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/update-automerge.d.ts +0 -6
- package/dist/types/src/hooks/automerge/update-automerge.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/update-codemirror.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/dist/types/src/hooks/yjs/yjs.test.d.ts.map +0 -1
- package/src/components/TextEditor/extensions/listener.ts +0 -39
- package/src/components/TextEditor/extensions/tooltip.ts +0 -61
- 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/yjs/index.ts +0 -6
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/autocomplete.d.ts +0 -0
- /package/dist/types/src/{hooks → extensions}/automerge/update-codemirror.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}/hr.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}/listener.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/highlight.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}/mermaid.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/table.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/tasklist.d.ts +0 -0
- /package/dist/types/src/{components/TextEditor/extensions → extensions}/typewriter.d.ts +0 -0
- /package/dist/types/src/{hooks → extensions}/yjs/yjs.test.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/dist/types/src/{components/TextEditor/extensions → util}/util.d.ts +0 -0
- /package/src/{components/TextEditor/extensions → extensions}/autocomplete.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}/image.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/{components/TextEditor/extensions → extensions}/mermaid.ts +0 -0
- /package/src/{components/TextEditor/extensions → extensions}/table.ts +0 -0
- /package/src/{components/TextEditor/extensions → extensions}/tasklist.ts +0 -0
- /package/src/{hooks/yjs → styles}/cursors.ts +0 -0
- /package/src/{components/TextEditor/themes → themes}/index.ts +0 -0
- /package/src/{components/TextEditor/extensions → util}/util.ts +0 -0
|
@@ -5,7 +5,18 @@ import { Doc, YText, YXmlFragment } from "@dxos/text-model";
|
|
|
5
5
|
// packages/ui/react-ui-editor/src/components/TextEditor/index.ts
|
|
6
6
|
import { tags as tags2 } from "@lezer/highlight";
|
|
7
7
|
|
|
8
|
-
// packages/ui/react-ui-editor/src/components/TextEditor/
|
|
8
|
+
// packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx
|
|
9
|
+
import { EditorState as EditorState2 } from "@codemirror/state";
|
|
10
|
+
import { EditorView as EditorView13 } from "@codemirror/view";
|
|
11
|
+
import { useFocusableGroup } from "@fluentui/react-tabster";
|
|
12
|
+
import { vim } from "@replit/codemirror-vim";
|
|
13
|
+
import defaultsDeep2 from "lodash.defaultsdeep";
|
|
14
|
+
import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useState } from "react";
|
|
15
|
+
import { generateName } from "@dxos/display-name";
|
|
16
|
+
import { useThemeContext } from "@dxos/react-ui";
|
|
17
|
+
import { getColorForValue, inputSurface, mx as mx3 } from "@dxos/react-ui-theme";
|
|
18
|
+
|
|
19
|
+
// packages/ui/react-ui-editor/src/extensions/autocomplete.ts
|
|
9
20
|
import { autocompletion, completionKeymap } from "@codemirror/autocomplete";
|
|
10
21
|
import { keymap } from "@codemirror/view";
|
|
11
22
|
var autocomplete = ({ onSearch }) => {
|
|
@@ -38,473 +49,249 @@ var autocomplete = ({ onSearch }) => {
|
|
|
38
49
|
];
|
|
39
50
|
};
|
|
40
51
|
|
|
41
|
-
// packages/ui/react-ui-editor/src/
|
|
42
|
-
import {
|
|
43
|
-
import {
|
|
44
|
-
import {
|
|
45
|
-
import { drawSelection, EditorView, placeholder } from "@codemirror/view";
|
|
46
|
-
var basicBundle = ({ readonly, themeMode, placeholder: _placeholder }) => [
|
|
47
|
-
EditorView.lineWrapping,
|
|
48
|
-
// TODO(burdon): Compare with minimalSetup.
|
|
49
|
-
// https://codemirror.net/docs/ref/#codemirror.minimalSetup
|
|
50
|
-
bracketMatching(),
|
|
51
|
-
closeBrackets(),
|
|
52
|
-
drawSelection(),
|
|
53
|
-
_placeholder && placeholder(_placeholder),
|
|
54
|
-
// TODO(burdon): Is this required?
|
|
55
|
-
themeMode === "dark" ? syntaxHighlighting(oneDarkHighlightStyle) : syntaxHighlighting(defaultHighlightStyle)
|
|
56
|
-
].filter(Boolean);
|
|
52
|
+
// packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
|
|
53
|
+
import { Facet as Facet2, StateField } from "@codemirror/state";
|
|
54
|
+
import { ViewPlugin } from "@codemirror/view";
|
|
55
|
+
import { next as A } from "@dxos/automerge/automerge";
|
|
57
56
|
|
|
58
|
-
// packages/ui/react-ui-editor/src/
|
|
59
|
-
import
|
|
60
|
-
import
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
min: 5,
|
|
74
|
-
max: 10
|
|
75
|
-
},
|
|
76
|
-
particleVelocityRange: {
|
|
77
|
-
x: [
|
|
78
|
-
-1,
|
|
79
|
-
1
|
|
80
|
-
],
|
|
81
|
-
y: [
|
|
82
|
-
-3.5,
|
|
83
|
-
-1.5
|
|
84
|
-
]
|
|
57
|
+
// packages/ui/react-ui-editor/src/extensions/automerge/cursor.ts
|
|
58
|
+
import get from "lodash.get";
|
|
59
|
+
import { next as automerge } from "@dxos/automerge/automerge";
|
|
60
|
+
var cursorConverter = (handle, path) => ({
|
|
61
|
+
// TODO(burdon): Handle assoc to associate with a previous character.
|
|
62
|
+
toCursor: (pos) => {
|
|
63
|
+
const doc = handle.docSync();
|
|
64
|
+
if (!doc) {
|
|
65
|
+
return "";
|
|
66
|
+
}
|
|
67
|
+
const value = get(doc, path);
|
|
68
|
+
if (typeof value === "string" && value.length <= pos) {
|
|
69
|
+
return "end";
|
|
70
|
+
}
|
|
71
|
+
return automerge.getCursor(doc, path.slice(), pos);
|
|
85
72
|
},
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
y: y - top
|
|
99
|
-
};
|
|
100
|
-
return {
|
|
101
|
-
element,
|
|
102
|
-
point
|
|
103
|
-
};
|
|
104
|
-
};
|
|
105
|
-
return [
|
|
106
|
-
// Cursor moved.
|
|
107
|
-
EditorView2.updateListener.of((update4) => {
|
|
108
|
-
if (blaster?.node !== update4.view.scrollDOM) {
|
|
109
|
-
if (blaster) {
|
|
110
|
-
blaster.destroy();
|
|
111
|
-
}
|
|
112
|
-
blaster = new Blaster(update4.view.scrollDOM, defaultsDeep({
|
|
113
|
-
particleGravity: 0.2,
|
|
114
|
-
particleShrinkRate: 0.995,
|
|
115
|
-
color: () => [
|
|
116
|
-
100 + Math.random() * 100,
|
|
117
|
-
0,
|
|
118
|
-
0
|
|
119
|
-
]
|
|
120
|
-
}, options, defaultOptions));
|
|
121
|
-
blaster.initialize();
|
|
122
|
-
blaster.start();
|
|
73
|
+
fromCursor: (cursor) => {
|
|
74
|
+
if (cursor === "") {
|
|
75
|
+
return 0;
|
|
76
|
+
}
|
|
77
|
+
const doc = handle.docSync();
|
|
78
|
+
if (!doc) {
|
|
79
|
+
return 0;
|
|
80
|
+
}
|
|
81
|
+
if (cursor === "end") {
|
|
82
|
+
const value = get(doc, path);
|
|
83
|
+
if (typeof value === "string") {
|
|
84
|
+
return value.length;
|
|
123
85
|
} else {
|
|
124
|
-
|
|
125
|
-
}
|
|
126
|
-
const current = update4.state.selection.main.head;
|
|
127
|
-
if (current !== last) {
|
|
128
|
-
last = current;
|
|
129
|
-
const { element, point } = getPoint(update4.view, current - 1);
|
|
130
|
-
if (element && point) {
|
|
131
|
-
blaster.spawn({
|
|
132
|
-
element,
|
|
133
|
-
point
|
|
134
|
-
});
|
|
135
|
-
}
|
|
136
|
-
}
|
|
137
|
-
}),
|
|
138
|
-
keymap2.of([
|
|
139
|
-
{
|
|
140
|
-
any: (_, event) => {
|
|
141
|
-
if (blaster) {
|
|
142
|
-
if (event.key === "Enter" && event.shiftKey) {
|
|
143
|
-
blaster.shake({
|
|
144
|
-
time: 0.8
|
|
145
|
-
});
|
|
146
|
-
return true;
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
return false;
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
])
|
|
153
|
-
];
|
|
154
|
-
};
|
|
155
|
-
var Blaster = class {
|
|
156
|
-
constructor(_node, _options) {
|
|
157
|
-
this._node = _node;
|
|
158
|
-
this._options = _options;
|
|
159
|
-
this._running = false;
|
|
160
|
-
this._shakeTime = 0;
|
|
161
|
-
this._shakeTimeMax = 0;
|
|
162
|
-
this._particles = [];
|
|
163
|
-
this._particlePointer = 0;
|
|
164
|
-
this._lastPoint = {
|
|
165
|
-
x: 0,
|
|
166
|
-
y: 0
|
|
167
|
-
};
|
|
168
|
-
this.shake = throttle(({ time }) => {
|
|
169
|
-
this._shakeTime = this._shakeTimeMax || time;
|
|
170
|
-
this._shakeTimeMax = time;
|
|
171
|
-
}, 100);
|
|
172
|
-
this.spawn = throttle(({ element, point }) => {
|
|
173
|
-
const color = getRGBComponents(element, this._options.color);
|
|
174
|
-
const numParticles = random(this._options.particleNumRange.min, this._options.particleNumRange.max);
|
|
175
|
-
const dir = this._lastPoint.x === point.x ? 0 : this._lastPoint.x < point.x ? 1 : -1;
|
|
176
|
-
this._lastPoint = point;
|
|
177
|
-
for (let i = numParticles; i--; i > 0) {
|
|
178
|
-
this._particles[this._particlePointer] = this._effect.create(point.x - dir * 16, point.y, color);
|
|
179
|
-
this._particlePointer = (this._particlePointer + 1) % this._options.maxParticles;
|
|
86
|
+
return 0;
|
|
180
87
|
}
|
|
181
|
-
}, 100);
|
|
182
|
-
this._effect = this._options.effect === 1 ? new Effect1(_options) : new Effect2(_options);
|
|
183
|
-
}
|
|
184
|
-
get node() {
|
|
185
|
-
return this._node;
|
|
186
|
-
}
|
|
187
|
-
initialize() {
|
|
188
|
-
invariant(!this._canvas && !this._ctx, void 0, {
|
|
189
|
-
F: __dxlog_file,
|
|
190
|
-
L: 138,
|
|
191
|
-
S: this,
|
|
192
|
-
A: [
|
|
193
|
-
"!this._canvas && !this._ctx",
|
|
194
|
-
""
|
|
195
|
-
]
|
|
196
|
-
});
|
|
197
|
-
this._canvas = document.createElement("canvas");
|
|
198
|
-
this._canvas.id = "code-blast-canvas";
|
|
199
|
-
this._canvas.style.position = "absolute";
|
|
200
|
-
this._canvas.style.zIndex = "0";
|
|
201
|
-
this._canvas.style.pointerEvents = "none";
|
|
202
|
-
this._ctx = this._canvas.getContext("2d");
|
|
203
|
-
const parent = this._node.parentElement?.parentElement;
|
|
204
|
-
parent?.appendChild(this._canvas);
|
|
205
|
-
this.resize();
|
|
206
|
-
}
|
|
207
|
-
destroy() {
|
|
208
|
-
this.stop();
|
|
209
|
-
if (this._canvas) {
|
|
210
|
-
this._canvas.remove();
|
|
211
|
-
this._canvas = void 0;
|
|
212
|
-
this._ctx = void 0;
|
|
213
88
|
}
|
|
89
|
+
return automerge.getCursorPosition(doc, path.slice(), cursor);
|
|
214
90
|
}
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
// packages/ui/react-ui-editor/src/extensions/automerge/defs.ts
|
|
94
|
+
import { Annotation, StateEffect } from "@codemirror/state";
|
|
95
|
+
var effectType = StateEffect.define({});
|
|
96
|
+
var updateHeads = (newHeads) => effectType.of({
|
|
97
|
+
newHeads
|
|
98
|
+
});
|
|
99
|
+
var getLastHeads = (state, field) => state.field(field).lastHeads;
|
|
100
|
+
var getPath = (state, field) => state.field(field).path;
|
|
101
|
+
var reconcileAnnotationType = Annotation.define();
|
|
102
|
+
var isReconcileTx = (tr) => !!tr.annotation(reconcileAnnotationType);
|
|
103
|
+
|
|
104
|
+
// packages/ui/react-ui-editor/src/extensions/automerge/semaphore.ts
|
|
105
|
+
import { next as automerge2 } from "@dxos/automerge/automerge";
|
|
106
|
+
|
|
107
|
+
// packages/ui/react-ui-editor/src/extensions/automerge/update-automerge.ts
|
|
108
|
+
import { next as am } from "@dxos/automerge/automerge";
|
|
109
|
+
var updateAutomerge = (field, handle, transactions, state) => {
|
|
110
|
+
const { lastHeads, path } = state.field(field);
|
|
111
|
+
let hasChanges = false;
|
|
112
|
+
for (const tr of transactions) {
|
|
113
|
+
tr.changes.iterChanges(() => {
|
|
114
|
+
hasChanges = true;
|
|
233
115
|
});
|
|
234
|
-
this._running = true;
|
|
235
|
-
this.loop();
|
|
236
116
|
}
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
this._node.style.transform = "translate(0px, 0px)";
|
|
117
|
+
if (!hasChanges) {
|
|
118
|
+
return void 0;
|
|
240
119
|
}
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
120
|
+
const newHeads = handle.changeAt(lastHeads, (doc) => {
|
|
121
|
+
for (const tr of transactions) {
|
|
122
|
+
tr.changes.iterChanges((fromA, toA, _fromB, _toB, inserted) => {
|
|
123
|
+
am.splice(doc, path, fromA, toA - fromA, inserted.toString());
|
|
124
|
+
});
|
|
244
125
|
}
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
for (let i = this._particles.length; i--; i > 0) {
|
|
262
|
-
const particle = this._particles[i];
|
|
263
|
-
if (!particle) {
|
|
264
|
-
continue;
|
|
265
|
-
}
|
|
266
|
-
if (particle.alpha < 0.01 || particle.size <= 0.5) {
|
|
267
|
-
continue;
|
|
268
|
-
}
|
|
269
|
-
this._effect.update(this._ctx, particle);
|
|
126
|
+
});
|
|
127
|
+
return newHeads ?? void 0;
|
|
128
|
+
};
|
|
129
|
+
|
|
130
|
+
// packages/ui/react-ui-editor/src/extensions/automerge/update-codemirror.ts
|
|
131
|
+
import { ChangeSet } from "@codemirror/state";
|
|
132
|
+
var updateCodeMirror = (view, selection, target, patches) => {
|
|
133
|
+
for (const patch of patches) {
|
|
134
|
+
const changeSpec = handlePatch(patch, target, view.state);
|
|
135
|
+
if (changeSpec != null) {
|
|
136
|
+
const changeSet = ChangeSet.of(changeSpec, view.state.doc.length, "\n");
|
|
137
|
+
selection = selection.map(changeSet, 1);
|
|
138
|
+
view.dispatch({
|
|
139
|
+
changes: changeSet,
|
|
140
|
+
annotations: reconcileAnnotationType.of({})
|
|
141
|
+
});
|
|
270
142
|
}
|
|
271
143
|
}
|
|
144
|
+
view.dispatch({
|
|
145
|
+
selection,
|
|
146
|
+
annotations: reconcileAnnotationType.of({})
|
|
147
|
+
});
|
|
272
148
|
};
|
|
273
|
-
var
|
|
274
|
-
|
|
275
|
-
|
|
149
|
+
var handlePatch = (patch, target, state) => {
|
|
150
|
+
if (patch.action === "insert") {
|
|
151
|
+
return handleInsert(target, patch);
|
|
152
|
+
} else if (patch.action === "splice") {
|
|
153
|
+
return handleSplice(target, patch);
|
|
154
|
+
} else if (patch.action === "del") {
|
|
155
|
+
return handleDel(target, patch);
|
|
156
|
+
} else if (patch.action === "put") {
|
|
157
|
+
return handlePut(target, patch, state);
|
|
158
|
+
} else {
|
|
159
|
+
return null;
|
|
276
160
|
}
|
|
277
161
|
};
|
|
278
|
-
var
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
y: y + 10,
|
|
283
|
-
vx: random(this._options.particleVelocityRange.x[0], this._options.particleVelocityRange.x[1]),
|
|
284
|
-
vy: random(this._options.particleVelocityRange.y[0], this._options.particleVelocityRange.y[1]),
|
|
285
|
-
size: random(this._options.particleSize.min, this._options.particleSize.max),
|
|
286
|
-
color,
|
|
287
|
-
alpha: 1
|
|
288
|
-
};
|
|
289
|
-
}
|
|
290
|
-
update(ctx, particle) {
|
|
291
|
-
particle.vy += this._options.particleGravity;
|
|
292
|
-
particle.x += particle.vx;
|
|
293
|
-
particle.y += particle.vy;
|
|
294
|
-
particle.alpha *= this._options.particleAlphaFadeout;
|
|
295
|
-
ctx.fillStyle = `rgba(${particle.color[0]},${particle.color[1]},${particle.color[2]},${particle.alpha})`;
|
|
296
|
-
ctx.fillRect(Math.round(particle.x - 1), Math.round(particle.y - 1), particle.size, particle.size);
|
|
162
|
+
var handleInsert = (target, patch) => {
|
|
163
|
+
const index = charPath(target, patch.path);
|
|
164
|
+
if (index == null) {
|
|
165
|
+
return [];
|
|
297
166
|
}
|
|
167
|
+
const text = patch.values.map((v) => v ? v.toString() : "").join("");
|
|
168
|
+
return [
|
|
169
|
+
{
|
|
170
|
+
from: index,
|
|
171
|
+
to: index,
|
|
172
|
+
insert: text
|
|
173
|
+
}
|
|
174
|
+
];
|
|
298
175
|
};
|
|
299
|
-
var
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
y: y + 10,
|
|
304
|
-
vx: random(this._options.particleVelocityRange.x[0], this._options.particleVelocityRange.x[1]),
|
|
305
|
-
vy: random(this._options.particleVelocityRange.y[0], this._options.particleVelocityRange.y[1]),
|
|
306
|
-
size: random(this._options.particleSize.min, this._options.particleSize.max),
|
|
307
|
-
color,
|
|
308
|
-
alpha: 1,
|
|
309
|
-
theta: random(0, 360) * Math.PI / 180,
|
|
310
|
-
drag: 0.92,
|
|
311
|
-
wander: 0.15
|
|
312
|
-
};
|
|
313
|
-
}
|
|
314
|
-
update(ctx, particle) {
|
|
315
|
-
particle.vy += this._options.particleGravity;
|
|
316
|
-
particle.x += particle.vx;
|
|
317
|
-
particle.y += particle.vy;
|
|
318
|
-
particle.vx *= particle.drag;
|
|
319
|
-
particle.vy *= particle.drag;
|
|
320
|
-
particle.theta += random(-0.5, 0.5);
|
|
321
|
-
particle.vx += Math.sin(particle.theta) * 0.1;
|
|
322
|
-
particle.vy += Math.cos(particle.theta) * 0.1;
|
|
323
|
-
particle.size *= this._options.particleShrinkRate;
|
|
324
|
-
particle.alpha *= this._options.particleAlphaFadeout;
|
|
325
|
-
ctx.fillStyle = `rgba(${particle.color[0]},${particle.color[1]},${particle.color[2]},${particle.alpha})`;
|
|
326
|
-
ctx.beginPath();
|
|
327
|
-
ctx.arc(Math.round(particle.x - 1), Math.round(particle.y - 1), particle.size, 0, 2 * Math.PI);
|
|
328
|
-
ctx.fill();
|
|
176
|
+
var handleSplice = (target, patch) => {
|
|
177
|
+
const index = charPath(target, patch.path);
|
|
178
|
+
if (index == null) {
|
|
179
|
+
return [];
|
|
329
180
|
}
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
if (!wait) {
|
|
335
|
-
callback.apply(this, args);
|
|
336
|
-
wait = true;
|
|
337
|
-
setTimeout(() => {
|
|
338
|
-
wait = false;
|
|
339
|
-
}, limit);
|
|
181
|
+
return [
|
|
182
|
+
{
|
|
183
|
+
from: index,
|
|
184
|
+
insert: patch.value
|
|
340
185
|
}
|
|
341
|
-
|
|
342
|
-
}
|
|
343
|
-
var
|
|
344
|
-
|
|
345
|
-
|
|
186
|
+
];
|
|
187
|
+
};
|
|
188
|
+
var handleDel = (target, patch) => {
|
|
189
|
+
const index = charPath(target, patch.path);
|
|
190
|
+
if (index == null) {
|
|
191
|
+
return [];
|
|
346
192
|
}
|
|
347
|
-
const
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
193
|
+
const length = patch.length || 1;
|
|
194
|
+
return [
|
|
195
|
+
{
|
|
196
|
+
from: index,
|
|
197
|
+
to: index + length
|
|
352
198
|
}
|
|
199
|
+
];
|
|
200
|
+
};
|
|
201
|
+
var handlePut = (target, patch, state) => {
|
|
202
|
+
const index = charPath(target, [
|
|
203
|
+
...patch.path,
|
|
204
|
+
0
|
|
205
|
+
]);
|
|
206
|
+
if (index == null) {
|
|
207
|
+
return [];
|
|
208
|
+
}
|
|
209
|
+
const length = state.doc.length;
|
|
210
|
+
if (typeof patch.value !== "string") {
|
|
211
|
+
return [];
|
|
353
212
|
}
|
|
354
213
|
return [
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
214
|
+
{
|
|
215
|
+
from: 0,
|
|
216
|
+
to: length,
|
|
217
|
+
insert: patch.value
|
|
218
|
+
}
|
|
358
219
|
];
|
|
359
220
|
};
|
|
360
|
-
var
|
|
361
|
-
if (
|
|
362
|
-
|
|
363
|
-
min = 0;
|
|
221
|
+
var charPath = (textPath, candidatePath) => {
|
|
222
|
+
if (candidatePath.length !== textPath.length + 1) {
|
|
223
|
+
return null;
|
|
364
224
|
}
|
|
365
|
-
|
|
225
|
+
for (let i = 0; i < textPath.length; i++) {
|
|
226
|
+
if (textPath[i] !== candidatePath[i]) {
|
|
227
|
+
return null;
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
const index = candidatePath[candidatePath.length - 1];
|
|
231
|
+
if (typeof index === "number") {
|
|
232
|
+
return index;
|
|
233
|
+
}
|
|
234
|
+
return null;
|
|
366
235
|
};
|
|
367
236
|
|
|
368
|
-
// packages/ui/react-ui-editor/src/
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
}
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
237
|
+
// packages/ui/react-ui-editor/src/extensions/automerge/semaphore.ts
|
|
238
|
+
var PatchSemaphore = class {
|
|
239
|
+
constructor(_field) {
|
|
240
|
+
this._field = _field;
|
|
241
|
+
this._inReconcile = false;
|
|
242
|
+
this._queue = [];
|
|
243
|
+
this.reconcile = (handle, view) => {
|
|
244
|
+
if (this._inReconcile) {
|
|
245
|
+
return;
|
|
246
|
+
}
|
|
247
|
+
this._inReconcile = true;
|
|
248
|
+
const path = getPath(view.state, this._field);
|
|
249
|
+
const oldHeads = getLastHeads(view.state, this._field);
|
|
250
|
+
let selection = view.state.selection;
|
|
251
|
+
const transactions = view.state.field(this._field).unreconciledTransactions.filter((tx) => !isReconcileTx(tx));
|
|
252
|
+
const toInvert = transactions.slice().reverse();
|
|
253
|
+
for (const tx of toInvert) {
|
|
254
|
+
const inverted = tx.changes.invert(tx.startState.doc);
|
|
255
|
+
selection = selection.map(inverted);
|
|
256
|
+
view.dispatch({
|
|
257
|
+
changes: inverted,
|
|
258
|
+
annotations: reconcileAnnotationType.of(true)
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
let newHeads = updateAutomerge(this._field, handle, transactions, view.state);
|
|
262
|
+
if (newHeads === null || newHeads === void 0) {
|
|
263
|
+
newHeads = automerge2.getHeads(handle.docSync());
|
|
264
|
+
}
|
|
265
|
+
const diff = automerge2.equals(oldHeads, newHeads) ? [] : automerge2.diff(handle.docSync(), oldHeads, newHeads);
|
|
266
|
+
updateCodeMirror(view, selection, path, diff);
|
|
267
|
+
view.dispatch({
|
|
268
|
+
effects: updateHeads(newHeads),
|
|
269
|
+
annotations: reconcileAnnotationType.of({})
|
|
270
|
+
});
|
|
271
|
+
this._inReconcile = false;
|
|
272
|
+
};
|
|
273
|
+
}
|
|
404
274
|
};
|
|
405
|
-
var light = "text-neutral-200 dark:text-neutral-800";
|
|
406
|
-
var mark = mx("!font-normal !no-underline !text-inherit opacity-40", light);
|
|
407
|
-
var bold = "font-bold";
|
|
408
|
-
var italic = "italic";
|
|
409
|
-
var strikethrough = "line-through";
|
|
410
|
-
var code = "font-mono !no-underline text-neutral-700 dark:text-neutral-300";
|
|
411
|
-
var codeMark = "font-mono text-primary-500";
|
|
412
|
-
var inlineUrl = mx(code, "px-1");
|
|
413
|
-
var blockquote = mx("pl-1 mr-1 border-is-4 border-primary-500/70 dark:border-primary-500/30", light);
|
|
414
275
|
|
|
415
|
-
// packages/ui/react-ui-editor/src/
|
|
416
|
-
import {
|
|
417
|
-
var
|
|
276
|
+
// packages/ui/react-ui-editor/src/util/cursor.ts
|
|
277
|
+
import { Facet } from "@codemirror/state";
|
|
278
|
+
var DEFAULT_CURSOR_CONVERTER = {
|
|
279
|
+
toCursor: (position) => position.toString(),
|
|
280
|
+
fromCursor: (cursor) => parseInt(cursor)
|
|
281
|
+
};
|
|
282
|
+
var CursorConverter = Facet.define({
|
|
283
|
+
combine: (providers) => providers[0] ?? DEFAULT_CURSOR_CONVERTER
|
|
284
|
+
});
|
|
418
285
|
|
|
419
|
-
// packages/ui/react-ui-editor/src/
|
|
420
|
-
var CODE_REGEX = /```[\s\S]*?```/gs;
|
|
421
|
-
var styles = EditorView3.baseTheme({
|
|
422
|
-
"& .cm-codeblock": {
|
|
423
|
-
fontFamily: get(tokens, "fontFamily.mono", []).join(",")
|
|
424
|
-
},
|
|
425
|
-
'&light [aria-readonly="true"] .cm-codeblock': {
|
|
426
|
-
background: get(tokens, "extend.colors.neutral.50")
|
|
427
|
-
},
|
|
428
|
-
'&dark [aria-readonly="true"] .cm-codeblock': {
|
|
429
|
-
background: get(tokens, "extend.colors.neutral.850")
|
|
430
|
-
},
|
|
431
|
-
'& [aria-readonly="true"] .cm-codeblock': {
|
|
432
|
-
display: "block",
|
|
433
|
-
paddingInline: "4px !important"
|
|
434
|
-
},
|
|
435
|
-
'& [aria-readonly="true"] .cm-codeblock-first': {
|
|
436
|
-
paddingTop: "4px !important",
|
|
437
|
-
borderTopLeftRadius: "4px",
|
|
438
|
-
borderTopRightRadius: "4px"
|
|
439
|
-
},
|
|
440
|
-
'& [aria-readonly="true"] .cm-codeblock-last': {
|
|
441
|
-
paddingBottom: "4px !important",
|
|
442
|
-
borderBottomLeftRadius: "4px",
|
|
443
|
-
borderBottomRightRadius: "4px"
|
|
444
|
-
}
|
|
445
|
-
});
|
|
446
|
-
var getLineRange = (lines, from, to) => {
|
|
447
|
-
const start = lines.findIndex((line) => line.from >= from);
|
|
448
|
-
const end = lines.findIndex((line) => line.to >= to);
|
|
449
|
-
return [
|
|
450
|
-
start,
|
|
451
|
-
end
|
|
452
|
-
];
|
|
453
|
-
};
|
|
454
|
-
var code2 = () => {
|
|
455
|
-
const getDecorations = (view) => {
|
|
456
|
-
const decorations = [];
|
|
457
|
-
if (view.state.readOnly) {
|
|
458
|
-
const text = view.state.doc.sliceString(0);
|
|
459
|
-
const matches = text.matchAll(CODE_REGEX);
|
|
460
|
-
const blocks = view.viewportLineBlocks;
|
|
461
|
-
for (const match of matches) {
|
|
462
|
-
const range = getLineRange(blocks, match.index, match.index + match[0].length);
|
|
463
|
-
for (let i = range[0]; i <= range[1]; i++) {
|
|
464
|
-
const block = blocks[i];
|
|
465
|
-
decorations.push(Decoration.line({
|
|
466
|
-
class: mx2("cm-codeblock", i === range[0] && "cm-codeblock-first", i === range[1] && "cm-codeblock-last")
|
|
467
|
-
}).range(block.from));
|
|
468
|
-
}
|
|
469
|
-
}
|
|
470
|
-
}
|
|
471
|
-
return Decoration.set(decorations);
|
|
472
|
-
};
|
|
473
|
-
return [
|
|
474
|
-
ViewPlugin.fromClass(class {
|
|
475
|
-
constructor(view) {
|
|
476
|
-
this.decorations = getDecorations(view);
|
|
477
|
-
}
|
|
478
|
-
update(update4) {
|
|
479
|
-
if (update4.docChanged || update4.viewportChanged) {
|
|
480
|
-
this.decorations = getDecorations(update4.view);
|
|
481
|
-
}
|
|
482
|
-
}
|
|
483
|
-
}, {
|
|
484
|
-
decorations: (value) => value.decorations
|
|
485
|
-
}),
|
|
486
|
-
styles
|
|
487
|
-
];
|
|
488
|
-
};
|
|
489
|
-
|
|
490
|
-
// packages/ui/react-ui-editor/src/components/TextEditor/extensions/comments.ts
|
|
491
|
-
import { StateEffect as StateEffect2, StateField as StateField3 } from "@codemirror/state";
|
|
492
|
-
import { hoverTooltip, keymap as keymap3, Decoration as Decoration2, EditorView as EditorView4, MatchDecorator, ViewPlugin as ViewPlugin3, WidgetType } from "@codemirror/view";
|
|
493
|
-
import sortBy from "lodash.sortby";
|
|
494
|
-
import { debounce } from "@dxos/async";
|
|
495
|
-
import { invariant as invariant3 } from "@dxos/invariant";
|
|
496
|
-
import { log as log3 } from "@dxos/log";
|
|
497
|
-
import { nonNullable } from "@dxos/util";
|
|
498
|
-
|
|
499
|
-
// packages/ui/react-ui-editor/src/components/TextEditor/extensions/util.ts
|
|
286
|
+
// packages/ui/react-ui-editor/src/util/util.ts
|
|
500
287
|
import { log } from "@dxos/log";
|
|
501
|
-
var
|
|
288
|
+
var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util/util.ts";
|
|
502
289
|
var callbackWrapper = (fn) => (...args) => {
|
|
503
290
|
try {
|
|
504
291
|
return fn(...args);
|
|
505
292
|
} catch (error) {
|
|
506
293
|
log.catch(error, void 0, {
|
|
507
|
-
F:
|
|
294
|
+
F: __dxlog_file,
|
|
508
295
|
L: 16,
|
|
509
296
|
S: void 0,
|
|
510
297
|
C: (f, a) => f(...a)
|
|
@@ -512,267 +299,641 @@ var callbackWrapper = (fn) => (...args) => {
|
|
|
512
299
|
}
|
|
513
300
|
};
|
|
514
301
|
|
|
515
|
-
// packages/ui/react-ui-editor/src/
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
for (const tr of transactions) {
|
|
548
|
-
tr.changes.iterChanges((fromA, toA, _fromB, _toB, inserted) => {
|
|
549
|
-
am.splice(doc, path, fromA, toA - fromA, inserted.toString());
|
|
550
|
-
});
|
|
302
|
+
// packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
|
|
303
|
+
var semaphoreFacet = Facet2.define({
|
|
304
|
+
combine: (values) => values.at(-1)
|
|
305
|
+
});
|
|
306
|
+
var automerge3 = ({ handle, path }) => {
|
|
307
|
+
const stateField = StateField.define({
|
|
308
|
+
create: () => ({
|
|
309
|
+
lastHeads: A.getHeads(handle.docSync()),
|
|
310
|
+
unreconciledTransactions: [],
|
|
311
|
+
path: path.slice()
|
|
312
|
+
}),
|
|
313
|
+
update: (value, tr) => {
|
|
314
|
+
const result = {
|
|
315
|
+
lastHeads: value.lastHeads,
|
|
316
|
+
unreconciledTransactions: value.unreconciledTransactions.slice(),
|
|
317
|
+
path: path.slice()
|
|
318
|
+
};
|
|
319
|
+
let clearUnreconciled = false;
|
|
320
|
+
for (const effect of tr.effects) {
|
|
321
|
+
if (effect.is(effectType)) {
|
|
322
|
+
result.lastHeads = effect.value.newHeads;
|
|
323
|
+
clearUnreconciled = true;
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
if (clearUnreconciled) {
|
|
327
|
+
result.unreconciledTransactions = [];
|
|
328
|
+
} else {
|
|
329
|
+
if (!isReconcileTx(tr)) {
|
|
330
|
+
result.unreconciledTransactions.push(tr);
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
return result;
|
|
551
334
|
}
|
|
552
335
|
});
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
}
|
|
336
|
+
const semaphore = new PatchSemaphore(stateField);
|
|
337
|
+
const viewPlugin = ViewPlugin.fromClass(class AutomergeCodemirrorViewPlugin {
|
|
338
|
+
constructor(_view) {
|
|
339
|
+
this._view = _view;
|
|
340
|
+
this._handleChange = () => {
|
|
341
|
+
this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
|
|
342
|
+
};
|
|
343
|
+
handle.addListener("change", this._handleChange);
|
|
344
|
+
}
|
|
345
|
+
update(update4) {
|
|
346
|
+
if (update4.transactions.length > 0 && update4.transactions.some((tr) => !isReconcileTx(tr))) {
|
|
347
|
+
queueMicrotask(() => {
|
|
348
|
+
this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
|
|
349
|
+
});
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
destroy() {
|
|
353
|
+
handle.addListener("change", this._handleChange);
|
|
568
354
|
}
|
|
569
|
-
}
|
|
570
|
-
view.dispatch({
|
|
571
|
-
selection,
|
|
572
|
-
annotations: reconcileAnnotationType.of({})
|
|
573
355
|
});
|
|
356
|
+
return {
|
|
357
|
+
extension: [
|
|
358
|
+
CursorConverter.of(cursorConverter(handle, path)),
|
|
359
|
+
semaphoreFacet.of(semaphore),
|
|
360
|
+
stateField,
|
|
361
|
+
viewPlugin
|
|
362
|
+
]
|
|
363
|
+
};
|
|
574
364
|
};
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
}
|
|
585
|
-
|
|
586
|
-
}
|
|
365
|
+
|
|
366
|
+
// packages/ui/react-ui-editor/src/extensions/awareness.ts
|
|
367
|
+
import { Annotation as Annotation2, Facet as Facet3, RangeSet } from "@codemirror/state";
|
|
368
|
+
import { Decoration, EditorView, ViewPlugin as ViewPlugin2, WidgetType } from "@codemirror/view";
|
|
369
|
+
import { Event } from "@dxos/async";
|
|
370
|
+
import { Context } from "@dxos/context";
|
|
371
|
+
var dummyProvider = {
|
|
372
|
+
remoteStateChange: new Event(),
|
|
373
|
+
open: () => {
|
|
374
|
+
},
|
|
375
|
+
close: () => {
|
|
376
|
+
},
|
|
377
|
+
update: () => {
|
|
378
|
+
},
|
|
379
|
+
getRemoteStates: () => []
|
|
587
380
|
};
|
|
588
|
-
var
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
const text = patch.values.map((v) => v ? v.toString() : "").join("");
|
|
381
|
+
var AwarenessProvider = Facet3.define({
|
|
382
|
+
combine: (providers) => providers[0] ?? dummyProvider
|
|
383
|
+
});
|
|
384
|
+
var RemoteSelectionChangedAnnotation = Annotation2.define();
|
|
385
|
+
var awareness = (provider = dummyProvider) => {
|
|
594
386
|
return [
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
387
|
+
AwarenessProvider.of(provider),
|
|
388
|
+
ViewPlugin2.fromClass(RemoteSelectionsDecorator, {
|
|
389
|
+
decorations: (value) => value.decorations
|
|
390
|
+
}),
|
|
391
|
+
styles
|
|
600
392
|
];
|
|
601
393
|
};
|
|
602
|
-
var
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
394
|
+
var RemoteSelectionsDecorator = class {
|
|
395
|
+
constructor(view) {
|
|
396
|
+
this.decorations = RangeSet.of([]);
|
|
397
|
+
this._ctx = new Context();
|
|
398
|
+
this._lastAnchor = void 0;
|
|
399
|
+
this._lastHead = void 0;
|
|
400
|
+
this._cursorConverter = view.state.facet(CursorConverter);
|
|
401
|
+
this._provider = view.state.facet(AwarenessProvider);
|
|
402
|
+
this._provider.open();
|
|
403
|
+
this._provider.remoteStateChange.on(this._ctx, () => {
|
|
404
|
+
view.dispatch({
|
|
405
|
+
annotations: [
|
|
406
|
+
RemoteSelectionChangedAnnotation.of([])
|
|
407
|
+
]
|
|
408
|
+
});
|
|
409
|
+
});
|
|
606
410
|
}
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
insert: patch.value
|
|
611
|
-
}
|
|
612
|
-
];
|
|
613
|
-
};
|
|
614
|
-
var handleDel = (target, patch) => {
|
|
615
|
-
const index = charPath(target, patch.path);
|
|
616
|
-
if (index == null) {
|
|
617
|
-
return [];
|
|
411
|
+
destroy() {
|
|
412
|
+
void this._ctx.dispose();
|
|
413
|
+
this._provider.close();
|
|
618
414
|
}
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
415
|
+
update(update4) {
|
|
416
|
+
this._updateLocalSelection(update4);
|
|
417
|
+
this._updateRemoteSelections(update4);
|
|
418
|
+
}
|
|
419
|
+
_updateLocalSelection(update4) {
|
|
420
|
+
const hasFocus = update4.view.hasFocus && update4.view.dom.ownerDocument.hasFocus();
|
|
421
|
+
const { anchor = void 0, head = void 0 } = hasFocus ? update4.state.selection.main : {};
|
|
422
|
+
if (this._lastAnchor === anchor && this._lastHead === head) {
|
|
423
|
+
return;
|
|
624
424
|
}
|
|
625
|
-
|
|
425
|
+
this._lastAnchor = anchor;
|
|
426
|
+
this._lastHead = head;
|
|
427
|
+
this._provider.update(anchor !== void 0 && head !== void 0 ? {
|
|
428
|
+
anchor: this._cursorConverter.toCursor(anchor),
|
|
429
|
+
head: this._cursorConverter.toCursor(head)
|
|
430
|
+
} : void 0);
|
|
431
|
+
}
|
|
432
|
+
_updateRemoteSelections(update4) {
|
|
433
|
+
const decorations = [];
|
|
434
|
+
const awarenessStates = this._provider.getRemoteStates();
|
|
435
|
+
for (const state of awarenessStates) {
|
|
436
|
+
const anchor = state.position?.anchor ? this._cursorConverter.fromCursor(state.position.anchor) : null;
|
|
437
|
+
const head = state.position?.head ? this._cursorConverter.fromCursor(state.position.head) : null;
|
|
438
|
+
if (anchor == null || head == null) {
|
|
439
|
+
continue;
|
|
440
|
+
}
|
|
441
|
+
const start = Math.min(Math.min(anchor, head), update4.view.state.doc.length);
|
|
442
|
+
const end = Math.min(Math.max(anchor, head), update4.view.state.doc.length);
|
|
443
|
+
const startLine = update4.view.state.doc.lineAt(start);
|
|
444
|
+
const endLine = update4.view.state.doc.lineAt(end);
|
|
445
|
+
const color = state.info.color ?? "#30bced";
|
|
446
|
+
const lightColor = state.info.lightColor ?? color + "33";
|
|
447
|
+
if (startLine.number === endLine.number) {
|
|
448
|
+
decorations.push({
|
|
449
|
+
from: start,
|
|
450
|
+
to: end,
|
|
451
|
+
value: Decoration.mark({
|
|
452
|
+
attributes: {
|
|
453
|
+
style: `background-color: ${lightColor}`
|
|
454
|
+
},
|
|
455
|
+
class: "cm-ySelection"
|
|
456
|
+
})
|
|
457
|
+
});
|
|
458
|
+
} else {
|
|
459
|
+
decorations.push({
|
|
460
|
+
from: start,
|
|
461
|
+
to: startLine.from + startLine.length,
|
|
462
|
+
value: Decoration.mark({
|
|
463
|
+
attributes: {
|
|
464
|
+
style: `background-color: ${color}`
|
|
465
|
+
},
|
|
466
|
+
class: "cm-ySelection"
|
|
467
|
+
})
|
|
468
|
+
});
|
|
469
|
+
decorations.push({
|
|
470
|
+
from: endLine.from,
|
|
471
|
+
to: end,
|
|
472
|
+
value: Decoration.mark({
|
|
473
|
+
attributes: {
|
|
474
|
+
style: `background-color: ${color}`
|
|
475
|
+
},
|
|
476
|
+
class: "cm-ySelection"
|
|
477
|
+
})
|
|
478
|
+
});
|
|
479
|
+
for (let i = startLine.number + 1; i < endLine.number; i++) {
|
|
480
|
+
const linePos = update4.view.state.doc.line(i).from;
|
|
481
|
+
decorations.push({
|
|
482
|
+
from: linePos,
|
|
483
|
+
to: linePos,
|
|
484
|
+
value: Decoration.line({
|
|
485
|
+
attributes: {
|
|
486
|
+
style: `background-color: ${color}`,
|
|
487
|
+
class: "cm-yLineSelection"
|
|
488
|
+
}
|
|
489
|
+
})
|
|
490
|
+
});
|
|
491
|
+
}
|
|
492
|
+
}
|
|
493
|
+
decorations.push({
|
|
494
|
+
from: head,
|
|
495
|
+
to: head,
|
|
496
|
+
value: Decoration.widget({
|
|
497
|
+
side: head - anchor > 0 ? -1 : 1,
|
|
498
|
+
block: false,
|
|
499
|
+
widget: new RemoteCaretWidget(state.info.displayName ?? "Anonymous", color)
|
|
500
|
+
})
|
|
501
|
+
});
|
|
502
|
+
}
|
|
503
|
+
this.decorations = Decoration.set(decorations, true);
|
|
504
|
+
}
|
|
626
505
|
};
|
|
627
|
-
var
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
506
|
+
var RemoteCaretWidget = class extends WidgetType {
|
|
507
|
+
constructor(name, color) {
|
|
508
|
+
super();
|
|
509
|
+
this.name = name;
|
|
510
|
+
this.color = color;
|
|
511
|
+
this.name = name;
|
|
512
|
+
this.color = color;
|
|
634
513
|
}
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
514
|
+
toDOM() {
|
|
515
|
+
const span = document.createElement("span");
|
|
516
|
+
span.className = "cm-ySelectionCaret";
|
|
517
|
+
span.style.backgroundColor = this.color;
|
|
518
|
+
span.style.borderColor = this.color;
|
|
519
|
+
const dot = document.createElement("div");
|
|
520
|
+
dot.className = "cm-ySelectionCaretDot";
|
|
521
|
+
const info = document.createElement("div");
|
|
522
|
+
info.className = "cm-ySelectionInfo";
|
|
523
|
+
info.innerText = this.name;
|
|
524
|
+
span.appendChild(document.createTextNode("\u2060"));
|
|
525
|
+
span.appendChild(dot);
|
|
526
|
+
span.appendChild(document.createTextNode("\u2060"));
|
|
527
|
+
span.appendChild(info);
|
|
528
|
+
span.appendChild(document.createTextNode("\u2060"));
|
|
529
|
+
return span;
|
|
530
|
+
}
|
|
531
|
+
eq(widget) {
|
|
532
|
+
return widget.color === this.color;
|
|
533
|
+
}
|
|
534
|
+
compare(widget) {
|
|
535
|
+
return widget.color === this.color;
|
|
536
|
+
}
|
|
537
|
+
updateDOM() {
|
|
538
|
+
return false;
|
|
539
|
+
}
|
|
540
|
+
get estimatedHeight() {
|
|
541
|
+
return -1;
|
|
542
|
+
}
|
|
543
|
+
ignoreEvent() {
|
|
544
|
+
return true;
|
|
545
|
+
}
|
|
546
|
+
};
|
|
547
|
+
var styles = EditorView.baseTheme({
|
|
548
|
+
".cm-ySelection": {},
|
|
549
|
+
".cm-yLineSelection": {
|
|
550
|
+
padding: 0,
|
|
551
|
+
margin: "0px 2px 0px 4px"
|
|
552
|
+
},
|
|
553
|
+
".cm-ySelectionCaret": {
|
|
554
|
+
position: "relative",
|
|
555
|
+
borderLeft: "1px solid black",
|
|
556
|
+
borderRight: "1px solid black",
|
|
557
|
+
marginLeft: "-1px",
|
|
558
|
+
marginRight: "-1px",
|
|
559
|
+
boxSizing: "border-box",
|
|
560
|
+
display: "inline"
|
|
561
|
+
},
|
|
562
|
+
".cm-ySelectionCaretDot": {
|
|
563
|
+
borderRadius: "50%",
|
|
564
|
+
position: "absolute",
|
|
565
|
+
width: ".4em",
|
|
566
|
+
height: ".4em",
|
|
567
|
+
top: "-.2em",
|
|
568
|
+
left: "-.2em",
|
|
569
|
+
backgroundColor: "inherit",
|
|
570
|
+
transition: "transform .3s ease-in-out",
|
|
571
|
+
boxSizing: "border-box"
|
|
572
|
+
},
|
|
573
|
+
".cm-ySelectionCaret:hover > .cm-ySelectionCaretDot": {
|
|
574
|
+
transformOrigin: "bottom center",
|
|
575
|
+
transform: "scale(0)"
|
|
576
|
+
},
|
|
577
|
+
".cm-ySelectionInfo": {
|
|
578
|
+
position: "absolute",
|
|
579
|
+
top: "-1.05em",
|
|
580
|
+
left: "-1px",
|
|
581
|
+
fontSize: ".75em",
|
|
582
|
+
fontFamily: "serif",
|
|
583
|
+
fontStyle: "normal",
|
|
584
|
+
fontWeight: "normal",
|
|
585
|
+
lineHeight: "normal",
|
|
586
|
+
userSelect: "none",
|
|
587
|
+
color: "white",
|
|
588
|
+
paddingLeft: "2px",
|
|
589
|
+
paddingRight: "2px",
|
|
590
|
+
zIndex: 101,
|
|
591
|
+
transition: "opacity .3s ease-in-out",
|
|
592
|
+
backgroundColor: "inherit",
|
|
593
|
+
// these should be separate
|
|
594
|
+
opacity: 0,
|
|
595
|
+
transitionDelay: "0s",
|
|
596
|
+
whiteSpace: "nowrap"
|
|
597
|
+
},
|
|
598
|
+
".cm-ySelectionCaret:hover > .cm-ySelectionInfo": {
|
|
599
|
+
opacity: 1,
|
|
600
|
+
transitionDelay: "0s"
|
|
601
|
+
}
|
|
602
|
+
});
|
|
603
|
+
|
|
604
|
+
// packages/ui/react-ui-editor/src/extensions/basic.ts
|
|
605
|
+
import { closeBrackets } from "@codemirror/autocomplete";
|
|
606
|
+
import { bracketMatching, defaultHighlightStyle, syntaxHighlighting } from "@codemirror/language";
|
|
607
|
+
import { oneDarkHighlightStyle } from "@codemirror/theme-one-dark";
|
|
608
|
+
import { drawSelection, EditorView as EditorView2, placeholder } from "@codemirror/view";
|
|
609
|
+
var basicBundle = ({ readonly, themeMode, placeholder: _placeholder }) => [
|
|
610
|
+
EditorView2.lineWrapping,
|
|
611
|
+
// TODO(burdon): Compare with minimalSetup.
|
|
612
|
+
// https://codemirror.net/docs/ref/#codemirror.minimalSetup
|
|
613
|
+
bracketMatching(),
|
|
614
|
+
closeBrackets(),
|
|
615
|
+
drawSelection(),
|
|
616
|
+
_placeholder && placeholder(_placeholder),
|
|
617
|
+
// TODO(burdon): Is this required?
|
|
618
|
+
themeMode === "dark" ? syntaxHighlighting(oneDarkHighlightStyle) : syntaxHighlighting(defaultHighlightStyle)
|
|
619
|
+
].filter(Boolean);
|
|
620
|
+
|
|
621
|
+
// packages/ui/react-ui-editor/src/extensions/blast.ts
|
|
622
|
+
import { EditorView as EditorView3, keymap as keymap2 } from "@codemirror/view";
|
|
623
|
+
import defaultsDeep from "lodash.defaultsdeep";
|
|
624
|
+
import { invariant } from "@dxos/invariant";
|
|
625
|
+
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/blast.ts";
|
|
626
|
+
var defaultOptions = {
|
|
627
|
+
effect: 2,
|
|
628
|
+
maxParticles: 200,
|
|
629
|
+
particleGravity: 0.08,
|
|
630
|
+
particleAlphaFadeout: 0.996,
|
|
631
|
+
particleSize: {
|
|
632
|
+
min: 2,
|
|
633
|
+
max: 8
|
|
634
|
+
},
|
|
635
|
+
particleNumRange: {
|
|
636
|
+
min: 5,
|
|
637
|
+
max: 10
|
|
638
|
+
},
|
|
639
|
+
particleVelocityRange: {
|
|
640
|
+
x: [
|
|
641
|
+
-1,
|
|
642
|
+
1
|
|
643
|
+
],
|
|
644
|
+
y: [
|
|
645
|
+
-3.5,
|
|
646
|
+
-1.5
|
|
647
|
+
]
|
|
648
|
+
},
|
|
649
|
+
particleShrinkRate: 0.95,
|
|
650
|
+
shakeIntensity: 5
|
|
651
|
+
};
|
|
652
|
+
var blast = (options = defaultOptions) => {
|
|
653
|
+
let blaster;
|
|
654
|
+
let last = 0;
|
|
655
|
+
const getPoint = (view, pos) => {
|
|
656
|
+
const { left: x = 0, top: y = 0 } = view.coordsForChar(pos) ?? {};
|
|
657
|
+
const element = document.elementFromPoint(x, y);
|
|
658
|
+
const { offsetLeft: left = 0, offsetTop: top = 0 } = view.scrollDOM.parentElement ?? {};
|
|
659
|
+
const point = {
|
|
660
|
+
x: x - left,
|
|
661
|
+
y: y - top
|
|
662
|
+
};
|
|
663
|
+
return {
|
|
664
|
+
element,
|
|
665
|
+
point
|
|
666
|
+
};
|
|
667
|
+
};
|
|
668
|
+
return [
|
|
669
|
+
// Cursor moved.
|
|
670
|
+
EditorView3.updateListener.of((update4) => {
|
|
671
|
+
if (blaster?.node !== update4.view.scrollDOM) {
|
|
672
|
+
if (blaster) {
|
|
673
|
+
blaster.destroy();
|
|
674
|
+
}
|
|
675
|
+
blaster = new Blaster(update4.view.scrollDOM, defaultsDeep({
|
|
676
|
+
particleGravity: 0.2,
|
|
677
|
+
particleShrinkRate: 0.995,
|
|
678
|
+
color: () => [
|
|
679
|
+
100 + Math.random() * 100,
|
|
680
|
+
0,
|
|
681
|
+
0
|
|
682
|
+
]
|
|
683
|
+
}, options, defaultOptions));
|
|
684
|
+
blaster.initialize();
|
|
685
|
+
blaster.start();
|
|
686
|
+
} else {
|
|
687
|
+
blaster.resize();
|
|
688
|
+
}
|
|
689
|
+
const current = update4.state.selection.main.head;
|
|
690
|
+
if (current !== last) {
|
|
691
|
+
last = current;
|
|
692
|
+
const { element, point } = getPoint(update4.view, current - 1);
|
|
693
|
+
if (element && point) {
|
|
694
|
+
blaster.spawn({
|
|
695
|
+
element,
|
|
696
|
+
point
|
|
697
|
+
});
|
|
698
|
+
}
|
|
699
|
+
}
|
|
700
|
+
}),
|
|
701
|
+
keymap2.of([
|
|
702
|
+
{
|
|
703
|
+
any: (_, event) => {
|
|
704
|
+
if (blaster) {
|
|
705
|
+
if (event.key === "Enter" && event.shiftKey) {
|
|
706
|
+
blaster.shake({
|
|
707
|
+
time: 0.8
|
|
708
|
+
});
|
|
709
|
+
return true;
|
|
710
|
+
}
|
|
711
|
+
}
|
|
712
|
+
return false;
|
|
713
|
+
}
|
|
714
|
+
}
|
|
715
|
+
])
|
|
716
|
+
];
|
|
717
|
+
};
|
|
718
|
+
var Blaster = class {
|
|
719
|
+
constructor(_node, _options) {
|
|
720
|
+
this._node = _node;
|
|
721
|
+
this._options = _options;
|
|
722
|
+
this._running = false;
|
|
723
|
+
this._shakeTime = 0;
|
|
724
|
+
this._shakeTimeMax = 0;
|
|
725
|
+
this._particles = [];
|
|
726
|
+
this._particlePointer = 0;
|
|
727
|
+
this._lastPoint = {
|
|
728
|
+
x: 0,
|
|
729
|
+
y: 0
|
|
730
|
+
};
|
|
731
|
+
this.shake = throttle(({ time }) => {
|
|
732
|
+
this._shakeTime = this._shakeTimeMax || time;
|
|
733
|
+
this._shakeTimeMax = time;
|
|
734
|
+
}, 100);
|
|
735
|
+
this.spawn = throttle(({ element, point }) => {
|
|
736
|
+
const color = getRGBComponents(element, this._options.color);
|
|
737
|
+
const numParticles = random(this._options.particleNumRange.min, this._options.particleNumRange.max);
|
|
738
|
+
const dir = this._lastPoint.x === point.x ? 0 : this._lastPoint.x < point.x ? 1 : -1;
|
|
739
|
+
this._lastPoint = point;
|
|
740
|
+
for (let i = numParticles; i--; i > 0) {
|
|
741
|
+
this._particles[this._particlePointer] = this._effect.create(point.x - dir * 16, point.y, color);
|
|
742
|
+
this._particlePointer = (this._particlePointer + 1) % this._options.maxParticles;
|
|
743
|
+
}
|
|
744
|
+
}, 100);
|
|
745
|
+
this._effect = this._options.effect === 1 ? new Effect1(_options) : new Effect2(_options);
|
|
746
|
+
}
|
|
747
|
+
get node() {
|
|
748
|
+
return this._node;
|
|
749
|
+
}
|
|
750
|
+
initialize() {
|
|
751
|
+
invariant(!this._canvas && !this._ctx, void 0, {
|
|
752
|
+
F: __dxlog_file2,
|
|
753
|
+
L: 138,
|
|
754
|
+
S: this,
|
|
755
|
+
A: [
|
|
756
|
+
"!this._canvas && !this._ctx",
|
|
757
|
+
""
|
|
758
|
+
]
|
|
759
|
+
});
|
|
760
|
+
this._canvas = document.createElement("canvas");
|
|
761
|
+
this._canvas.id = "code-blast-canvas";
|
|
762
|
+
this._canvas.style.position = "absolute";
|
|
763
|
+
this._canvas.style.zIndex = "0";
|
|
764
|
+
this._canvas.style.pointerEvents = "none";
|
|
765
|
+
this._ctx = this._canvas.getContext("2d");
|
|
766
|
+
const parent = this._node.parentElement?.parentElement;
|
|
767
|
+
parent?.appendChild(this._canvas);
|
|
768
|
+
this.resize();
|
|
769
|
+
}
|
|
770
|
+
destroy() {
|
|
771
|
+
this.stop();
|
|
772
|
+
if (this._canvas) {
|
|
773
|
+
this._canvas.remove();
|
|
774
|
+
this._canvas = void 0;
|
|
775
|
+
this._ctx = void 0;
|
|
776
|
+
}
|
|
777
|
+
}
|
|
778
|
+
resize() {
|
|
779
|
+
if (this._node.parentElement && this._canvas) {
|
|
780
|
+
const { offsetLeft: x, offsetTop: y, offsetWidth: width, offsetHeight: height } = this._node.parentElement;
|
|
781
|
+
this._canvas.style.top = `${y}px`;
|
|
782
|
+
this._canvas.style.left = `${x}px`;
|
|
783
|
+
this._canvas.width = width;
|
|
784
|
+
this._canvas.height = height;
|
|
785
|
+
}
|
|
786
|
+
}
|
|
787
|
+
start() {
|
|
788
|
+
invariant(this._canvas && this._ctx, void 0, {
|
|
789
|
+
F: __dxlog_file2,
|
|
790
|
+
L: 177,
|
|
791
|
+
S: this,
|
|
792
|
+
A: [
|
|
793
|
+
"this._canvas && this._ctx",
|
|
794
|
+
""
|
|
795
|
+
]
|
|
796
|
+
});
|
|
797
|
+
this._running = true;
|
|
798
|
+
this.loop();
|
|
799
|
+
}
|
|
800
|
+
stop() {
|
|
801
|
+
this._running = false;
|
|
802
|
+
this._node.style.transform = "translate(0px, 0px)";
|
|
803
|
+
}
|
|
804
|
+
loop() {
|
|
805
|
+
if (!this._running || !this._canvas || !this._ctx) {
|
|
806
|
+
return;
|
|
807
|
+
}
|
|
808
|
+
this._ctx.clearRect(0, 0, this._canvas.width ?? 0, this._canvas.height ?? 0);
|
|
809
|
+
const now = (/* @__PURE__ */ new Date()).getTime();
|
|
810
|
+
this._lastTime ??= now;
|
|
811
|
+
const dt = (now - this._lastTime) / 1e3;
|
|
812
|
+
this._lastTime = now;
|
|
813
|
+
if (this._shakeTime > 0) {
|
|
814
|
+
this._shakeTime -= dt;
|
|
815
|
+
const magnitude = this._shakeTime / this._shakeTimeMax * this._options.shakeIntensity;
|
|
816
|
+
const shakeX = random(-magnitude, magnitude);
|
|
817
|
+
const shakeY = random(-magnitude, magnitude);
|
|
818
|
+
this._node.style.transform = `translate(${shakeX}px,${shakeY}px)`;
|
|
819
|
+
}
|
|
820
|
+
this.drawParticles();
|
|
821
|
+
requestAnimationFrame(this.loop.bind(this));
|
|
822
|
+
}
|
|
823
|
+
drawParticles() {
|
|
824
|
+
for (let i = this._particles.length; i--; i > 0) {
|
|
825
|
+
const particle = this._particles[i];
|
|
826
|
+
if (!particle) {
|
|
827
|
+
continue;
|
|
828
|
+
}
|
|
829
|
+
if (particle.alpha < 0.01 || particle.size <= 0.5) {
|
|
830
|
+
continue;
|
|
831
|
+
}
|
|
832
|
+
this._effect.update(this._ctx, particle);
|
|
833
|
+
}
|
|
834
|
+
}
|
|
835
|
+
};
|
|
836
|
+
var Effect = class {
|
|
837
|
+
constructor(_options) {
|
|
838
|
+
this._options = _options;
|
|
839
|
+
}
|
|
840
|
+
};
|
|
841
|
+
var Effect1 = class extends Effect {
|
|
842
|
+
create(x, y, color) {
|
|
843
|
+
return {
|
|
844
|
+
x,
|
|
845
|
+
y: y + 10,
|
|
846
|
+
vx: random(this._options.particleVelocityRange.x[0], this._options.particleVelocityRange.x[1]),
|
|
847
|
+
vy: random(this._options.particleVelocityRange.y[0], this._options.particleVelocityRange.y[1]),
|
|
848
|
+
size: random(this._options.particleSize.min, this._options.particleSize.max),
|
|
849
|
+
color,
|
|
850
|
+
alpha: 1
|
|
851
|
+
};
|
|
852
|
+
}
|
|
853
|
+
update(ctx, particle) {
|
|
854
|
+
particle.vy += this._options.particleGravity;
|
|
855
|
+
particle.x += particle.vx;
|
|
856
|
+
particle.y += particle.vy;
|
|
857
|
+
particle.alpha *= this._options.particleAlphaFadeout;
|
|
858
|
+
ctx.fillStyle = `rgba(${particle.color[0]},${particle.color[1]},${particle.color[2]},${particle.alpha})`;
|
|
859
|
+
ctx.fillRect(Math.round(particle.x - 1), Math.round(particle.y - 1), particle.size, particle.size);
|
|
860
|
+
}
|
|
861
|
+
};
|
|
862
|
+
var Effect2 = class extends Effect {
|
|
863
|
+
create(x, y, color) {
|
|
864
|
+
return {
|
|
865
|
+
x,
|
|
866
|
+
y: y + 10,
|
|
867
|
+
vx: random(this._options.particleVelocityRange.x[0], this._options.particleVelocityRange.x[1]),
|
|
868
|
+
vy: random(this._options.particleVelocityRange.y[0], this._options.particleVelocityRange.y[1]),
|
|
869
|
+
size: random(this._options.particleSize.min, this._options.particleSize.max),
|
|
870
|
+
color,
|
|
871
|
+
alpha: 1,
|
|
872
|
+
theta: random(0, 360) * Math.PI / 180,
|
|
873
|
+
drag: 0.92,
|
|
874
|
+
wander: 0.15
|
|
875
|
+
};
|
|
876
|
+
}
|
|
877
|
+
update(ctx, particle) {
|
|
878
|
+
particle.vy += this._options.particleGravity;
|
|
879
|
+
particle.x += particle.vx;
|
|
880
|
+
particle.y += particle.vy;
|
|
881
|
+
particle.vx *= particle.drag;
|
|
882
|
+
particle.vy *= particle.drag;
|
|
883
|
+
particle.theta += random(-0.5, 0.5);
|
|
884
|
+
particle.vx += Math.sin(particle.theta) * 0.1;
|
|
885
|
+
particle.vy += Math.cos(particle.theta) * 0.1;
|
|
886
|
+
particle.size *= this._options.particleShrinkRate;
|
|
887
|
+
particle.alpha *= this._options.particleAlphaFadeout;
|
|
888
|
+
ctx.fillStyle = `rgba(${particle.color[0]},${particle.color[1]},${particle.color[2]},${particle.alpha})`;
|
|
889
|
+
ctx.beginPath();
|
|
890
|
+
ctx.arc(Math.round(particle.x - 1), Math.round(particle.y - 1), particle.size, 0, 2 * Math.PI);
|
|
891
|
+
ctx.fill();
|
|
638
892
|
}
|
|
639
|
-
return [
|
|
640
|
-
{
|
|
641
|
-
from: 0,
|
|
642
|
-
to: length,
|
|
643
|
-
insert: patch.value
|
|
644
|
-
}
|
|
645
|
-
];
|
|
646
893
|
};
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
894
|
+
function throttle(callback, limit) {
|
|
895
|
+
let wait = false;
|
|
896
|
+
return function(...args) {
|
|
897
|
+
if (!wait) {
|
|
898
|
+
callback.apply(this, args);
|
|
899
|
+
wait = true;
|
|
900
|
+
setTimeout(() => {
|
|
901
|
+
wait = false;
|
|
902
|
+
}, limit);
|
|
654
903
|
}
|
|
904
|
+
};
|
|
905
|
+
}
|
|
906
|
+
var getRGBComponents = (node, color) => {
|
|
907
|
+
if (typeof color === "function") {
|
|
908
|
+
return color();
|
|
655
909
|
}
|
|
656
|
-
const
|
|
657
|
-
if (
|
|
658
|
-
|
|
910
|
+
const bgColor = getComputedStyle(node).color;
|
|
911
|
+
if (bgColor) {
|
|
912
|
+
const x = bgColor.match(/(\d+), (\d+), (\d+)/)?.slice(1);
|
|
913
|
+
if (x) {
|
|
914
|
+
return x;
|
|
915
|
+
}
|
|
659
916
|
}
|
|
660
|
-
return
|
|
917
|
+
return [
|
|
918
|
+
50,
|
|
919
|
+
50,
|
|
920
|
+
50
|
|
921
|
+
];
|
|
661
922
|
};
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
this._inReconcile = false;
|
|
667
|
-
this._queue = [];
|
|
668
|
-
this.reconcile = (handle, view) => {
|
|
669
|
-
if (this._inReconcile) {
|
|
670
|
-
return;
|
|
671
|
-
}
|
|
672
|
-
this._inReconcile = true;
|
|
673
|
-
const path = getPath(view.state, this._field);
|
|
674
|
-
const oldHeads = getLastHeads(view.state, this._field);
|
|
675
|
-
let selection = view.state.selection;
|
|
676
|
-
const transactions = view.state.field(this._field).unreconciledTransactions.filter((tx) => !isReconcileTx(tx));
|
|
677
|
-
const toInvert = transactions.slice().reverse();
|
|
678
|
-
for (const tx of toInvert) {
|
|
679
|
-
const inverted = tx.changes.invert(tx.startState.doc);
|
|
680
|
-
selection = selection.map(inverted);
|
|
681
|
-
view.dispatch({
|
|
682
|
-
changes: inverted,
|
|
683
|
-
annotations: reconcileAnnotationType.of(true)
|
|
684
|
-
});
|
|
685
|
-
}
|
|
686
|
-
let newHeads = updateAutomerge(this._field, handle, transactions, view.state);
|
|
687
|
-
if (newHeads === null || newHeads === void 0) {
|
|
688
|
-
newHeads = automerge.getHeads(handle.docSync());
|
|
689
|
-
}
|
|
690
|
-
const diff = automerge.equals(oldHeads, newHeads) ? [] : automerge.diff(handle.docSync(), oldHeads, newHeads);
|
|
691
|
-
updateCodeMirror(view, selection, path, diff);
|
|
692
|
-
view.dispatch({
|
|
693
|
-
effects: updateHeads(newHeads),
|
|
694
|
-
annotations: reconcileAnnotationType.of({})
|
|
695
|
-
});
|
|
696
|
-
this._inReconcile = false;
|
|
697
|
-
};
|
|
698
|
-
if (field !== void 0) {
|
|
699
|
-
this._field = field;
|
|
700
|
-
}
|
|
923
|
+
var random = (min, max) => {
|
|
924
|
+
if (!max) {
|
|
925
|
+
max = min;
|
|
926
|
+
min = 0;
|
|
701
927
|
}
|
|
928
|
+
return min + ~~(Math.random() * (max - min + 1));
|
|
702
929
|
};
|
|
703
930
|
|
|
704
|
-
// packages/ui/react-ui-editor/src/
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
});
|
|
709
|
-
var getLastHeads = (state, field) => state.field(field).lastHeads;
|
|
710
|
-
var getPath = (state, field) => state.field(field).path;
|
|
711
|
-
var semaphoreFacet = Facet.define({
|
|
712
|
-
combine: (values) => values.at(-1)
|
|
713
|
-
});
|
|
714
|
-
var automergePlugin = (handle, path) => {
|
|
715
|
-
const stateField = StateField.define({
|
|
716
|
-
create: () => ({
|
|
717
|
-
lastHeads: automerge2.getHeads(handle.docSync()),
|
|
718
|
-
unreconciledTransactions: [],
|
|
719
|
-
path: path.slice()
|
|
720
|
-
}),
|
|
721
|
-
update: (value, tr) => {
|
|
722
|
-
const result = {
|
|
723
|
-
lastHeads: value.lastHeads,
|
|
724
|
-
unreconciledTransactions: value.unreconciledTransactions.slice(),
|
|
725
|
-
path: path.slice()
|
|
726
|
-
};
|
|
727
|
-
let clearUnreconciled = false;
|
|
728
|
-
for (const effect of tr.effects) {
|
|
729
|
-
if (effect.is(effectType)) {
|
|
730
|
-
result.lastHeads = effect.value.newHeads;
|
|
731
|
-
clearUnreconciled = true;
|
|
732
|
-
}
|
|
733
|
-
}
|
|
734
|
-
if (clearUnreconciled) {
|
|
735
|
-
result.unreconciledTransactions = [];
|
|
736
|
-
} else {
|
|
737
|
-
if (!isReconcileTx(tr)) {
|
|
738
|
-
result.unreconciledTransactions.push(tr);
|
|
739
|
-
}
|
|
740
|
-
}
|
|
741
|
-
return result;
|
|
742
|
-
}
|
|
743
|
-
});
|
|
744
|
-
const semaphore = new PatchSemaphore(stateField);
|
|
745
|
-
const viewPlugin = ViewPlugin2.fromClass(class AutomergeCodemirrorViewPlugin {
|
|
746
|
-
constructor(view) {
|
|
747
|
-
this._handleChange = () => {
|
|
748
|
-
this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
|
|
749
|
-
};
|
|
750
|
-
this._view = view;
|
|
751
|
-
handle.addListener("change", this._handleChange);
|
|
752
|
-
}
|
|
753
|
-
update(update4) {
|
|
754
|
-
if (update4.transactions.length > 0 && update4.transactions.some((t) => !isReconcileTx(t))) {
|
|
755
|
-
queueMicrotask(() => {
|
|
756
|
-
this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
|
|
757
|
-
});
|
|
758
|
-
}
|
|
759
|
-
}
|
|
760
|
-
destroy() {
|
|
761
|
-
handle.addListener("change", this._handleChange);
|
|
762
|
-
}
|
|
763
|
-
});
|
|
764
|
-
return {
|
|
765
|
-
extension: [
|
|
766
|
-
stateField,
|
|
767
|
-
semaphoreFacet.of(semaphore),
|
|
768
|
-
viewPlugin
|
|
769
|
-
]
|
|
770
|
-
};
|
|
771
|
-
};
|
|
772
|
-
var reconcileAnnotationType = Annotation.define();
|
|
773
|
-
var isReconcileTx = (tr) => !!tr.annotation(reconcileAnnotationType);
|
|
931
|
+
// packages/ui/react-ui-editor/src/extensions/code.ts
|
|
932
|
+
import { ViewPlugin as ViewPlugin3, EditorView as EditorView4, Decoration as Decoration2 } from "@codemirror/view";
|
|
933
|
+
import get2 from "lodash.get";
|
|
934
|
+
import { mx as mx2 } from "@dxos/react-ui-theme";
|
|
774
935
|
|
|
775
|
-
// packages/ui/react-ui-editor/src/
|
|
936
|
+
// packages/ui/react-ui-editor/src/styles/cursors.ts
|
|
776
937
|
import * as random2 from "lib0/random";
|
|
777
938
|
var cursorColors = [
|
|
778
939
|
{
|
|
@@ -782,235 +943,162 @@ var cursorColors = [
|
|
|
782
943
|
{
|
|
783
944
|
color: "#6eeb83",
|
|
784
945
|
light: "#6eeb8333"
|
|
785
|
-
},
|
|
786
|
-
{
|
|
787
|
-
color: "#ffbc42",
|
|
788
|
-
light: "#ffbc4233"
|
|
789
|
-
},
|
|
790
|
-
{
|
|
791
|
-
color: "#ecd444",
|
|
792
|
-
light: "#ecd44433"
|
|
793
|
-
},
|
|
794
|
-
{
|
|
795
|
-
color: "#ee6352",
|
|
796
|
-
light: "#ee635233"
|
|
797
|
-
},
|
|
798
|
-
{
|
|
799
|
-
color: "#9ac2c9",
|
|
800
|
-
light: "#9ac2c933"
|
|
801
|
-
},
|
|
802
|
-
{
|
|
803
|
-
color: "#8acb88",
|
|
804
|
-
light: "#8acb8833"
|
|
805
|
-
},
|
|
806
|
-
{
|
|
807
|
-
color: "#1be7ff",
|
|
808
|
-
light: "#1be7ff33"
|
|
809
|
-
}
|
|
810
|
-
];
|
|
811
|
-
var cursorColor = cursorColors[random2.uint32() % cursorColors.length];
|
|
812
|
-
|
|
813
|
-
// packages/ui/react-ui-editor/src/hooks/yjs/space-provider.ts
|
|
814
|
-
import * as decoding from "lib0/decoding";
|
|
815
|
-
import * as encoding from "lib0/encoding";
|
|
816
|
-
import { Observable } from "lib0/observable";
|
|
817
|
-
import * as awarenessProtocol from "y-protocols/awareness";
|
|
818
|
-
import { log as log2 } from "@dxos/log";
|
|
819
|
-
var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/yjs/space-provider.ts";
|
|
820
|
-
var messageAwareness = 1;
|
|
821
|
-
var messageQueryAwareness = 3;
|
|
822
|
-
var SpaceAwarenessProvider = class extends Observable {
|
|
823
|
-
constructor({ space, doc, channel, awareness }) {
|
|
824
|
-
super();
|
|
825
|
-
this._space = space;
|
|
826
|
-
this._awareness = awareness ?? new awarenessProtocol.Awareness(doc);
|
|
827
|
-
this._channel = channel;
|
|
828
|
-
this._clientId = doc.clientID;
|
|
829
|
-
this._awareness.on("update", this._handleAwarenessUpdate.bind(this));
|
|
830
|
-
this._space.listen(this._channel, this._handleSpaceMessage.bind(this));
|
|
831
|
-
if (typeof window !== "undefined") {
|
|
832
|
-
window.addEventListener("beforeunload", this._handleBeforeUnload.bind(this));
|
|
833
|
-
} else if (typeof process !== "undefined") {
|
|
834
|
-
process.on("exit", this._handleBeforeUnload.bind(this));
|
|
835
|
-
}
|
|
836
|
-
const encoderAwarenessQuery = encoding.createEncoder();
|
|
837
|
-
encoding.writeVarUint(encoderAwarenessQuery, messageQueryAwareness);
|
|
838
|
-
void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwarenessQuery));
|
|
839
|
-
const encoderAwarenessState = encoding.createEncoder();
|
|
840
|
-
encoding.writeVarUint(encoderAwarenessState, messageAwareness);
|
|
841
|
-
encoding.writeVarUint8Array(encoderAwarenessState, awarenessProtocol.encodeAwarenessUpdate(this.awareness, [
|
|
842
|
-
this._clientId
|
|
843
|
-
]));
|
|
844
|
-
void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwarenessState));
|
|
845
|
-
}
|
|
846
|
-
get awareness() {
|
|
847
|
-
return this._awareness;
|
|
848
|
-
}
|
|
849
|
-
_handleAwarenessUpdate({ added, updated, removed }, origin) {
|
|
850
|
-
log2("awareness update", {
|
|
851
|
-
added,
|
|
852
|
-
updated,
|
|
853
|
-
removed,
|
|
854
|
-
origin
|
|
855
|
-
}, {
|
|
856
|
-
F: __dxlog_file3,
|
|
857
|
-
L: 67,
|
|
858
|
-
S: this,
|
|
859
|
-
C: (f, a) => f(...a)
|
|
860
|
-
});
|
|
861
|
-
const changedClients = added.concat(updated).concat(removed);
|
|
862
|
-
const encoderAwareness = encoding.createEncoder();
|
|
863
|
-
encoding.writeVarUint(encoderAwareness, messageAwareness);
|
|
864
|
-
encoding.writeVarUint8Array(encoderAwareness, awarenessProtocol.encodeAwarenessUpdate(this._awareness, changedClients));
|
|
865
|
-
void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwareness));
|
|
866
|
-
}
|
|
867
|
-
_handleSpaceMessage({ payload }) {
|
|
868
|
-
log2("space message", payload, {
|
|
869
|
-
F: __dxlog_file3,
|
|
870
|
-
L: 79,
|
|
871
|
-
S: this,
|
|
872
|
-
C: (f, a) => f(...a)
|
|
873
|
-
});
|
|
874
|
-
const data = new Uint8Array(Array.from(Object.values(payload)));
|
|
875
|
-
const encoder = this._readMessage(data);
|
|
876
|
-
if (encoder) {
|
|
877
|
-
void this._space.postMessage(this._channel, encoding.toUint8Array(encoder));
|
|
878
|
-
}
|
|
879
|
-
}
|
|
880
|
-
_readMessage(message) {
|
|
881
|
-
const decoder = decoding.createDecoder(message);
|
|
882
|
-
const encoder = encoding.createEncoder();
|
|
883
|
-
const messageType = decoding.readVarUint(decoder);
|
|
884
|
-
let sendReply = false;
|
|
885
|
-
switch (messageType) {
|
|
886
|
-
case messageAwareness: {
|
|
887
|
-
awarenessProtocol.applyAwarenessUpdate(this._awareness, decoding.readVarUint8Array(decoder), this);
|
|
888
|
-
break;
|
|
889
|
-
}
|
|
890
|
-
case messageQueryAwareness: {
|
|
891
|
-
encoding.writeVarUint(encoder, messageAwareness);
|
|
892
|
-
encoding.writeVarUint8Array(encoder, awarenessProtocol.encodeAwarenessUpdate(this._awareness, Array.from(this._awareness.getStates().keys())));
|
|
893
|
-
sendReply = true;
|
|
894
|
-
break;
|
|
895
|
-
}
|
|
896
|
-
default: {
|
|
897
|
-
console.error("Invalid message:", messageType);
|
|
898
|
-
return encoder;
|
|
899
|
-
}
|
|
900
|
-
}
|
|
901
|
-
if (!sendReply) {
|
|
902
|
-
return null;
|
|
903
|
-
}
|
|
904
|
-
return encoder;
|
|
905
|
-
}
|
|
906
|
-
_handleBeforeUnload() {
|
|
907
|
-
awarenessProtocol.removeAwarenessStates(this._awareness, [
|
|
908
|
-
this._clientId
|
|
909
|
-
], "window unload");
|
|
946
|
+
},
|
|
947
|
+
{
|
|
948
|
+
color: "#ffbc42",
|
|
949
|
+
light: "#ffbc4233"
|
|
950
|
+
},
|
|
951
|
+
{
|
|
952
|
+
color: "#ecd444",
|
|
953
|
+
light: "#ecd44433"
|
|
954
|
+
},
|
|
955
|
+
{
|
|
956
|
+
color: "#ee6352",
|
|
957
|
+
light: "#ee635233"
|
|
958
|
+
},
|
|
959
|
+
{
|
|
960
|
+
color: "#9ac2c9",
|
|
961
|
+
light: "#9ac2c933"
|
|
962
|
+
},
|
|
963
|
+
{
|
|
964
|
+
color: "#8acb88",
|
|
965
|
+
light: "#8acb8833"
|
|
966
|
+
},
|
|
967
|
+
{
|
|
968
|
+
color: "#1be7ff",
|
|
969
|
+
light: "#1be7ff33"
|
|
910
970
|
}
|
|
971
|
+
];
|
|
972
|
+
var cursorColor = cursorColors[random2.uint32() % cursorColors.length];
|
|
973
|
+
|
|
974
|
+
// packages/ui/react-ui-editor/src/styles/markdown.ts
|
|
975
|
+
import { mx } from "@dxos/react-ui-theme";
|
|
976
|
+
var headings = {
|
|
977
|
+
1: [
|
|
978
|
+
"mbs-4 mbe-2 font-medium text-inherit no-underline text-4xl",
|
|
979
|
+
"-ml-[10px]"
|
|
980
|
+
],
|
|
981
|
+
2: [
|
|
982
|
+
"mbs-4 mbe-2 font-medium text-inherit no-underline text-3xl",
|
|
983
|
+
"-ml-[8px]"
|
|
984
|
+
],
|
|
985
|
+
3: [
|
|
986
|
+
"mbs-4 mbe-2 font-medium text-inherit no-underline text-2xl",
|
|
987
|
+
"-ml-[7px]"
|
|
988
|
+
],
|
|
989
|
+
4: [
|
|
990
|
+
"mbs-4 mbe-2 font-medium text-inherit no-underline text-xl",
|
|
991
|
+
"-ml-[6px]"
|
|
992
|
+
],
|
|
993
|
+
5: [
|
|
994
|
+
"mbs-4 mbe-2 font-medium text-inherit no-underline text-lg",
|
|
995
|
+
"-ml-[5px]"
|
|
996
|
+
],
|
|
997
|
+
6: [
|
|
998
|
+
"mbs-4 mbe-2 font-medium text-inherit no-underline",
|
|
999
|
+
"-ml-[4px]"
|
|
1000
|
+
]
|
|
1001
|
+
};
|
|
1002
|
+
var heading = (level, readonly) => {
|
|
1003
|
+
const [style, offset] = headings[level];
|
|
1004
|
+
return mx(style, readonly && offset);
|
|
911
1005
|
};
|
|
1006
|
+
var light = "text-neutral-200 dark:text-neutral-800";
|
|
1007
|
+
var mark = mx("!font-normal !no-underline !text-inherit opacity-40", light);
|
|
1008
|
+
var bold = "font-bold";
|
|
1009
|
+
var italic = "italic";
|
|
1010
|
+
var strikethrough = "line-through";
|
|
1011
|
+
var code = "font-mono !no-underline text-neutral-700 dark:text-neutral-300";
|
|
1012
|
+
var codeMark = "font-mono text-primary-500";
|
|
1013
|
+
var inlineUrl = mx(code, "px-1");
|
|
1014
|
+
var blockquote = mx("pl-1 mr-1 border-is-4 border-primary-500/70 dark:border-primary-500/30", light);
|
|
912
1015
|
|
|
913
|
-
// packages/ui/react-ui-editor/src/
|
|
914
|
-
|
|
915
|
-
var
|
|
916
|
-
|
|
917
|
-
|
|
1016
|
+
// packages/ui/react-ui-editor/src/styles/tokens.ts
|
|
1017
|
+
import { tailwindConfig } from "@dxos/react-ui-theme";
|
|
1018
|
+
var tokens = tailwindConfig({}).theme;
|
|
1019
|
+
|
|
1020
|
+
// packages/ui/react-ui-editor/src/extensions/code.ts
|
|
1021
|
+
var CODE_REGEX = /```[\s\S]*?```/gs;
|
|
1022
|
+
var styles2 = EditorView4.baseTheme({
|
|
1023
|
+
"& .cm-codeblock": {
|
|
1024
|
+
fontFamily: get2(tokens, "fontFamily.mono", []).join(",")
|
|
1025
|
+
},
|
|
1026
|
+
'&light [aria-readonly="true"] .cm-codeblock': {
|
|
1027
|
+
background: get2(tokens, "extend.colors.neutral.50")
|
|
1028
|
+
},
|
|
1029
|
+
'&dark [aria-readonly="true"] .cm-codeblock': {
|
|
1030
|
+
background: get2(tokens, "extend.colors.neutral.850")
|
|
1031
|
+
},
|
|
1032
|
+
'& [aria-readonly="true"] .cm-codeblock': {
|
|
1033
|
+
display: "block",
|
|
1034
|
+
paddingInline: "4px !important"
|
|
1035
|
+
},
|
|
1036
|
+
'& [aria-readonly="true"] .cm-codeblock-first': {
|
|
1037
|
+
paddingTop: "4px !important",
|
|
1038
|
+
borderTopLeftRadius: "4px",
|
|
1039
|
+
borderTopRightRadius: "4px"
|
|
1040
|
+
},
|
|
1041
|
+
'& [aria-readonly="true"] .cm-codeblock-last': {
|
|
1042
|
+
paddingBottom: "4px !important",
|
|
1043
|
+
borderBottomLeftRadius: "4px",
|
|
1044
|
+
borderBottomRightRadius: "4px"
|
|
1045
|
+
}
|
|
918
1046
|
});
|
|
919
|
-
var
|
|
920
|
-
const
|
|
921
|
-
const
|
|
922
|
-
|
|
923
|
-
|
|
924
|
-
|
|
925
|
-
|
|
926
|
-
]);
|
|
927
|
-
return model;
|
|
1047
|
+
var getLineRange = (lines, from, to) => {
|
|
1048
|
+
const start = lines.findIndex((line) => line.from >= from);
|
|
1049
|
+
const end = lines.findIndex((line) => line.to >= to);
|
|
1050
|
+
return [
|
|
1051
|
+
start,
|
|
1052
|
+
end
|
|
1053
|
+
];
|
|
928
1054
|
};
|
|
929
|
-
var
|
|
930
|
-
const
|
|
931
|
-
|
|
932
|
-
|
|
933
|
-
|
|
934
|
-
|
|
935
|
-
|
|
1055
|
+
var code2 = () => {
|
|
1056
|
+
const getDecorations = (view) => {
|
|
1057
|
+
const decorations = [];
|
|
1058
|
+
if (view.state.readOnly) {
|
|
1059
|
+
const text = view.state.doc.sliceString(0);
|
|
1060
|
+
const matches = text.matchAll(CODE_REGEX);
|
|
1061
|
+
const blocks = view.viewportLineBlocks;
|
|
1062
|
+
for (const match of matches) {
|
|
1063
|
+
const range = getLineRange(blocks, match.index, match.index + match[0].length);
|
|
1064
|
+
for (let i = range[0]; i <= range[1]; i++) {
|
|
1065
|
+
const block = blocks[i];
|
|
1066
|
+
decorations.push(Decoration2.line({
|
|
1067
|
+
class: mx2("cm-codeblock", i === range[0] && "cm-codeblock-first", i === range[1] && "cm-codeblock-last")
|
|
1068
|
+
}).range(block.from));
|
|
1069
|
+
}
|
|
1070
|
+
}
|
|
936
1071
|
}
|
|
937
|
-
return
|
|
938
|
-
}
|
|
939
|
-
};
|
|
940
|
-
var createYjsModel = ({ identity, space, text }) => {
|
|
941
|
-
invariant2(text?.doc && text?.content, void 0, {
|
|
942
|
-
F: __dxlog_file4,
|
|
943
|
-
L: 97,
|
|
944
|
-
S: void 0,
|
|
945
|
-
A: [
|
|
946
|
-
"text?.doc && text?.content",
|
|
947
|
-
""
|
|
948
|
-
]
|
|
949
|
-
});
|
|
950
|
-
const provider = space ? new SpaceAwarenessProvider({
|
|
951
|
-
space,
|
|
952
|
-
doc: text.doc,
|
|
953
|
-
channel: `yjs.awareness.${text.id}`
|
|
954
|
-
}) : void 0;
|
|
955
|
-
const model = {
|
|
956
|
-
id: text.doc.guid,
|
|
957
|
-
content: text.content,
|
|
958
|
-
text: () => text.content.toString(),
|
|
959
|
-
// https://github.com/yjs/yjs?tab=readme-ov-file#relative-positions
|
|
960
|
-
getCursorFromRange: (range) => {
|
|
961
|
-
const from = Y.encodeRelativePosition(Y.createRelativePositionFromTypeIndex(text.content, range.from));
|
|
962
|
-
const to = Y.encodeRelativePosition(Y.createRelativePositionFromTypeIndex(text.content, range.to, -1));
|
|
963
|
-
return [
|
|
964
|
-
arrayToString(from),
|
|
965
|
-
arrayToString(to)
|
|
966
|
-
].join(":");
|
|
967
|
-
},
|
|
968
|
-
getRangeFromCursor: (cursor) => {
|
|
969
|
-
const parts = cursor.split(":");
|
|
970
|
-
const from = Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(stringToArray(parts[0])), text.doc);
|
|
971
|
-
const to = Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(stringToArray(parts[1])), text.doc);
|
|
972
|
-
return {
|
|
973
|
-
from: from.index,
|
|
974
|
-
to: to.index
|
|
975
|
-
};
|
|
976
|
-
},
|
|
977
|
-
extension: [
|
|
978
|
-
yCollab(text.content, provider?.awareness),
|
|
979
|
-
modelState.init(() => model)
|
|
980
|
-
],
|
|
981
|
-
awareness: provider?.awareness,
|
|
982
|
-
peer: identity ? {
|
|
983
|
-
id: identity.identityKey.toHex(),
|
|
984
|
-
name: identity.profile?.displayName
|
|
985
|
-
} : void 0
|
|
986
|
-
};
|
|
987
|
-
return model;
|
|
988
|
-
};
|
|
989
|
-
var createAutomergeModel = ({ identity, text }) => {
|
|
990
|
-
const obj = text;
|
|
991
|
-
const doc = getRawDoc(obj, [
|
|
992
|
-
obj.field
|
|
993
|
-
]);
|
|
994
|
-
const model = {
|
|
995
|
-
id: obj.id,
|
|
996
|
-
content: doc,
|
|
997
|
-
text: () => get2(doc.handle.docSync(), doc.path),
|
|
998
|
-
// TODO(burdon): https://automerge.org/automerge/api-docs/js/functions/next.getCursor.html
|
|
999
|
-
extension: [
|
|
1000
|
-
automergePlugin(doc.handle, doc.path),
|
|
1001
|
-
modelState.init(() => model)
|
|
1002
|
-
],
|
|
1003
|
-
peer: identity ? {
|
|
1004
|
-
id: identity.identityKey.toHex(),
|
|
1005
|
-
name: identity.profile?.displayName
|
|
1006
|
-
} : void 0
|
|
1072
|
+
return Decoration2.set(decorations);
|
|
1007
1073
|
};
|
|
1008
|
-
return
|
|
1074
|
+
return [
|
|
1075
|
+
ViewPlugin3.fromClass(class {
|
|
1076
|
+
constructor(view) {
|
|
1077
|
+
this.decorations = getDecorations(view);
|
|
1078
|
+
}
|
|
1079
|
+
update(update4) {
|
|
1080
|
+
if (update4.docChanged || update4.viewportChanged) {
|
|
1081
|
+
this.decorations = getDecorations(update4.view);
|
|
1082
|
+
}
|
|
1083
|
+
}
|
|
1084
|
+
}, {
|
|
1085
|
+
decorations: (value) => value.decorations
|
|
1086
|
+
}),
|
|
1087
|
+
styles2
|
|
1088
|
+
];
|
|
1009
1089
|
};
|
|
1010
1090
|
|
|
1011
|
-
// packages/ui/react-ui-editor/src/
|
|
1012
|
-
|
|
1013
|
-
|
|
1091
|
+
// packages/ui/react-ui-editor/src/extensions/comments.ts
|
|
1092
|
+
import { StateEffect as StateEffect2, StateField as StateField2 } from "@codemirror/state";
|
|
1093
|
+
import { hoverTooltip, keymap as keymap3, Decoration as Decoration3, EditorView as EditorView5, MatchDecorator, ViewPlugin as ViewPlugin4, WidgetType as WidgetType2 } from "@codemirror/view";
|
|
1094
|
+
import get3 from "lodash.get";
|
|
1095
|
+
import sortBy from "lodash.sortby";
|
|
1096
|
+
import { debounce } from "@dxos/async";
|
|
1097
|
+
import { invariant as invariant2 } from "@dxos/invariant";
|
|
1098
|
+
import { log as log2 } from "@dxos/log";
|
|
1099
|
+
import { nonNullable } from "@dxos/util";
|
|
1100
|
+
var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/comments.ts";
|
|
1101
|
+
var styles3 = EditorView5.baseTheme({
|
|
1014
1102
|
"& .cm-bookmark": {
|
|
1015
1103
|
cursor: "pointer",
|
|
1016
1104
|
margin: "4px",
|
|
@@ -1021,28 +1109,44 @@ var styles2 = EditorView4.baseTheme({
|
|
|
1021
1109
|
backgroundColor: "orange"
|
|
1022
1110
|
},
|
|
1023
1111
|
"& .cm-comment": {
|
|
1024
|
-
backgroundColor: "yellow"
|
|
1112
|
+
backgroundColor: get3(tokens, "extend.colors.yellow.50")
|
|
1025
1113
|
},
|
|
1026
1114
|
"& .cm-comment-active": {
|
|
1027
|
-
backgroundColor: "
|
|
1115
|
+
backgroundColor: get3(tokens, "extend.colors.yellow.100")
|
|
1028
1116
|
}
|
|
1029
1117
|
});
|
|
1030
1118
|
var marks = {
|
|
1031
|
-
highlight:
|
|
1119
|
+
highlight: Decoration3.mark({
|
|
1032
1120
|
class: "cm-comment"
|
|
1033
1121
|
}),
|
|
1034
|
-
highlightActive:
|
|
1122
|
+
highlightActive: Decoration3.mark({
|
|
1035
1123
|
class: "cm-comment-active"
|
|
1036
1124
|
})
|
|
1037
1125
|
};
|
|
1126
|
+
var setFocus = (view, thread) => {
|
|
1127
|
+
const range = view.state.field(commentsStateField).ranges.find((range2) => range2.id === thread);
|
|
1128
|
+
if (!range) {
|
|
1129
|
+
return;
|
|
1130
|
+
}
|
|
1131
|
+
view.dispatch({
|
|
1132
|
+
effects: setSelection.of({
|
|
1133
|
+
active: thread
|
|
1134
|
+
}),
|
|
1135
|
+
selection: {
|
|
1136
|
+
anchor: range.from
|
|
1137
|
+
},
|
|
1138
|
+
scrollIntoView: true
|
|
1139
|
+
});
|
|
1140
|
+
};
|
|
1038
1141
|
var setCommentRange = StateEffect2.define();
|
|
1039
1142
|
var setSelection = StateEffect2.define();
|
|
1040
1143
|
var setCommentState = StateEffect2.define();
|
|
1041
|
-
var commentsStateField =
|
|
1144
|
+
var commentsStateField = StateField2.define({
|
|
1042
1145
|
create: () => ({
|
|
1043
1146
|
ranges: []
|
|
1044
1147
|
}),
|
|
1045
1148
|
update: (value, tr) => {
|
|
1149
|
+
const cursorConverter3 = tr.state.facet(CursorConverter);
|
|
1046
1150
|
for (const effect of tr.effects) {
|
|
1047
1151
|
if (effect.is(setSelection)) {
|
|
1048
1152
|
return {
|
|
@@ -1051,14 +1155,14 @@ var commentsStateField = StateField3.define({
|
|
|
1051
1155
|
};
|
|
1052
1156
|
}
|
|
1053
1157
|
if (effect.is(setCommentRange)) {
|
|
1054
|
-
const {
|
|
1158
|
+
const { comments: comments2 } = effect.value;
|
|
1055
1159
|
const ranges = comments2.map((comment) => {
|
|
1056
|
-
const range =
|
|
1057
|
-
return {
|
|
1160
|
+
const range = getRangeFromCursor(cursorConverter3, comment.cursor);
|
|
1161
|
+
return range && {
|
|
1058
1162
|
...comment,
|
|
1059
1163
|
...range
|
|
1060
1164
|
};
|
|
1061
|
-
});
|
|
1165
|
+
}).filter(nonNullable);
|
|
1062
1166
|
return {
|
|
1063
1167
|
...value,
|
|
1064
1168
|
ranges
|
|
@@ -1071,7 +1175,7 @@ var commentsStateField = StateField3.define({
|
|
|
1071
1175
|
return value;
|
|
1072
1176
|
}
|
|
1073
1177
|
});
|
|
1074
|
-
var highlightDecorations =
|
|
1178
|
+
var highlightDecorations = EditorView5.decorations.compute([
|
|
1075
1179
|
commentsStateField
|
|
1076
1180
|
], (state) => {
|
|
1077
1181
|
const { active, ranges } = state.field(commentsStateField);
|
|
@@ -1089,17 +1193,17 @@ var highlightDecorations = EditorView4.decorations.compute([
|
|
|
1089
1193
|
return marks.highlight.range(range.from, range.to);
|
|
1090
1194
|
}
|
|
1091
1195
|
}).filter(nonNullable) ?? [];
|
|
1092
|
-
return
|
|
1196
|
+
return Decoration3.set(decorations);
|
|
1093
1197
|
});
|
|
1094
|
-
var BookmarkWidget = class extends
|
|
1198
|
+
var BookmarkWidget = class extends WidgetType2 {
|
|
1095
1199
|
constructor(_anchor, _id, _handleClick) {
|
|
1096
1200
|
super();
|
|
1097
1201
|
this._anchor = _anchor;
|
|
1098
1202
|
this._id = _id;
|
|
1099
1203
|
this._handleClick = _handleClick;
|
|
1100
|
-
|
|
1101
|
-
F:
|
|
1102
|
-
L:
|
|
1204
|
+
invariant2(this._id, void 0, {
|
|
1205
|
+
F: __dxlog_file3,
|
|
1206
|
+
L: 169,
|
|
1103
1207
|
S: this,
|
|
1104
1208
|
A: [
|
|
1105
1209
|
"this._id",
|
|
@@ -1123,9 +1227,10 @@ var BookmarkWidget = class extends WidgetType {
|
|
|
1123
1227
|
var comments = (options = {}) => {
|
|
1124
1228
|
const handleSelect = debounce((state) => options.onSelect?.(state), 200);
|
|
1125
1229
|
const createCommentThread = (view) => {
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
|
|
1230
|
+
const cursorConverter3 = view.state.facet(CursorConverter);
|
|
1231
|
+
invariant2(options.onCreate, void 0, {
|
|
1232
|
+
F: __dxlog_file3,
|
|
1233
|
+
L: 225,
|
|
1129
1234
|
S: void 0,
|
|
1130
1235
|
A: [
|
|
1131
1236
|
"options.onCreate",
|
|
@@ -1136,8 +1241,7 @@ var comments = (options = {}) => {
|
|
|
1136
1241
|
if (from === to) {
|
|
1137
1242
|
return false;
|
|
1138
1243
|
}
|
|
1139
|
-
const
|
|
1140
|
-
const relPos = model?.getCursorFromRange?.({
|
|
1244
|
+
const relPos = getCursorFromRange(cursorConverter3, {
|
|
1141
1245
|
from,
|
|
1142
1246
|
to
|
|
1143
1247
|
});
|
|
@@ -1169,7 +1273,7 @@ var comments = (options = {}) => {
|
|
|
1169
1273
|
}
|
|
1170
1274
|
return false;
|
|
1171
1275
|
};
|
|
1172
|
-
const bookmarksViewPlugin =
|
|
1276
|
+
const bookmarksViewPlugin = ViewPlugin4.fromClass(class BookmarkViewPlugin {
|
|
1173
1277
|
static {
|
|
1174
1278
|
// Match markdown footnotes (option).
|
|
1175
1279
|
// https://www.markdownguide.org/extended-syntax/#footnotes
|
|
@@ -1177,7 +1281,7 @@ var comments = (options = {}) => {
|
|
|
1177
1281
|
regexp: /\[\^(\w+)\]/g,
|
|
1178
1282
|
decoration: (match, view, pos) => {
|
|
1179
1283
|
const id = match[1];
|
|
1180
|
-
return
|
|
1284
|
+
return Decoration3.replace({
|
|
1181
1285
|
id,
|
|
1182
1286
|
widget: new BookmarkWidget(pos, id)
|
|
1183
1287
|
});
|
|
@@ -1192,15 +1296,15 @@ var comments = (options = {}) => {
|
|
|
1192
1296
|
}
|
|
1193
1297
|
}, {
|
|
1194
1298
|
decorations: (instance) => instance.bookmarks,
|
|
1195
|
-
provide: (plugin) =>
|
|
1196
|
-
return view.plugin(plugin)?.bookmarks ||
|
|
1299
|
+
provide: (plugin) => EditorView5.atomicRanges.of((view) => {
|
|
1300
|
+
return view.plugin(plugin)?.bookmarks || Decoration3.none;
|
|
1197
1301
|
})
|
|
1198
1302
|
});
|
|
1199
1303
|
return [
|
|
1200
1304
|
bookmarksViewPlugin,
|
|
1201
1305
|
commentsStateField,
|
|
1202
1306
|
highlightDecorations,
|
|
1203
|
-
|
|
1307
|
+
styles3,
|
|
1204
1308
|
//
|
|
1205
1309
|
// Keymap.
|
|
1206
1310
|
//
|
|
@@ -1243,37 +1347,28 @@ var comments = (options = {}) => {
|
|
|
1243
1347
|
// Monitor cursor movement and text updates.
|
|
1244
1348
|
// TODO(burdon): Is there a better (finer grained) way to do this?
|
|
1245
1349
|
//
|
|
1246
|
-
|
|
1350
|
+
EditorView5.updateListener.of(({ view, state, changes }) => {
|
|
1351
|
+
const cursorConverter3 = view.state.facet(CursorConverter);
|
|
1247
1352
|
{
|
|
1248
1353
|
let mod = false;
|
|
1249
|
-
const model = state.field(modelState);
|
|
1250
1354
|
const { active, ranges } = state.field(commentsStateField);
|
|
1251
1355
|
changes.iterChanges((from, to, from2, to2) => {
|
|
1252
|
-
invariant3(model, void 0, {
|
|
1253
|
-
F: __dxlog_file5,
|
|
1254
|
-
L: 334,
|
|
1255
|
-
S: void 0,
|
|
1256
|
-
A: [
|
|
1257
|
-
"model",
|
|
1258
|
-
""
|
|
1259
|
-
]
|
|
1260
|
-
});
|
|
1261
1356
|
ranges.forEach((range) => {
|
|
1262
1357
|
if (from2 === to2) {
|
|
1263
|
-
const newRange =
|
|
1264
|
-
if (newRange.to - newRange.from === 0) {
|
|
1265
|
-
|
|
1358
|
+
const newRange = getRangeFromCursor(cursorConverter3, range.cursor);
|
|
1359
|
+
if (!newRange || newRange.to - newRange.from === 0) {
|
|
1360
|
+
log2.info("deleted comment", {
|
|
1266
1361
|
thread: range.id
|
|
1267
1362
|
}, {
|
|
1268
|
-
F:
|
|
1269
|
-
L:
|
|
1363
|
+
F: __dxlog_file3,
|
|
1364
|
+
L: 359,
|
|
1270
1365
|
S: void 0,
|
|
1271
1366
|
C: (f, a) => f(...a)
|
|
1272
1367
|
});
|
|
1273
1368
|
}
|
|
1274
1369
|
}
|
|
1275
1370
|
if (from <= range.to) {
|
|
1276
|
-
const newRange =
|
|
1371
|
+
const newRange = getRangeFromCursor(cursorConverter3, range.cursor);
|
|
1277
1372
|
Object.assign(range, newRange);
|
|
1278
1373
|
mod = true;
|
|
1279
1374
|
}
|
|
@@ -1322,18 +1417,35 @@ var comments = (options = {}) => {
|
|
|
1322
1417
|
})
|
|
1323
1418
|
];
|
|
1324
1419
|
};
|
|
1420
|
+
var getCursorFromRange = (cursorConverter3, range) => {
|
|
1421
|
+
const from = cursorConverter3.toCursor(range.from);
|
|
1422
|
+
const to = cursorConverter3.toCursor(range.to, -1);
|
|
1423
|
+
return [
|
|
1424
|
+
from,
|
|
1425
|
+
to
|
|
1426
|
+
].join(":");
|
|
1427
|
+
};
|
|
1428
|
+
var getRangeFromCursor = (cursorConverter3, cursor) => {
|
|
1429
|
+
const parts = cursor.split(":");
|
|
1430
|
+
const from = cursorConverter3.fromCursor(parts[0]);
|
|
1431
|
+
const to = cursorConverter3.fromCursor(parts[1]);
|
|
1432
|
+
return from && to ? {
|
|
1433
|
+
from,
|
|
1434
|
+
to
|
|
1435
|
+
} : void 0;
|
|
1436
|
+
};
|
|
1325
1437
|
|
|
1326
|
-
// packages/ui/react-ui-editor/src/
|
|
1327
|
-
import { Decoration as
|
|
1328
|
-
import
|
|
1329
|
-
var
|
|
1438
|
+
// packages/ui/react-ui-editor/src/extensions/hr.ts
|
|
1439
|
+
import { Decoration as Decoration4, EditorView as EditorView6, MatchDecorator as MatchDecorator2, ViewPlugin as ViewPlugin5, WidgetType as WidgetType3 } from "@codemirror/view";
|
|
1440
|
+
import get4 from "lodash.get";
|
|
1441
|
+
var styles4 = EditorView6.baseTheme({
|
|
1330
1442
|
"& .cm-hr": {
|
|
1331
1443
|
// TODO(burdon): ???
|
|
1332
1444
|
// Note that block-level decorations should not have vertical margins,
|
|
1333
|
-
borderBottom: `1px solid ${
|
|
1445
|
+
borderBottom: `1px solid ${get4(tokens, "extend.colors.neutral.200")}`
|
|
1334
1446
|
}
|
|
1335
1447
|
});
|
|
1336
|
-
var HorizontalRuleWidget = class extends
|
|
1448
|
+
var HorizontalRuleWidget = class extends WidgetType3 {
|
|
1337
1449
|
constructor(_pos) {
|
|
1338
1450
|
super();
|
|
1339
1451
|
this._pos = _pos;
|
|
@@ -1349,13 +1461,13 @@ var HorizontalRuleWidget = class extends WidgetType2 {
|
|
|
1349
1461
|
};
|
|
1350
1462
|
var placeholderMatcher = new MatchDecorator2({
|
|
1351
1463
|
regexp: /^---$/g,
|
|
1352
|
-
decoration: (match, view, pos) =>
|
|
1464
|
+
decoration: (match, view, pos) => Decoration4.replace({
|
|
1353
1465
|
widget: new HorizontalRuleWidget(pos)
|
|
1354
1466
|
})
|
|
1355
1467
|
});
|
|
1356
1468
|
var hr = () => [
|
|
1357
|
-
|
|
1358
|
-
|
|
1469
|
+
styles4,
|
|
1470
|
+
ViewPlugin5.fromClass(class {
|
|
1359
1471
|
constructor(view) {
|
|
1360
1472
|
this.rules = placeholderMatcher.createDeco(view);
|
|
1361
1473
|
}
|
|
@@ -1365,21 +1477,21 @@ var hr = () => [
|
|
|
1365
1477
|
}, {
|
|
1366
1478
|
decorations: (instance) => instance.rules,
|
|
1367
1479
|
// TODO(burdon): Is this really atomic (cursor can move into ---).
|
|
1368
|
-
provide: (plugin) =>
|
|
1369
|
-
return view.plugin(plugin)?.rules ||
|
|
1480
|
+
provide: (plugin) => EditorView6.atomicRanges.of((view) => {
|
|
1481
|
+
return view.plugin(plugin)?.rules || Decoration4.none;
|
|
1370
1482
|
})
|
|
1371
1483
|
})
|
|
1372
1484
|
];
|
|
1373
1485
|
|
|
1374
|
-
// packages/ui/react-ui-editor/src/
|
|
1486
|
+
// packages/ui/react-ui-editor/src/extensions/image.ts
|
|
1375
1487
|
import { syntaxTree } from "@codemirror/language";
|
|
1376
|
-
import { RangeSetBuilder, StateField as
|
|
1377
|
-
import { Decoration as
|
|
1488
|
+
import { RangeSetBuilder, StateField as StateField3 } from "@codemirror/state";
|
|
1489
|
+
import { Decoration as Decoration5, EditorView as EditorView7, WidgetType as WidgetType4 } from "@codemirror/view";
|
|
1378
1490
|
var image = (options = {}) => {
|
|
1379
|
-
return
|
|
1491
|
+
return StateField3.define({
|
|
1380
1492
|
create: (state) => update(state, options),
|
|
1381
1493
|
update: (_, tr) => update(tr.state, options),
|
|
1382
|
-
provide: (field) =>
|
|
1494
|
+
provide: (field) => EditorView7.decorations.from(field)
|
|
1383
1495
|
});
|
|
1384
1496
|
};
|
|
1385
1497
|
var update = (state, options) => {
|
|
@@ -1392,7 +1504,7 @@ var update = (state, options) => {
|
|
|
1392
1504
|
if (urlNode) {
|
|
1393
1505
|
const hide = state.readOnly || cursor < node.from || cursor > node.to;
|
|
1394
1506
|
const url = state.sliceDoc(urlNode.from, urlNode.to);
|
|
1395
|
-
builder.add(hide ? node.from : node.to, node.to,
|
|
1507
|
+
builder.add(hide ? node.from : node.to, node.to, Decoration5.replace({
|
|
1396
1508
|
block: true,
|
|
1397
1509
|
widget: new ImageWidget(url)
|
|
1398
1510
|
}));
|
|
@@ -1402,7 +1514,7 @@ var update = (state, options) => {
|
|
|
1402
1514
|
});
|
|
1403
1515
|
return builder.finish();
|
|
1404
1516
|
};
|
|
1405
|
-
var ImageWidget = class extends
|
|
1517
|
+
var ImageWidget = class extends WidgetType4 {
|
|
1406
1518
|
constructor(_url) {
|
|
1407
1519
|
super();
|
|
1408
1520
|
this._url = _url;
|
|
@@ -1418,19 +1530,70 @@ var ImageWidget = class extends WidgetType3 {
|
|
|
1418
1530
|
return img;
|
|
1419
1531
|
}
|
|
1420
1532
|
};
|
|
1421
|
-
|
|
1422
|
-
// packages/ui/react-ui-editor/src/
|
|
1423
|
-
import { syntaxTree as syntaxTree2 } from "@codemirror/language";
|
|
1424
|
-
import { RangeSetBuilder as RangeSetBuilder2, StateField as
|
|
1425
|
-
import { Decoration as
|
|
1426
|
-
|
|
1427
|
-
|
|
1428
|
-
|
|
1429
|
-
|
|
1430
|
-
|
|
1431
|
-
|
|
1432
|
-
|
|
1433
|
-
|
|
1533
|
+
|
|
1534
|
+
// packages/ui/react-ui-editor/src/extensions/link.ts
|
|
1535
|
+
import { syntaxTree as syntaxTree2 } from "@codemirror/language";
|
|
1536
|
+
import { RangeSetBuilder as RangeSetBuilder2, StateField as StateField4 } from "@codemirror/state";
|
|
1537
|
+
import { Decoration as Decoration6, EditorView as EditorView8, WidgetType as WidgetType5, hoverTooltip as hoverTooltip2 } from "@codemirror/view";
|
|
1538
|
+
import { tooltipContent } from "@dxos/react-ui-theme";
|
|
1539
|
+
var markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
|
|
1540
|
+
var link = (options = {}) => {
|
|
1541
|
+
const extensions = [
|
|
1542
|
+
StateField4.define({
|
|
1543
|
+
create: (state) => update2(state, options),
|
|
1544
|
+
update: (_, tr) => update2(tr.state, options),
|
|
1545
|
+
provide: (field) => EditorView8.decorations.from(field)
|
|
1546
|
+
})
|
|
1547
|
+
];
|
|
1548
|
+
if (options.onHover) {
|
|
1549
|
+
extensions.push(
|
|
1550
|
+
// https://codemirror.net/examples/tooltip
|
|
1551
|
+
// https://codemirror.net/docs/ref/#view.hoverTooltip
|
|
1552
|
+
// https://github.com/codemirror/view/blob/main/src/tooltip.ts
|
|
1553
|
+
hoverTooltip2((view, pos) => {
|
|
1554
|
+
const { from, text } = view.state.doc.lineAt(pos);
|
|
1555
|
+
const p = pos - from;
|
|
1556
|
+
let idx = 0;
|
|
1557
|
+
let match;
|
|
1558
|
+
do {
|
|
1559
|
+
match = text.substring(idx).match(markdownLinkRegexp);
|
|
1560
|
+
if (!match) {
|
|
1561
|
+
match = void 0;
|
|
1562
|
+
break;
|
|
1563
|
+
}
|
|
1564
|
+
idx = text.indexOf(match[0]);
|
|
1565
|
+
if (p >= idx && p < idx + match[0].length) {
|
|
1566
|
+
break;
|
|
1567
|
+
}
|
|
1568
|
+
idx += match[0].length;
|
|
1569
|
+
} while (true);
|
|
1570
|
+
if (!match) {
|
|
1571
|
+
return null;
|
|
1572
|
+
}
|
|
1573
|
+
const [, , url] = match ?? [];
|
|
1574
|
+
return {
|
|
1575
|
+
pos: idx + from,
|
|
1576
|
+
end: idx + from + match[0].length,
|
|
1577
|
+
above: true,
|
|
1578
|
+
create: () => {
|
|
1579
|
+
const el = document.createElement("div");
|
|
1580
|
+
el.className = tooltipContent({}, "pli-2 plb-1");
|
|
1581
|
+
options.onHover(el, url);
|
|
1582
|
+
return {
|
|
1583
|
+
dom: el,
|
|
1584
|
+
offset: {
|
|
1585
|
+
x: 0,
|
|
1586
|
+
y: 4
|
|
1587
|
+
}
|
|
1588
|
+
};
|
|
1589
|
+
}
|
|
1590
|
+
};
|
|
1591
|
+
})
|
|
1592
|
+
);
|
|
1593
|
+
}
|
|
1594
|
+
return extensions;
|
|
1595
|
+
};
|
|
1596
|
+
var LinkButton = class extends WidgetType5 {
|
|
1434
1597
|
constructor(_pos, _url, _onAttach) {
|
|
1435
1598
|
super();
|
|
1436
1599
|
this._pos = _pos;
|
|
@@ -1446,15 +1609,14 @@ var LinkButton = class extends WidgetType4 {
|
|
|
1446
1609
|
return el;
|
|
1447
1610
|
}
|
|
1448
1611
|
};
|
|
1449
|
-
var LinkText = class extends
|
|
1450
|
-
constructor(
|
|
1612
|
+
var LinkText = class extends WidgetType5 {
|
|
1613
|
+
constructor(_text, _url) {
|
|
1451
1614
|
super();
|
|
1452
|
-
this._pos = _pos;
|
|
1453
1615
|
this._text = _text;
|
|
1454
1616
|
this._url = _url;
|
|
1455
1617
|
}
|
|
1456
1618
|
eq(other) {
|
|
1457
|
-
return this.
|
|
1619
|
+
return this._url === other._url;
|
|
1458
1620
|
}
|
|
1459
1621
|
toDOM(view) {
|
|
1460
1622
|
const link2 = document.createElement("a");
|
|
@@ -1468,7 +1630,7 @@ var LinkText = class extends WidgetType4 {
|
|
|
1468
1630
|
link2.onclick = () => {
|
|
1469
1631
|
view.dispatch({
|
|
1470
1632
|
selection: {
|
|
1471
|
-
anchor:
|
|
1633
|
+
anchor: view.posAtDOM(link2)
|
|
1472
1634
|
}
|
|
1473
1635
|
});
|
|
1474
1636
|
};
|
|
@@ -1490,12 +1652,12 @@ var update2 = (state, options) => {
|
|
|
1490
1652
|
return false;
|
|
1491
1653
|
}
|
|
1492
1654
|
if (state.readOnly || cursor < node.from || cursor > node.to) {
|
|
1493
|
-
builder.add(node.from, node.to,
|
|
1494
|
-
widget: new LinkText(
|
|
1655
|
+
builder.add(node.from, node.to, Decoration6.replace({
|
|
1656
|
+
widget: new LinkText(text, options.link ? url : void 0)
|
|
1495
1657
|
}));
|
|
1496
1658
|
}
|
|
1497
1659
|
if (options.onRender) {
|
|
1498
|
-
builder.add(node.to, node.to,
|
|
1660
|
+
builder.add(node.to, node.to, Decoration6.replace({
|
|
1499
1661
|
widget: new LinkButton(node.from, url, options.onRender)
|
|
1500
1662
|
}));
|
|
1501
1663
|
}
|
|
@@ -1506,27 +1668,21 @@ var update2 = (state, options) => {
|
|
|
1506
1668
|
return builder.finish();
|
|
1507
1669
|
};
|
|
1508
1670
|
|
|
1509
|
-
// packages/ui/react-ui-editor/src/
|
|
1510
|
-
import {
|
|
1511
|
-
|
|
1512
|
-
|
|
1513
|
-
|
|
1514
|
-
onFocus ? EditorView8.focusChangeEffect.of((view, focused) => {
|
|
1671
|
+
// packages/ui/react-ui-editor/src/extensions/listener.ts
|
|
1672
|
+
import { EditorView as EditorView9 } from "@codemirror/view";
|
|
1673
|
+
var listener = ({ onFocus, onChange }) => {
|
|
1674
|
+
const extensions = [];
|
|
1675
|
+
onFocus && extensions.push(EditorView9.focusChangeEffect.of((_, focused) => {
|
|
1515
1676
|
onFocus(focused);
|
|
1516
1677
|
return null;
|
|
1517
|
-
})
|
|
1518
|
-
onChange
|
|
1519
|
-
|
|
1520
|
-
|
|
1521
|
-
|
|
1522
|
-
|
|
1523
|
-
}
|
|
1524
|
-
return null;
|
|
1525
|
-
}
|
|
1526
|
-
}) : void 0
|
|
1527
|
-
].filter(nonNullable2);
|
|
1678
|
+
}));
|
|
1679
|
+
onChange && extensions.push(EditorView9.updateListener.of((update4) => {
|
|
1680
|
+
onChange(update4.state.doc.toString());
|
|
1681
|
+
}));
|
|
1682
|
+
return extensions;
|
|
1683
|
+
};
|
|
1528
1684
|
|
|
1529
|
-
// packages/ui/react-ui-editor/src/
|
|
1685
|
+
// packages/ui/react-ui-editor/src/extensions/markdown/bundle.ts
|
|
1530
1686
|
import { closeBrackets as closeBrackets2, closeBracketsKeymap } from "@codemirror/autocomplete";
|
|
1531
1687
|
import { history, historyKeymap, indentWithTab, standardKeymap } from "@codemirror/commands";
|
|
1532
1688
|
import { markdownLanguage as markdownLanguage2, markdown } from "@codemirror/lang-markdown";
|
|
@@ -1535,14 +1691,14 @@ import { languages } from "@codemirror/language-data";
|
|
|
1535
1691
|
import { searchKeymap } from "@codemirror/search";
|
|
1536
1692
|
import { EditorState } from "@codemirror/state";
|
|
1537
1693
|
import { oneDarkHighlightStyle as oneDarkHighlightStyle2 } from "@codemirror/theme-one-dark";
|
|
1538
|
-
import { crosshairCursor, drawSelection as drawSelection2, dropCursor, EditorView as
|
|
1694
|
+
import { crosshairCursor, drawSelection as drawSelection2, dropCursor, EditorView as EditorView10, highlightActiveLine, keymap as keymap4, placeholder as placeholder2 } from "@codemirror/view";
|
|
1539
1695
|
|
|
1540
|
-
// packages/ui/react-ui-editor/src/
|
|
1696
|
+
// packages/ui/react-ui-editor/src/extensions/markdown/highlight.ts
|
|
1541
1697
|
import { markdownLanguage } from "@codemirror/lang-markdown";
|
|
1542
1698
|
import { HighlightStyle } from "@codemirror/language";
|
|
1543
1699
|
import { tags, styleTags, Tag } from "@lezer/highlight";
|
|
1544
1700
|
import { Table } from "@lezer/markdown";
|
|
1545
|
-
import
|
|
1701
|
+
import get5 from "lodash.get";
|
|
1546
1702
|
var markdownTags = {
|
|
1547
1703
|
Blockquote: Tag.define(),
|
|
1548
1704
|
CodeMark: Tag.define(),
|
|
@@ -1728,17 +1884,17 @@ var markdownHighlightStyle = (readonly) => {
|
|
|
1728
1884
|
], {
|
|
1729
1885
|
scope: markdownLanguage,
|
|
1730
1886
|
all: {
|
|
1731
|
-
fontFamily:
|
|
1887
|
+
fontFamily: get5(tokens, "fontFamily.body", []).join(",")
|
|
1732
1888
|
}
|
|
1733
1889
|
});
|
|
1734
1890
|
};
|
|
1735
1891
|
|
|
1736
|
-
// packages/ui/react-ui-editor/src/
|
|
1892
|
+
// packages/ui/react-ui-editor/src/extensions/markdown/bundle.ts
|
|
1737
1893
|
var markdownBundle = ({ readonly, themeMode, placeholder: _placeholder }) => {
|
|
1738
1894
|
return [
|
|
1739
1895
|
EditorState.allowMultipleSelections.of(true),
|
|
1740
1896
|
EditorState.tabSize.of(2),
|
|
1741
|
-
|
|
1897
|
+
EditorView10.lineWrapping,
|
|
1742
1898
|
customKeymap(),
|
|
1743
1899
|
bracketMatching2(),
|
|
1744
1900
|
closeBrackets2(),
|
|
@@ -1786,7 +1942,7 @@ var customKeymap = () => keymap4.of([
|
|
|
1786
1942
|
...searchKeymap
|
|
1787
1943
|
]);
|
|
1788
1944
|
|
|
1789
|
-
// packages/ui/react-ui-editor/src/
|
|
1945
|
+
// packages/ui/react-ui-editor/src/extensions/mention.ts
|
|
1790
1946
|
import { autocompletion as autocompletion2 } from "@codemirror/autocomplete";
|
|
1791
1947
|
var mention = ({ onSearch }) => {
|
|
1792
1948
|
return autocompletion2({
|
|
@@ -1809,20 +1965,20 @@ var mention = ({ onSearch }) => {
|
|
|
1809
1965
|
});
|
|
1810
1966
|
};
|
|
1811
1967
|
|
|
1812
|
-
// packages/ui/react-ui-editor/src/
|
|
1968
|
+
// packages/ui/react-ui-editor/src/extensions/mermaid.ts
|
|
1813
1969
|
var mermaid = () => {
|
|
1814
1970
|
return [];
|
|
1815
1971
|
};
|
|
1816
1972
|
|
|
1817
|
-
// packages/ui/react-ui-editor/src/
|
|
1973
|
+
// packages/ui/react-ui-editor/src/extensions/table.ts
|
|
1818
1974
|
import { syntaxTree as syntaxTree3 } from "@codemirror/language";
|
|
1819
|
-
import { RangeSetBuilder as RangeSetBuilder3, StateField as
|
|
1820
|
-
import { Decoration as
|
|
1975
|
+
import { RangeSetBuilder as RangeSetBuilder3, StateField as StateField5 } from "@codemirror/state";
|
|
1976
|
+
import { Decoration as Decoration7, EditorView as EditorView11, WidgetType as WidgetType6 } from "@codemirror/view";
|
|
1821
1977
|
var table = (options = {}) => {
|
|
1822
|
-
return
|
|
1978
|
+
return StateField5.define({
|
|
1823
1979
|
create: (state) => update3(state, options),
|
|
1824
1980
|
update: (_, tr) => update3(tr.state, options),
|
|
1825
|
-
provide: (field) =>
|
|
1981
|
+
provide: (field) => EditorView11.decorations.from(field)
|
|
1826
1982
|
});
|
|
1827
1983
|
};
|
|
1828
1984
|
var update3 = (state, options) => {
|
|
@@ -1866,17 +2022,17 @@ var update3 = (state, options) => {
|
|
|
1866
2022
|
});
|
|
1867
2023
|
tables.forEach((table2) => {
|
|
1868
2024
|
const hide = state.readOnly || cursor < table2.from || cursor > table2.to;
|
|
1869
|
-
hide && builder.add(table2.from, table2.to,
|
|
2025
|
+
hide && builder.add(table2.from, table2.to, Decoration7.replace({
|
|
1870
2026
|
block: true,
|
|
1871
2027
|
widget: new TableWidget(table2)
|
|
1872
2028
|
}));
|
|
1873
|
-
builder.add(table2.from, table2.to,
|
|
2029
|
+
builder.add(table2.from, table2.to, Decoration7.mark({
|
|
1874
2030
|
class: "cm-table"
|
|
1875
2031
|
}));
|
|
1876
2032
|
});
|
|
1877
2033
|
return builder.finish();
|
|
1878
2034
|
};
|
|
1879
|
-
var TableWidget = class extends
|
|
2035
|
+
var TableWidget = class extends WidgetType6 {
|
|
1880
2036
|
constructor(_table) {
|
|
1881
2037
|
super();
|
|
1882
2038
|
this._table = _table;
|
|
@@ -1910,15 +2066,15 @@ var TableWidget = class extends WidgetType5 {
|
|
|
1910
2066
|
}
|
|
1911
2067
|
};
|
|
1912
2068
|
|
|
1913
|
-
// packages/ui/react-ui-editor/src/
|
|
1914
|
-
import { EditorView as
|
|
1915
|
-
var
|
|
2069
|
+
// packages/ui/react-ui-editor/src/extensions/tasklist.ts
|
|
2070
|
+
import { EditorView as EditorView12, Decoration as Decoration8, WidgetType as WidgetType7, MatchDecorator as MatchDecorator3, ViewPlugin as ViewPlugin6 } from "@codemirror/view";
|
|
2071
|
+
var styles5 = EditorView12.baseTheme({
|
|
1916
2072
|
"& .cm-task-item": {
|
|
1917
2073
|
paddingLeft: "4px",
|
|
1918
2074
|
paddingRight: "8px"
|
|
1919
2075
|
}
|
|
1920
2076
|
});
|
|
1921
|
-
var CheckboxWidget = class extends
|
|
2077
|
+
var CheckboxWidget = class extends WidgetType7 {
|
|
1922
2078
|
constructor(_pos, _checked, _indent, _onCheck) {
|
|
1923
2079
|
super();
|
|
1924
2080
|
this._pos = _pos;
|
|
@@ -1958,7 +2114,7 @@ var tasklist = (options = {}) => {
|
|
|
1958
2114
|
decoration: (match, view, pos) => {
|
|
1959
2115
|
const indent = Math.floor(match[1].length / 2);
|
|
1960
2116
|
const checked = match[2] === "x" || match[2] === "X";
|
|
1961
|
-
return
|
|
2117
|
+
return Decoration8.replace({
|
|
1962
2118
|
widget: new CheckboxWidget(pos, checked, indent, view.state.readOnly ? void 0 : (checked2) => {
|
|
1963
2119
|
const idx = pos + match[0].indexOf("[") + 1;
|
|
1964
2120
|
view.dispatch({
|
|
@@ -1976,7 +2132,7 @@ var tasklist = (options = {}) => {
|
|
|
1976
2132
|
});
|
|
1977
2133
|
}
|
|
1978
2134
|
});
|
|
1979
|
-
const tasks =
|
|
2135
|
+
const tasks = ViewPlugin6.fromClass(class {
|
|
1980
2136
|
constructor(view) {
|
|
1981
2137
|
this.tasks = taskMatcher.createDeco(view);
|
|
1982
2138
|
}
|
|
@@ -1985,61 +2141,17 @@ var tasklist = (options = {}) => {
|
|
|
1985
2141
|
}
|
|
1986
2142
|
}, {
|
|
1987
2143
|
decorations: (value) => value.tasks,
|
|
1988
|
-
provide: (plugin) =>
|
|
1989
|
-
return view.plugin(plugin)?.tasks ||
|
|
2144
|
+
provide: (plugin) => EditorView12.atomicRanges.of((view) => {
|
|
2145
|
+
return view.plugin(plugin)?.tasks || Decoration8.none;
|
|
1990
2146
|
})
|
|
1991
2147
|
});
|
|
1992
2148
|
return [
|
|
1993
2149
|
tasks,
|
|
1994
|
-
|
|
2150
|
+
styles5
|
|
1995
2151
|
];
|
|
1996
2152
|
};
|
|
1997
2153
|
|
|
1998
|
-
// packages/ui/react-ui-editor/src/
|
|
1999
|
-
import { hoverTooltip as hoverTooltip2 } from "@codemirror/view";
|
|
2000
|
-
import { tooltipContent } from "@dxos/react-ui-theme";
|
|
2001
|
-
var markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
|
|
2002
|
-
var tooltip = ({ onHover, regexp = markdownLinkRegexp }) => hoverTooltip2((view, pos) => {
|
|
2003
|
-
const { from, text } = view.state.doc.lineAt(pos);
|
|
2004
|
-
const p = pos - from;
|
|
2005
|
-
let idx = 0;
|
|
2006
|
-
let match;
|
|
2007
|
-
do {
|
|
2008
|
-
match = text.substring(idx).match(regexp);
|
|
2009
|
-
if (!match) {
|
|
2010
|
-
match = void 0;
|
|
2011
|
-
break;
|
|
2012
|
-
}
|
|
2013
|
-
idx = text.indexOf(match[0]);
|
|
2014
|
-
if (p >= idx && p < idx + match[0].length) {
|
|
2015
|
-
break;
|
|
2016
|
-
}
|
|
2017
|
-
idx += match[0].length;
|
|
2018
|
-
} while (true);
|
|
2019
|
-
if (!match) {
|
|
2020
|
-
return null;
|
|
2021
|
-
}
|
|
2022
|
-
const [, , url] = match ?? [];
|
|
2023
|
-
return {
|
|
2024
|
-
pos: idx + from,
|
|
2025
|
-
end: idx + from + match[0].length,
|
|
2026
|
-
above: true,
|
|
2027
|
-
create: () => {
|
|
2028
|
-
const el = document.createElement("div");
|
|
2029
|
-
el.className = tooltipContent({}, "pli-2 plb-1");
|
|
2030
|
-
onHover(el, url);
|
|
2031
|
-
return {
|
|
2032
|
-
dom: el,
|
|
2033
|
-
offset: {
|
|
2034
|
-
x: 0,
|
|
2035
|
-
y: 4
|
|
2036
|
-
}
|
|
2037
|
-
};
|
|
2038
|
-
}
|
|
2039
|
-
};
|
|
2040
|
-
});
|
|
2041
|
-
|
|
2042
|
-
// packages/ui/react-ui-editor/src/components/TextEditor/extensions/typewriter.ts
|
|
2154
|
+
// packages/ui/react-ui-editor/src/extensions/typewriter.ts
|
|
2043
2155
|
import { keymap as keymap5 } from "@codemirror/view";
|
|
2044
2156
|
var defaultItems = [
|
|
2045
2157
|
"hello world!",
|
|
@@ -2096,8 +2208,29 @@ var typewriter = ({ delay = 75, items = defaultItems } = {}) => {
|
|
|
2096
2208
|
];
|
|
2097
2209
|
};
|
|
2098
2210
|
|
|
2099
|
-
// packages/ui/react-ui-editor/src/
|
|
2100
|
-
import
|
|
2211
|
+
// packages/ui/react-ui-editor/src/extensions/yjs/yjs.ts
|
|
2212
|
+
import { yCollab } from "y-codemirror.next";
|
|
2213
|
+
|
|
2214
|
+
// packages/ui/react-ui-editor/src/extensions/yjs/cursor.ts
|
|
2215
|
+
import * as Y from "yjs";
|
|
2216
|
+
import { arrayToString, stringToArray } from "@dxos/util";
|
|
2217
|
+
var cursorConverter2 = (text) => ({
|
|
2218
|
+
toCursor: (index, assoc) => {
|
|
2219
|
+
return arrayToString(Y.encodeRelativePosition(Y.createRelativePositionFromTypeIndex(text, index, assoc)));
|
|
2220
|
+
},
|
|
2221
|
+
fromCursor: (cursor) => {
|
|
2222
|
+
return Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(stringToArray(cursor)), text.doc)?.index ?? 0;
|
|
2223
|
+
}
|
|
2224
|
+
});
|
|
2225
|
+
|
|
2226
|
+
// packages/ui/react-ui-editor/src/extensions/yjs/yjs.ts
|
|
2227
|
+
var yjs = (content, awareness2) => [
|
|
2228
|
+
CursorConverter.of(cursorConverter2(content)),
|
|
2229
|
+
yCollab(content, awareness2)
|
|
2230
|
+
];
|
|
2231
|
+
|
|
2232
|
+
// packages/ui/react-ui-editor/src/themes/default.ts
|
|
2233
|
+
import get6 from "lodash.get";
|
|
2101
2234
|
var defaultTheme = {
|
|
2102
2235
|
//
|
|
2103
2236
|
// Main layout:
|
|
@@ -2128,7 +2261,7 @@ var defaultTheme = {
|
|
|
2128
2261
|
},
|
|
2129
2262
|
"& .cm-scroller": {
|
|
2130
2263
|
overflow: "visible",
|
|
2131
|
-
fontFamily:
|
|
2264
|
+
fontFamily: get6(tokens, "fontFamily.mono", []).join(",")
|
|
2132
2265
|
},
|
|
2133
2266
|
"& .cm-content": {
|
|
2134
2267
|
padding: 0,
|
|
@@ -2136,11 +2269,11 @@ var defaultTheme = {
|
|
|
2136
2269
|
fontSize: "16px"
|
|
2137
2270
|
},
|
|
2138
2271
|
"&light .cm-content": {
|
|
2139
|
-
color:
|
|
2272
|
+
color: get6(tokens, "extend.colors.neutral.900", "black"),
|
|
2140
2273
|
caretColor: "black"
|
|
2141
2274
|
},
|
|
2142
2275
|
"&dark .cm-content": {
|
|
2143
|
-
color:
|
|
2276
|
+
color: get6(tokens, "extend.colors.neutral.100", "white"),
|
|
2144
2277
|
caretColor: "white"
|
|
2145
2278
|
},
|
|
2146
2279
|
//
|
|
@@ -2168,25 +2301,25 @@ var defaultTheme = {
|
|
|
2168
2301
|
// Selection
|
|
2169
2302
|
//
|
|
2170
2303
|
"&light .cm-selectionBackground": {
|
|
2171
|
-
background:
|
|
2304
|
+
background: get6(tokens, "extend.colors.primary.100")
|
|
2172
2305
|
},
|
|
2173
2306
|
"&light.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground": {
|
|
2174
|
-
background:
|
|
2307
|
+
background: get6(tokens, "extend.colors.primary.200")
|
|
2175
2308
|
},
|
|
2176
2309
|
"&dark .cm-selectionBackground": {
|
|
2177
|
-
background:
|
|
2310
|
+
background: get6(tokens, "extend.colors.primary.700")
|
|
2178
2311
|
},
|
|
2179
2312
|
"&dark.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground": {
|
|
2180
|
-
background:
|
|
2313
|
+
background: get6(tokens, "extend.colors.primary.600")
|
|
2181
2314
|
},
|
|
2182
2315
|
//
|
|
2183
2316
|
// Search
|
|
2184
2317
|
//
|
|
2185
2318
|
"&light .cm-searchMatch": {
|
|
2186
|
-
backgroundColor:
|
|
2319
|
+
backgroundColor: get6(tokens, "extend.colors.yellow.100")
|
|
2187
2320
|
},
|
|
2188
2321
|
"&dark .cm-searchMatch": {
|
|
2189
|
-
backgroundColor:
|
|
2322
|
+
backgroundColor: get6(tokens, "extend.colors.yellow.700")
|
|
2190
2323
|
},
|
|
2191
2324
|
//
|
|
2192
2325
|
// collaboration
|
|
@@ -2219,12 +2352,12 @@ var defaultTheme = {
|
|
|
2219
2352
|
// link
|
|
2220
2353
|
//
|
|
2221
2354
|
"& .cm-link": {
|
|
2222
|
-
color:
|
|
2355
|
+
color: get6(tokens, "extend.colors.primary.500"),
|
|
2223
2356
|
textDecorationLine: "underline",
|
|
2224
2357
|
textDecorationThickness: "1px",
|
|
2225
2358
|
textUnderlineOffset: "2px",
|
|
2226
2359
|
borderRadius: ".125rem",
|
|
2227
|
-
fontFamily:
|
|
2360
|
+
fontFamily: get6(tokens, "fontFamily.body", []).join(",")
|
|
2228
2361
|
},
|
|
2229
2362
|
//
|
|
2230
2363
|
// tooltip
|
|
@@ -2246,7 +2379,7 @@ var defaultTheme = {
|
|
|
2246
2379
|
display: "none"
|
|
2247
2380
|
},
|
|
2248
2381
|
"& .cm-completionLabel": {
|
|
2249
|
-
fontFamily:
|
|
2382
|
+
fontFamily: get6(tokens, "fontFamily.body", []).join(",")
|
|
2250
2383
|
},
|
|
2251
2384
|
"& .cm-completionMatchedText": {
|
|
2252
2385
|
textDecoration: "none"
|
|
@@ -2262,15 +2395,15 @@ var defaultTheme = {
|
|
|
2262
2395
|
// table
|
|
2263
2396
|
//
|
|
2264
2397
|
"& .cm-table *": {
|
|
2265
|
-
fontFamily: `${
|
|
2398
|
+
fontFamily: `${get6(tokens, "fontFamily.mono", []).join(",")} !important`,
|
|
2266
2399
|
textDecoration: "none !important"
|
|
2267
2400
|
},
|
|
2268
2401
|
"& .cm-table-head": {
|
|
2269
2402
|
padding: "2px 16px 2px 0px",
|
|
2270
|
-
borderBottom: `1px solid ${
|
|
2403
|
+
borderBottom: `1px solid ${get6(tokens, "extend.colors.neutral.500")}`,
|
|
2271
2404
|
fontWeight: 100,
|
|
2272
2405
|
textAlign: "left",
|
|
2273
|
-
color:
|
|
2406
|
+
color: get6(tokens, "extend.colors.neutral.500")
|
|
2274
2407
|
},
|
|
2275
2408
|
"& .cm-table-cell": {
|
|
2276
2409
|
padding: "2px 16px 2px 0px"
|
|
@@ -2285,8 +2418,8 @@ var defaultTheme = {
|
|
|
2285
2418
|
// font size
|
|
2286
2419
|
// TODO(thure): This appears to be the best or only way to set selection caret heights, but it's far more verbose than it needs to be.
|
|
2287
2420
|
//
|
|
2288
|
-
...Object.keys(
|
|
2289
|
-
const height =
|
|
2421
|
+
...Object.keys(get6(tokens, "extend.fontSize", {})).reduce((acc, fontSize) => {
|
|
2422
|
+
const height = get6(tokens, [
|
|
2290
2423
|
"extend",
|
|
2291
2424
|
"fontSize",
|
|
2292
2425
|
fontSize,
|
|
@@ -2321,23 +2454,23 @@ var defaultTheme = {
|
|
|
2321
2454
|
* </div
|
|
2322
2455
|
*/
|
|
2323
2456
|
"& .cm-panels": {
|
|
2324
|
-
border: `1px solid ${
|
|
2457
|
+
border: `1px solid ${get6(tokens, "extend.colors.neutral.200")}`
|
|
2325
2458
|
},
|
|
2326
2459
|
"& .cm-panel": {
|
|
2327
|
-
background:
|
|
2328
|
-
fontFamily:
|
|
2460
|
+
background: get6(tokens, "extend.colors.neutral.50"),
|
|
2461
|
+
fontFamily: get6(tokens, "fontFamily.body", []).join(",")
|
|
2329
2462
|
},
|
|
2330
2463
|
"& .cm-button": {
|
|
2331
2464
|
margin: "4px",
|
|
2332
|
-
fontFamily:
|
|
2333
|
-
background:
|
|
2465
|
+
fontFamily: get6(tokens, "fontFamily.body", []).join(","),
|
|
2466
|
+
background: get6(tokens, "extend.colors.neutral.100"),
|
|
2334
2467
|
backgroundImage: "none",
|
|
2335
2468
|
border: "none",
|
|
2336
2469
|
"&:hover": {
|
|
2337
|
-
background:
|
|
2470
|
+
background: get6(tokens, "extend.colors.neutral.200")
|
|
2338
2471
|
},
|
|
2339
2472
|
"&:active": {
|
|
2340
|
-
background:
|
|
2473
|
+
background: get6(tokens, "extend.colors.neutral.300"),
|
|
2341
2474
|
backgroundImage: "none"
|
|
2342
2475
|
}
|
|
2343
2476
|
},
|
|
@@ -2347,37 +2480,28 @@ var defaultTheme = {
|
|
|
2347
2480
|
};
|
|
2348
2481
|
var textTheme = {
|
|
2349
2482
|
"& .cm-scroller": {
|
|
2350
|
-
fontFamily:
|
|
2483
|
+
fontFamily: get6(tokens, "fontFamily.body", []).join(",")
|
|
2351
2484
|
},
|
|
2352
2485
|
"& .cm-placeholder": {
|
|
2353
|
-
fontFamily:
|
|
2486
|
+
fontFamily: get6(tokens, "fontFamily.body", []).join(",")
|
|
2354
2487
|
}
|
|
2355
2488
|
};
|
|
2356
2489
|
var markdownTheme = {
|
|
2357
2490
|
// NOTE: Must leave base font family as is (i.e., monospace) due to fenced code blocks.
|
|
2358
2491
|
"& .cm-placeholder": {
|
|
2359
|
-
fontFamily:
|
|
2492
|
+
fontFamily: get6(tokens, "fontFamily.body", []).join(",")
|
|
2360
2493
|
}
|
|
2361
2494
|
};
|
|
2362
2495
|
var codeTheme = {
|
|
2363
2496
|
"& .cm-scroller": {
|
|
2364
|
-
fontFamily:
|
|
2497
|
+
fontFamily: get6(tokens, "fontFamily.mono", []).join(",")
|
|
2365
2498
|
},
|
|
2366
2499
|
"& .cm-placeholder": {
|
|
2367
|
-
fontFamily:
|
|
2500
|
+
fontFamily: get6(tokens, "fontFamily.mono", []).join(",")
|
|
2368
2501
|
}
|
|
2369
2502
|
};
|
|
2370
2503
|
|
|
2371
2504
|
// packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx
|
|
2372
|
-
import { EditorState as EditorState2 } from "@codemirror/state";
|
|
2373
|
-
import { EditorView as EditorView12 } from "@codemirror/view";
|
|
2374
|
-
import { useFocusableGroup } from "@fluentui/react-tabster";
|
|
2375
|
-
import { vim } from "@replit/codemirror-vim";
|
|
2376
|
-
import defaultsDeep2 from "lodash.defaultsdeep";
|
|
2377
|
-
import React, { forwardRef, useCallback, useEffect as useEffect2, useImperativeHandle, useState as useState2 } from "react";
|
|
2378
|
-
import { generateName } from "@dxos/display-name";
|
|
2379
|
-
import { useThemeContext } from "@dxos/react-ui";
|
|
2380
|
-
import { getColorForValue, inputSurface, mx as mx3 } from "@dxos/react-ui-theme";
|
|
2381
2505
|
var EditorModes = [
|
|
2382
2506
|
"default",
|
|
2383
2507
|
"vim"
|
|
@@ -2387,8 +2511,8 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: co
|
|
|
2387
2511
|
const tabsterDOMAttribute = useFocusableGroup({
|
|
2388
2512
|
tabBehavior: "limited"
|
|
2389
2513
|
});
|
|
2390
|
-
const [root, setRoot] =
|
|
2391
|
-
const [{ state = void 0, view = void 0 } = {}, setEditor] =
|
|
2514
|
+
const [root, setRoot] = useState(null);
|
|
2515
|
+
const [{ state = void 0, view = void 0 } = {}, setEditor] = useState();
|
|
2392
2516
|
useImperativeHandle(forwardedRef, () => ({
|
|
2393
2517
|
root,
|
|
2394
2518
|
state,
|
|
@@ -2398,10 +2522,10 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: co
|
|
|
2398
2522
|
state,
|
|
2399
2523
|
root
|
|
2400
2524
|
]);
|
|
2401
|
-
const { awareness, peer } = model;
|
|
2402
|
-
|
|
2403
|
-
if (
|
|
2404
|
-
|
|
2525
|
+
const { awareness: awareness2, peer } = model;
|
|
2526
|
+
useEffect(() => {
|
|
2527
|
+
if (awareness2 && peer) {
|
|
2528
|
+
awareness2.setLocalStateField("user", {
|
|
2405
2529
|
name: peer.name ?? generateName(peer.id),
|
|
2406
2530
|
color: getColorForValue({
|
|
2407
2531
|
value: peer.id,
|
|
@@ -2415,11 +2539,11 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: co
|
|
|
2415
2539
|
});
|
|
2416
2540
|
}
|
|
2417
2541
|
}, [
|
|
2418
|
-
|
|
2542
|
+
awareness2,
|
|
2419
2543
|
peer,
|
|
2420
2544
|
themeMode
|
|
2421
2545
|
]);
|
|
2422
|
-
|
|
2546
|
+
useEffect(() => {
|
|
2423
2547
|
if (view && comments2?.length) {
|
|
2424
2548
|
view.dispatch({
|
|
2425
2549
|
effects: setCommentRange.of({
|
|
@@ -2432,7 +2556,7 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: co
|
|
|
2432
2556
|
view,
|
|
2433
2557
|
comments2
|
|
2434
2558
|
]);
|
|
2435
|
-
|
|
2559
|
+
useEffect(() => {
|
|
2436
2560
|
if (!root) {
|
|
2437
2561
|
return;
|
|
2438
2562
|
}
|
|
@@ -2444,9 +2568,9 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: co
|
|
|
2444
2568
|
editorMode === "vim" && vim(),
|
|
2445
2569
|
// Theme.
|
|
2446
2570
|
// TODO(burdon): Make theme configurable.
|
|
2447
|
-
|
|
2448
|
-
|
|
2449
|
-
|
|
2571
|
+
EditorView13.baseTheme(defaultTheme),
|
|
2572
|
+
EditorView13.theme(slots?.editor?.theme ?? {}),
|
|
2573
|
+
EditorView13.darkTheme.of(themeMode === "dark"),
|
|
2450
2574
|
// Storage and replication.
|
|
2451
2575
|
model.extension,
|
|
2452
2576
|
// Custom.
|
|
@@ -2456,7 +2580,7 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: co
|
|
|
2456
2580
|
view?.destroy();
|
|
2457
2581
|
setEditor({
|
|
2458
2582
|
state: state2,
|
|
2459
|
-
view: new
|
|
2583
|
+
view: new EditorView13({
|
|
2460
2584
|
state: state2,
|
|
2461
2585
|
parent: root
|
|
2462
2586
|
})
|
|
@@ -2550,23 +2674,370 @@ var defaultMarkdownSlots = {
|
|
|
2550
2674
|
theme: markdownTheme
|
|
2551
2675
|
}
|
|
2552
2676
|
};
|
|
2677
|
+
|
|
2678
|
+
// packages/ui/react-ui-editor/src/hooks/automerge.ts
|
|
2679
|
+
import get7 from "lodash.get";
|
|
2680
|
+
import { getRawDoc } from "@dxos/echo-schema";
|
|
2681
|
+
import { isNotNullOrUndefined } from "@dxos/util";
|
|
2682
|
+
|
|
2683
|
+
// packages/ui/react-ui-editor/src/hooks/awareness-provider.ts
|
|
2684
|
+
import { DeferredTask, Event as Event2, sleep } from "@dxos/async";
|
|
2685
|
+
import { Context as Context2 } from "@dxos/context";
|
|
2686
|
+
import { invariant as invariant3 } from "@dxos/invariant";
|
|
2687
|
+
import { log as log3 } from "@dxos/log";
|
|
2688
|
+
var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/awareness-provider.ts";
|
|
2689
|
+
var DEBOUNCE_INTERVAL = 100;
|
|
2690
|
+
var SpaceAwarenessProvider = class {
|
|
2691
|
+
constructor(params) {
|
|
2692
|
+
this.remoteStateChange = new Event2();
|
|
2693
|
+
this._remoteStates = /* @__PURE__ */ new Map();
|
|
2694
|
+
this._space = params.space;
|
|
2695
|
+
this._channel = params.channel;
|
|
2696
|
+
this._peerId = params.peerId;
|
|
2697
|
+
this._info = params.info;
|
|
2698
|
+
}
|
|
2699
|
+
open() {
|
|
2700
|
+
this._ctx = new Context2();
|
|
2701
|
+
this._postTask = new DeferredTask(this._ctx, async () => {
|
|
2702
|
+
if (this._localState) {
|
|
2703
|
+
await this._space.postMessage(this._channel, {
|
|
2704
|
+
kind: "post",
|
|
2705
|
+
state: this._localState
|
|
2706
|
+
});
|
|
2707
|
+
await sleep(DEBOUNCE_INTERVAL);
|
|
2708
|
+
}
|
|
2709
|
+
});
|
|
2710
|
+
const unsubscribe = this._space.listen(this._channel, (message) => {
|
|
2711
|
+
switch (message.payload.kind) {
|
|
2712
|
+
case "query": {
|
|
2713
|
+
this._handleQueryMessage();
|
|
2714
|
+
break;
|
|
2715
|
+
}
|
|
2716
|
+
case "post": {
|
|
2717
|
+
this._handlePostMessage(message.payload);
|
|
2718
|
+
break;
|
|
2719
|
+
}
|
|
2720
|
+
}
|
|
2721
|
+
});
|
|
2722
|
+
this._ctx.onDispose(unsubscribe);
|
|
2723
|
+
void this._space.postMessage(this._channel, {
|
|
2724
|
+
kind: "query"
|
|
2725
|
+
}).catch((err) => {
|
|
2726
|
+
log3.debug("failed to query awareness", {
|
|
2727
|
+
err
|
|
2728
|
+
}, {
|
|
2729
|
+
F: __dxlog_file4,
|
|
2730
|
+
L: 85,
|
|
2731
|
+
S: this,
|
|
2732
|
+
C: (f, a) => f(...a)
|
|
2733
|
+
});
|
|
2734
|
+
});
|
|
2735
|
+
}
|
|
2736
|
+
close() {
|
|
2737
|
+
void this._ctx?.dispose();
|
|
2738
|
+
this._ctx = void 0;
|
|
2739
|
+
this._postTask = void 0;
|
|
2740
|
+
}
|
|
2741
|
+
update(position) {
|
|
2742
|
+
invariant3(this._postTask, void 0, {
|
|
2743
|
+
F: __dxlog_file4,
|
|
2744
|
+
L: 96,
|
|
2745
|
+
S: this,
|
|
2746
|
+
A: [
|
|
2747
|
+
"this._postTask",
|
|
2748
|
+
""
|
|
2749
|
+
]
|
|
2750
|
+
});
|
|
2751
|
+
this._localState = {
|
|
2752
|
+
peerId: this._peerId,
|
|
2753
|
+
position,
|
|
2754
|
+
info: this._info
|
|
2755
|
+
};
|
|
2756
|
+
this._postTask.schedule();
|
|
2757
|
+
}
|
|
2758
|
+
getRemoteStates() {
|
|
2759
|
+
return Array.from(this._remoteStates.values());
|
|
2760
|
+
}
|
|
2761
|
+
_handleQueryMessage() {
|
|
2762
|
+
invariant3(this._postTask, void 0, {
|
|
2763
|
+
F: __dxlog_file4,
|
|
2764
|
+
L: 111,
|
|
2765
|
+
S: this,
|
|
2766
|
+
A: [
|
|
2767
|
+
"this._postTask",
|
|
2768
|
+
""
|
|
2769
|
+
]
|
|
2770
|
+
});
|
|
2771
|
+
this._postTask.schedule();
|
|
2772
|
+
}
|
|
2773
|
+
_handlePostMessage(message) {
|
|
2774
|
+
invariant3(message.kind === "post", void 0, {
|
|
2775
|
+
F: __dxlog_file4,
|
|
2776
|
+
L: 116,
|
|
2777
|
+
S: this,
|
|
2778
|
+
A: [
|
|
2779
|
+
"message.kind === 'post'",
|
|
2780
|
+
""
|
|
2781
|
+
]
|
|
2782
|
+
});
|
|
2783
|
+
this._remoteStates.set(message.state.peerId, message.state);
|
|
2784
|
+
this.remoteStateChange.emit();
|
|
2785
|
+
}
|
|
2786
|
+
};
|
|
2787
|
+
|
|
2788
|
+
// packages/ui/react-ui-editor/src/hooks/useTextModel.ts
|
|
2789
|
+
import { StateField as StateField6 } from "@codemirror/state";
|
|
2790
|
+
import { useEffect as useEffect2, useState as useState2 } from "react";
|
|
2791
|
+
import { isAutomergeObject } from "@dxos/react-client/echo";
|
|
2792
|
+
|
|
2793
|
+
// packages/ui/react-ui-editor/src/hooks/yjs.ts
|
|
2794
|
+
import * as decoding from "lib0/decoding";
|
|
2795
|
+
import * as encoding from "lib0/encoding";
|
|
2796
|
+
import { Observable } from "lib0/observable";
|
|
2797
|
+
import * as YP from "y-protocols/awareness";
|
|
2798
|
+
import * as Y2 from "yjs";
|
|
2799
|
+
import { invariant as invariant4 } from "@dxos/invariant";
|
|
2800
|
+
import { log as log4 } from "@dxos/log";
|
|
2801
|
+
import { arrayToString as arrayToString2, stringToArray as stringToArray2 } from "@dxos/util";
|
|
2802
|
+
var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/yjs.ts";
|
|
2803
|
+
var createYjsModel = ({ identity, space, text }) => {
|
|
2804
|
+
invariant4(text?.doc && text?.content, void 0, {
|
|
2805
|
+
F: __dxlog_file5,
|
|
2806
|
+
L: 23,
|
|
2807
|
+
S: void 0,
|
|
2808
|
+
A: [
|
|
2809
|
+
"text?.doc && text?.content",
|
|
2810
|
+
""
|
|
2811
|
+
]
|
|
2812
|
+
});
|
|
2813
|
+
const provider = space ? new YAwarenessProvider({
|
|
2814
|
+
space,
|
|
2815
|
+
doc: text.doc,
|
|
2816
|
+
channel: `yjs.awareness.${text.id}`
|
|
2817
|
+
}) : void 0;
|
|
2818
|
+
const model = {
|
|
2819
|
+
id: text.doc.guid,
|
|
2820
|
+
content: text.content,
|
|
2821
|
+
text: () => text.content.toString(),
|
|
2822
|
+
// https://github.com/yjs/yjs?tab=readme-ov-file#relative-positions
|
|
2823
|
+
// TODO(dmaretskyi): Refactor as cursor-converter.
|
|
2824
|
+
getCursorFromRange: (range) => {
|
|
2825
|
+
const from = Y2.encodeRelativePosition(Y2.createRelativePositionFromTypeIndex(text.content, range.from));
|
|
2826
|
+
const to = Y2.encodeRelativePosition(Y2.createRelativePositionFromTypeIndex(text.content, range.to, -1));
|
|
2827
|
+
return [
|
|
2828
|
+
arrayToString2(from),
|
|
2829
|
+
arrayToString2(to)
|
|
2830
|
+
].join(":");
|
|
2831
|
+
},
|
|
2832
|
+
getRangeFromCursor: (cursor) => {
|
|
2833
|
+
invariant4(text.doc, void 0, {
|
|
2834
|
+
F: __dxlog_file5,
|
|
2835
|
+
L: 40,
|
|
2836
|
+
S: void 0,
|
|
2837
|
+
A: [
|
|
2838
|
+
"text.doc",
|
|
2839
|
+
""
|
|
2840
|
+
]
|
|
2841
|
+
});
|
|
2842
|
+
const parts = cursor.split(":");
|
|
2843
|
+
const from = Y2.createAbsolutePositionFromRelativePosition(Y2.decodeRelativePosition(stringToArray2(parts[0])), text.doc);
|
|
2844
|
+
const to = Y2.createAbsolutePositionFromRelativePosition(Y2.decodeRelativePosition(stringToArray2(parts[1])), text.doc);
|
|
2845
|
+
return from && to ? {
|
|
2846
|
+
from: from.index,
|
|
2847
|
+
to: to.index
|
|
2848
|
+
} : void 0;
|
|
2849
|
+
},
|
|
2850
|
+
extension: [
|
|
2851
|
+
modelState.init(() => model),
|
|
2852
|
+
yjs(text.content, provider?.awareness)
|
|
2853
|
+
],
|
|
2854
|
+
awareness: provider?.awareness,
|
|
2855
|
+
peer: identity ? {
|
|
2856
|
+
id: identity.identityKey.toHex(),
|
|
2857
|
+
name: identity.profile?.displayName
|
|
2858
|
+
} : void 0
|
|
2859
|
+
};
|
|
2860
|
+
return model;
|
|
2861
|
+
};
|
|
2862
|
+
var messageAwareness = 1;
|
|
2863
|
+
var messageQueryAwareness = 3;
|
|
2864
|
+
var YAwarenessProvider = class extends Observable {
|
|
2865
|
+
constructor({ space, doc, channel, awareness: awareness2 }) {
|
|
2866
|
+
super();
|
|
2867
|
+
this._space = space;
|
|
2868
|
+
this._awareness = awareness2 ?? new YP.Awareness(doc);
|
|
2869
|
+
this._channel = channel;
|
|
2870
|
+
this._clientId = doc.clientID;
|
|
2871
|
+
this._awareness.on("update", this._handleAwarenessUpdate.bind(this));
|
|
2872
|
+
this._space.listen(this._channel, this._handleSpaceMessage.bind(this));
|
|
2873
|
+
if (typeof window !== "undefined") {
|
|
2874
|
+
window.addEventListener("beforeunload", this._handleBeforeUnload.bind(this));
|
|
2875
|
+
} else if (typeof process !== "undefined") {
|
|
2876
|
+
process.on("exit", this._handleBeforeUnload.bind(this));
|
|
2877
|
+
}
|
|
2878
|
+
const encoderAwarenessQuery = encoding.createEncoder();
|
|
2879
|
+
encoding.writeVarUint(encoderAwarenessQuery, messageQueryAwareness);
|
|
2880
|
+
void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwarenessQuery));
|
|
2881
|
+
const encoderAwarenessState = encoding.createEncoder();
|
|
2882
|
+
encoding.writeVarUint(encoderAwarenessState, messageAwareness);
|
|
2883
|
+
encoding.writeVarUint8Array(encoderAwarenessState, YP.encodeAwarenessUpdate(this.awareness, [
|
|
2884
|
+
this._clientId
|
|
2885
|
+
]));
|
|
2886
|
+
void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwarenessState));
|
|
2887
|
+
}
|
|
2888
|
+
get awareness() {
|
|
2889
|
+
return this._awareness;
|
|
2890
|
+
}
|
|
2891
|
+
_handleAwarenessUpdate({ added, updated, removed }, origin) {
|
|
2892
|
+
log4("awareness update", {
|
|
2893
|
+
added,
|
|
2894
|
+
updated,
|
|
2895
|
+
removed,
|
|
2896
|
+
origin
|
|
2897
|
+
}, {
|
|
2898
|
+
F: __dxlog_file5,
|
|
2899
|
+
L: 122,
|
|
2900
|
+
S: this,
|
|
2901
|
+
C: (f, a) => f(...a)
|
|
2902
|
+
});
|
|
2903
|
+
const changedClients = added.concat(updated).concat(removed);
|
|
2904
|
+
const encoderAwareness = encoding.createEncoder();
|
|
2905
|
+
encoding.writeVarUint(encoderAwareness, messageAwareness);
|
|
2906
|
+
encoding.writeVarUint8Array(encoderAwareness, YP.encodeAwarenessUpdate(this._awareness, changedClients));
|
|
2907
|
+
void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwareness));
|
|
2908
|
+
}
|
|
2909
|
+
_handleSpaceMessage({ payload }) {
|
|
2910
|
+
log4("space message", payload, {
|
|
2911
|
+
F: __dxlog_file5,
|
|
2912
|
+
L: 131,
|
|
2913
|
+
S: this,
|
|
2914
|
+
C: (f, a) => f(...a)
|
|
2915
|
+
});
|
|
2916
|
+
const data = new Uint8Array(Array.from(Object.values(payload)));
|
|
2917
|
+
const encoder = this._readMessage(data);
|
|
2918
|
+
if (encoder) {
|
|
2919
|
+
void this._space.postMessage(this._channel, encoding.toUint8Array(encoder));
|
|
2920
|
+
}
|
|
2921
|
+
}
|
|
2922
|
+
_readMessage(message) {
|
|
2923
|
+
const decoder = decoding.createDecoder(message);
|
|
2924
|
+
const encoder = encoding.createEncoder();
|
|
2925
|
+
const messageType = decoding.readVarUint(decoder);
|
|
2926
|
+
let sendReply = false;
|
|
2927
|
+
switch (messageType) {
|
|
2928
|
+
case messageAwareness: {
|
|
2929
|
+
YP.applyAwarenessUpdate(this._awareness, decoding.readVarUint8Array(decoder), this);
|
|
2930
|
+
break;
|
|
2931
|
+
}
|
|
2932
|
+
case messageQueryAwareness: {
|
|
2933
|
+
encoding.writeVarUint(encoder, messageAwareness);
|
|
2934
|
+
encoding.writeVarUint8Array(encoder, YP.encodeAwarenessUpdate(this._awareness, Array.from(this._awareness.getStates().keys())));
|
|
2935
|
+
sendReply = true;
|
|
2936
|
+
break;
|
|
2937
|
+
}
|
|
2938
|
+
default: {
|
|
2939
|
+
console.error("Invalid message:", messageType);
|
|
2940
|
+
return encoder;
|
|
2941
|
+
}
|
|
2942
|
+
}
|
|
2943
|
+
if (!sendReply) {
|
|
2944
|
+
return null;
|
|
2945
|
+
}
|
|
2946
|
+
return encoder;
|
|
2947
|
+
}
|
|
2948
|
+
_handleBeforeUnload() {
|
|
2949
|
+
YP.removeAwarenessStates(this._awareness, [
|
|
2950
|
+
this._clientId
|
|
2951
|
+
], "window unload");
|
|
2952
|
+
}
|
|
2953
|
+
};
|
|
2954
|
+
|
|
2955
|
+
// packages/ui/react-ui-editor/src/hooks/useTextModel.ts
|
|
2956
|
+
var modelState = StateField6.define({
|
|
2957
|
+
create: () => void 0,
|
|
2958
|
+
update: (model) => model
|
|
2959
|
+
});
|
|
2960
|
+
var useTextModel = (props) => {
|
|
2961
|
+
const { identity, space, text } = props;
|
|
2962
|
+
const [model, setModel] = useState2(() => createModel(props));
|
|
2963
|
+
useEffect2(() => setModel(createModel(props)), [
|
|
2964
|
+
identity,
|
|
2965
|
+
space,
|
|
2966
|
+
text
|
|
2967
|
+
]);
|
|
2968
|
+
return model;
|
|
2969
|
+
};
|
|
2970
|
+
var createModel = (props) => {
|
|
2971
|
+
const { text } = props;
|
|
2972
|
+
if (isAutomergeObject(text)) {
|
|
2973
|
+
return createAutomergeModel(props);
|
|
2974
|
+
} else if (text?.doc) {
|
|
2975
|
+
return createYjsModel(props);
|
|
2976
|
+
} else {
|
|
2977
|
+
return void 0;
|
|
2978
|
+
}
|
|
2979
|
+
};
|
|
2980
|
+
|
|
2981
|
+
// packages/ui/react-ui-editor/src/hooks/automerge.ts
|
|
2982
|
+
var createAutomergeModel = ({ space, identity, text }) => {
|
|
2983
|
+
const obj = text;
|
|
2984
|
+
const doc = getRawDoc(obj, [
|
|
2985
|
+
obj.field
|
|
2986
|
+
]);
|
|
2987
|
+
const awarenessProvider = space && new SpaceAwarenessProvider({
|
|
2988
|
+
space,
|
|
2989
|
+
channel: `automerge.awareness.${obj.id}`,
|
|
2990
|
+
info: {
|
|
2991
|
+
displayName: identity?.profile?.displayName ?? "",
|
|
2992
|
+
color: cursorColor.color,
|
|
2993
|
+
lightColor: cursorColor.light
|
|
2994
|
+
},
|
|
2995
|
+
peerId: identity?.identityKey.toHex() ?? "Anonymous"
|
|
2996
|
+
});
|
|
2997
|
+
const model = {
|
|
2998
|
+
id: obj.id,
|
|
2999
|
+
content: doc,
|
|
3000
|
+
text: () => get7(doc.handle.docSync(), doc.path),
|
|
3001
|
+
// TODO(burdon): https://automerge.org/automerge/api-docs/js/functions/next.getCursor.html
|
|
3002
|
+
extension: [
|
|
3003
|
+
modelState.init(() => model),
|
|
3004
|
+
automerge3({
|
|
3005
|
+
handle: doc.handle,
|
|
3006
|
+
path: doc.path
|
|
3007
|
+
}),
|
|
3008
|
+
awarenessProvider && AwarenessProvider.of(awarenessProvider),
|
|
3009
|
+
awareness()
|
|
3010
|
+
].filter(isNotNullOrUndefined),
|
|
3011
|
+
peer: identity ? {
|
|
3012
|
+
id: identity.identityKey.toHex(),
|
|
3013
|
+
name: identity.profile?.displayName
|
|
3014
|
+
} : void 0
|
|
3015
|
+
};
|
|
3016
|
+
return model;
|
|
3017
|
+
};
|
|
2553
3018
|
export {
|
|
3019
|
+
AwarenessProvider,
|
|
2554
3020
|
BaseTextEditor,
|
|
2555
3021
|
Doc,
|
|
2556
3022
|
EditorModes,
|
|
2557
3023
|
MarkdownEditor,
|
|
3024
|
+
RemoteSelectionsDecorator,
|
|
2558
3025
|
SpaceAwarenessProvider,
|
|
2559
3026
|
TextEditor,
|
|
2560
3027
|
TextKind,
|
|
3028
|
+
YAwarenessProvider,
|
|
2561
3029
|
YText,
|
|
2562
3030
|
YXmlFragment,
|
|
2563
3031
|
autocomplete,
|
|
3032
|
+
automerge3 as automerge,
|
|
3033
|
+
awareness,
|
|
2564
3034
|
basicBundle,
|
|
2565
3035
|
blast,
|
|
2566
3036
|
code2 as code,
|
|
2567
3037
|
codeTheme,
|
|
2568
3038
|
comments,
|
|
2569
|
-
|
|
3039
|
+
createAutomergeModel,
|
|
3040
|
+
createYjsModel,
|
|
2570
3041
|
defaultMarkdownSlots,
|
|
2571
3042
|
defaultOptions,
|
|
2572
3043
|
defaultSlots,
|
|
@@ -2585,12 +3056,14 @@ export {
|
|
|
2585
3056
|
mermaid,
|
|
2586
3057
|
modelState,
|
|
2587
3058
|
setCommentRange,
|
|
3059
|
+
setFocus,
|
|
3060
|
+
setSelection,
|
|
2588
3061
|
table,
|
|
2589
3062
|
tags2 as tags,
|
|
2590
3063
|
tasklist,
|
|
2591
3064
|
textTheme,
|
|
2592
|
-
tooltip,
|
|
2593
3065
|
typewriter,
|
|
2594
|
-
useTextModel
|
|
3066
|
+
useTextModel,
|
|
3067
|
+
yjs
|
|
2595
3068
|
};
|
|
2596
3069
|
//# sourceMappingURL=index.mjs.map
|