@dxos/react-ui-editor 0.3.10 → 0.3.11-main.008b7c6

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.
Files changed (211) hide show
  1. package/dist/lib/browser/index.mjs +1537 -847
  2. package/dist/lib/browser/index.mjs.map +4 -4
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/types/src/components/TextEditor/MarkdownEditor.stories.d.ts +14 -10
  5. package/dist/types/src/components/TextEditor/MarkdownEditor.stories.d.ts.map +1 -1
  6. package/dist/types/src/components/TextEditor/TextEditor.d.ts +3 -2
  7. package/dist/types/src/components/TextEditor/TextEditor.d.ts.map +1 -1
  8. package/dist/types/src/components/TextEditor/TextEditor.stories.d.ts +3 -0
  9. package/dist/types/src/components/TextEditor/TextEditor.stories.d.ts.map +1 -1
  10. package/dist/types/src/{hooks/automerge → components/TextEditor}/automerge.stories.d.ts +6 -2
  11. package/dist/types/src/components/TextEditor/automerge.stories.d.ts.map +1 -0
  12. package/dist/types/src/components/TextEditor/codemirror.stories.d.ts.map +1 -1
  13. package/dist/types/src/components/TextEditor/index.d.ts +0 -2
  14. package/dist/types/src/components/TextEditor/index.d.ts.map +1 -1
  15. package/dist/types/src/{hooks/yjs → components/TextEditor}/yjs.stories.d.ts +1 -1
  16. package/dist/types/src/components/TextEditor/yjs.stories.d.ts.map +1 -0
  17. package/dist/types/src/extensions/autocomplete.d.ts.map +1 -0
  18. package/dist/types/src/extensions/automerge/automerge.d.ts +9 -0
  19. package/dist/types/src/extensions/automerge/automerge.d.ts.map +1 -0
  20. package/dist/types/src/extensions/automerge/cursor.d.ts +5 -0
  21. package/dist/types/src/extensions/automerge/cursor.d.ts.map +1 -0
  22. package/dist/types/src/extensions/automerge/defs.d.ts +26 -0
  23. package/dist/types/src/extensions/automerge/defs.d.ts.map +1 -0
  24. package/dist/types/src/extensions/automerge/index.d.ts +3 -0
  25. package/dist/types/src/extensions/automerge/index.d.ts.map +1 -0
  26. package/dist/types/src/{hooks/automerge/PatchSemaphore.d.ts → extensions/automerge/semaphore.d.ts} +5 -5
  27. package/dist/types/src/extensions/automerge/semaphore.d.ts.map +1 -0
  28. package/dist/types/src/extensions/automerge/update-automerge.d.ts +5 -0
  29. package/dist/types/src/extensions/automerge/update-automerge.d.ts.map +1 -0
  30. package/dist/types/src/extensions/automerge/update-codemirror.d.ts +5 -0
  31. package/dist/types/src/extensions/automerge/update-codemirror.d.ts.map +1 -0
  32. package/dist/types/src/extensions/awareness.d.ts +46 -0
  33. package/dist/types/src/extensions/awareness.d.ts.map +1 -0
  34. package/dist/types/src/extensions/basic.d.ts.map +1 -0
  35. package/dist/types/src/extensions/blast.d.ts.map +1 -0
  36. package/dist/types/src/extensions/code.d.ts.map +1 -0
  37. package/dist/types/src/extensions/comments.d.ts +50 -0
  38. package/dist/types/src/extensions/comments.d.ts.map +1 -0
  39. package/dist/types/src/extensions/hr.d.ts +2 -0
  40. package/dist/types/src/extensions/hr.d.ts.map +1 -0
  41. package/dist/types/src/extensions/image.d.ts.map +1 -0
  42. package/dist/types/src/{components/TextEditor/extensions → extensions}/index.d.ts +6 -3
  43. package/dist/types/src/extensions/index.d.ts.map +1 -0
  44. package/dist/types/src/{components/TextEditor/extensions → extensions}/link.d.ts +1 -0
  45. package/dist/types/src/extensions/link.d.ts.map +1 -0
  46. package/dist/types/src/extensions/listener.d.ts +10 -0
  47. package/dist/types/src/extensions/listener.d.ts.map +1 -0
  48. package/dist/types/src/extensions/markdown/bundle.d.ts.map +1 -0
  49. package/dist/types/src/{components/TextEditor/extensions → extensions}/markdown/highlight.d.ts +0 -1
  50. package/dist/types/src/extensions/markdown/highlight.d.ts.map +1 -0
  51. package/dist/types/src/extensions/markdown/index.d.ts.map +1 -0
  52. package/dist/types/src/extensions/mention.d.ts.map +1 -0
  53. package/dist/types/src/extensions/mermaid.d.ts +3 -0
  54. package/dist/types/src/extensions/mermaid.d.ts.map +1 -0
  55. package/dist/types/src/extensions/table.d.ts.map +1 -0
  56. package/dist/types/src/extensions/tasklist.d.ts.map +1 -0
  57. package/dist/types/src/{components/TextEditor/extensions/demo.d.ts → extensions/typewriter.d.ts} +2 -3
  58. package/dist/types/src/extensions/typewriter.d.ts.map +1 -0
  59. package/dist/types/src/extensions/yjs/cursor.d.ts +4 -0
  60. package/dist/types/src/extensions/yjs/cursor.d.ts.map +1 -0
  61. package/dist/types/src/extensions/yjs/index.d.ts +2 -0
  62. package/dist/types/src/extensions/yjs/index.d.ts.map +1 -0
  63. package/dist/types/src/extensions/yjs/yjs.d.ts +4 -0
  64. package/dist/types/src/extensions/yjs/yjs.d.ts.map +1 -0
  65. package/dist/types/src/extensions/yjs/yjs.test.d.ts +2 -0
  66. package/dist/types/src/extensions/yjs/yjs.test.d.ts.map +1 -0
  67. package/dist/types/src/hooks/automerge.d.ts +3 -0
  68. package/dist/types/src/hooks/automerge.d.ts.map +1 -0
  69. package/dist/types/src/hooks/awareness-provider.d.ts +28 -0
  70. package/dist/types/src/hooks/awareness-provider.d.ts.map +1 -0
  71. package/dist/types/src/hooks/index.d.ts +2 -0
  72. package/dist/types/src/hooks/index.d.ts.map +1 -1
  73. package/dist/types/src/hooks/useTextModel.d.ts +20 -11
  74. package/dist/types/src/hooks/useTextModel.d.ts.map +1 -1
  75. package/dist/types/src/hooks/{yjs/space-provider.d.ts → yjs.d.ts} +8 -8
  76. package/dist/types/src/hooks/yjs.d.ts.map +1 -0
  77. package/dist/types/src/index.d.ts +3 -0
  78. package/dist/types/src/index.d.ts.map +1 -1
  79. package/dist/types/src/styles/cursors.d.ts.map +1 -0
  80. package/dist/types/src/styles/index.d.ts +1 -0
  81. package/dist/types/src/styles/index.d.ts.map +1 -1
  82. package/dist/types/src/testing/replicator.d.ts +2 -2
  83. package/dist/types/src/testing/replicator.d.ts.map +1 -1
  84. package/dist/types/src/{components/TextEditor/themes → themes}/default.d.ts +5 -13
  85. package/dist/types/src/themes/default.d.ts.map +1 -0
  86. package/dist/types/src/themes/index.d.ts.map +1 -0
  87. package/dist/types/src/util/cursor.d.ts +17 -0
  88. package/dist/types/src/util/cursor.d.ts.map +1 -0
  89. package/dist/types/src/util/index.d.ts +3 -0
  90. package/dist/types/src/util/index.d.ts.map +1 -0
  91. package/dist/types/src/util/util.d.ts +5 -0
  92. package/dist/types/src/util/util.d.ts.map +1 -0
  93. package/package.json +25 -20
  94. package/src/components/TextEditor/MarkdownEditor.stories.tsx +130 -71
  95. package/src/components/TextEditor/TextEditor.stories.tsx +15 -2
  96. package/src/components/TextEditor/TextEditor.tsx +30 -26
  97. package/src/{hooks/automerge → components/TextEditor}/automerge.stories.tsx +67 -8
  98. package/src/components/TextEditor/codemirror.stories.ts +3 -2
  99. package/src/components/TextEditor/index.ts +0 -3
  100. package/src/{hooks/yjs → components/TextEditor}/yjs.stories.tsx +1 -1
  101. package/src/extensions/automerge/automerge.ts +94 -0
  102. package/src/extensions/automerge/cursor.ts +51 -0
  103. package/src/extensions/automerge/defs.ts +62 -0
  104. package/src/extensions/automerge/index.ts +6 -0
  105. package/src/{hooks/automerge/PatchSemaphore.ts → extensions/automerge/semaphore.ts} +18 -15
  106. package/src/{hooks/automerge/translation/codemirror-to-automerge.ts → extensions/automerge/update-automerge.ts} +6 -7
  107. package/src/{hooks/automerge/translation/automerge-to-codemirror.ts → extensions/automerge/update-codemirror.ts} +14 -11
  108. package/src/extensions/awareness.ts +316 -0
  109. package/src/{components/TextEditor/extensions → extensions}/code.ts +13 -13
  110. package/src/extensions/comments.ts +421 -0
  111. package/src/extensions/hr.ts +74 -0
  112. package/src/{components/TextEditor/extensions → extensions}/image.ts +3 -1
  113. package/src/{components/TextEditor/extensions → extensions}/index.ts +6 -3
  114. package/src/{components/TextEditor/extensions → extensions}/link.ts +66 -10
  115. package/src/extensions/listener.ts +35 -0
  116. package/src/{components/TextEditor/extensions → extensions}/markdown/highlight.ts +6 -9
  117. package/src/extensions/mermaid.ts +11 -0
  118. package/src/{components/TextEditor/extensions → extensions}/table.ts +14 -1
  119. package/src/{components/TextEditor/extensions/demo.ts → extensions/typewriter.ts} +2 -3
  120. package/src/extensions/yjs/cursor.ts +21 -0
  121. package/src/extensions/yjs/index.ts +5 -0
  122. package/src/extensions/yjs/yjs.test.ts +35 -0
  123. package/src/extensions/yjs/yjs.ts +16 -0
  124. package/src/hooks/automerge.ts +52 -0
  125. package/src/hooks/awareness-provider.ts +120 -0
  126. package/src/hooks/index.ts +2 -0
  127. package/src/hooks/useTextModel.ts +43 -79
  128. package/src/hooks/{yjs/space-provider.ts → yjs.ts} +71 -19
  129. package/src/index.ts +3 -0
  130. package/src/styles/index.ts +1 -0
  131. package/src/testing/replicator.ts +10 -16
  132. package/src/{components/TextEditor/themes → themes}/default.ts +61 -38
  133. package/src/util/cursor.ts +29 -0
  134. package/src/util/index.ts +6 -0
  135. package/src/util/util.ts +18 -0
  136. package/dist/types/src/components/TextEditor/extensions/autocomplete.d.ts.map +0 -1
  137. package/dist/types/src/components/TextEditor/extensions/basic.d.ts.map +0 -1
  138. package/dist/types/src/components/TextEditor/extensions/blast.d.ts.map +0 -1
  139. package/dist/types/src/components/TextEditor/extensions/code.d.ts.map +0 -1
  140. package/dist/types/src/components/TextEditor/extensions/comments.d.ts +0 -18
  141. package/dist/types/src/components/TextEditor/extensions/comments.d.ts.map +0 -1
  142. package/dist/types/src/components/TextEditor/extensions/demo.d.ts.map +0 -1
  143. package/dist/types/src/components/TextEditor/extensions/experimental.d.ts +0 -10
  144. package/dist/types/src/components/TextEditor/extensions/experimental.d.ts.map +0 -1
  145. package/dist/types/src/components/TextEditor/extensions/highlight.d.ts +0 -24
  146. package/dist/types/src/components/TextEditor/extensions/highlight.d.ts.map +0 -1
  147. package/dist/types/src/components/TextEditor/extensions/image.d.ts.map +0 -1
  148. package/dist/types/src/components/TextEditor/extensions/index.d.ts.map +0 -1
  149. package/dist/types/src/components/TextEditor/extensions/link.d.ts.map +0 -1
  150. package/dist/types/src/components/TextEditor/extensions/listener.d.ts +0 -9
  151. package/dist/types/src/components/TextEditor/extensions/listener.d.ts.map +0 -1
  152. package/dist/types/src/components/TextEditor/extensions/markdown/bundle.d.ts.map +0 -1
  153. package/dist/types/src/components/TextEditor/extensions/markdown/highlight.d.ts.map +0 -1
  154. package/dist/types/src/components/TextEditor/extensions/markdown/index.d.ts.map +0 -1
  155. package/dist/types/src/components/TextEditor/extensions/mention.d.ts.map +0 -1
  156. package/dist/types/src/components/TextEditor/extensions/table.d.ts.map +0 -1
  157. package/dist/types/src/components/TextEditor/extensions/tasklist.d.ts.map +0 -1
  158. package/dist/types/src/components/TextEditor/extensions/tooltip.d.ts +0 -12
  159. package/dist/types/src/components/TextEditor/extensions/tooltip.d.ts.map +0 -1
  160. package/dist/types/src/components/TextEditor/themes/default.d.ts.map +0 -1
  161. package/dist/types/src/components/TextEditor/themes/index.d.ts.map +0 -1
  162. package/dist/types/src/hooks/automerge/PatchSemaphore.d.ts.map +0 -1
  163. package/dist/types/src/hooks/automerge/automerge.stories.d.ts.map +0 -1
  164. package/dist/types/src/hooks/automerge/handle.d.ts +0 -9
  165. package/dist/types/src/hooks/automerge/handle.d.ts.map +0 -1
  166. package/dist/types/src/hooks/automerge/index.d.ts +0 -3
  167. package/dist/types/src/hooks/automerge/index.d.ts.map +0 -1
  168. package/dist/types/src/hooks/automerge/plugin.d.ts +0 -26
  169. package/dist/types/src/hooks/automerge/plugin.d.ts.map +0 -1
  170. package/dist/types/src/hooks/automerge/translation/automerge-to-codemirror.d.ts +0 -5
  171. package/dist/types/src/hooks/automerge/translation/automerge-to-codemirror.d.ts.map +0 -1
  172. package/dist/types/src/hooks/automerge/translation/codemirror-to-automerge.d.ts +0 -6
  173. package/dist/types/src/hooks/automerge/translation/codemirror-to-automerge.d.ts.map +0 -1
  174. package/dist/types/src/hooks/automerge/translation/index.d.ts +0 -3
  175. package/dist/types/src/hooks/automerge/translation/index.d.ts.map +0 -1
  176. package/dist/types/src/hooks/yjs/cursors.d.ts.map +0 -1
  177. package/dist/types/src/hooks/yjs/index.d.ts +0 -3
  178. package/dist/types/src/hooks/yjs/index.d.ts.map +0 -1
  179. package/dist/types/src/hooks/yjs/space-provider.d.ts.map +0 -1
  180. package/dist/types/src/hooks/yjs/yjs.stories.d.ts.map +0 -1
  181. package/src/components/TextEditor/extensions/comments.ts +0 -173
  182. package/src/components/TextEditor/extensions/experimental.tsx +0 -114
  183. package/src/components/TextEditor/extensions/highlight.ts +0 -128
  184. package/src/components/TextEditor/extensions/listener.ts +0 -23
  185. package/src/components/TextEditor/extensions/tooltip.tsx +0 -61
  186. package/src/hooks/automerge/handle.ts +0 -14
  187. package/src/hooks/automerge/index.ts +0 -6
  188. package/src/hooks/automerge/plugin.ts +0 -134
  189. package/src/hooks/automerge/translation/index.ts +0 -6
  190. package/src/hooks/yjs/index.ts +0 -6
  191. /package/dist/types/src/{components/TextEditor/extensions → extensions}/autocomplete.d.ts +0 -0
  192. /package/dist/types/src/{components/TextEditor/extensions → extensions}/basic.d.ts +0 -0
  193. /package/dist/types/src/{components/TextEditor/extensions → extensions}/blast.d.ts +0 -0
  194. /package/dist/types/src/{components/TextEditor/extensions → extensions}/code.d.ts +0 -0
  195. /package/dist/types/src/{components/TextEditor/extensions → extensions}/image.d.ts +0 -0
  196. /package/dist/types/src/{components/TextEditor/extensions → extensions}/markdown/bundle.d.ts +0 -0
  197. /package/dist/types/src/{components/TextEditor/extensions → extensions}/markdown/index.d.ts +0 -0
  198. /package/dist/types/src/{components/TextEditor/extensions → extensions}/mention.d.ts +0 -0
  199. /package/dist/types/src/{components/TextEditor/extensions → extensions}/table.d.ts +0 -0
  200. /package/dist/types/src/{components/TextEditor/extensions → extensions}/tasklist.d.ts +0 -0
  201. /package/dist/types/src/{hooks/yjs → styles}/cursors.d.ts +0 -0
  202. /package/dist/types/src/{components/TextEditor/themes → themes}/index.d.ts +0 -0
  203. /package/src/{components/TextEditor/extensions → extensions}/autocomplete.ts +0 -0
  204. /package/src/{components/TextEditor/extensions → extensions}/basic.ts +0 -0
  205. /package/src/{components/TextEditor/extensions → extensions}/blast.ts +0 -0
  206. /package/src/{components/TextEditor/extensions → extensions}/markdown/bundle.ts +0 -0
  207. /package/src/{components/TextEditor/extensions → extensions}/markdown/index.ts +0 -0
  208. /package/src/{components/TextEditor/extensions → extensions}/mention.ts +0 -0
  209. /package/src/{components/TextEditor/extensions → extensions}/tasklist.ts +0 -0
  210. /package/src/{hooks/yjs → styles}/cursors.ts +0 -0
  211. /package/src/{components/TextEditor/themes → themes}/index.ts +0 -0
