@dxos/react-ui-editor 0.3.10-main.8fd45da → 0.3.10-main.92d1f2c

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 (87) hide show
  1. package/dist/lib/browser/index.mjs +986 -296
  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 +19 -1
  5. package/dist/types/src/components/TextEditor/MarkdownEditor.stories.d.ts.map +1 -1
  6. package/dist/types/src/components/TextEditor/TextEditor.d.ts +2 -1
  7. package/dist/types/src/components/TextEditor/TextEditor.d.ts.map +1 -1
  8. package/dist/types/src/components/TextEditor/extensions/autocomplete.d.ts.map +1 -1
  9. package/dist/types/src/components/TextEditor/extensions/basic.d.ts +2 -1
  10. package/dist/types/src/components/TextEditor/extensions/basic.d.ts.map +1 -1
  11. package/dist/types/src/components/TextEditor/extensions/blast.d.ts +25 -0
  12. package/dist/types/src/components/TextEditor/extensions/blast.d.ts.map +1 -0
  13. package/dist/types/src/components/TextEditor/extensions/comments.d.ts +10 -6
  14. package/dist/types/src/components/TextEditor/extensions/comments.d.ts.map +1 -1
  15. package/dist/types/src/components/TextEditor/extensions/demo.d.ts +11 -0
  16. package/dist/types/src/components/TextEditor/extensions/demo.d.ts.map +1 -0
  17. package/dist/types/src/components/TextEditor/extensions/experimental.d.ts +1 -1
  18. package/dist/types/src/components/TextEditor/extensions/experimental.d.ts.map +1 -1
  19. package/dist/types/src/components/TextEditor/extensions/image.d.ts +4 -0
  20. package/dist/types/src/components/TextEditor/extensions/image.d.ts.map +1 -0
  21. package/dist/types/src/components/TextEditor/extensions/index.d.ts +5 -0
  22. package/dist/types/src/components/TextEditor/extensions/index.d.ts.map +1 -1
  23. package/dist/types/src/components/TextEditor/extensions/link.d.ts.map +1 -1
  24. package/dist/types/src/components/TextEditor/extensions/listener.d.ts +4 -2
  25. package/dist/types/src/components/TextEditor/extensions/listener.d.ts.map +1 -1
  26. package/dist/types/src/components/TextEditor/extensions/markdown/bundle.d.ts +2 -1
  27. package/dist/types/src/components/TextEditor/extensions/markdown/bundle.d.ts.map +1 -1
  28. package/dist/types/src/components/TextEditor/extensions/markdown/highlight.d.ts +9 -3
  29. package/dist/types/src/components/TextEditor/extensions/markdown/highlight.d.ts.map +1 -1
  30. package/dist/types/src/components/TextEditor/extensions/mention.d.ts +6 -0
  31. package/dist/types/src/components/TextEditor/extensions/mention.d.ts.map +1 -0
  32. package/dist/types/src/components/TextEditor/extensions/table.d.ts +8 -0
  33. package/dist/types/src/components/TextEditor/extensions/table.d.ts.map +1 -0
  34. package/dist/types/src/components/TextEditor/extensions/tasklist.d.ts +2 -1
  35. package/dist/types/src/components/TextEditor/extensions/tasklist.d.ts.map +1 -1
  36. package/dist/types/src/components/TextEditor/themes/default.d.ts +5 -0
  37. package/dist/types/src/components/TextEditor/themes/default.d.ts.map +1 -1
  38. package/dist/types/src/hooks/automerge/PatchSemaphore.d.ts +3 -0
  39. package/dist/types/src/hooks/automerge/PatchSemaphore.d.ts.map +1 -1
  40. package/dist/types/src/hooks/automerge/automerge.stories.d.ts +8 -1
  41. package/dist/types/src/hooks/automerge/automerge.stories.d.ts.map +1 -1
  42. package/dist/types/src/hooks/automerge/index.d.ts +1 -1
  43. package/dist/types/src/hooks/automerge/index.d.ts.map +1 -1
  44. package/dist/types/src/hooks/automerge/plugin.d.ts.map +1 -1
  45. package/dist/types/src/hooks/automerge/translation/automerge-to-codemirror.d.ts +5 -0
  46. package/dist/types/src/hooks/automerge/translation/automerge-to-codemirror.d.ts.map +1 -0
  47. package/dist/types/src/hooks/automerge/translation/codemirror-to-automerge.d.ts +6 -0
  48. package/dist/types/src/hooks/automerge/translation/codemirror-to-automerge.d.ts.map +1 -0
  49. package/dist/types/src/hooks/automerge/translation/index.d.ts +3 -0
  50. package/dist/types/src/hooks/automerge/translation/index.d.ts.map +1 -0
  51. package/dist/types/src/{components/TextEditor → hooks/yjs}/yjs.stories.d.ts +1 -1
  52. package/dist/types/src/hooks/yjs/yjs.stories.d.ts.map +1 -0
  53. package/dist/types/src/styles/markdown.d.ts +3 -2
  54. package/dist/types/src/styles/markdown.d.ts.map +1 -1
  55. package/package.json +20 -19
  56. package/src/components/TextEditor/MarkdownEditor.stories.tsx +106 -29
  57. package/src/components/TextEditor/TextEditor.tsx +12 -8
  58. package/src/components/TextEditor/extensions/autocomplete.ts +5 -20
  59. package/src/components/TextEditor/extensions/basic.ts +2 -1
  60. package/src/components/TextEditor/extensions/blast.ts +387 -0
  61. package/src/components/TextEditor/extensions/comments.ts +59 -60
  62. package/src/components/TextEditor/extensions/demo.ts +69 -0
  63. package/src/components/TextEditor/extensions/experimental.tsx +14 -35
  64. package/src/components/TextEditor/extensions/image.ts +67 -0
  65. package/src/components/TextEditor/extensions/index.ts +5 -0
  66. package/src/components/TextEditor/extensions/link.ts +17 -25
  67. package/src/components/TextEditor/extensions/listener.ts +4 -4
  68. package/src/components/TextEditor/extensions/markdown/bundle.ts +30 -19
  69. package/src/components/TextEditor/extensions/markdown/highlight.ts +147 -108
  70. package/src/components/TextEditor/extensions/mention.ts +31 -0
  71. package/src/components/TextEditor/extensions/table.ts +122 -0
  72. package/src/components/TextEditor/extensions/tasklist.ts +41 -27
  73. package/src/components/TextEditor/themes/default.ts +54 -2
  74. package/src/hooks/automerge/PatchSemaphore.ts +12 -9
  75. package/src/hooks/automerge/automerge.stories.tsx +3 -2
  76. package/src/hooks/automerge/index.ts +1 -1
  77. package/src/hooks/automerge/plugin.ts +1 -0
  78. package/src/hooks/automerge/{amToCodemirror.ts → translation/automerge-to-codemirror.ts} +10 -2
  79. package/src/hooks/automerge/{codeMirrorToAm.ts → translation/codemirror-to-automerge.ts} +7 -4
  80. package/src/hooks/automerge/translation/index.ts +6 -0
  81. package/src/{components/TextEditor → hooks/yjs}/yjs.stories.tsx +1 -1
  82. package/src/styles/markdown.ts +14 -8
  83. package/dist/types/src/components/TextEditor/yjs.stories.d.ts.map +0 -1
  84. package/dist/types/src/hooks/automerge/amToCodemirror.d.ts +0 -6
  85. package/dist/types/src/hooks/automerge/amToCodemirror.d.ts.map +0 -1
  86. package/dist/types/src/hooks/automerge/codeMirrorToAm.d.ts +0 -7
  87. package/dist/types/src/hooks/automerge/codeMirrorToAm.d.ts.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../src/hooks/automerge/plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,SAAS,EAEd,WAAW,EACX,UAAU,EACV,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,SAAS,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAGlE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,KAAK,CAAC;IACjB,IAAI,EAAE,IAAI,EAAE,CAAC;IACb,wBAAwB,EAAE,WAAW,EAAE,CAAC;CACzC,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,KAAK,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,UAAU,0DAAsC,CAAC;AAE9D,eAAO,MAAM,WAAW,sCAAsB,YAAY,WAAW,CAAgC,CAAC;AAEtG,eAAO,MAAM,YAAY,UAAW,WAAW,uCAAsD,CAAC;AAEtG,eAAO,MAAM,OAAO,UAAW,WAAW,mBAAiB,IAAI,EAA6B,CAAC;AAE7F,MAAM,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;AAMtC,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY,UAAU,QAAQ,IAAI,EAAE,KAAG,eA8DlE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qDAA+B,CAAC;AAEpE,eAAO,MAAM,aAAa,OAAQ,WAAW,KAAG,OAAmD,CAAC;AAEpG,eAAO,MAAM,aAAa,OAAQ,eAAe,SAchD,CAAC"}
