@dxos/react-ui-editor 0.8.4-main.e098934 → 0.8.4-main.e8ec1fe
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/{chunk-22UMM3QJ.mjs → chunk-HL3YF6WC.mjs} +2 -2
- package/dist/lib/browser/chunk-HL3YF6WC.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +4960 -4414
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/types/index.mjs +1 -1
- package/dist/lib/node-esm/{chunk-YXYQPV6R.mjs → chunk-YJZGD3LY.mjs} +2 -2
- package/dist/lib/node-esm/chunk-YJZGD3LY.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +4960 -4414
- package/dist/lib/node-esm/index.mjs.map +4 -4
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/types/index.mjs +1 -1
- package/dist/types/src/components/Editor/Editor.d.ts +37 -15
- package/dist/types/src/components/Editor/Editor.d.ts.map +1 -1
- package/dist/types/src/components/Editor/Editor.stories.d.ts +20 -0
- package/dist/types/src/components/Editor/Editor.stories.d.ts.map +1 -0
- package/dist/types/src/components/EditorContent/EditorContent.d.ts +29 -0
- package/dist/types/src/components/EditorContent/EditorContent.d.ts.map +1 -0
- package/dist/types/src/components/EditorContent/EditorContent.stories.d.ts +26 -0
- package/dist/types/src/components/EditorContent/EditorContent.stories.d.ts.map +1 -0
- package/dist/types/src/components/EditorContent/controller.d.ts +10 -0
- package/dist/types/src/components/EditorContent/controller.d.ts.map +1 -0
- package/dist/types/src/components/EditorContent/index.d.ts +3 -0
- package/dist/types/src/components/EditorContent/index.d.ts.map +1 -0
- package/dist/types/src/components/EditorMenuProvider/EditorMenuProvider.d.ts +36 -0
- package/dist/types/src/components/EditorMenuProvider/EditorMenuProvider.d.ts.map +1 -0
- package/dist/types/src/components/EditorMenuProvider/index.d.ts +7 -0
- package/dist/types/src/components/EditorMenuProvider/index.d.ts.map +1 -0
- package/dist/types/src/components/EditorMenuProvider/menu-presets.d.ts +4 -0
- package/dist/types/src/components/EditorMenuProvider/menu-presets.d.ts.map +1 -0
- package/dist/types/src/components/EditorMenuProvider/menu.d.ts +28 -0
- package/dist/types/src/components/EditorMenuProvider/menu.d.ts.map +1 -0
- package/dist/types/src/components/EditorMenuProvider/popover.d.ts +47 -0
- package/dist/types/src/components/EditorMenuProvider/popover.d.ts.map +1 -0
- package/dist/types/src/components/EditorMenuProvider/useEditorMenu.d.ts +34 -0
- package/dist/types/src/components/EditorMenuProvider/useEditorMenu.d.ts.map +1 -0
- package/dist/types/src/components/EditorMenuProvider/util.d.ts +8 -0
- package/dist/types/src/components/EditorMenuProvider/util.d.ts.map +1 -0
- package/dist/types/src/components/EditorPreviewProvider/EditorPreviewProvider.d.ts +16 -0
- package/dist/types/src/components/EditorPreviewProvider/EditorPreviewProvider.d.ts.map +1 -0
- package/dist/types/src/components/EditorPreviewProvider/index.d.ts +2 -0
- package/dist/types/src/components/EditorPreviewProvider/index.d.ts.map +1 -0
- package/dist/types/src/components/EditorToolbar/EditorToolbar.d.ts +26 -2
- package/dist/types/src/components/EditorToolbar/EditorToolbar.d.ts.map +1 -1
- package/dist/types/src/components/EditorToolbar/actions.d.ts +39 -0
- package/dist/types/src/components/EditorToolbar/actions.d.ts.map +1 -0
- package/dist/types/src/components/EditorToolbar/blocks.d.ts +3 -3
- package/dist/types/src/components/EditorToolbar/blocks.d.ts.map +1 -1
- package/dist/types/src/components/EditorToolbar/formatting.d.ts +3 -3
- package/dist/types/src/components/EditorToolbar/formatting.d.ts.map +1 -1
- package/dist/types/src/components/EditorToolbar/headings.d.ts +3 -3
- package/dist/types/src/components/EditorToolbar/headings.d.ts.map +1 -1
- package/dist/types/src/components/EditorToolbar/index.d.ts +2 -1
- package/dist/types/src/components/EditorToolbar/index.d.ts.map +1 -1
- package/dist/types/src/components/EditorToolbar/useEditorToolbar.d.ts +11 -0
- package/dist/types/src/components/EditorToolbar/useEditorToolbar.d.ts.map +1 -0
- package/dist/types/src/components/EditorToolbar/view-mode.d.ts +3 -3
- package/dist/types/src/components/EditorToolbar/view-mode.d.ts.map +1 -1
- package/dist/types/src/components/index.d.ts +4 -2
- package/dist/types/src/components/index.d.ts.map +1 -1
- package/dist/types/src/extensions/autocomplete/autocomplete.d.ts +17 -0
- package/dist/types/src/extensions/autocomplete/autocomplete.d.ts.map +1 -0
- package/dist/types/src/extensions/autocomplete/index.d.ts +5 -0
- package/dist/types/src/extensions/autocomplete/index.d.ts.map +1 -0
- package/dist/types/src/extensions/autocomplete/match.d.ts +13 -0
- package/dist/types/src/extensions/autocomplete/match.d.ts.map +1 -0
- package/dist/types/src/extensions/autocomplete/placeholder.d.ts +20 -0
- package/dist/types/src/extensions/autocomplete/placeholder.d.ts.map +1 -0
- package/dist/types/src/extensions/autocomplete/typeahead.d.ts +10 -0
- package/dist/types/src/extensions/autocomplete/typeahead.d.ts.map +1 -0
- package/dist/types/src/extensions/automerge/automerge.d.ts +1 -1
- package/dist/types/src/extensions/automerge/automerge.d.ts.map +1 -1
- package/dist/types/src/extensions/automerge/automerge.stories.d.ts +1 -1
- package/dist/types/src/extensions/automerge/automerge.stories.d.ts.map +1 -1
- package/dist/types/src/extensions/automerge/cursor.d.ts +1 -1
- package/dist/types/src/extensions/automerge/cursor.d.ts.map +1 -1
- package/dist/types/src/extensions/automerge/sync.d.ts +3 -3
- package/dist/types/src/extensions/automerge/sync.d.ts.map +1 -1
- package/dist/types/src/extensions/automerge/update-automerge.d.ts +1 -1
- package/dist/types/src/extensions/automerge/update-automerge.d.ts.map +1 -1
- package/dist/types/src/extensions/autoscroll.d.ts +14 -4
- package/dist/types/src/extensions/autoscroll.d.ts.map +1 -1
- package/dist/types/src/extensions/awareness/awareness-provider.d.ts +1 -1
- package/dist/types/src/extensions/awareness/awareness-provider.d.ts.map +1 -1
- package/dist/types/src/extensions/blocks.d.ts +2 -0
- package/dist/types/src/extensions/blocks.d.ts.map +1 -0
- package/dist/types/src/extensions/bookmarks.d.ts +12 -0
- package/dist/types/src/extensions/bookmarks.d.ts.map +1 -0
- package/dist/types/src/extensions/comments.d.ts.map +1 -1
- package/dist/types/src/extensions/factories.d.ts +10 -5
- package/dist/types/src/extensions/factories.d.ts.map +1 -1
- package/dist/types/src/extensions/focus.d.ts.map +1 -1
- package/dist/types/src/extensions/folding.d.ts.map +1 -1
- package/dist/types/src/extensions/index.d.ts +8 -1
- package/dist/types/src/extensions/index.d.ts.map +1 -1
- package/dist/types/src/extensions/json.d.ts +1 -1
- package/dist/types/src/extensions/json.d.ts.map +1 -1
- package/dist/types/src/extensions/listener.d.ts +8 -6
- package/dist/types/src/extensions/listener.d.ts.map +1 -1
- package/dist/types/src/extensions/markdown/bundle.d.ts.map +1 -1
- package/dist/types/src/extensions/markdown/decorate.d.ts.map +1 -1
- package/dist/types/src/extensions/markdown/formatting.d.ts +1 -3
- package/dist/types/src/extensions/markdown/formatting.d.ts.map +1 -1
- package/dist/types/src/extensions/modal.d.ts +7 -0
- package/dist/types/src/extensions/modal.d.ts.map +1 -0
- package/dist/types/src/extensions/modes.d.ts +1 -1
- package/dist/types/src/extensions/modes.d.ts.map +1 -1
- package/dist/types/src/extensions/outliner/menu.d.ts +8 -0
- package/dist/types/src/extensions/outliner/menu.d.ts.map +1 -0
- package/dist/types/src/extensions/preview/preview.d.ts +6 -3
- package/dist/types/src/extensions/preview/preview.d.ts.map +1 -1
- package/dist/types/src/extensions/replacer.d.ts +21 -0
- package/dist/types/src/extensions/replacer.d.ts.map +1 -0
- package/dist/types/src/extensions/replacer.test.d.ts +2 -0
- package/dist/types/src/extensions/replacer.test.d.ts.map +1 -0
- package/dist/types/src/extensions/scrolling.d.ts +78 -0
- package/dist/types/src/extensions/scrolling.d.ts.map +1 -0
- package/dist/types/src/extensions/state.d.ts +2 -0
- package/dist/types/src/extensions/state.d.ts.map +1 -0
- package/dist/types/src/extensions/submit.d.ts +10 -0
- package/dist/types/src/extensions/submit.d.ts.map +1 -0
- package/dist/types/src/extensions/tab.d.ts +4 -0
- package/dist/types/src/extensions/tab.d.ts.map +1 -0
- package/dist/types/src/extensions/tags/streamer.d.ts.map +1 -1
- package/dist/types/src/extensions/tags/xml-tags.d.ts +42 -16
- package/dist/types/src/extensions/tags/xml-tags.d.ts.map +1 -1
- package/dist/types/src/hooks/useTextEditor.d.ts +5 -9
- package/dist/types/src/hooks/useTextEditor.d.ts.map +1 -1
- package/dist/types/src/stories/{Command.stories.d.ts → CommandDialog.stories.d.ts} +2 -3
- package/dist/types/src/stories/CommandDialog.stories.d.ts.map +1 -0
- package/dist/types/src/stories/Comments.stories.d.ts +3 -4
- package/dist/types/src/stories/Comments.stories.d.ts.map +1 -1
- package/dist/types/src/stories/EditorToolbar.stories.d.ts +1 -2
- package/dist/types/src/stories/EditorToolbar.stories.d.ts.map +1 -1
- package/dist/types/src/stories/Experimental.stories.d.ts +3 -4
- package/dist/types/src/stories/Experimental.stories.d.ts.map +1 -1
- package/dist/types/src/stories/Markdown.stories.d.ts +3 -4
- package/dist/types/src/stories/Markdown.stories.d.ts.map +1 -1
- package/dist/types/src/stories/Outliner.stories.d.ts +0 -1
- package/dist/types/src/stories/Outliner.stories.d.ts.map +1 -1
- package/dist/types/src/stories/{CommandMenu.stories.d.ts → Popover.stories.d.ts} +6 -6
- package/dist/types/src/stories/Popover.stories.d.ts.map +1 -0
- package/dist/types/src/stories/Preview.stories.d.ts +4 -4
- package/dist/types/src/stories/Preview.stories.d.ts.map +1 -1
- package/dist/types/src/stories/Tags.stories.d.ts +0 -1
- package/dist/types/src/stories/Tags.stories.d.ts.map +1 -1
- package/dist/types/src/stories/TextEditor.stories.d.ts +3 -5
- package/dist/types/src/stories/TextEditor.stories.d.ts.map +1 -1
- package/dist/types/src/stories/components/EditorStory.d.ts +7 -5
- package/dist/types/src/stories/components/EditorStory.d.ts.map +1 -1
- package/dist/types/src/stories/components/util.d.ts.map +1 -1
- package/dist/types/src/styles/theme.d.ts.map +1 -1
- package/dist/types/src/types/types.d.ts +1 -1
- package/dist/types/src/types/types.d.ts.map +1 -1
- package/dist/types/src/util/debug.d.ts +4 -0
- package/dist/types/src/util/debug.d.ts.map +1 -1
- package/dist/types/src/util/index.d.ts +0 -1
- package/dist/types/src/util/index.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +57 -58
- package/src/components/Editor/Editor.stories.tsx +89 -0
- package/src/components/Editor/Editor.tsx +160 -25
- package/src/components/EditorContent/EditorContent.stories.tsx +70 -0
- package/src/components/EditorContent/EditorContent.tsx +70 -0
- package/src/components/EditorContent/controller.ts +50 -0
- package/src/components/EditorContent/index.ts +6 -0
- package/src/components/EditorMenuProvider/EditorMenuProvider.tsx +233 -0
- package/src/components/EditorMenuProvider/index.ts +11 -0
- package/src/components/EditorMenuProvider/menu-presets.ts +123 -0
- package/src/components/EditorMenuProvider/menu.ts +71 -0
- package/src/components/EditorMenuProvider/popover.ts +287 -0
- package/src/components/EditorMenuProvider/useEditorMenu.ts +175 -0
- package/src/components/EditorMenuProvider/util.ts +31 -0
- package/src/components/EditorPreviewProvider/EditorPreviewProvider.tsx +82 -0
- package/src/components/EditorPreviewProvider/index.ts +5 -0
- package/src/components/EditorToolbar/EditorToolbar.tsx +101 -91
- package/src/components/EditorToolbar/{lists.ts → actions.ts} +46 -16
- package/src/components/EditorToolbar/blocks.ts +2 -1
- package/src/components/EditorToolbar/formatting.ts +2 -1
- package/src/components/EditorToolbar/headings.ts +8 -5
- package/src/components/EditorToolbar/image.ts +1 -1
- package/src/components/EditorToolbar/index.ts +3 -7
- package/src/components/EditorToolbar/search.ts +1 -1
- package/src/components/EditorToolbar/useEditorToolbar.ts +20 -0
- package/src/components/EditorToolbar/view-mode.ts +2 -1
- package/src/components/index.ts +8 -2
- package/src/extensions/{autocomplete.ts → autocomplete/autocomplete.ts} +8 -76
- package/src/extensions/autocomplete/index.ts +8 -0
- package/src/extensions/autocomplete/match.ts +46 -0
- package/src/extensions/{command → autocomplete}/placeholder.ts +21 -17
- package/src/extensions/{command → autocomplete}/typeahead.ts +6 -48
- package/src/extensions/automerge/automerge.stories.tsx +9 -9
- package/src/extensions/automerge/automerge.ts +28 -9
- package/src/extensions/automerge/cursor.ts +1 -1
- package/src/extensions/automerge/sync.ts +8 -4
- package/src/extensions/automerge/update-automerge.ts +1 -1
- package/src/extensions/autoscroll.ts +98 -92
- package/src/extensions/awareness/awareness-provider.ts +2 -2
- package/src/extensions/blocks.ts +131 -0
- package/src/extensions/bookmarks.ts +75 -0
- package/src/extensions/comments.ts +2 -1
- package/src/extensions/factories.ts +47 -16
- package/src/extensions/focus.ts +5 -4
- package/src/extensions/folding.tsx +3 -6
- package/src/extensions/hashtag.tsx +2 -2
- package/src/extensions/index.ts +8 -1
- package/src/extensions/json.ts +1 -1
- package/src/extensions/listener.ts +14 -20
- package/src/extensions/markdown/bundle.ts +16 -4
- package/src/extensions/markdown/decorate.ts +9 -8
- package/src/extensions/markdown/formatting.ts +8 -10
- package/src/extensions/markdown/highlight.ts +1 -1
- package/src/extensions/markdown/image.ts +2 -2
- package/src/extensions/markdown/table.ts +6 -6
- package/src/extensions/modal.ts +24 -0
- package/src/extensions/modes.ts +2 -2
- package/src/extensions/{command/floating-menu.ts → outliner/menu.ts} +9 -9
- package/src/extensions/outliner/outliner.test.ts +1 -1
- package/src/extensions/outliner/outliner.ts +3 -3
- package/src/extensions/outliner/tree.test.ts +1 -1
- package/src/extensions/preview/index.ts +1 -1
- package/src/extensions/preview/preview.ts +14 -11
- package/src/extensions/replacer.test.ts +75 -0
- package/src/extensions/replacer.ts +93 -0
- package/src/extensions/scrolling.ts +189 -0
- package/src/extensions/selection.ts +3 -3
- package/src/extensions/state.ts +7 -0
- package/src/extensions/submit.ts +62 -0
- package/src/extensions/tab.ts +29 -0
- package/src/extensions/tags/extended-markdown.test.ts +2 -1
- package/src/extensions/tags/streamer.ts +4 -5
- package/src/extensions/tags/xml-tags.ts +320 -155
- package/src/extensions/typewriter.ts +1 -1
- package/src/hooks/useTextEditor.ts +31 -31
- package/src/stories/{Command.stories.tsx → CommandDialog.stories.tsx} +20 -27
- package/src/stories/Comments.stories.tsx +8 -9
- package/src/stories/EditorToolbar.stories.tsx +14 -13
- package/src/stories/Experimental.stories.tsx +7 -7
- package/src/stories/Markdown.stories.tsx +6 -6
- package/src/stories/Outliner.stories.tsx +20 -20
- package/src/stories/Popover.stories.tsx +162 -0
- package/src/stories/Preview.stories.tsx +46 -42
- package/src/stories/Tags.stories.tsx +24 -10
- package/src/stories/TextEditor.stories.tsx +10 -35
- package/src/stories/components/EditorStory.tsx +29 -16
- package/src/stories/components/util.tsx +40 -8
- package/src/styles/markdown.ts +1 -1
- package/src/styles/theme.ts +13 -11
- package/src/types/types.ts +1 -1
- package/src/util/debug.ts +5 -0
- package/src/util/index.ts +0 -1
- package/dist/lib/browser/chunk-22UMM3QJ.mjs.map +0 -7
- package/dist/lib/browser/testing/index.mjs +0 -76
- package/dist/lib/browser/testing/index.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-YXYQPV6R.mjs.map +0 -7
- package/dist/lib/node-esm/testing/index.mjs +0 -78
- package/dist/lib/node-esm/testing/index.mjs.map +0 -7
- package/dist/types/src/components/CommandMenu/CommandMenu.d.ts +0 -38
- package/dist/types/src/components/CommandMenu/CommandMenu.d.ts.map +0 -1
- package/dist/types/src/components/CommandMenu/index.d.ts +0 -2
- package/dist/types/src/components/CommandMenu/index.d.ts.map +0 -1
- package/dist/types/src/components/EditorToolbar/lists.d.ts +0 -19
- package/dist/types/src/components/EditorToolbar/lists.d.ts.map +0 -1
- package/dist/types/src/components/EditorToolbar/util.d.ts +0 -51
- package/dist/types/src/components/EditorToolbar/util.d.ts.map +0 -1
- package/dist/types/src/extensions/autocomplete.d.ts +0 -26
- package/dist/types/src/extensions/autocomplete.d.ts.map +0 -1
- package/dist/types/src/extensions/command/action.d.ts +0 -17
- package/dist/types/src/extensions/command/action.d.ts.map +0 -1
- package/dist/types/src/extensions/command/command-menu.d.ts +0 -20
- package/dist/types/src/extensions/command/command-menu.d.ts.map +0 -1
- package/dist/types/src/extensions/command/command.d.ts +0 -6
- package/dist/types/src/extensions/command/command.d.ts.map +0 -1
- package/dist/types/src/extensions/command/floating-menu.d.ts +0 -7
- package/dist/types/src/extensions/command/floating-menu.d.ts.map +0 -1
- package/dist/types/src/extensions/command/hint.d.ts +0 -19
- package/dist/types/src/extensions/command/hint.d.ts.map +0 -1
- package/dist/types/src/extensions/command/index.d.ts +0 -7
- package/dist/types/src/extensions/command/index.d.ts.map +0 -1
- package/dist/types/src/extensions/command/placeholder.d.ts +0 -10
- package/dist/types/src/extensions/command/placeholder.d.ts.map +0 -1
- package/dist/types/src/extensions/command/state.d.ts +0 -16
- package/dist/types/src/extensions/command/state.d.ts.map +0 -1
- package/dist/types/src/extensions/command/typeahead.d.ts +0 -22
- package/dist/types/src/extensions/command/typeahead.d.ts.map +0 -1
- package/dist/types/src/extensions/command/useCommandMenu.d.ts +0 -25
- package/dist/types/src/extensions/command/useCommandMenu.d.ts.map +0 -1
- package/dist/types/src/stories/Command.stories.d.ts.map +0 -1
- package/dist/types/src/stories/CommandMenu.stories.d.ts.map +0 -1
- package/dist/types/src/testing/PreviewPopover.d.ts +0 -20
- package/dist/types/src/testing/PreviewPopover.d.ts.map +0 -1
- package/dist/types/src/testing/index.d.ts +0 -3
- package/dist/types/src/testing/index.d.ts.map +0 -1
- package/dist/types/src/testing/util.d.ts +0 -3
- package/dist/types/src/testing/util.d.ts.map +0 -1
- package/dist/types/src/util/domino.d.ts +0 -18
- package/dist/types/src/util/domino.d.ts.map +0 -1
- package/src/components/CommandMenu/CommandMenu.tsx +0 -346
- package/src/components/CommandMenu/index.ts +0 -5
- package/src/components/EditorToolbar/util.ts +0 -76
- package/src/extensions/command/action.ts +0 -55
- package/src/extensions/command/command-menu.ts +0 -211
- package/src/extensions/command/command.ts +0 -34
- package/src/extensions/command/hint.ts +0 -103
- package/src/extensions/command/index.ts +0 -10
- package/src/extensions/command/state.ts +0 -90
- package/src/extensions/command/useCommandMenu.ts +0 -115
- package/src/stories/CommandMenu.stories.tsx +0 -158
- package/src/testing/PreviewPopover.tsx +0 -78
- package/src/testing/index.ts +0 -6
- package/src/testing/util.ts +0 -7
- package/src/util/domino.ts +0 -51
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/react-ui-editor",
|
|
3
|
-
"version": "0.8.4-main.
|
|
3
|
+
"version": "0.8.4-main.e8ec1fe",
|
|
4
4
|
"description": "Document editing experience within a DXOS shell.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -20,12 +20,6 @@
|
|
|
20
20
|
"types": "./dist/types/src/types/index.d.ts",
|
|
21
21
|
"browser": "./dist/lib/browser/types/index.mjs",
|
|
22
22
|
"node": "./dist/lib/node-esm/types/index.mjs"
|
|
23
|
-
},
|
|
24
|
-
"./testing": {
|
|
25
|
-
"source": "./src/testing/index.ts",
|
|
26
|
-
"types": "./dist/types/src/testing/index.d.ts",
|
|
27
|
-
"browser": "./dist/lib/browser/testing/index.mjs",
|
|
28
|
-
"node": "./dist/lib/node-esm/testing/index.mjs"
|
|
29
23
|
}
|
|
30
24
|
},
|
|
31
25
|
"types": "dist/types/src/index.d.ts",
|
|
@@ -37,31 +31,34 @@
|
|
|
37
31
|
"src"
|
|
38
32
|
],
|
|
39
33
|
"dependencies": {
|
|
40
|
-
"@automerge/automerge": "3.1.
|
|
41
|
-
"@codemirror/autocomplete": "^6.
|
|
34
|
+
"@automerge/automerge": "3.1.2",
|
|
35
|
+
"@codemirror/autocomplete": "^6.19.0",
|
|
42
36
|
"@codemirror/commands": "^6.8.1",
|
|
37
|
+
"@codemirror/lang-html": "^6.4.11",
|
|
43
38
|
"@codemirror/lang-javascript": "^6.2.4",
|
|
44
39
|
"@codemirror/lang-json": "^6.0.2",
|
|
45
40
|
"@codemirror/lang-markdown": "^6.3.4",
|
|
46
41
|
"@codemirror/lang-xml": "^6.1.0",
|
|
42
|
+
"@codemirror/lang-yaml": "^6.1.2",
|
|
47
43
|
"@codemirror/language": "^6.11.3",
|
|
48
44
|
"@codemirror/language-data": "^6.5.1",
|
|
49
45
|
"@codemirror/lint": "^6.8.5",
|
|
50
46
|
"@codemirror/search": "^6.5.11",
|
|
51
47
|
"@codemirror/state": "^6.5.2",
|
|
52
48
|
"@codemirror/theme-one-dark": "^6.1.3",
|
|
53
|
-
"@codemirror/view": "^6.38.
|
|
49
|
+
"@codemirror/view": "^6.38.4",
|
|
54
50
|
"@fluentui/react-tabster": "^9.24.2",
|
|
55
51
|
"@lezer/common": "^1.2.2",
|
|
56
52
|
"@lezer/generator": "^1.7.1",
|
|
57
53
|
"@lezer/highlight": "^1.2.1",
|
|
58
54
|
"@lezer/markdown": "^1.3.1",
|
|
59
55
|
"@preact-signals/safe-react": "^0.9.0",
|
|
60
|
-
"@preact/signals-react": "^3.
|
|
56
|
+
"@preact/signals-react": "^3.3.0",
|
|
61
57
|
"@radix-ui/react-context": "1.1.1",
|
|
62
58
|
"@radix-ui/react-use-controllable-state": "1.1.0",
|
|
63
59
|
"@replit/codemirror-vim": "^6.2.1",
|
|
64
60
|
"@replit/codemirror-vscode-keymap": "^6.0.2",
|
|
61
|
+
"@uiw/codemirror-theme-vscode": "^4.25.2",
|
|
65
62
|
"ajv": "^8.17.1",
|
|
66
63
|
"codemirror": "^6.0.1",
|
|
67
64
|
"lib0": "^0.2.65",
|
|
@@ -69,71 +66,73 @@
|
|
|
69
66
|
"lodash.merge": "^4.6.2",
|
|
70
67
|
"lodash.sortby": "^4.7.0",
|
|
71
68
|
"style-mod": "^4.1.0",
|
|
72
|
-
"@dxos/app-graph": "0.8.4-main.
|
|
73
|
-
"@dxos/
|
|
74
|
-
"@dxos/
|
|
75
|
-
"@dxos/
|
|
76
|
-
"@dxos/
|
|
77
|
-
"@dxos/invariant": "0.8.4-main.
|
|
78
|
-
"@dxos/
|
|
79
|
-
"@dxos/
|
|
80
|
-
"@dxos/
|
|
81
|
-
"@dxos/
|
|
82
|
-
"@dxos/
|
|
83
|
-
"@dxos/react-
|
|
84
|
-
"@dxos/react-ui-
|
|
85
|
-
"@dxos/
|
|
86
|
-
"@dxos/util": "0.8.4-main.
|
|
69
|
+
"@dxos/app-graph": "0.8.4-main.e8ec1fe",
|
|
70
|
+
"@dxos/debug": "0.8.4-main.e8ec1fe",
|
|
71
|
+
"@dxos/display-name": "0.8.4-main.e8ec1fe",
|
|
72
|
+
"@dxos/async": "0.8.4-main.e8ec1fe",
|
|
73
|
+
"@dxos/client": "0.8.4-main.e8ec1fe",
|
|
74
|
+
"@dxos/invariant": "0.8.4-main.e8ec1fe",
|
|
75
|
+
"@dxos/lit-ui": "0.8.4-main.e8ec1fe",
|
|
76
|
+
"@dxos/echo": "0.8.4-main.e8ec1fe",
|
|
77
|
+
"@dxos/live-object": "0.8.4-main.e8ec1fe",
|
|
78
|
+
"@dxos/log": "0.8.4-main.e8ec1fe",
|
|
79
|
+
"@dxos/protocols": "0.8.4-main.e8ec1fe",
|
|
80
|
+
"@dxos/react-hooks": "0.8.4-main.e8ec1fe",
|
|
81
|
+
"@dxos/react-ui-menu": "0.8.4-main.e8ec1fe",
|
|
82
|
+
"@dxos/context": "0.8.4-main.e8ec1fe",
|
|
83
|
+
"@dxos/util": "0.8.4-main.e8ec1fe",
|
|
84
|
+
"@dxos/react-ui-stack": "0.8.4-main.e8ec1fe",
|
|
85
|
+
"@dxos/react-ui-types": "0.8.4-main.e8ec1fe"
|
|
87
86
|
},
|
|
88
87
|
"devDependencies": {
|
|
89
|
-
"@automerge/automerge": "3.1.
|
|
90
|
-
"@automerge/automerge-repo": "2.
|
|
91
|
-
"@automerge/automerge-repo-network-broadcastchannel": "2.
|
|
92
|
-
"@effect-
|
|
93
|
-
"@effect/platform": "0.
|
|
88
|
+
"@automerge/automerge": "3.1.2",
|
|
89
|
+
"@automerge/automerge-repo": "2.4.0",
|
|
90
|
+
"@automerge/automerge-repo-network-broadcastchannel": "2.4.0",
|
|
91
|
+
"@effect-atom/atom-react": "^0.3.4",
|
|
92
|
+
"@effect/platform": "0.92.1",
|
|
94
93
|
"@types/chai": "^4.2.15",
|
|
95
94
|
"@types/chai-dom": "^1.11.0",
|
|
96
95
|
"@types/lodash.defaultsdeep": "^4.6.6",
|
|
97
96
|
"@types/lodash.merge": "^4.6.6",
|
|
98
97
|
"@types/lodash.sortby": "^4.7.7",
|
|
99
|
-
"@types/react": "~
|
|
100
|
-
"@types/react-dom": "~
|
|
98
|
+
"@types/react": "~19.2.2",
|
|
99
|
+
"@types/react-dom": "~19.2.2",
|
|
101
100
|
"@types/react-test-renderer": "^17.0.2",
|
|
102
101
|
"chai": "^4.4.1",
|
|
103
102
|
"chai-dom": "^1.11.0",
|
|
104
|
-
"effect": "3.
|
|
103
|
+
"effect": "3.18.3",
|
|
105
104
|
"happy-dom": "^13.3.1",
|
|
106
|
-
"jsdom": "^
|
|
105
|
+
"jsdom": "^27.0.0",
|
|
107
106
|
"mocha": "^10.6.0",
|
|
108
|
-
"react": "~
|
|
109
|
-
"react-dom": "~
|
|
110
|
-
"react-test-renderer": "~
|
|
111
|
-
"vite": "7.1.
|
|
107
|
+
"react": "~19.2.0",
|
|
108
|
+
"react-dom": "~19.2.0",
|
|
109
|
+
"react-test-renderer": "~19.2.0",
|
|
110
|
+
"vite": "7.1.9",
|
|
112
111
|
"vite-plugin-top-level-await": "^1.6.0",
|
|
113
112
|
"vite-plugin-wasm": "^3.5.0",
|
|
114
|
-
"@dxos/
|
|
115
|
-
"@dxos/echo-signals": "0.8.4-main.
|
|
116
|
-
"@dxos/
|
|
117
|
-
"@dxos/
|
|
118
|
-
"@dxos/
|
|
119
|
-
"@dxos/react-ui
|
|
120
|
-
"@dxos/react-
|
|
121
|
-
"@dxos/react-ui-stack": "0.8.4-main.
|
|
122
|
-
"@dxos/react-ui-
|
|
123
|
-
"@dxos/react-ui-
|
|
124
|
-
"@dxos/
|
|
125
|
-
"@dxos/
|
|
126
|
-
"@dxos/
|
|
113
|
+
"@dxos/config": "0.8.4-main.e8ec1fe",
|
|
114
|
+
"@dxos/echo-signals": "0.8.4-main.e8ec1fe",
|
|
115
|
+
"@dxos/echo": "0.8.4-main.e8ec1fe",
|
|
116
|
+
"@dxos/keyboard": "0.8.4-main.e8ec1fe",
|
|
117
|
+
"@dxos/random": "0.8.4-main.e8ec1fe",
|
|
118
|
+
"@dxos/react-ui": "0.8.4-main.e8ec1fe",
|
|
119
|
+
"@dxos/react-ui-attention": "0.8.4-main.e8ec1fe",
|
|
120
|
+
"@dxos/react-ui-stack": "0.8.4-main.e8ec1fe",
|
|
121
|
+
"@dxos/react-ui-theme": "0.8.4-main.e8ec1fe",
|
|
122
|
+
"@dxos/react-ui-syntax-highlighter": "0.8.4-main.e8ec1fe",
|
|
123
|
+
"@dxos/schema": "0.8.4-main.e8ec1fe",
|
|
124
|
+
"@dxos/react-client": "0.8.4-main.e8ec1fe",
|
|
125
|
+
"@dxos/storybook-utils": "0.8.4-main.e8ec1fe"
|
|
127
126
|
},
|
|
128
127
|
"peerDependencies": {
|
|
129
|
-
"@effect-
|
|
128
|
+
"@effect-atom/atom-react": "^0.3.4",
|
|
130
129
|
"@effect/platform": "^0.80.12",
|
|
131
130
|
"effect": "^3.13.3",
|
|
132
|
-
"react": "
|
|
133
|
-
"react-dom": "
|
|
134
|
-
"@dxos/react-
|
|
135
|
-
"@dxos/react-ui-theme": "0.8.4-main.
|
|
136
|
-
"@dxos/react-
|
|
131
|
+
"react": "^19.0.0",
|
|
132
|
+
"react-dom": "^19.0.0",
|
|
133
|
+
"@dxos/react-ui": "0.8.4-main.e8ec1fe",
|
|
134
|
+
"@dxos/react-ui-theme": "0.8.4-main.e8ec1fe",
|
|
135
|
+
"@dxos/react-client": "0.8.4-main.e8ec1fe"
|
|
137
136
|
},
|
|
138
137
|
"publishConfig": {
|
|
139
138
|
"access": "public"
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2025 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { type Decorator, type Meta, type StoryObj } from '@storybook/react-vite';
|
|
6
|
+
import React, { useMemo } from 'react';
|
|
7
|
+
|
|
8
|
+
import { faker } from '@dxos/random';
|
|
9
|
+
import { useThemeContext } from '@dxos/react-ui';
|
|
10
|
+
import { withLayout, withTheme } from '@dxos/react-ui/testing';
|
|
11
|
+
import { withAttention } from '@dxos/react-ui-attention/testing';
|
|
12
|
+
|
|
13
|
+
import {
|
|
14
|
+
createBasicExtensions,
|
|
15
|
+
createMarkdownExtensions,
|
|
16
|
+
createThemeExtensions,
|
|
17
|
+
decorateMarkdown,
|
|
18
|
+
} from '../../extensions';
|
|
19
|
+
import { createMenuGroup } from '../EditorMenuProvider';
|
|
20
|
+
|
|
21
|
+
import { Editor, type EditorContentProps } from './Editor';
|
|
22
|
+
|
|
23
|
+
// TODO(burdon): PreviewPopoverProvider (MarkdownStream, Preview story).
|
|
24
|
+
// TODO(burdon): Adapt Markdown plugin to use new Editor (plan first to check fit).
|
|
25
|
+
// TODO(burdon): Remove redundant hooks and simplify props.
|
|
26
|
+
|
|
27
|
+
faker.seed(1234);
|
|
28
|
+
|
|
29
|
+
const initialValue = ['# Blue Monday', '', 'How does it **feel**?', ''].join('\n');
|
|
30
|
+
|
|
31
|
+
// TODO(burdon): Adapter other tests in react-ui-editor/stories to use this pattern.
|
|
32
|
+
const withExtensions: Decorator = (Story, { args }) => {
|
|
33
|
+
const { themeMode } = useThemeContext();
|
|
34
|
+
const extensions = useMemo(
|
|
35
|
+
() => [
|
|
36
|
+
// Basic extensions.
|
|
37
|
+
createBasicExtensions(),
|
|
38
|
+
createThemeExtensions({ themeMode }),
|
|
39
|
+
createMarkdownExtensions(),
|
|
40
|
+
decorateMarkdown(),
|
|
41
|
+
],
|
|
42
|
+
[themeMode],
|
|
43
|
+
);
|
|
44
|
+
|
|
45
|
+
return <Story args={{ ...args, extensions, initialValue }} />;
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
const meta = {
|
|
49
|
+
title: 'ui/react-ui-editor/Editor',
|
|
50
|
+
component: Editor.Content,
|
|
51
|
+
decorators: [withExtensions, withTheme, withLayout({ container: 'column' }), withAttention],
|
|
52
|
+
parameters: {
|
|
53
|
+
layout: 'fullscreen',
|
|
54
|
+
},
|
|
55
|
+
} satisfies Meta<typeof Editor.Content>;
|
|
56
|
+
|
|
57
|
+
export default meta;
|
|
58
|
+
|
|
59
|
+
type Story = StoryObj<EditorContentProps>;
|
|
60
|
+
|
|
61
|
+
export const Default: Story = {
|
|
62
|
+
render: (args) => (
|
|
63
|
+
<Editor.Root>
|
|
64
|
+
<Editor.Content {...args} />
|
|
65
|
+
</Editor.Root>
|
|
66
|
+
),
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
export const WithToolbar: Story = {
|
|
70
|
+
render: (args) => (
|
|
71
|
+
<Editor.Root>
|
|
72
|
+
<Editor.Toolbar />
|
|
73
|
+
<Editor.Content {...args} />
|
|
74
|
+
</Editor.Root>
|
|
75
|
+
),
|
|
76
|
+
};
|
|
77
|
+
|
|
78
|
+
const items = faker.helpers.multiple(faker.commerce.productName, { count: 10 }).sort();
|
|
79
|
+
|
|
80
|
+
export const WithPopover: Story = {
|
|
81
|
+
render: (args) => (
|
|
82
|
+
<Editor.Root trigger={['@']} getMenu={({ text }) => [createMenuGroup({ items, filter: text })]}>
|
|
83
|
+
<Editor.Viewport>
|
|
84
|
+
<Editor.Toolbar />
|
|
85
|
+
<Editor.Content {...args} />
|
|
86
|
+
</Editor.Viewport>
|
|
87
|
+
</Editor.Root>
|
|
88
|
+
),
|
|
89
|
+
};
|
|
@@ -2,38 +2,173 @@
|
|
|
2
2
|
// Copyright 2025 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { type
|
|
6
|
-
import
|
|
5
|
+
import { type Extension } from '@codemirror/state';
|
|
6
|
+
import { createContext } from '@radix-ui/react-context';
|
|
7
|
+
import React, { type PropsWithChildren, forwardRef, useCallback, useImperativeHandle, useMemo, useState } from 'react';
|
|
7
8
|
|
|
8
|
-
import {
|
|
9
|
+
import { invariant } from '@dxos/invariant';
|
|
10
|
+
import { type ThemedClassName } from '@dxos/react-ui';
|
|
9
11
|
import { mx } from '@dxos/react-ui-theme';
|
|
10
|
-
import {
|
|
12
|
+
import { isNonNullable } from '@dxos/util';
|
|
11
13
|
|
|
12
|
-
import {
|
|
14
|
+
import {
|
|
15
|
+
type EditorController,
|
|
16
|
+
EditorContent as NaturalEditorContent,
|
|
17
|
+
type EditorContentProps as NaturalEditorContentProps,
|
|
18
|
+
noopController,
|
|
19
|
+
} from '../EditorContent';
|
|
20
|
+
import { EditorMenuProvider, type UseEditorMenuProps, useEditorMenu } from '../EditorMenuProvider';
|
|
21
|
+
import {
|
|
22
|
+
type EditorToolbarState,
|
|
23
|
+
EditorToolbar as NaturalEditorToolbar,
|
|
24
|
+
type EditorToolbarProps as NaturalEditorToolbarProps,
|
|
25
|
+
useEditorToolbar,
|
|
26
|
+
} from '../EditorToolbar';
|
|
13
27
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
28
|
+
//
|
|
29
|
+
// Context
|
|
30
|
+
//
|
|
31
|
+
|
|
32
|
+
type EditorContextValue = {
|
|
33
|
+
controller?: EditorController;
|
|
34
|
+
setController: (controller: EditorController) => void;
|
|
35
|
+
extensions?: Extension[];
|
|
36
|
+
} & Pick<NaturalEditorToolbarProps, 'state'>;
|
|
37
|
+
|
|
38
|
+
const [EditorContextProvider, useEditorContext] = createContext<EditorContextValue>('Editor');
|
|
39
|
+
|
|
40
|
+
//
|
|
41
|
+
// Root
|
|
42
|
+
//
|
|
43
|
+
|
|
44
|
+
type EditorRootProps = PropsWithChildren<Omit<UseEditorMenuProps, 'viewRef'> & Pick<EditorToolbarState, 'viewMode'>>;
|
|
20
45
|
|
|
21
46
|
/**
|
|
22
|
-
*
|
|
47
|
+
* Root component for the Editor compound component.
|
|
48
|
+
* Provides context for all child components and manages the editor controller state.
|
|
23
49
|
*/
|
|
24
|
-
|
|
25
|
-
({
|
|
26
|
-
const {
|
|
27
|
-
const { parentRef, focusAttributes, view } = useTextEditor(
|
|
28
|
-
() => ({
|
|
29
|
-
id,
|
|
30
|
-
initialValue: text.content,
|
|
31
|
-
...props,
|
|
32
|
-
}),
|
|
33
|
-
[id, text, themeMode],
|
|
34
|
-
);
|
|
50
|
+
const EditorRoot = forwardRef<EditorController | null, EditorRootProps>(
|
|
51
|
+
({ children, viewMode, ...props }, forwardedRef) => {
|
|
52
|
+
const state = useEditorToolbar({ viewMode });
|
|
35
53
|
|
|
36
|
-
|
|
37
|
-
|
|
54
|
+
const [controller, setController] = useState<EditorController>();
|
|
55
|
+
useImperativeHandle(forwardedRef, () => controller ?? noopController, [controller]);
|
|
56
|
+
|
|
57
|
+
// TODO(burdon): Consider lighter-weight approach if EditorMenuProvider is not needed.
|
|
58
|
+
const { groupsRef, extension, ...menuProps } = useEditorMenu(props);
|
|
59
|
+
const extensions = useMemo(() => [extension], [extension]);
|
|
60
|
+
|
|
61
|
+
return (
|
|
62
|
+
<EditorContextProvider
|
|
63
|
+
controller={controller}
|
|
64
|
+
setController={setController}
|
|
65
|
+
extensions={extensions}
|
|
66
|
+
state={state}
|
|
67
|
+
>
|
|
68
|
+
<EditorMenuProvider view={controller?.view} groups={groupsRef.current} {...menuProps}>
|
|
69
|
+
{children}
|
|
70
|
+
</EditorMenuProvider>
|
|
71
|
+
</EditorContextProvider>
|
|
72
|
+
);
|
|
38
73
|
},
|
|
39
74
|
);
|
|
75
|
+
|
|
76
|
+
EditorRoot.displayName = 'Editor.Root';
|
|
77
|
+
|
|
78
|
+
//
|
|
79
|
+
// Viewport
|
|
80
|
+
//
|
|
81
|
+
|
|
82
|
+
type EditorViewportProps = ThemedClassName<PropsWithChildren<{}>>;
|
|
83
|
+
|
|
84
|
+
/**
|
|
85
|
+
* Viewport component that wraps the toolbar and editor content area.
|
|
86
|
+
*/
|
|
87
|
+
const EditorViewport = ({ classNames, children }: EditorViewportProps) => {
|
|
88
|
+
return (
|
|
89
|
+
<div role='none' className={mx('grid grid-rows-[min-content_1fr] bs-full overflow-hidden', classNames)}>
|
|
90
|
+
{children}
|
|
91
|
+
</div>
|
|
92
|
+
);
|
|
93
|
+
};
|
|
94
|
+
|
|
95
|
+
EditorViewport.displayName = 'Editor.Viewport';
|
|
96
|
+
|
|
97
|
+
//
|
|
98
|
+
// Content
|
|
99
|
+
//
|
|
100
|
+
|
|
101
|
+
type EditorContentProps = Omit<NaturalEditorContentProps, 'ref'>;
|
|
102
|
+
|
|
103
|
+
/**
|
|
104
|
+
* Content component that renders the actual CodeMirror editor.
|
|
105
|
+
* Automatically registers the editor controller with the context.
|
|
106
|
+
*/
|
|
107
|
+
const EditorContent = ({ extensions: providedExtensions, ...props }: EditorContentProps) => {
|
|
108
|
+
const { extensions: additionalExtensions = [], setController } = useEditorContext(EditorContent.displayName);
|
|
109
|
+
|
|
110
|
+
const extensions = useMemo(
|
|
111
|
+
() => [additionalExtensions, providedExtensions].filter(isNonNullable).flat(),
|
|
112
|
+
[providedExtensions, additionalExtensions],
|
|
113
|
+
);
|
|
114
|
+
|
|
115
|
+
return <NaturalEditorContent {...props} extensions={extensions} ref={setController} />;
|
|
116
|
+
};
|
|
117
|
+
|
|
118
|
+
EditorContent.displayName = 'Editor.Content';
|
|
119
|
+
|
|
120
|
+
//
|
|
121
|
+
// Toolbar
|
|
122
|
+
//
|
|
123
|
+
|
|
124
|
+
type EditorToolbarProps = Omit<NaturalEditorToolbarProps, 'getView' | 'state'>;
|
|
125
|
+
|
|
126
|
+
/**
|
|
127
|
+
* Toolbar component that provides editor formatting and control actions.
|
|
128
|
+
* Automatically connects to the editor view through context.
|
|
129
|
+
*/
|
|
130
|
+
const EditorToolbar = (props: EditorToolbarProps) => {
|
|
131
|
+
const { controller, state } = useEditorContext(EditorToolbar.displayName);
|
|
132
|
+
|
|
133
|
+
// TODO(burdon): Fix invariant.
|
|
134
|
+
const getView = useCallback(() => {
|
|
135
|
+
invariant(controller?.view);
|
|
136
|
+
return controller?.view;
|
|
137
|
+
}, [controller]);
|
|
138
|
+
|
|
139
|
+
return <NaturalEditorToolbar {...props} getView={getView} state={state} />;
|
|
140
|
+
};
|
|
141
|
+
|
|
142
|
+
EditorToolbar.displayName = 'Editor.Toolbar';
|
|
143
|
+
|
|
144
|
+
//
|
|
145
|
+
// Editor
|
|
146
|
+
//
|
|
147
|
+
|
|
148
|
+
/**
|
|
149
|
+
* Compound editor component following the Radix UI pattern.
|
|
150
|
+
*
|
|
151
|
+
* @example
|
|
152
|
+
* ```tsx
|
|
153
|
+
* EditorMenuGroup.Root>
|
|
154
|
+
* EditorMenuGroup.Toolbar />
|
|
155
|
+
* EditorMenuGroup.Viewport>
|
|
156
|
+
* EditorMenuGroup.Content extensions={[...]} />
|
|
157
|
+
* </Editor.Viewport>
|
|
158
|
+
* </Editor.Root>
|
|
159
|
+
* ```
|
|
160
|
+
*/
|
|
161
|
+
export const Editor = {
|
|
162
|
+
Root: EditorRoot,
|
|
163
|
+
Viewport: EditorViewport,
|
|
164
|
+
Content: EditorContent,
|
|
165
|
+
Toolbar: EditorToolbar,
|
|
166
|
+
};
|
|
167
|
+
|
|
168
|
+
export type {
|
|
169
|
+
EditorController,
|
|
170
|
+
EditorRootProps,
|
|
171
|
+
EditorViewportProps,
|
|
172
|
+
EditorContentProps,
|
|
173
|
+
// EditorToolbarProps, // TODO(burdon): Restore once removed deprecated props.
|
|
174
|
+
};
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2025 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { type Meta, type StoryObj } from '@storybook/react-vite';
|
|
6
|
+
import React from 'react';
|
|
7
|
+
import { useMemo } from 'react';
|
|
8
|
+
|
|
9
|
+
import { createDocAccessor, createObject } from '@dxos/client/echo';
|
|
10
|
+
import { useThemeContext } from '@dxos/react-ui';
|
|
11
|
+
import { withLayout, withTheme } from '@dxos/react-ui/testing';
|
|
12
|
+
import { Text } from '@dxos/schema';
|
|
13
|
+
|
|
14
|
+
import { automerge, createBasicExtensions, createThemeExtensions } from '../../extensions';
|
|
15
|
+
|
|
16
|
+
import { EditorContent } from './EditorContent';
|
|
17
|
+
|
|
18
|
+
const meta = {
|
|
19
|
+
title: 'ui/react-ui-editor/EditorComponent',
|
|
20
|
+
component: EditorContent,
|
|
21
|
+
decorators: [withTheme, withLayout({ container: 'column' })],
|
|
22
|
+
} satisfies Meta<typeof EditorContent>;
|
|
23
|
+
|
|
24
|
+
export default meta;
|
|
25
|
+
|
|
26
|
+
type Story = StoryObj<typeof meta>;
|
|
27
|
+
|
|
28
|
+
export const Default: Story = {
|
|
29
|
+
render: (args) => {
|
|
30
|
+
const { themeMode } = useThemeContext();
|
|
31
|
+
const extensions = useMemo(
|
|
32
|
+
() => [
|
|
33
|
+
// Basic extensions.
|
|
34
|
+
createBasicExtensions(),
|
|
35
|
+
createThemeExtensions({ themeMode }),
|
|
36
|
+
],
|
|
37
|
+
[],
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
return <EditorContent classNames='p-2' {...args} extensions={extensions} />;
|
|
41
|
+
},
|
|
42
|
+
args: {
|
|
43
|
+
selectionEnd: true,
|
|
44
|
+
value: 'Hello world!',
|
|
45
|
+
onChange: (value) => console.log(value),
|
|
46
|
+
},
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
export const Automerge: Story = {
|
|
50
|
+
render: ({ value, ...props }) => {
|
|
51
|
+
const { themeMode } = useThemeContext();
|
|
52
|
+
const extensions = useMemo(
|
|
53
|
+
() => [
|
|
54
|
+
// Basic extensions.
|
|
55
|
+
createBasicExtensions(),
|
|
56
|
+
createThemeExtensions({ themeMode }),
|
|
57
|
+
automerge(createDocAccessor(createObject(Text.make(value)), ['content'])),
|
|
58
|
+
],
|
|
59
|
+
[],
|
|
60
|
+
);
|
|
61
|
+
|
|
62
|
+
// TODO(burdon): Remove the need for initialValue.
|
|
63
|
+
return <EditorContent classNames='p-2' {...props} initialValue={value} extensions={extensions} />;
|
|
64
|
+
},
|
|
65
|
+
args: {
|
|
66
|
+
selectionEnd: true,
|
|
67
|
+
value: 'Hello world!',
|
|
68
|
+
onChange: (value) => console.log(value),
|
|
69
|
+
},
|
|
70
|
+
};
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2025 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { Transaction } from '@codemirror/state';
|
|
6
|
+
import { EditorView } from '@codemirror/view';
|
|
7
|
+
import React, { forwardRef, useEffect, useImperativeHandle } from 'react';
|
|
8
|
+
|
|
9
|
+
import { type ThemedClassName } from '@dxos/react-ui';
|
|
10
|
+
import { mx } from '@dxos/react-ui-theme';
|
|
11
|
+
|
|
12
|
+
import { initialSync } from '../../extensions';
|
|
13
|
+
import { type UseTextEditorProps, useTextEditor } from '../../hooks';
|
|
14
|
+
|
|
15
|
+
import { type EditorController, createEditorController } from './controller';
|
|
16
|
+
|
|
17
|
+
export type EditorContentProps = ThemedClassName<
|
|
18
|
+
{
|
|
19
|
+
value?: string;
|
|
20
|
+
onChange?: (value: string) => void;
|
|
21
|
+
} & UseTextEditorProps
|
|
22
|
+
>;
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Minimal text editor.
|
|
26
|
+
* NOTE: This shouold not be used with the automerge extension.
|
|
27
|
+
* @deprecated Use Editor.Content
|
|
28
|
+
*/
|
|
29
|
+
export const EditorContent = forwardRef<EditorController, EditorContentProps>(
|
|
30
|
+
({ classNames, id, extensions, selectionEnd, value, onChange, ...props }, forwardedRef) => {
|
|
31
|
+
const { parentRef, focusAttributes, view } = useTextEditor(
|
|
32
|
+
() => ({
|
|
33
|
+
id,
|
|
34
|
+
initialValue: value,
|
|
35
|
+
selectionEnd,
|
|
36
|
+
extensions: [
|
|
37
|
+
extensions ?? [],
|
|
38
|
+
EditorView.updateListener.of(({ view, docChanged, transactions }) => {
|
|
39
|
+
const isInitialSync = transactions.some((tr) => tr.annotation(Transaction.userEvent) === initialSync.value);
|
|
40
|
+
if (!isInitialSync && docChanged) {
|
|
41
|
+
onChange?.(view.state.doc.toString());
|
|
42
|
+
}
|
|
43
|
+
}),
|
|
44
|
+
],
|
|
45
|
+
...props,
|
|
46
|
+
}),
|
|
47
|
+
[id, extensions, onChange, selectionEnd],
|
|
48
|
+
);
|
|
49
|
+
|
|
50
|
+
// External controller.
|
|
51
|
+
useImperativeHandle(forwardedRef, () => {
|
|
52
|
+
return createEditorController(view);
|
|
53
|
+
}, [id, view]);
|
|
54
|
+
|
|
55
|
+
// Set initial value and cursor position.
|
|
56
|
+
useEffect(() => {
|
|
57
|
+
requestAnimationFrame(() => {
|
|
58
|
+
view?.dispatch({
|
|
59
|
+
annotations: initialSync,
|
|
60
|
+
changes: value ? [{ from: 0, to: view?.state.doc.length ?? 0, insert: value ?? '' }] : [],
|
|
61
|
+
selection: selectionEnd ? { anchor: view?.state.doc.length ?? 0 } : undefined,
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
view?.focus();
|
|
65
|
+
});
|
|
66
|
+
}, [view, value, selectionEnd]);
|
|
67
|
+
|
|
68
|
+
return <div role='none' className={mx('is-full', classNames)} {...focusAttributes} ref={parentRef} />;
|
|
69
|
+
},
|
|
70
|
+
);
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2025 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { type EditorView } from '@codemirror/view';
|
|
6
|
+
|
|
7
|
+
export interface EditorController {
|
|
8
|
+
get view(): EditorView | null;
|
|
9
|
+
getText: () => string;
|
|
10
|
+
setText: (text: string, focus?: boolean) => void;
|
|
11
|
+
focus: () => void;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export const noopController: EditorController = {
|
|
15
|
+
get view() {
|
|
16
|
+
return null;
|
|
17
|
+
},
|
|
18
|
+
getText: () => '',
|
|
19
|
+
setText: () => {},
|
|
20
|
+
focus: () => {},
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
export const createEditorController = (view: EditorView | null): EditorController => {
|
|
24
|
+
return {
|
|
25
|
+
get view() {
|
|
26
|
+
return view;
|
|
27
|
+
},
|
|
28
|
+
getText: () => {
|
|
29
|
+
return view?.state.doc.toString() ?? '';
|
|
30
|
+
},
|
|
31
|
+
setText: (text: string, focus?: boolean) => {
|
|
32
|
+
view?.dispatch({
|
|
33
|
+
changes: {
|
|
34
|
+
from: 0,
|
|
35
|
+
to: view?.state.doc.length ?? 0,
|
|
36
|
+
insert: text,
|
|
37
|
+
},
|
|
38
|
+
selection: {
|
|
39
|
+
anchor: text.length,
|
|
40
|
+
head: text.length,
|
|
41
|
+
},
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
if (focus) {
|
|
45
|
+
view?.focus();
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
focus: () => view?.focus(),
|
|
49
|
+
};
|
|
50
|
+
};
|