@@ -0,0 +1,316 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import { Annotation, Facet, type Extension, RangeSet, type Range } from '@codemirror/state';
6
+ import {
7
+ Decoration,
8
+ type DecorationSet,
9
+ EditorView,
10
+ type PluginValue,
11
+ ViewPlugin,
12
+ type ViewUpdate,
13
+ WidgetType,
14
+ } from '@codemirror/view';
15
+
16
+ import { Event } from '@dxos/async';
17
+ import { Context } from '@dxos/context';
18
+
19
+ import { CursorConverter } from '../util';
20
+
21
+ export interface AwarenessProvider {
22
+ remoteStateChange: Event<void>;
23
+
24
+ open(): void;
25
+ close(): void;
26
+
27
+ update(position: AwarenessPosition | undefined): void;
28
+ getRemoteStates(): AwarenessState[];
29
+ }
30
+
31
+ const dummyProvider: AwarenessProvider = {
32
+ remoteStateChange: new Event(),
33
+
34
+ open: () => {},
35
+ close: () => {},
36
+
37
+ update: () => {},
38
+ getRemoteStates: () => [],
39
+ };
40
+
41
+ export const AwarenessProvider = Facet.define<AwarenessProvider, AwarenessProvider>({
42
+ combine: (providers) => providers[0] ?? dummyProvider,
43
+ });
44
+
45
+ // TODO(dmaretskyi): Specify the users that actually changed. Currently, we recalculate positions for every user.
46
+ const RemoteSelectionChangedAnnotation = Annotation.define();
47
+
48
+ export type AwarenessPosition = {
49
+ anchor?: string;
50
+ head?: string;
51
+ };
52
+
53
+ export type AwarenessInfo = {
54
+ displayName?: string;
55
+ // TODO(burdon): Rename light/dark.
56
+ color?: string;
57
+ lightColor?: string;
58
+ };
59
+
60
+ export type AwarenessState = {
61
+ position?: AwarenessPosition;
62
+ peerId: string;
63
+ info: AwarenessInfo;
64
+ };
65
+
66
+ /**
67
+ * Extension provides presence information about other peers.
68
+ */
69
+ // TODO(burdon): Why provide default?
70
+ export const awareness = (provider = dummyProvider): Extension => {
71
+ return [
72
+ AwarenessProvider.of(provider),
73
+ ViewPlugin.fromClass(RemoteSelectionsDecorator, {
74
+ decorations: (value) => value.decorations,
75
+ }),
76
+ styles,
77
+ ];
78
+ };
79
+
80
+ /**
81
+ * Generates selection decorations from remote peers.
82
+ */
83
+ export class RemoteSelectionsDecorator implements PluginValue {
84
+ public decorations: DecorationSet = RangeSet.of([]);
85
+
86
+ private readonly _ctx = new Context();
87
+
88
+ private _cursorConverter: CursorConverter;
89
+ private _provider: AwarenessProvider;
90
+ private _lastAnchor?: number = undefined;
91
+ private _lastHead?: number = undefined;
92
+
93
+ constructor(view: EditorView) {
94
+ this._cursorConverter = view.state.facet(CursorConverter);
95
+ this._provider = view.state.facet(AwarenessProvider);
96
+ this._provider.open();
97
+ this._provider.remoteStateChange.on(this._ctx, () => {
98
+ view.dispatch({ annotations: [RemoteSelectionChangedAnnotation.of([])] });
99
+ });
100
+ }
101
+
102
+ destroy() {
103
+ void this._ctx.dispose();
104
+ this._provider.close();
105
+ }
106
+
107
+ update(update: ViewUpdate) {
108
+ this._updateLocalSelection(update);
109
+ this._updateRemoteSelections(update);
110
+ }
111
+
112
+ private _updateLocalSelection(update: ViewUpdate) {
113
+ const hasFocus = update.view.hasFocus && update.view.dom.ownerDocument.hasFocus();
114
+ const { anchor = undefined, head = undefined } = hasFocus ? update.state.selection.main : {};
115
+ if (this._lastAnchor === anchor && this._lastHead === head) {
116
+ return;
117
+ }
118
+
119
+ this._lastAnchor = anchor;
120
+ this._lastHead = head;
121
+
122
+ this._provider.update(
123
+ anchor !== undefined && head !== undefined
124
+ ? {
125
+ anchor: this._cursorConverter.toCursor(anchor),
126
+ head: this._cursorConverter.toCursor(head),
127
+ }
128
+ : undefined,
129
+ );
130
+ }
131
+
132
+ private _updateRemoteSelections(update: ViewUpdate) {
133
+ const decorations: Range<Decoration>[] = [];
134
+ const awarenessStates = this._provider.getRemoteStates();
135
+ for (const state of awarenessStates) {
136
+ const anchor = state.position?.anchor ? this._cursorConverter.fromCursor(state.position.anchor) : null;
137
+ const head = state.position?.head ? this._cursorConverter.fromCursor(state.position.head) : null;
138
+ if (anchor == null || head == null) {
139
+ continue;
140
+ }
141
+
142
+ const start = Math.min(Math.min(anchor, head), update.view.state.doc.length);
143
+ const end = Math.min(Math.max(anchor, head), update.view.state.doc.length);
144
+
145
+ const startLine = update.view.state.doc.lineAt(start);
146
+ const endLine = update.view.state.doc.lineAt(end);
147
+
148
+ // TODO(burdon): Factor out styles.
149
+ const color = state.info.color ?? '#30bced';
150
+ const lightColor = state.info.lightColor ?? color + '33';
151
+
152
+ if (startLine.number === endLine.number) {
153
+ // Selected content in a single line.
154
+ decorations.push({
155
+ from: start,
156
+ to: end,
157
+ value: Decoration.mark({
158
+ attributes: { style: `background-color: ${lightColor}` },
159
+ class: 'cm-ySelection',
160
+ }),
161
+ });
162
+ } else {
163
+ // Selected content in multiple lines; first, render text-selection in the first line.
164
+ decorations.push({
165
+ from: start,
166
+ to: startLine.from + startLine.length,
167
+ value: Decoration.mark({
168
+ attributes: { style: `background-color: ${color}` },
169
+ class: 'cm-ySelection',
170
+ }),
171
+ });
172
+
173
+ // Render text-selection in the last line.
174
+ decorations.push({
175
+ from: endLine.from,
176
+ to: end,
177
+ value: Decoration.mark({
178
+ attributes: { style: `background-color: ${color}` },
179
+ class: 'cm-ySelection',
180
+ }),
181
+ });
182
+
183
+ for (let i = startLine.number + 1; i < endLine.number; i++) {
184
+ const linePos = update.view.state.doc.line(i).from;
185
+ decorations.push({
186
+ from: linePos,
187
+ to: linePos,
188
+ value: Decoration.line({
189
+ attributes: { style: `background-color: ${color}`, class: 'cm-yLineSelection' },
190
+ }),
191
+ });
192
+ }
193
+ }
194
+
195
+ decorations.push({
196
+ from: head,
197
+ to: head,
198
+ value: Decoration.widget({
199
+ side: head - anchor > 0 ? -1 : 1, // The local cursor should be rendered outside the remote selection.
200
+ block: false,
201
+ widget: new RemoteCaretWidget(state.info.displayName ?? 'Anonymous', color),
202
+ }),
203
+ });
204
+ }
205
+
206
+ this.decorations = Decoration.set(decorations, true);
207
+ }
208
+ }
209
+
210
+ class RemoteCaretWidget extends WidgetType {
211
+ constructor(public name: string, public color: string) {
212
+ super();
213
+ this.name = name;
214
+ this.color = color;
215
+ }
216
+
217
+ toDOM(): HTMLElement {
218
+ const span = document.createElement('span');
219
+ span.className = 'cm-ySelectionCaret';
220
+ span.style.backgroundColor = this.color;
221
+ span.style.borderColor = this.color;
222
+
223
+ const dot = document.createElement('div');
224
+ dot.className = 'cm-ySelectionCaretDot';
225
+
226
+ const info = document.createElement('div');
227
+ info.className = 'cm-ySelectionInfo';
228
+ info.innerText = this.name;
229
+
230
+ span.appendChild(document.createTextNode('\u2060'));
231
+ span.appendChild(dot);
232
+ span.appendChild(document.createTextNode('\u2060'));
233
+ span.appendChild(info);
234
+ span.appendChild(document.createTextNode('\u2060'));
235
+
236
+ return span;
237
+ }
238
+
239
+ override eq(widget: this) {
240
+ return widget.color === this.color;
241
+ }
242
+
243
+ compare(widget: this) {
244
+ return widget.color === this.color;
245
+ }
246
+
247
+ override updateDOM() {
248
+ return false;
249
+ }
250
+
251
+ override get estimatedHeight() {
252
+ return -1;
253
+ }
254
+
255
+ override ignoreEvent() {
256
+ return true;
257
+ }
258
+ }
259
+
260
+ // TODO(burdon): Rename prefix (y for yjs?)
261
+ const styles = EditorView.baseTheme({
262
+ '.cm-ySelection': {},
263
+ '.cm-yLineSelection': {
264
+ padding: 0,
265
+ margin: '0px 2px 0px 4px',
266
+ },
267
+ '.cm-ySelectionCaret': {
268
+ position: 'relative',
269
+ borderLeft: '1px solid black',
270
+ borderRight: '1px solid black',
271
+ marginLeft: '-1px',
272
+ marginRight: '-1px',
273
+ boxSizing: 'border-box',
274
+ display: 'inline',
275
+ },
276
+ '.cm-ySelectionCaretDot': {
277
+ borderRadius: '50%',
278
+ position: 'absolute',
279
+ width: '.4em',
280
+ height: '.4em',
281
+ top: '-.2em',
282
+ left: '-.2em',
283
+ backgroundColor: 'inherit',
284
+ transition: 'transform .3s ease-in-out',
285
+ boxSizing: 'border-box',
286
+ },
287
+ '.cm-ySelectionCaret:hover > .cm-ySelectionCaretDot': {
288
+ transformOrigin: 'bottom center',
289
+ transform: 'scale(0)',
290
+ },
291
+ '.cm-ySelectionInfo': {
292
+ position: 'absolute',
293
+ top: '-1.05em',
294
+ left: '-1px',
295
+ fontSize: '.75em',
296
+ fontFamily: 'serif',
297
+ fontStyle: 'normal',
298
+ fontWeight: 'normal',
299
+ lineHeight: 'normal',
300
+ userSelect: 'none',
301
+ color: 'white',
302
+ paddingLeft: '2px',
303
+ paddingRight: '2px',
304
+ zIndex: 101,
305
+ transition: 'opacity .3s ease-in-out',
306
+ backgroundColor: 'inherit',
307
+ // these should be separate
308
+ opacity: 0,
309
+ transitionDelay: '0s',
310
+ whiteSpace: 'nowrap',
311
+ },
312
+ '.cm-ySelectionCaret:hover > .cm-ySelectionInfo': {
313
+ opacity: 1,
314
+ transitionDelay: '0s',
315
+ },
316
+ });
@@ -15,34 +15,38 @@ import get from 'lodash.get';
15
15
 
