@dxos/react-ui-editor 0.3.11-main.a996413 → 0.3.11-main.b00882f

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 (166) hide show
  1. package/dist/lib/browser/index.mjs +2010 -1505
  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 +16 -13
  5. package/dist/types/src/components/TextEditor/MarkdownEditor.stories.d.ts.map +1 -1
  6. package/dist/types/src/components/TextEditor/TextEditor.d.ts +20 -17
  7. package/dist/types/src/components/TextEditor/TextEditor.d.ts.map +1 -1
  8. package/dist/types/src/components/TextEditor/TextEditor.stories.d.ts +6 -3
  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 -1
  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/comments.stories.d.ts +26 -0
  14. package/dist/types/src/components/TextEditor/comments.stories.d.ts.map +1 -0
  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 -1
  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 +24 -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/extensions/automerge/semaphore.d.ts +14 -0
  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.map +1 -0
  31. package/dist/types/src/extensions/awareness.d.ts +48 -0
  32. package/dist/types/src/extensions/awareness.d.ts.map +1 -0
  33. package/dist/types/src/extensions/basic.d.ts +4 -5
  34. package/dist/types/src/extensions/basic.d.ts.map +1 -1
  35. package/dist/types/src/extensions/code.d.ts.map +1 -1
  36. package/dist/types/src/extensions/comments.d.ts +32 -19
  37. package/dist/types/src/extensions/comments.d.ts.map +1 -1
  38. package/dist/types/src/extensions/cursor.d.ts +25 -0
  39. package/dist/types/src/extensions/cursor.d.ts.map +1 -0
  40. package/dist/types/src/extensions/hr.d.ts.map +1 -1
  41. package/dist/types/src/extensions/image.d.ts.map +1 -1
  42. package/dist/types/src/extensions/index.d.ts +5 -1
  43. package/dist/types/src/extensions/index.d.ts.map +1 -1
  44. package/dist/types/src/extensions/link.d.ts.map +1 -1
  45. package/dist/types/src/extensions/markdown/bundle.d.ts +2 -5
  46. package/dist/types/src/extensions/markdown/bundle.d.ts.map +1 -1
  47. package/dist/types/src/extensions/markdown/highlight.d.ts.map +1 -1
  48. package/dist/types/src/extensions/mention.d.ts.map +1 -1
  49. package/dist/types/src/extensions/outliner.d.ts +4 -0
  50. package/dist/types/src/extensions/outliner.d.ts.map +1 -0
  51. package/dist/types/src/extensions/tasklist.d.ts.map +1 -1
  52. package/dist/types/src/extensions/yjs/cursor.d.ts +4 -0
  53. package/dist/types/src/extensions/yjs/cursor.d.ts.map +1 -0
  54. package/dist/types/src/extensions/yjs/index.d.ts +2 -0
  55. package/dist/types/src/extensions/yjs/index.d.ts.map +1 -0
  56. package/dist/types/src/extensions/yjs/yjs.d.ts +4 -0
  57. package/dist/types/src/extensions/yjs/yjs.d.ts.map +1 -0
  58. package/dist/types/src/extensions/yjs/yjs.test.d.ts.map +1 -0
  59. package/dist/types/src/hooks/automerge.d.ts +4 -0
  60. package/dist/types/src/hooks/automerge.d.ts.map +1 -0
  61. package/dist/types/src/hooks/awareness-provider.d.ts +28 -0
  62. package/dist/types/src/hooks/awareness-provider.d.ts.map +1 -0
  63. package/dist/types/src/hooks/defs.d.ts +28 -0
  64. package/dist/types/src/hooks/defs.d.ts.map +1 -0
  65. package/dist/types/src/hooks/index.d.ts +5 -1
  66. package/dist/types/src/hooks/index.d.ts.map +1 -1
  67. package/dist/types/src/hooks/useTextEditor.d.ts +17 -0
  68. package/dist/types/src/hooks/useTextEditor.d.ts.map +1 -0
  69. package/dist/types/src/hooks/useTextModel.d.ts +2 -31
  70. package/dist/types/src/hooks/useTextModel.d.ts.map +1 -1
  71. package/dist/types/src/hooks/{yjs/space-provider.d.ts → yjs.d.ts} +9 -8
  72. package/dist/types/src/hooks/yjs.d.ts.map +1 -0
  73. package/dist/types/src/index.d.ts +3 -0
  74. package/dist/types/src/index.d.ts.map +1 -1
  75. package/dist/types/src/styles/cursors.d.ts.map +1 -0
  76. package/dist/types/src/styles/index.d.ts +1 -0
  77. package/dist/types/src/styles/index.d.ts.map +1 -1
  78. package/dist/types/src/styles/markdown.d.ts.map +1 -1
  79. package/dist/types/src/styles/tokens.d.ts +1 -0
  80. package/dist/types/src/styles/tokens.d.ts.map +1 -1
  81. package/dist/types/src/testing/replicator.d.ts +2 -2
  82. package/dist/types/src/testing/replicator.d.ts.map +1 -1
  83. package/dist/types/src/themes/default.d.ts.map +1 -1
  84. package/dist/types/src/util.d.ts +7 -0
  85. package/dist/types/src/util.d.ts.map +1 -0
  86. package/package.json +32 -30
  87. package/src/components/TextEditor/MarkdownEditor.stories.tsx +77 -80
  88. package/src/components/TextEditor/TextEditor.stories.tsx +13 -34
  89. package/src/components/TextEditor/TextEditor.tsx +125 -93
  90. package/src/{hooks/automerge → components/TextEditor}/automerge.stories.tsx +66 -6
  91. package/src/components/TextEditor/codemirror.stories.ts +3 -2
  92. package/src/components/TextEditor/comments.stories.tsx +357 -0
  93. package/src/{hooks/yjs → components/TextEditor}/yjs.stories.tsx +1 -1
  94. package/src/extensions/autocomplete.ts +23 -19
  95. package/src/extensions/automerge/automerge.ts +88 -0
  96. package/src/extensions/automerge/cursor.ts +52 -0
  97. package/src/extensions/automerge/defs.ts +41 -0
  98. package/src/extensions/automerge/index.ts +6 -0
  99. package/src/{hooks → extensions}/automerge/semaphore.ts +34 -29
  100. package/src/{hooks → extensions}/automerge/update-automerge.ts +5 -6
  101. package/src/{hooks → extensions}/automerge/update-codemirror.ts +13 -5
  102. package/src/extensions/awareness.ts +327 -0
  103. package/src/extensions/basic.ts +22 -17
  104. package/src/extensions/code.ts +28 -23
  105. package/src/extensions/comments.ts +252 -229
  106. package/src/extensions/cursor.ts +50 -0
  107. package/src/extensions/hr.ts +50 -52
  108. package/src/extensions/image.ts +40 -22
  109. package/src/extensions/index.ts +5 -1
  110. package/src/extensions/link.ts +86 -88
  111. package/src/extensions/markdown/bundle.ts +18 -24
  112. package/src/extensions/markdown/highlight.ts +3 -12
  113. package/src/extensions/mention.ts +9 -2
  114. package/src/extensions/outliner.ts +12 -0
  115. package/src/extensions/table.ts +10 -4
  116. package/src/extensions/tasklist.ts +78 -88
  117. package/src/extensions/yjs/cursor.ts +22 -0
  118. package/src/extensions/yjs/index.ts +5 -0
  119. package/src/{hooks → extensions}/yjs/yjs.test.ts +2 -26
  120. package/src/extensions/yjs/yjs.ts +16 -0
  121. package/src/hooks/automerge.ts +53 -0
  122. package/src/hooks/awareness-provider.ts +120 -0
  123. package/src/hooks/defs.ts +47 -0
  124. package/src/hooks/index.ts +6 -1
  125. package/src/hooks/useTextEditor.ts +29 -0
  126. package/src/hooks/useTextModel.ts +9 -129
  127. package/src/hooks/{yjs/space-provider.ts → yjs.ts} +50 -19
  128. package/src/index.ts +3 -0
  129. package/src/styles/index.ts +1 -0
  130. package/src/styles/markdown.ts +0 -2
  131. package/src/styles/tokens.ts +3 -0
  132. package/src/testing/replicator.ts +10 -15
  133. package/src/themes/default.ts +51 -78
  134. package/src/util.ts +41 -0
  135. package/dist/types/src/extensions/mermaid.d.ts +0 -3
  136. package/dist/types/src/extensions/mermaid.d.ts.map +0 -1
  137. package/dist/types/src/extensions/util.d.ts +0 -5
  138. package/dist/types/src/extensions/util.d.ts.map +0 -1
  139. package/dist/types/src/hooks/automerge/automerge.stories.d.ts.map +0 -1
  140. package/dist/types/src/hooks/automerge/handle.d.ts +0 -9
  141. package/dist/types/src/hooks/automerge/handle.d.ts.map +0 -1
  142. package/dist/types/src/hooks/automerge/index.d.ts +0 -3
  143. package/dist/types/src/hooks/automerge/index.d.ts.map +0 -1
  144. package/dist/types/src/hooks/automerge/plugin.d.ts +0 -26
  145. package/dist/types/src/hooks/automerge/plugin.d.ts.map +0 -1
  146. package/dist/types/src/hooks/automerge/semaphore.d.ts +0 -19
  147. package/dist/types/src/hooks/automerge/semaphore.d.ts.map +0 -1
  148. package/dist/types/src/hooks/automerge/update-automerge.d.ts +0 -6
  149. package/dist/types/src/hooks/automerge/update-automerge.d.ts.map +0 -1
  150. package/dist/types/src/hooks/automerge/update-codemirror.d.ts.map +0 -1
  151. package/dist/types/src/hooks/yjs/cursors.d.ts.map +0 -1
  152. package/dist/types/src/hooks/yjs/index.d.ts +0 -3
  153. package/dist/types/src/hooks/yjs/index.d.ts.map +0 -1
  154. package/dist/types/src/hooks/yjs/space-provider.d.ts.map +0 -1
  155. package/dist/types/src/hooks/yjs/yjs.stories.d.ts.map +0 -1
  156. package/dist/types/src/hooks/yjs/yjs.test.d.ts.map +0 -1
  157. package/src/extensions/mermaid.ts +0 -11
  158. package/src/extensions/util.ts +0 -18
  159. package/src/hooks/automerge/handle.ts +0 -14
  160. package/src/hooks/automerge/index.ts +0 -6
  161. package/src/hooks/automerge/plugin.ts +0 -132
  162. package/src/hooks/yjs/index.ts +0 -6
  163. /package/dist/types/src/{hooks → extensions}/automerge/update-codemirror.d.ts +0 -0
  164. /package/dist/types/src/{hooks → extensions}/yjs/yjs.test.d.ts +0 -0
  165. /package/dist/types/src/{hooks/yjs → styles}/cursors.d.ts +0 -0
  166. /package/src/{hooks/yjs → styles}/cursors.ts +0 -0