1
+ {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../src/hooks/automerge/plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,SAAS,EAEd,WAAW,EACX,UAAU,EACV,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,SAAS,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAGlE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,KAAK,CAAC;IACjB,IAAI,EAAE,IAAI,EAAE,CAAC;IACb,wBAAwB,EAAE,WAAW,EAAE,CAAC;CACzC,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,KAAK,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,UAAU,0DAAsC,CAAC;AAE9D,eAAO,MAAM,WAAW,sCAAsB,YAAY,WAAW,CAAgC,CAAC;AAEtG,eAAO,MAAM,YAAY,UAAW,WAAW,uCAAsD,CAAC;AAEtG,eAAO,MAAM,OAAO,UAAW,WAAW,mBAAiB,IAAI,EAA6B,CAAC;AAE7F,MAAM,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;AAMtC,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY,UAAU,QAAQ,IAAI,EAAE,KAAG,eA+DlE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qDAA+B,CAAC;AAEpE,eAAO,MAAM,aAAa,OAAQ,WAAW,KAAG,OAAmD,CAAC;AAEpG,eAAO,MAAM,aAAa,OAAQ,eAAe,SAchD,CAAC"}
@@ -0,0 +1,5 @@
1
+ import { type EditorSelection } from '@codemirror/state';
2
+ import { type EditorView } from '@codemirror/view';
3
+ import { type Patch, type Prop } from '@dxos/automerge/automerge';
4
+ export declare const automergeToCodemirror: (view: EditorView, selection: EditorSelection, target: Prop[], patches: Patch[]) => void;
5
+ //# sourceMappingURL=automerge-to-codemirror.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"automerge-to-codemirror.d.ts","sourceRoot":"","sources":["../../../../../../src/hooks/automerge/translation/automerge-to-codemirror.ts"],"names":[],"mappings":"AAMA,OAAO,EAA8B,KAAK,eAAe,EAAoB,MAAM,mBAAmB,CAAC;AACvG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,IAAI,EAGV,MAAM,2BAA2B,CAAC;AAInC,eAAO,MAAM,qBAAqB,SAC1B,UAAU,aACL,eAAe,UAClB,IAAI,EAAE,WACL,KAAK,EAAE,SAkBjB,CAAC"}
@@ -0,0 +1,6 @@
1
+ import { type EditorState, type Transaction } from '@codemirror/state';
2
+ import { type Heads } from '@dxos/automerge/automerge';
3
+ import { type IDocHandle } from '../handle';
4
+ import { type Field } from '../plugin';
5
+ export declare const codemirrorToAutomerge: (field: Field, handle: IDocHandle, transactions: Transaction[], state: EditorState) => Heads | undefined;
6
+ //# sourceMappingURL=codemirror-to-automerge.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"codemirror-to-automerge.d.ts","sourceRoot":"","sources":["../../../../../../src/hooks/automerge/translation/codemirror-to-automerge.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,WAAW,EAAa,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAElF,OAAO,EAAc,KAAK,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,WAAW,CAAC;AAEvC,eAAO,MAAM,qBAAqB,yBAExB,UAAU,gBACJ,WAAW,EAAE,SACpB,WAAW,KACjB,KAAK,GAAG,SAyBV,CAAC"}
@@ -0,0 +1,3 @@
1
+ export * from './automerge-to-codemirror';
2
+ export * from './codemirror-to-automerge';
3
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/hooks/automerge/translation/index.ts"],"names":[],"mappings":"AAIA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import '@dxosTheme';
2
2
  import React from 'react';
3
3
  declare const _default: {
4
- component: React.ForwardRefExoticComponent<import("./TextEditor").TextEditorProps & React.RefAttributes<import("./TextEditor").TextEditorRef>>;
4
+ component: React.ForwardRefExoticComponent<import("../../components").TextEditorProps & React.RefAttributes<import("../../components").TextEditorRef>>;
5
5
  decorators: import("@storybook/react").Decorator[];
6
6
  };
7
7
  export default _default;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"yjs.stories.d.ts","sourceRoot":"","sources":["../../../../../src/hooks/yjs/yjs.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,YAAY,CAAC;AAEpB,OAAO,KAAmB,MAAM,OAAO,CAAC;;;;;AAWxC,wBAGE;AA+BF,eAAO,MAAM,OAAO;;;CAInB,CAAC"}
@@ -1,5 +1,6 @@
1
1
  export type HeadingLevel = 1 | 2 | 3 | 4 | 5 | 6;
2
- export declare const heading: Record<HeadingLevel, string>;
2
+ export declare const headings: Record<HeadingLevel, string[]>;
3
+ export declare const heading: (level: HeadingLevel, readonly?: boolean) => string;
3
4
  export declare const text = "text-neutral-800 dark:text-neutral-200";
4
5
  export declare const light = "text-neutral-200 dark:text-neutral-800";
5
6
  export declare const mark: string;
@@ -12,7 +13,7 @@ export declare const codeMark = "font-mono text-primary-500";
12
13
  export declare const codeBlock = "mlb-2 font-mono bg-neutral-500/10 p-3 rounded";
13
14
  export declare const inlineUrl: string;
14
15
  export declare const blockquote: string;
15
- export declare const horizontalRule = "flex mlb-4 border-b text-neutral-100 dark:text-neutral-900 border-neutral-500/50";
16
+ export declare const horizontalRule = "flex mlb-4 border-b text-neutral-100 dark:text-neutral-900 border-neutral-200 dark:border-neutral-800";
16
17
  export declare const unorderedList = "mlb-2 grid grid-cols-[min-content_1fr] [&>li:before]:content-[attr(marker)] [&>li:before]:mlb-1 [&>li:before]:mie-2";
17
18
  export declare const orderedList = "mlb-2 grid grid-cols-[min-content_1fr] [&>li:before]:content-[counters(section,_\".\")_\"._\"] [counter-reset:section] [&>li:before]:mlb-1";
18
19
  export declare const listItem = "contents before:[counter-increment:section]";
@@ -1 +1 @@
1
- {"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../../../src/styles/markdown.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAGjD,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAOhD,CAAC;AAEF,eAAO,MAAM,IAAI,2CAA2C,CAAC;AAC7D,eAAO,MAAM,KAAK,2CAA2C,CAAC;AAE9D,eAAO,MAAM,IAAI,QAAmE,CAAC;AAErF,eAAO,MAAM,SAAS,UAAU,CAAC;AAEjC,eAAO,MAAM,IAAI,cAAc,CAAC;AAChC,eAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,eAAO,MAAM,aAAa,iBAAiB,CAAC;AAE5C,eAAO,MAAM,IAAI,mEAAmE,CAAC;AACrF,eAAO,MAAM,QAAQ,+BAA+B,CAAC;AACrD,eAAO,MAAM,SAAS,kDAAkD,CAAC;AAEzE,eAAO,MAAM,SAAS,QAAmB,CAAC;AAG1C,eAAO,MAAM,UAAU,QAAsF,CAAC;AAG9G,eAAO,MAAM,cAAc,qFAAqF,CAAC;AAGjH,eAAO,MAAM,aAAa,wHAC6F,CAAC;AACxH,eAAO,MAAM,WAAW,+IACkH,CAAC;AAE3I,eAAO,MAAM,QAAQ,gDAAgD,CAAC"}
1
+ {"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../../../src/styles/markdown.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAGjD,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,CAOnD,CAAC;AAEF,eAAO,MAAM,OAAO,UAAW,YAAY,aAAa,OAAO,WAG9D,CAAC;AAEF,eAAO,MAAM,IAAI,2CAA2C,CAAC;AAC7D,eAAO,MAAM,KAAK,2CAA2C,CAAC;AAE9D,eAAO,MAAM,IAAI,QAAmE,CAAC;AAErF,eAAO,MAAM,SAAS,UAAU,CAAC;AAEjC,eAAO,MAAM,IAAI,cAAc,CAAC;AAChC,eAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,eAAO,MAAM,aAAa,iBAAiB,CAAC;AAE5C,eAAO,MAAM,IAAI,mEAAmE,CAAC;AACrF,eAAO,MAAM,QAAQ,+BAA+B,CAAC;AACrD,eAAO,MAAM,SAAS,kDAAkD,CAAC;AAEzE,eAAO,MAAM,SAAS,QAAmB,CAAC;AAG1C,eAAO,MAAM,UAAU,QAAsF,CAAC;AAG9G,eAAO,MAAM,cAAc,0GAC8E,CAAC;AAG1G,eAAO,MAAM,aAAa,wHAC6F,CAAC;AACxH,eAAO,MAAM,WAAW,+IACkH,CAAC;AAE3I,eAAO,MAAM,QAAQ,gDAAgD,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/react-ui-editor",
3
- "version": "0.3.10-main.8fd45da",
3
+ "version": "0.3.10-main.92d1f2c",
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",
@@ -36,18 +36,19 @@
36
36
  "y-codemirror.next": "^0.3.2",
37
37
  "y-protocols": "^1.0.5",
38
38
  "yjs": "^13.6.10",
39
- "@dxos/debug": "0.3.10-main.8fd45da",
40
- "@dxos/display-name": "0.3.10-main.8fd45da",
41
- "@dxos/echo-schema": "0.3.10-main.8fd45da",
42
- "@dxos/invariant": "0.3.10-main.8fd45da",
43
- "@dxos/protocols": "0.3.10-main.8fd45da",
44
- "@dxos/react-ui": "0.3.10-main.8fd45da",
45
- "@dxos/react-ui-theme": "0.3.10-main.8fd45da",
46
- "@dxos/text-model": "0.3.10-main.8fd45da",
47
- "@dxos/log": "0.3.10-main.8fd45da",
48
- "@dxos/react-async": "0.3.10-main.8fd45da",
49
- "@dxos/util": "0.3.10-main.8fd45da",
50
- "@dxos/automerge": "0.3.10-main.8fd45da"
39
+ "@dxos/async": "0.3.10-main.92d1f2c",
40
+ "@dxos/debug": "0.3.10-main.92d1f2c",
41
+ "@dxos/echo-schema": "0.3.10-main.92d1f2c",
42
+ "@dxos/invariant": "0.3.10-main.92d1f2c",
43
+ "@dxos/log": "0.3.10-main.92d1f2c",
44
+ "@dxos/automerge": "0.3.10-main.92d1f2c",
45
+ "@dxos/display-name": "0.3.10-main.92d1f2c",
46
+ "@dxos/protocols": "0.3.10-main.92d1f2c",
47
+ "@dxos/react-async": "0.3.10-main.92d1f2c",
48
+ "@dxos/react-ui-theme": "0.3.10-main.92d1f2c",
49
+ "@dxos/react-ui": "0.3.10-main.92d1f2c",
50
+ "@dxos/text-model": "0.3.10-main.92d1f2c",
51
+ "@dxos/util": "0.3.10-main.92d1f2c"
51
52
  },
52
53
  "devDependencies": {
53
54
  "@automerge/automerge-repo-network-broadcastchannel": "^1.0.19",
@@ -60,17 +61,17 @@
60
61
  "@types/react-dom": "^18.0.6",
61
62
  "react": "^18.2.0",
62
63
  "react-dom": "^18.2.0",
63
- "@dxos/config": "0.3.10-main.8fd45da",
64
- "@dxos/echo-typegen": "0.3.10-main.8fd45da",
65
- "@dxos/react-client": "0.3.10-main.8fd45da",
66
- "@dxos/storybook-utils": "0.3.10-main.8fd45da",
67
- "@dxos/react-ui": "0.3.10-main.8fd45da"
64
+ "@dxos/config": "0.3.10-main.92d1f2c",
65
+ "@dxos/echo-typegen": "0.3.10-main.92d1f2c",
66
+ "@dxos/react-ui": "0.3.10-main.92d1f2c",
67
+ "@dxos/react-client": "0.3.10-main.92d1f2c",
68
+ "@dxos/storybook-utils": "0.3.10-main.92d1f2c"
68
69
  },
69
70
  "peerDependencies": {
70
71
  "@phosphor-icons/react": "^2.0.5",
71
72
  "react": "^18.2.0",
72
73
  "react-dom": "^18.2.0",
73
- "@dxos/react-client": "0.3.10-main.8fd45da"
74
+ "@dxos/react-client": "0.3.10-main.92d1f2c"
74
75
  },
75
76
  "publishConfig": {
76
77
  "access": "public"
@@ -3,9 +3,11 @@
3
3
  //
4
4
 
5
5
  import '@dxosTheme';
6
+
6
7
  import { EditorView } from '@codemirror/view';
7
8
  import { faker } from '@faker-js/faker';
8
9
  import { ArrowSquareOut } from '@phosphor-icons/react';
10
+ import defaultsDeep from 'lodash.defaultsdeep';
9
11
  import React, { StrictMode, useRef, useState } from 'react';
10
12
  import { createRoot } from 'react-dom/client';
11
13
 
@@ -24,18 +26,19 @@ import {
24
26
  type TooltipOptions,
25
27
  type LinkOptions,
26
28
  comments,
29
+ table,
30
+ image,
31
+ mention,
32
+ blast,
33
+ demo,
34
+ defaultOptions,
27
35
  } from './extensions';
28
36
  import { useTextModel } from '../../hooks';
29
37
 
30
- // TODO(burdon): Read-only render mode (presentation).
31
- // TODO(burdon): Slides.
32
- // TODO(burdon): Autocomplete.
33
- // TODO(burdon): Block quote.
34
- // TODO(burdon): Images.
35
- // TODO(burdon): Tables.
36
-
37
38
  const str = (...lines: string[]) => lines.join('\n');
38
39
 
40
+ const num = () => faker.number.int({ min: 0, max: 9999 }).toLocaleString();
41
+
39
42
  // prettier-ignore
40
43
  const text = {
41
44
  tasks: str(
@@ -77,6 +80,7 @@ const text = {
77
80
  ' const x = 100;',
78
81
  ' return () => <div>Test</div>;',
79
82
  '};',
83
+ '',
80
84
  '```'
81
85
  ),
82
86
 
@@ -89,11 +93,24 @@ const text = {
89
93
  '',
90
94
  ),
91
95
 
96
+ table: str(
97
+ '# Table',
98
+ '',
99
+ `| ${faker.lorem.word()} | ${faker.lorem.word()} | ${faker.lorem.word()} |`,
100
+ '|---|---|---|',
101
+ `| ${num()} | ${num()} | ${num()} |`,
102
+ `| ${num()} | ${num()} | ${num()} |`,
103
+ `| ${num()} | ${num()} | ${num()} |`,
104
+ '', // TODO(burdon): Possible GFM parsing bug if no newline?
105
+ ),
106
+
107
+ image: str('# Image', '', '![dxos](https://pbs.twimg.com/profile_banners/1268328127673044992/1684766689/1500x500)'),
108
+
92
109
  headings: str(
93
110
  ...[1, 2, 3, 4, 5, 6].map((level) => ['#'.repeat(level) + ` Heading ${level}`, faker.lorem.sentences(), '']).flat(),
94
111
  ),
95
112
 
96
- paragraphs: str(...faker.helpers.multiple(() => [faker.lorem.paragraph(), ''], { count: 3 }).flat())
113
+ paragraphs: str(...faker.helpers.multiple(() => [faker.lorem.paragraph(), ''], { count: 3 }).flat()),
97
114
  };
98
115
 
99
116
  const document = str(
@@ -103,9 +120,7 @@ const document = str(
103
120
  '',
104
121
  'This is all about https://dxos.org and related technologies.',
105
122
  '',
106
- 'This this is **bold**, __underlined__, _italic_, and `f(INLINE)`.',
107
- '',
108
- '__NOTE__: Fenced code uses the base font.',
123
+ 'This this is **bold**, ~~strikethrough~~, _italic_, and `f(INLINE)`.',
109
124
  '',
110
125
  '---',
111
126
  text.links,
@@ -119,6 +134,11 @@ const document = str(
119
134
  text.code,
120
135
  '---',
121
136
  text.headings,
137
+ '---',
138
+ text.table,
139
+ '---',
140
+ text.image,
141
+ '',
122
142
  );
123
143
 
124
144
  const links = [
@@ -158,7 +178,7 @@ const Story = ({
158
178
  text,
159
179
  automerge,
160
180
  ...props
161
- }: { text?: string; automerge?: boolean } & Pick<TextEditorProps, 'extensions' | 'slots'>) => {
181
+ }: { text?: string; automerge?: boolean } & Pick<TextEditorProps, 'readonly' | 'extensions' | 'slots'>) => {
162
182
  const ref = useRef<TextEditorRef>(null);
163
183
  const [item] = useState({ text: new TextObject(text, undefined, undefined, { useAutomergeBackend: automerge }) });
164
184
  const model = useTextModel({ text: item.text });
@@ -185,20 +205,23 @@ export default {
185
205
  render: Story,
186
206
  };
187
207
 
208
+ const extensions = [
209
+ link({ onRender }),
210
+ tooltip({ onHover }),
211
+ tasklist(),
212
+ table(),
213
+ image(),
214
+ autocomplete({
215
+ onSearch: (text) => links.filter(({ label }) => label.toLowerCase().includes(text.toLowerCase())),
216
+ }),
217
+ ];
218
+
188
219
  export const Default = {
189
- render: () => (
190
- <Story
191
- text={document}
192
- extensions={[
193
- link({ onRender }),
194
- tooltip({ onHover }),
195
- tasklist(),
196
- autocomplete({
197
- onSearch: (text) => links.filter(({ label }) => label.toLowerCase().includes(text.toLowerCase())),
198
- }),
199
- ]}
200
- />
201
- ),
220
+ render: () => <Story text={document} extensions={extensions} />,
221
+ };
222
+
223
+ export const Readonly = {
224
+ render: () => <Story text={document} extensions={extensions} readonly />,
202
225
  };
203
226
 
204
227
  export const Simple = {
@@ -206,11 +229,19 @@ export const Simple = {
206
229
  };
207
230
 
208
231
  export const Tooltips = {
209
- render: () => <Story text={text.links} extensions={[tooltip({ onHover })]} />,
232
+ render: () => <Story text={str(text.links, '')} extensions={[tooltip({ onHover })]} />,
210
233
  };
211
234
 
212
235
  export const Links = {
213
- render: () => <Story text={text.links} extensions={[link({ onRender })]} />,
236
+ render: () => <Story text={str(text.links, '')} extensions={[link({ onRender })]} />,
237
+ };
238
+
239
+ export const Table = {
240
+ render: () => <Story text={str(text.table, '')} extensions={[table()]} />,
241
+ };
242
+
243
+ export const Image = {
244
+ render: () => <Story text={str(text.image, '', '')} readonly extensions={[image()]} />,
214
245
  };
215
246
 
216
247
  export const TaskList = {
@@ -219,8 +250,10 @@ export const TaskList = {
219
250
  text={str(text.tasks, '', text.list)}
220
251
  extensions={[
221
252
  tasklist(),
222
- listener((text) => {
223
- console.log(text);
253
+ listener({
254
+ onChange: (text) => {
255
+ console.log(text);
256
+ },
224
257
  }),
225
258
  ]}
226
259
  />
@@ -241,6 +274,21 @@ export const Autocomplete = {
241
274
  ),
242
275
  };
243
276
 
277
+ const names = ['adam', 'alice', 'alison', 'bob', 'carol', 'charlie', 'sayuri', 'shoko'];
278
+
279
+ export const Mention = {
280
+ render: () => (
281
+ <Story
282
+ text={str('# Mention', '', '', '', '', '', '')}
283
+ extensions={[
284
+ mention({
285
+ onSearch: (text) => names.filter((name) => name.toLowerCase().startsWith(text.toLowerCase())),
286
+ }),
287
+ ]}
288
+ />
289
+ ),
290
+ };
291
+
244
292
  const mark = () => `[^${PublicKey.random().toHex()}]`;
245
293
  export const Comments = {
246
294
  render: () => (
@@ -271,3 +319,32 @@ export const Diagnostics = {
271
319
  />
272
320
  ),
273
321
  };
322
+
323
+ export const Demo = {
324
+ render: () => <Story text={text.paragraphs} extensions={[demo()]} />,
325
+ };
326
+
327
+ export const Blast = {
328
+ render: () => (
329
+ <Story
330
+ text={str(text.paragraphs, text.code, text.paragraphs)}
331
+ extensions={[
332
+ demo({
333
+ items: localStorage.getItem('dxos.composer.extension.demo')?.split(','),
334
+ }),
335
+ blast(
336
+ defaultsDeep(
337
+ {
338
+ effect: 2,
339
+ particleGravity: 0.2,
340
+ particleShrinkRate: 0.995,
341
+ color: () => [faker.number.int({ min: 100, max: 200 }), 0, 0],
342
+ // color: () => [faker.number.int(256), faker.number.int(256), faker.number.int(256)],
343
+ },
344
+ defaultOptions,
345
+ ),
346
+ ),
347
+ ]}
348
+ />
349
+ ),
350
+ };
@@ -56,9 +56,10 @@ export type TextEditorSlots = {
56
56
 
57
57
  export type TextEditorProps = {
58
58
  model: EditorModel;
59
+ readonly?: boolean;
60
+ editorMode?: EditorMode;
59
61
  extensions?: Extension[];
60
62
  slots?: TextEditorSlots;
61
- editorMode?: EditorMode;
62
63
  };
63
64
 
64
65
  /**
@@ -66,7 +67,7 @@ export type TextEditorProps = {
66
67
  * NOTE: Rather than adding properties, try to create extensions that can be reused.
67
68
  */
68
69
  export const BaseTextEditor = forwardRef<TextEditorRef, TextEditorProps>(
69
- ({ model, extensions = [], slots = defaultSlots, editorMode }, forwardedRef) => {
70
+ ({ model, readonly, editorMode, extensions = [], slots = defaultSlots }, forwardedRef) => {
70
71
  const { themeMode } = useThemeContext();
71
72
  const tabsterDOMAttribute = useFocusableGroup({ tabBehavior: 'limited' });
72
73
 
@@ -95,6 +96,8 @@ export const BaseTextEditor = forwardRef<TextEditorRef, TextEditorProps>(
95
96
  const state = EditorState.create({
96
97
  doc: model.text(),
97
98
  extensions: [
99
+ readonly && EditorState.readOnly.of(readonly),
100
+
98
101
  // TODO(burdon): Factor out VIM mode?
99
102
  editorMode === 'vim' && vim(),
100
103
 
@@ -124,7 +127,7 @@ export const BaseTextEditor = forwardRef<TextEditorRef, TextEditorProps>(
124
127
  setView(undefined);
125
128
  setState(undefined);
126
129
  };
127
- }, [root, model, themeMode, editorMode]);
130
+ }, [root, model, themeMode, readonly, editorMode]);
128
131
 
129
132
  const handleKeyUp = useCallback(
130
133
  (event: KeyboardEvent) => {
@@ -157,15 +160,15 @@ export const BaseTextEditor = forwardRef<TextEditorRef, TextEditorProps>(
157
160
  },
158
161
  );
159
162
 
160
- // TODO(burdon): Set default text theme?
161
163
  export const TextEditor = forwardRef<TextEditorRef, TextEditorProps>(
162
- ({ extensions = [], slots: _slots, ...props }, forwardedRef) => {
164
+ ({ readonly, extensions = [], slots: _slots, ...props }, forwardedRef) => {
163
165
  const { themeMode } = useThemeContext();
164
166
  const slots = defaultsDeep({}, _slots, defaultTextSlots);
165
167
  return (
166
168
  <BaseTextEditor
167
169
  ref={forwardedRef}
168
- extensions={[basicBundle({ themeMode, placeholder: slots?.editor?.placeholder }), ...extensions]}
170
+ readonly={readonly}
171
+ extensions={[basicBundle({ readonly, themeMode, placeholder: slots?.editor?.placeholder }), ...extensions]}
169
172
  slots={slots}
170
173
  {...props}
171
174
  />
@@ -174,13 +177,14 @@ export const TextEditor = forwardRef<TextEditorRef, TextEditorProps>(
174
177
  );
175
178
 
176
179
  export const MarkdownEditor = forwardRef<TextEditorRef, TextEditorProps>(
177
- ({ extensions = [], slots: _slots, ...props }, forwardedRef) => {
180
+ ({ readonly, extensions = [], slots: _slots, ...props }, forwardedRef) => {
178
181
  const { themeMode } = useThemeContext();
179
182
  const slots = defaultsDeep({}, _slots, defaultMarkdownSlots);
180
183
  return (
181
184
  <BaseTextEditor
182
185
  ref={forwardedRef}
183
- extensions={[markdownBundle({ themeMode, placeholder: slots?.editor?.placeholder }), ...extensions]}
186
+ readonly={readonly}
187
+ extensions={[markdownBundle({ readonly, themeMode, placeholder: slots?.editor?.placeholder }), ...extensions]}
184
188
  slots={slots}
185
189
  {...props}
186
190
  />
@@ -2,23 +2,15 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- // TODO(burdon): Automcomplete: https://codemirror.net/5/doc/manual.html#addon_runmode
6
- // TODO(burdon): Modes: parallel parsing and decoration (e.g., associated with language).
7
- // TODO(burdon): Add-on: runmode: run lexer over content (with rendering codemirror).
8
- // https://codemirror.net/5/doc/manual.html#addon_runmode
9
- // TODO(burdon): Add-on: dialog.
10
- // TODO(burdon): Comments: https://codemirror.net/5/doc/manual.html#setBookmark
11
- // TODO(burdon): Split view: https://codemirror.net/examples/split
12
-
13
5
  // https://codemirror.net/examples/autocompletion
14
6
  // https://codemirror.net/docs/ref/#autocomplete.autocompletion
15
7
  // https://codemirror.net/docs/ref/#autocomplete.Completion
16
8
 
17
9
  import {
18
10
  autocompletion,
11
+ completionKeymap,
19
12
  type Completion,
20
13
  type CompletionContext,
21
- completionKeymap,
22
14
  type CompletionResult,
23
15
  } from '@codemirror/autocomplete';
24
16
  import { keymap } from '@codemirror/view';
@@ -51,21 +43,14 @@ export const autocomplete = ({ onSearch }: AutocompleteOptions) => {
51
43
  // TODO(burdon): Optional decoration via addToOptions
52
44
  override: [
53
45
  (context: CompletionContext): CompletionResult | null => {
54
- const word = context.matchBefore(/\w*/);
55
- if (!word || (word.from === word.to && !context.explicit)) {
46
+ const match = context.matchBefore(/\w*/);
47
+ if (!match || (match.from === match.to && !context.explicit)) {
56
48
  return null;
57
49
  }
58
50
 
59
- // TODO(burdon): Option to convert to links?
60
51
  return {
61
- from: word.from,
62
- options: onSearch(word.text.toLowerCase()),
63
- // options: [
64
- // { label: 'apple', type: 'keyword' },
65
- // { label: 'amazon', type: 'keyword' },
66
- // { label: 'hello', type: 'variable', info: '(World)' },
67
- // { label: 'magic', type: 'text', apply: '⠁⭒*.✩.*⭒⠁', detail: 'macro' },
68
- // ],
52
+ from: match.from,
53
+ options: onSearch(match.text.toLowerCase()),
69
54
  };
70
55
  },
71
56
  ],
@@ -11,11 +11,12 @@ import { EditorView, placeholder } from '@codemirror/view';
11
11
  import type { ThemeMode } from '@dxos/react-ui';
12
12
 
13
13
  export type BasicBundleOptions = {
14
+ readonly?: boolean;
14
15
  themeMode?: ThemeMode;
15
16
  placeholder?: string;
16
17
  };
17
18
 
18
- export const basicBundle = ({ themeMode, placeholder: _placeholder }: BasicBundleOptions): Extension[] =>
19
+ export const basicBundle = ({ readonly, themeMode, placeholder: _placeholder }: BasicBundleOptions): Extension[] =>
19
20
  [
20
21
  // TODO(burdon): Compare with minimalSetup.
21
22
  // https://codemirror.net/docs/ref/#codemirror.minimalSetup