16
16
  import { mx } from '@dxos/react-ui-theme';
17
17
 
18
- import { tokens } from '../../../styles';
18
+ import { tokens } from '../styles';
19
19
 
20
20
  const CODE_REGEX = /```[\s\S]*?```/gs;
21
21
 
22
22
  // TODO(burdon): Reconcile with theme.
23
23
  const styles = EditorView.baseTheme({
24
- '& .cm-code-block': {
25
- display: 'block',
26
- paddingInline: '4px !important',
24
+ '& .cm-codeblock': {
25
+ fontFamily: get(tokens, 'fontFamily.mono', []).join(','),
27
26
  },
28
- '&light .cm-code-block': {
27
+ '&light [aria-readonly="true"] .cm-codeblock': {
29
28
  background: get(tokens, 'extend.colors.neutral.50'),
30
29
  },
31
- '&dark .cm-code-block': {
30
+ '&dark [aria-readonly="true"] .cm-codeblock': {
32
31
  background: get(tokens, 'extend.colors.neutral.850'),
33
32
  },
34
- '& .cm-code-block-first': {
33
+ '& [aria-readonly="true"] .cm-codeblock': {
34
+ display: 'block',
35
+ paddingInline: '4px !important',
36
+ },
37
+ '& [aria-readonly="true"] .cm-codeblock-first': {
35
38
  paddingTop: '4px !important',
36
39
  borderTopLeftRadius: '4px',
37
40
  borderTopRightRadius: '4px',
38
41
  },
39
- '& .cm-code-block-last': {
42
+ '& [aria-readonly="true"] .cm-codeblock-last': {
40
43
  paddingBottom: '4px !important',
41
44
  borderBottomLeftRadius: '4px',
42
45
  borderBottomRightRadius: '4px',
43
46
  },
44
47
  });
45
48
 
49
+ // TODO(burdon): Start from EditorView.lineBlockAt(pos).
46
50
  const getLineRange = (lines: BlockInfo[], from: number, to: number) => {
47
51
  const start = lines.findIndex((line) => line.from >= from);
48
52
  const end = lines.findIndex((line) => line.to >= to);
@@ -62,11 +66,7 @@ export const code = () => {
62
66
  const block = blocks[i];
63
67
  decorations.push(
64
68
  Decoration.line({
65
- class: mx(
66
- 'cm-code-block',
67
- i === range[0] && 'cm-code-block-first',
68
- i === range[1] && 'cm-code-block-last',
69
- ),
69
+ class: mx('cm-codeblock', i === range[0] && 'cm-codeblock-first', i === range[1] && 'cm-codeblock-last'),
70
70
  }).range(block.from),
71
71
  );
72
72
  }