@@ -2,73 +2,71 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import {
6
- Decoration,
7
- type DecorationSet,
8
- EditorView,
9
- MatchDecorator,
10
- ViewPlugin,
11
- type ViewUpdate,
12
- WidgetType,
13
- } from '@codemirror/view';
14
- import get from 'lodash.get';
5
+ import { syntaxTree } from '@codemirror/language';
6
+ import { RangeSetBuilder } from '@codemirror/state';
7
+ import { Decoration, type DecorationSet, EditorView, ViewPlugin, type ViewUpdate, WidgetType } from '@codemirror/view';
15
8
 
16
- import { tokens } from '../styles';
9
+ import { getToken } from '../styles';
17
10
 
18
11
  // TODO(burdon): Reconcile with theme.
19
12
  const styles = EditorView.baseTheme({
20
13
  '& .cm-hr': {
21
- // TODO(burdon): ???
22
14
  // Note that block-level decorations should not have vertical margins,
23
- borderBottom: `1px solid ${get(tokens, 'extend.colors.neutral.200')}`,
15
+ borderTop: `1px solid ${getToken('extend.colors.neutral.200')}`,
24
16
  },
25
17
  });
26
18
 
27
19
  class HorizontalRuleWidget extends WidgetType {
28
- constructor(readonly _pos: number) {
29
- super();
30
- }
31
-
32
- override eq(other: WidgetType) {
33
- return this._pos === (other as any as HorizontalRuleWidget)._pos;
34
- }
35
-
36
- toDOM(view: EditorView) {
37
- // TODO(burdon): Create <hr> element? Does this clash with markdown parser?
20
+ override toDOM() {
38
21
  const el = document.createElement('div');
39
22
  el.className = 'cm-hr';
40
23
  return el;
41
24
  }
42
25
  }
43
26
 
44
- const placeholderMatcher = new MatchDecorator({
45
- regexp: /^---$/g,
46
- decoration: (match, view, pos) =>
47
- Decoration.replace({
48
- widget: new HorizontalRuleWidget(pos),
49
- }),
50
- });
27
+ const decoration = Decoration.replace({ widget: new HorizontalRuleWidget() });
28
+
29
+ const buildDecorations = (view: EditorView): DecorationSet => {
30
+ const builder = new RangeSetBuilder<Decoration>();
31
+ const { state } = view;
32
+ const cursor = state.selection.main.head;
33
+
34
+ for (const { from, to } of view.visibleRanges) {
35
+ syntaxTree(state).iterate({
36
+ enter: (node) => {
37
+ if (node.name === 'HorizontalRule') {
38
+ // Check if cursor is inside text.
39
+ if (cursor <= node.from || cursor >= node.to) {
40
+ builder.add(node.from, node.to, decoration);
41
+ }
42
+ }
43
+ },
44
+ from,
45
+ to,
46
+ });
47
+ }
48
+
49
+ return builder.finish();
50
+ };
51
+
52
+ export const hr = () => {
53
+ return [
54
+ styles,
55
+ ViewPlugin.fromClass(
56
+ class {
57
+ decorations: DecorationSet;
51
58
 
52
- export const hr = () => [
53
- styles,
54
- ViewPlugin.fromClass(
55
- class {
56
- rules: DecorationSet;
57
- constructor(view: EditorView) {
58
- this.rules = placeholderMatcher.createDeco(view);
59
- }
59
+ constructor(view: EditorView) {
60
+ this.decorations = buildDecorations(view);
61
+ }
60
62
 
61
- update(update: ViewUpdate) {
62
- this.rules = placeholderMatcher.updateDeco(update, this.rules);
63
- }
64
- },
65
- {
66
- decorations: (instance) => instance.rules,
67
- // TODO(burdon): Is this really atomic (cursor can move into ---).
68
- provide: (plugin) =>
69
- EditorView.atomicRanges.of((view) => {
70
- return view.plugin(plugin)?.rules || Decoration.none;
71
- }),
72
- },
73
- ),
74
- ];
63
+ update(update: ViewUpdate) {
64
+ this.decorations = buildDecorations(update.view);
65
+ }
66
+ },
67
+ {
68
+ decorations: (v) => v.decorations,
69
+ },
70
+ ),
71
+ ];
72
+ };
@@ -3,28 +3,45 @@
3
3
  //
4
4
 
5
5
  import { syntaxTree } from '@codemirror/language';
6
- import {
7
- type EditorState,
8
- type Extension,
9
- type RangeSet,
10
- RangeSetBuilder,
11
- StateField,
12
- type Transaction,
13
- } from '@codemirror/state';
14
- import { Decoration, EditorView, WidgetType } from '@codemirror/view';
6
+ import { type EditorState, type Extension, StateField, type Transaction, type Range } from '@codemirror/state';
7
+ import { Decoration, type DecorationSet, EditorView, WidgetType } from '@codemirror/view';
15
8
 
16
9
  export type ImageOptions = {};
17
10
 
18
11
  export const image = (options: ImageOptions = {}): Extension => {
19
- return StateField.define<RangeSet<any>>({
20
- create: (state) => update(state, options),
21
- update: (_: RangeSet<any>, tr: Transaction) => update(tr.state, options),
12
+ return StateField.define<DecorationSet>({
13
+ create: (state) => {
14
+ return Decoration.set(buildDecorations(0, state.doc.length, state));
15
+ },
16
+ update: (value: DecorationSet, tr: Transaction) => {
17
+ if (!tr.docChanged && !tr.selection) {
18
+ return value;
19
+ }
20
+ // Find range of changes and cursor changes.
21
+ const cursor = tr.state.selection.main.head;
22
+ const oldCursor = tr.changes.mapPos(tr.startState.selection.main.head);
23
+ let from = Math.min(cursor, oldCursor);
24
+ let to = Math.max(cursor, oldCursor);
25
+ tr.changes.iterChangedRanges((fromA, toA, fromB, toB) => {
26
+ from = Math.min(from, fromB);
27
+ to = Math.max(to, toB);
28
+ });
29
+ // Expand to cover lines
30
+ from = tr.state.doc.lineAt(from).from;
31
+ to = tr.state.doc.lineAt(to).to;
32
+ return value.map(tr.changes).update({
33
+ filterFrom: from,
34
+ filterTo: to,
35
+ filter: () => false,
36
+ add: buildDecorations(from, to, tr.state),
37
+ });
38
+ },
22
39
  provide: (field) => EditorView.decorations.from(field),
23
40
  });
24
41
  };
25
42
 
26
- const update = (state: EditorState, options: ImageOptions) => {
27
- const builder = new RangeSetBuilder();
43
+ const buildDecorations = (from: number, to: number, state: EditorState) => {
44
+ const decorations: Range<Decoration>[] = [];
28
45
  const cursor = state.selection.main.head;
29
46
 
30
47
  syntaxTree(state).iterate({
@@ -34,20 +51,20 @@ const update = (state: EditorState, options: ImageOptions) => {
34
51
  if (urlNode) {
35
52
  const hide = state.readOnly || cursor < node.from || cursor > node.to;
36
53
  const url = state.sliceDoc(urlNode.from, urlNode.to);
37
- builder.add(
38
- hide ? node.from : node.to,
39
- node.to,
54
+ decorations.push(
40
55
  Decoration.replace({
41
56
  block: true, // Prevent cursor from entering.
42
57
  widget: new ImageWidget(url),
43
- }),
58
+ }).range(hide ? node.from : node.to, node.to),
44
59
  );
45
60
  }
46
61
  }
47
62
  },
63
+ from,
64
+ to,
48
65
  });
49
66
 
50
- return builder.finish();
67
+ return decorations;
51
68
  };
52
69
 
53
70
  class ImageWidget extends WidgetType {
@@ -55,15 +72,16 @@ class ImageWidget extends WidgetType {
55
72
  super();
56
73
  }
57
74
 
58
- // TODO(burdon): Does this need to be unique for each position?
59
- override eq(other: WidgetType) {
75
+ override eq(other: this) {
60
76
  return this._url === (other as any as ImageWidget)._url;
61
77
  }
62
78
 
63
- toDOM(view: EditorView) {
79
+ override toDOM(view: EditorView) {
64
80
  const img = document.createElement('img');
65
81
  img.setAttribute('src', this._url);
66
82
  img.setAttribute('class', 'cm-image');
83
+ // Images are hidden until successfully loaded to avoid flickering effects.
84
+ img.onload = () => img.classList.add('cm-loaded-image');
67
85
  return img;
68
86
  }
69
87
  }
@@ -3,17 +3,21 @@
3
3
  //
4
4
 
5
5
  export * from './autocomplete';
6
+ export * from './automerge';
7
+ export * from './awareness';
6
8
  export * from './basic';
7
9
  export * from './blast';
8
10
  export * from './code';
9
11
  export * from './comments';
12
+ export * from './cursor';
10
13
  export * from './hr';
11
14
  export * from './image';
12
15
  export * from './link';
13
16
  export * from './listener';
14
17
  export * from './markdown';
15
18
  export * from './mention';
16
- export * from './mermaid';
19
+ export * from './outliner';
17
20
  export * from './table';
18
21
  export * from './tasklist';
19
22
  export * from './typewriter';
23
+ export * from './yjs';
@@ -4,20 +4,20 @@
4
4
  //
5
5
 
6
6
  import { syntaxTree } from '@codemirror/language';
7
+ import { type Extension, RangeSetBuilder } from '@codemirror/state';
7
8
  import {
8
- type EditorState,
9
- type Extension,
10
- type RangeSet,
11
- RangeSetBuilder,
12
- StateField,
13
- type Transaction,
14
- } from '@codemirror/state';
15
- import { Decoration, EditorView, WidgetType, hoverTooltip } from '@codemirror/view';
9
+ hoverTooltip,
10
+ Decoration,
11
+ type DecorationSet,
12
+ type EditorView,
13
+ ViewPlugin,
14
+ type ViewUpdate,
15
+ WidgetType,
16
+ } from '@codemirror/view';
17
+ import { type SyntaxNode } from '@lezer/common';
16
18
 
17
19
  import { tooltipContent } from '@dxos/react-ui-theme';
18
20
 
19
- const markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
20
-
21
21
  // Adapted from:
22
22
  // https://codemirror.net/try/?c=aW1wb3J0IHsgYmFzaWNTZXR1cCwgRWRpdG9yVmlldyB9IGZyb20gImNvZGVtaXJyb3IiCmltcG9ydCB7IG1hcmtkb3duIH0gZnJvbSAiQGNvZGVtaXJyb3IvbGFuZy1tYXJrZG93biIKaW1wb3J0IHsgc3ludGF4VHJlZSB9IGZyb20gIkBjb2RlbWlycm9yL2xhbmd1YWdlIjsKaW1wb3J0IHsgRWRpdG9yU3RhdGUsIFJhbmdlU2V0QnVpbGRlciwgU3RhdGVGaWVsZCB9IGZyb20gIkBjb2RlbWlycm9yL3N0YXRlIjsKaW1wb3J0IHsgRGVjb3JhdGlvbiwgV2lkZ2V0VHlwZSB9IGZyb20gIkBjb2RlbWlycm9yL3ZpZXciOwoKY2xhc3MgTGluayBleHRlbmRzIFdpZGdldFR5cGUgewogIGNvbnN0cnVjdG9yKHRleHQsIHVybCkgewogICAgc3VwZXIoKQogICAgdGhpcy50ZXh0ID0gdGV4dAogICAgdGhpcy51cmwgPSB1cmwKICB9CiAgZXEob3RoZXIpIHsgcmV0dXJuIHRoaXMudGV4dCA9PSBvdGhlci50ZXh0ICYmIHRoaXMudXJsID09IG90aGVyLnVybCB9CiAgdG9ET00oKSB7CiAgICBsZXQgbGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImEiKQogICAgbGluay50ZXh0Q29udGVudCA9IHRoaXMudGV4dAogICAgbGluay5ocmVmID0gdGhpcy51cmwKICAgIHJldHVybiBsaW5rOwogIH0KfQoKbGV0IGRlY29yYXRpb25zRmllbGQgPSBTdGF0ZUZpZWxkLmRlZmluZSh7CiAgY3JlYXRlKCkgewogICAgcmV0dXJuIERlY29yYXRpb24ubm9uZTsKICB9LAogIHVwZGF0ZShfLCB0cikgewogICAgY29uc3QgYnVpbGRlciA9IG5ldyBSYW5nZVNldEJ1aWxkZXIoKTsKICAgIGxldCBjdXJzb3IgPSB0ci5zdGF0ZS5zZWxlY3Rpb24ubWFpbi5oZWFkOwogICAgc3ludGF4VHJlZSh0ci5zdGF0ZSkuaXRlcmF0ZSh7CiAgICAgIGVudGVyOiAobm9kZSkgPT4gewogICAgICAgIGlmICgoY3Vyc29yIDwgbm9kZS5mcm9tIHx8IGN1cnNvciA+IG5vZGUudG8pICYmIG5vZGUubmFtZSA9PSAiTGluayIpIHsKICAgICAgICAgIGxldCBtYXJrcyA9IG5vZGUubm9kZS5nZXRDaGlsZHJlbigiTGlua01hcmsiKTsKICAgICAgICAgIGxldCB0ZXh0ID0gbWFya3MubGVuZ3RoID49IDIgPyB0ci5zdGF0ZS5zbGljZURvYyhtYXJrc1swXS50bywgbWFya3NbMV0uZnJvbSkgOiAiIgoKICAgICAgICAgIGxldCB1cmxOb2RlID0gbm9kZS5ub2RlLmdldENoaWxkKCJVUkwiKTsKICAgICAgICAgIGxldCB1cmwgPSB1cmxOb2RlID8gdHIuc3RhdGUuc2xpY2VEb2ModXJsTm9kZS5mcm9tLCB1cmxOb2RlLnRvKSA6ICIiCiAgICAgICAgICBidWlsZGVyLmFkZChub2RlLmZyb20sIG5vZGUudG8sIERlY29yYXRpb24ucmVwbGFjZSh7CiAgICAgICAgICAgIHdpZGdldDogbmV3IExpbmsodGV4dCwgdXJsKSwKICAgICAgICAgIH0pLAogICAgICAgICAgICAgICAgICAgICApOwogICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgIH0KICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgfSwKICAgIH0pOwogICAgcmV0dXJuIGJ1aWxkZXIuZmluaXNoKCk7CiAgfSwKICBwcm92aWRlOiAoZikgPT4gRWRpdG9yVmlldy5kZWNvcmF0aW9ucy5mcm9tKGYpLAp9KTsKCmxldCB2aWV3ID0gbmV3IEVkaXRvclZpZXcoewogIGRvYzogIiMgSGVsbG8gV29ybGRcblxuW1Rlc3RdKGh0dHBzOi8vZXhhbXBsZS5jb20pXG5cblxuIiwKICBleHRlbnNpb25zOiBbZGVjb3JhdGlvbnNGaWVsZCwgbWFya2Rvd24oKV0sCiAgcGFyZW50OiBkb2N1bWVudC5ib2R5LAp9KTsKCnZpZXcuZm9jdXMoKTs=
23
23
  // https://discuss.codemirror.net/t/link-widget-is-clicked-only-if-editor-is-out-of-focus/7433
@@ -34,11 +34,24 @@ export type LinkOptions = {
34
34
  */
35
35
  export const link = (options: LinkOptions = {}): Extension => {
36
36
  const extensions: Extension[] = [
37
- StateField.define<RangeSet<any>>({
38
- create: (state) => update(state, options),
39
- update: (_: RangeSet<any>, tr: Transaction) => update(tr.state, options),
40
- provide: (field) => EditorView.decorations.from(field),
41
- }),
37
+ ViewPlugin.fromClass(
38
+ class {
39
+ decorations: DecorationSet;
40
+
41
+ constructor(view: EditorView) {
42
+ this.decorations = buildDecorations(view, options);
43
+ }
44
+
45
+ update(update: ViewUpdate) {
46
+ if (update.docChanged || update.viewportChanged || update.selectionSet) {
47
+ this.decorations = buildDecorations(update.view, options);
48
+ }
49
+ }
50
+ },
51
+ {
52
+ decorations: (v) => v.decorations,
53
+ },
54
+ ),
42
55
  ];
43
56
 
44
57
  if (options.onHover) {
@@ -46,41 +59,25 @@ export const link = (options: LinkOptions = {}): Extension => {
46
59
  // https://codemirror.net/examples/tooltip
47
60
  // https://codemirror.net/docs/ref/#view.hoverTooltip
48
61
  // https://github.com/codemirror/view/blob/main/src/tooltip.ts
49
- hoverTooltip((view, pos) => {
50
- const { from, text } = view.state.doc.lineAt(pos);
51
- const p = pos - from;
52
-
53
- let idx = 0;
54
- let match;
55
- do {
56
- match = text.substring(idx).match(markdownLinkRegexp);
57
- if (!match) {
58
- match = undefined;
59
- break;
60
- }
61
-
62
- idx = text.indexOf(match[0]);
63
- if (p >= idx && p < idx + match[0].length) {
64
- break;
65
- }
66
-
67
- idx += match[0].length;
68
- } while (true);
69
-
70
- if (!match) {
62
+ hoverTooltip((view, pos, side) => {
63
+ const syntax = syntaxTree(view.state).resolveInner(pos, side);
64
+ let link = null;
65
+ for (let i = 0, node: SyntaxNode | null = syntax; !link && node && i < 5; node = node.parent, i++) {
66
+ link = node.name === 'Link' ? node : null;
67
+ }
68
+ const url = link && link.getChild('URL');
69
+ if (!url || !link) {
71
70
  return null;
72
71
  }
73
-
74
- const [, , url] = match ?? [];
75
-
72
+ const urlText = view.state.sliceDoc(url.from, url.to);
76
73
  return {
77
- pos: idx + from,
78
- end: idx + from + match[0].length,
74
+ pos: link.from,
75
+ end: link.to,
79
76
  above: true,
80
77
  create: () => {
81
78
  const el = document.createElement('div');
82
79
  el.className = tooltipContent({}, 'pli-2 plb-1');
83
- options.onHover!(el, url);
80
+ options.onHover!(el, urlText);
84
81
  return { dom: el, offset: { x: 0, y: 4 } };
85
82
  },
86
83
  };
@@ -92,19 +89,15 @@ export const link = (options: LinkOptions = {}): Extension => {
92
89
  };
93
90
 
94
91
  class LinkButton extends WidgetType {
95
- constructor(
96
- private readonly _pos: number,
97
- private readonly _url: string,
98
- private readonly _onAttach: LinkOptions['onRender'],
99
- ) {
92
+ constructor(private readonly _url: string, private readonly _onAttach: LinkOptions['onRender']) {
100
93
  super();
101
94
  }
102
95
 
103
- override eq(other: LinkButton) {
104
- return this._pos === other._pos && this._url === other._url;
96
+ override eq(other: this) {
97
+ return this._url === other._url;
105
98
  }
106
99
 
107
- toDOM(view: EditorView) {
100
+ override toDOM(view: EditorView) {
108
101
  const el = document.createElement('span');
109
102
  this._onAttach!(el, this._url);
110
103
  return el;
@@ -116,11 +109,11 @@ class LinkText extends WidgetType {
116
109
  super();
117
110
  }
118
111
 
119
- override eq(other: LinkText) {
112
+ override eq(other: this) {
120
113
  return this._url === other._url;
121
114
  }
122
115
 
123
- toDOM(view: EditorView) {
116
+ override toDOM(view: EditorView) {
124
117
  const link = document.createElement('a');
125
118
  link.setAttribute('class', 'cm-link');
126
119
  link.textContent = this._text;
@@ -147,46 +140,51 @@ class LinkText extends WidgetType {
147
140
  * possibly overlapping ranges in such a way that they can efficiently be mapped though document changes.
148
141
  * https://codemirror.net/docs/ref/#state
149
142
  */
150
- const update = (state: EditorState, options: LinkOptions) => {
151
- const builder = new RangeSetBuilder();
143
+ const buildDecorations = (view: EditorView, options: LinkOptions): DecorationSet => {
144
+ const builder = new RangeSetBuilder<Decoration>();
145
+ const { state } = view;
152
146
  const cursor = state.selection.main.head;
153
147
 
154
- syntaxTree(state).iterate({
155
- enter: (node) => {
156
- // Check if cursor is inside text.
157
- if (node.name === 'Link') {
158
- const marks = node.node.getChildren('LinkMark');
159
- const text = marks.length >= 2 ? state.sliceDoc(marks[0].to, marks[1].from) : '';
160
- const urlNode = node.node.getChild('URL');
161
- const url = urlNode ? state.sliceDoc(urlNode.from, urlNode.to) : '';
162
- if (!url) {
163
- return false;
164
- }
148
+ for (const { from, to } of view.visibleRanges) {
149
+ syntaxTree(state).iterate({
150
+ enter: (node) => {
151
+ // Check if cursor is inside text.
152
+ if (node.name === 'Link') {
153
+ const marks = node.node.getChildren('LinkMark');
154
+ const text = marks.length >= 2 ? state.sliceDoc(marks[0].to, marks[1].from) : '';
155
+ const urlNode = node.node.getChild('URL');
156
+ const url = urlNode ? state.sliceDoc(urlNode.from, urlNode.to) : '';
157
+ if (!url) {
158
+ return false;
159
+ }
165
160
 
166
- if (state.readOnly || cursor < node.from || cursor > node.to) {
167
- builder.add(
168
- node.from,
169
- node.to,
170
- Decoration.replace({
171
- widget: new LinkText(text, options.link ? url : undefined),
172
- }),
173
- );
174
- }
161
+ if (!view.hasFocus || state.readOnly || cursor < node.from || cursor > node.to) {
162
+ builder.add(
163
+ node.from,
164
+ node.to,
165
+ Decoration.replace({
166
+ widget: new LinkText(text, options.link ? url : undefined),
167
+ }),
168
+ );
169
+ }
175
170
 
176
- if (options.onRender) {
177
- builder.add(
178
- node.to,
179
- node.to,
180
- Decoration.replace({
181
- widget: new LinkButton(node.from, url, options.onRender),
182
- }),
183
- );
184
- }
171
+ if (options.onRender) {
172
+ builder.add(
173
+ node.to,
174
+ node.to,
175
+ Decoration.replace({
176
+ widget: new LinkButton(url, options.onRender),
177
+ }),
178
+ );
179
+ }
185
180
 
186
- return false;
187
- }
188
- },
189
- });
181
+ return false;
182
+ }
183
+ },
184
+ from,
185
+ to,
186
+ });
187
+ }
190
188
 
191
189
  return builder.finish();
192
190
  };
@@ -23,18 +23,15 @@ import {
23
23
  import type { ThemeMode } from '@dxos/react-ui';
24
24
 
25
25
  import { markdownHighlightStyle, markdownTagsExtensions } from './highlight';
26
+ import { type TextEditorProps } from '../../components';
26
27
 
27
28
  export type MarkdownBundleOptions = {
28
- readonly?: boolean;
29
29
  themeMode?: ThemeMode;
30
- placeholder?: string;
31
- };
30
+ } & Pick<TextEditorProps, 'readonly' | 'placeholder'>;
32
31
 
33
32
  /**
34
33
  * Markdown bundle.
35
34
  * Refs:
36
- * https://github.com/codemirror/basic-setup
37
- * https://github.com/codemirror/basic-setup/blob/main/src/codemirror.ts#L50
38
35
  * https://codemirror.net/docs/community
39
36
  * https://codemirror.net/docs/ref/#codemirror.basicSetup
40
37
  */
@@ -49,8 +46,7 @@ export const markdownBundle = ({
49
46
  EditorState.tabSize.of(2),
50
47
  EditorView.lineWrapping,
51
48
 
52
- customKeymap(),
53
-
49
+ // https://github.com/codemirror/basic-setup
54
50
  bracketMatching(),
55
51
  closeBrackets(),
56
52
  crosshairCursor(),
@@ -59,7 +55,7 @@ export const markdownBundle = ({
59
55
  highlightActiveLine(),
60
56
  history(),
61
57
  indentOnInput(),
62
- _placeholder && placeholder(_placeholder),
58
+ _placeholder ? placeholder(_placeholder) : [],
63
59
 
64
60
  // Main extension.
65
61
  // https://github.com/codemirror/lang-markdown
@@ -87,20 +83,18 @@ export const markdownBundle = ({
87
83
 
88
84
  // Custom styles.
89
85
  syntaxHighlighting(markdownHighlightStyle(readonly)),
90
- ].filter(Boolean) as Extension[];
91
- };
92
86
 
93
- // https://codemirror.net/docs/ref/#view.keymap
94
- const customKeymap = () =>
95
- keymap.of([
96
- // https://codemirror.net/docs/ref/#commands.indentWithTab
97
- indentWithTab,
98
- // https://codemirror.net/docs/ref/#commands.standardKeymap
99
- ...standardKeymap,
100
- // https://codemirror.net/docs/ref/#commands.historyKeymap
101
- ...historyKeymap,
102
- // https://codemirror.net/docs/ref/#autocomplete.closeBracketsKeymap
103
- ...closeBracketsKeymap,
104
- // https://codemirror.net/docs/ref/#search.searchKeymap
105
- ...searchKeymap,
106
- ]);
87
+ keymap.of([
88
+ // https://codemirror.net/docs/ref/#commands.indentWithTab
89
+ indentWithTab,
90
+ // https://codemirror.net/docs/ref/#autocomplete.closeBracketsKeymap
91
+ ...closeBracketsKeymap,
92
+ // https://codemirror.net/docs/ref/#commands.historyKeymap
93
+ ...historyKeymap,
94
+ // https://codemirror.net/docs/ref/#search.searchKeymap
95
+ ...searchKeymap,
96
+ // https://codemirror.net/docs/ref/#commands.standardKeymap
97
+ ...standardKeymap,
98
+ ]),
99
+ ];
100
+ };
@@ -6,19 +6,18 @@ import { markdownLanguage } from '@codemirror/lang-markdown';
6
6
  import { HighlightStyle } from '@codemirror/language';
7
7
  import { tags, styleTags, Tag } from '@lezer/highlight';
8
8
  import { type MarkdownConfig, Table } from '@lezer/markdown';
9
- import get from 'lodash.get';
10
9
 
11
10
  import {
12
11
  blockquote,
13
12
  bold,
14
13
  code,
15
14
  codeMark,
15
+ getToken,
16
16
  heading,
17
17
  inlineUrl,
18
18
  italic,
19
19
  mark,
20
20
  strikethrough,
21
- tokens,
22
21
  } from '../../styles';
23
22
 
24
23
  /**
@@ -32,7 +31,6 @@ export const markdownTags = {
32
31
  CodeText: Tag.define(),
33
32
  EmphasisMark: Tag.define(),
34
33
  HeaderMark: Tag.define(),
35
- // HorizontalRule: Tag.define(),
36
34
  InlineCode: Tag.define(),
37
35
  LinkLabel: Tag.define(),
38
36
  LinkReference: Tag.define(),
@@ -178,13 +176,6 @@ export const markdownHighlightStyle = (readonly?: boolean) => {
178
176
  class: blockquote,
179
177
  },
180
178
 
181
- // TODO(burdon): Replace with extension.
182
- // {
183
- // tag: [markdownTags.HorizontalRule],
184
- // class: mx(horizontalRule, readonly && '-indent-[100rem]'),
185
- // },
186
-
187
- // TODO(burdon): Only if being edited.
188
179
  {
189
180
  tag: [markdownTags.TableCell],
190
181
  class: 'font-mono',
@@ -193,12 +184,12 @@ export const markdownHighlightStyle = (readonly?: boolean) => {
193
184
  // Main content, paragraphs, etc.
194
185
  // {
195
186
  // tag: [tags.content],
196
- // fontFamily: get(tokens, 'fontFamily.body', []).join(','),
187
+ // fontFamily: getToken('fontFamily.body', []).join(','),
197
188
  // },
198
189
  ],
199
190
  {
200
191
  scope: markdownLanguage,
201
- all: { fontFamily: get(tokens, 'fontFamily.body', []).join(',') },
192
+ all: { fontFamily: getToken('fontFamily.body', []).join(',') },
202
193
  },
203
194
  );
204
195
  };
@@ -9,18 +9,25 @@ export type MentionOptions = {
9
9
  onSearch: (text: string) => string[];
10
10
  };
11
11
 
12
+ // TODO(burdon): Can only have a single autocompletion. Merge configuration with autocomplete.
12
13
  export const mention = ({ onSearch }: MentionOptions): Extension => {
13
14
  return autocompletion({
15
+ // TODO(burdon): Not working.
16
+ activateOnTyping: true,
17
+ // activateOnTypingDelay: 100,
18
+ // selectOnOpen: true,
14
19
  closeOnBlur: false, // For debugging.
20
+ // defaultKeymap: false,
21
+ icons: false,
15
22
  override: [
16
23
  (context: CompletionContext): CompletionResult | null => {
24
+ console.log(context);
25
+
17
26
  const match = context.matchBefore(/@(\w+)?/);
18
27
  if (!match || (match.from === match.to && !context.explicit)) {
19
28
  return null;
20
29
  }
21
30
 
22
- console.log(match);
23
-
24
31
  return {
25
32
  from: match.from,
26
33
  options: onSearch(match.text.slice(1).toLowerCase()).map((value) => ({ label: `@${value}` })),
@@ -0,0 +1,12 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import { type Extension } from '@codemirror/state';
6
+
7
+ export type OutlinerOptions = {};
8
+
9
+ // TODO(burdon): Experimental component: multiple hierarchical draggable editor sections.
10
+ export const outliner = (options: OutlinerOptions = {}): Extension => {
11
+ return [];
12
+ };