@dxos/react-ui-editor 0.3.11-main.4eab977 → 0.3.11-main.4faaf44

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 (163) hide show
  1. package/dist/lib/browser/index.mjs +1134 -1241
  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 -6
  9. package/dist/types/src/components/TextEditor/TextEditor.stories.d.ts.map +1 -1
  10. package/dist/types/src/components/TextEditor/comments.stories.d.ts +26 -0
  11. package/dist/types/src/components/TextEditor/comments.stories.d.ts.map +1 -0
  12. package/dist/types/src/extensions/autocomplete.d.ts.map +1 -1
  13. package/dist/types/src/extensions/automerge/automerge.d.ts.map +1 -1
  14. package/dist/types/src/extensions/automerge/cursor.d.ts +1 -1
  15. package/dist/types/src/extensions/automerge/cursor.d.ts.map +1 -1
  16. package/dist/types/src/extensions/automerge/defs.d.ts +7 -9
  17. package/dist/types/src/extensions/automerge/defs.d.ts.map +1 -1
  18. package/dist/types/src/extensions/automerge/index.d.ts +0 -1
  19. package/dist/types/src/extensions/automerge/index.d.ts.map +1 -1
  20. package/dist/types/src/extensions/automerge/semaphore.d.ts +7 -12
  21. package/dist/types/src/extensions/automerge/semaphore.d.ts.map +1 -1
  22. package/dist/types/src/extensions/automerge/update-automerge.d.ts +2 -2
  23. package/dist/types/src/extensions/awareness.d.ts +1 -1
  24. package/dist/types/src/extensions/awareness.d.ts.map +1 -1
  25. package/dist/types/src/extensions/basic.d.ts +4 -5
  26. package/dist/types/src/extensions/basic.d.ts.map +1 -1
  27. package/dist/types/src/extensions/comments.d.ts +32 -19
  28. package/dist/types/src/extensions/comments.d.ts.map +1 -1
  29. package/dist/types/src/{util → extensions}/cursor.d.ts +10 -2
  30. package/dist/types/src/extensions/cursor.d.ts.map +1 -0
  31. package/dist/types/src/extensions/index.d.ts +2 -7
  32. package/dist/types/src/extensions/index.d.ts.map +1 -1
  33. package/dist/types/src/extensions/markdown/bundle.d.ts +3 -6
  34. package/dist/types/src/extensions/markdown/bundle.d.ts.map +1 -1
  35. package/dist/types/src/extensions/markdown/code.d.ts.map +1 -0
  36. package/dist/types/src/extensions/markdown/heading.d.ts +6 -0
  37. package/dist/types/src/extensions/markdown/heading.d.ts.map +1 -0
  38. package/dist/types/src/extensions/markdown/highlight.d.ts.map +1 -1
  39. package/dist/types/src/extensions/markdown/hr.d.ts.map +1 -0
  40. package/dist/types/src/extensions/markdown/image.d.ts.map +1 -0
  41. package/dist/types/src/extensions/markdown/index.d.ts +7 -0
  42. package/dist/types/src/extensions/markdown/index.d.ts.map +1 -1
  43. package/dist/types/src/extensions/markdown/link.d.ts.map +1 -0
  44. package/dist/types/src/extensions/markdown/table.d.ts.map +1 -0
  45. package/dist/types/src/extensions/markdown/tasklist.d.ts.map +1 -0
  46. package/dist/types/src/extensions/mention.d.ts.map +1 -1
  47. package/dist/types/src/extensions/outliner.d.ts +4 -0
  48. package/dist/types/src/extensions/outliner.d.ts.map +1 -0
  49. package/dist/types/src/hooks/awareness-provider.d.ts +7 -4
  50. package/dist/types/src/hooks/awareness-provider.d.ts.map +1 -1
  51. package/dist/types/src/hooks/defs.d.ts +25 -0
  52. package/dist/types/src/hooks/defs.d.ts.map +1 -0
  53. package/dist/types/src/hooks/index.d.ts +2 -2
  54. package/dist/types/src/hooks/index.d.ts.map +1 -1
  55. package/dist/types/src/hooks/useTextEditor.d.ts +17 -0
  56. package/dist/types/src/hooks/useTextEditor.d.ts.map +1 -0
  57. package/dist/types/src/hooks/useTextModel.d.ts +2 -32
  58. package/dist/types/src/hooks/useTextModel.d.ts.map +1 -1
  59. package/dist/types/src/index.d.ts +1 -0
  60. package/dist/types/src/index.d.ts.map +1 -1
  61. package/dist/types/src/styles/markdown.d.ts +2 -2
  62. package/dist/types/src/styles/markdown.d.ts.map +1 -1
  63. package/dist/types/src/themes/default.d.ts.map +1 -1
  64. package/dist/types/src/util.d.ts +7 -0
  65. package/dist/types/src/util.d.ts.map +1 -0
  66. package/package.json +34 -36
  67. package/src/components/TextEditor/MarkdownEditor.stories.tsx +82 -82
  68. package/src/components/TextEditor/TextEditor.stories.tsx +12 -46
  69. package/src/components/TextEditor/TextEditor.tsx +122 -93
  70. package/src/components/TextEditor/comments.stories.tsx +357 -0
  71. package/src/extensions/autocomplete.ts +6 -3
  72. package/src/extensions/automerge/automerge.ts +40 -46
  73. package/src/extensions/automerge/cursor.ts +2 -1
  74. package/src/extensions/automerge/defs.ts +10 -31
  75. package/src/extensions/automerge/index.ts +0 -1
  76. package/src/extensions/automerge/semaphore.ts +23 -20
  77. package/src/extensions/automerge/update-automerge.ts +2 -2
  78. package/src/extensions/awareness.ts +40 -46
  79. package/src/extensions/basic.ts +22 -17
  80. package/src/extensions/comments.ts +246 -238
  81. package/src/extensions/cursor.ts +50 -0
  82. package/src/extensions/index.ts +2 -7
  83. package/src/extensions/markdown/bundle.ts +20 -30
  84. package/src/extensions/markdown/code.ts +127 -0
  85. package/src/extensions/markdown/heading.ts +59 -0
  86. package/src/extensions/markdown/highlight.ts +9 -23
  87. package/src/extensions/markdown/hr.ts +71 -0
  88. package/src/extensions/{image.ts → markdown/image.ts} +2 -2
  89. package/src/extensions/markdown/index.ts +7 -0
  90. package/src/extensions/{link.ts → markdown/link.ts} +8 -9
  91. package/src/extensions/{table.ts → markdown/table.ts} +2 -2
  92. package/src/extensions/markdown/tasklist.ts +110 -0
  93. package/src/extensions/mention.ts +9 -2
  94. package/src/extensions/outliner.ts +12 -0
  95. package/src/hooks/awareness-provider.ts +24 -20
  96. package/src/hooks/defs.ts +42 -0
  97. package/src/hooks/index.ts +3 -2
  98. package/src/hooks/useTextEditor.ts +29 -0
  99. package/src/hooks/useTextModel.ts +48 -60
  100. package/src/index.ts +1 -0
  101. package/src/styles/markdown.ts +9 -12
  102. package/src/themes/default.ts +15 -50
  103. package/src/util.ts +41 -0
  104. package/dist/types/src/components/TextEditor/codemirror.stories.d.ts +0 -12
  105. package/dist/types/src/components/TextEditor/codemirror.stories.d.ts.map +0 -1
  106. package/dist/types/src/components/TextEditor/yjs.stories.d.ts +0 -12
  107. package/dist/types/src/components/TextEditor/yjs.stories.d.ts.map +0 -1
  108. package/dist/types/src/extensions/code.d.ts.map +0 -1
  109. package/dist/types/src/extensions/hr.d.ts.map +0 -1
  110. package/dist/types/src/extensions/image.d.ts.map +0 -1
  111. package/dist/types/src/extensions/link.d.ts.map +0 -1
  112. package/dist/types/src/extensions/table.d.ts.map +0 -1
  113. package/dist/types/src/extensions/tasklist.d.ts.map +0 -1
  114. package/dist/types/src/extensions/yjs/cursor.d.ts +0 -4
  115. package/dist/types/src/extensions/yjs/cursor.d.ts.map +0 -1
  116. package/dist/types/src/extensions/yjs/index.d.ts +0 -2
  117. package/dist/types/src/extensions/yjs/index.d.ts.map +0 -1
  118. package/dist/types/src/extensions/yjs/yjs.d.ts +0 -4
  119. package/dist/types/src/extensions/yjs/yjs.d.ts.map +0 -1
  120. package/dist/types/src/extensions/yjs/yjs.test.d.ts +0 -2
  121. package/dist/types/src/extensions/yjs/yjs.test.d.ts.map +0 -1
  122. package/dist/types/src/hooks/automerge.d.ts +0 -3
  123. package/dist/types/src/hooks/automerge.d.ts.map +0 -1
  124. package/dist/types/src/hooks/yjs.d.ts +0 -27
  125. package/dist/types/src/hooks/yjs.d.ts.map +0 -1
  126. package/dist/types/src/testing/index.d.ts +0 -3
  127. package/dist/types/src/testing/index.d.ts.map +0 -1
  128. package/dist/types/src/testing/proto/gen/schema.d.ts +0 -15
  129. package/dist/types/src/testing/proto/gen/schema.d.ts.map +0 -1
  130. package/dist/types/src/testing/proto/index.d.ts +0 -2
  131. package/dist/types/src/testing/proto/index.d.ts.map +0 -1
  132. package/dist/types/src/testing/replicator.d.ts +0 -45
  133. package/dist/types/src/testing/replicator.d.ts.map +0 -1
  134. package/dist/types/src/util/cursor.d.ts.map +0 -1
  135. package/dist/types/src/util/index.d.ts +0 -3
  136. package/dist/types/src/util/index.d.ts.map +0 -1
  137. package/dist/types/src/util/util.d.ts +0 -5
  138. package/dist/types/src/util/util.d.ts.map +0 -1
  139. package/src/components/TextEditor/codemirror.stories.ts +0 -115
  140. package/src/components/TextEditor/yjs.stories.tsx +0 -56
  141. package/src/extensions/code.ts +0 -98
  142. package/src/extensions/hr.ts +0 -73
  143. package/src/extensions/tasklist.ts +0 -119
  144. package/src/extensions/yjs/cursor.ts +0 -21
  145. package/src/extensions/yjs/index.ts +0 -5
  146. package/src/extensions/yjs/yjs.test.ts +0 -35
  147. package/src/extensions/yjs/yjs.ts +0 -16
  148. package/src/hooks/automerge.ts +0 -52
  149. package/src/hooks/yjs.ts +0 -178
  150. package/src/testing/index.ts +0 -6
  151. package/src/testing/proto/gen/schema.ts +0 -49
  152. package/src/testing/proto/index.ts +0 -5
  153. package/src/testing/proto/schema.proto +0 -15
  154. package/src/testing/replicator.ts +0 -184
  155. package/src/util/cursor.ts +0 -29
  156. package/src/util/index.ts +0 -6
  157. package/src/util/util.ts +0 -18
  158. /package/dist/types/src/extensions/{code.d.ts → markdown/code.d.ts} +0 -0
  159. /package/dist/types/src/extensions/{hr.d.ts → markdown/hr.d.ts} +0 -0
  160. /package/dist/types/src/extensions/{image.d.ts → markdown/image.d.ts} +0 -0
  161. /package/dist/types/src/extensions/{link.d.ts → markdown/link.d.ts} +0 -0
  162. /package/dist/types/src/extensions/{table.d.ts → markdown/table.d.ts} +0 -0
  163. /package/dist/types/src/extensions/{tasklist.d.ts → markdown/tasklist.d.ts} +0 -0
@@ -1,15 +0,0 @@
1
- /**
2
- * @generated @dxos/echo-typegen src/testing/proto/schema.proto
3
- **/
4
- import * as dxos_echo_schema from "@dxos/echo-schema";
5
- export declare const types: dxos_echo_schema.TypeCollection;
6
- export type EditorDocumentProps = {
7
- content: dxos_echo_schema.Text;
8
- };
9
- export declare class EditorDocument extends dxos_echo_schema.TypedObject<EditorDocumentProps> {
10
- static readonly schema: dxos_echo_schema.Schema;
11
- static filter(filter?: Partial<EditorDocumentProps> | dxos_echo_schema.OperatorFilter<EditorDocument>): dxos_echo_schema.Filter<EditorDocument>;
12
- constructor(initValues?: Partial<EditorDocumentProps>, opts?: dxos_echo_schema.TypedObjectOptions);
13
- content: dxos_echo_schema.Text;
14
- }
15
- //# sourceMappingURL=schema.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../../../src/testing/proto/gen/schema.ts"],"names":[],"mappings":"AAAA;;IAEI;AAEJ,OAAO,KAAK,gBAAgB,MAAM,mBAAmB,CAAC;AAEtD,eAAO,MAAM,KAAK,iCAAwC,CAAC;AAE3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;CAChC,CAAC;AAEF,qBAAa,cAAe,SAAQ,gBAAgB,CAAC,WAAW,CAAC,mBAAmB,CAAC;IACnF,gBAAwB,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAExD,MAAM,CAAC,MAAM,CACX,MAAM,CAAC,EACH,OAAO,CAAC,mBAAmB,CAAC,GAC5B,gBAAgB,CAAC,cAAc,CAAC,cAAc,CAAC,GAClD,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC;gBAQxC,UAAU,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,EACzC,IAAI,CAAC,EAAE,gBAAgB,CAAC,kBAAkB;IAIpC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;CACxC"}
@@ -1,2 +0,0 @@
1
- export * from './gen/schema';
2
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/testing/proto/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC"}
@@ -1,45 +0,0 @@
1
- import { Observable } from 'lib0/observable';
2
- import * as YP from 'y-protocols/awareness';
3
- import { Doc } from 'yjs';
4
- import { Event } from '@dxos/async';
5
- import { TextKind } from '@dxos/protocols/proto/dxos/echo/model/text';
6
- import { type EditorModel } from '../hooks';
7
- type Awareness = YP.Awareness;
8
- /**
9
- * Yjs awareness provider in-memory.
10
- */
11
- export declare class AwarenessProvider extends Observable<any> {
12
- private readonly _remoteUpdate;
13
- private readonly _awareness;
14
- private readonly _doc;
15
- constructor({ update, doc, awareness }: {
16
- update: Event<Uint8Array>;
17
- doc: Doc;
18
- awareness?: Awareness;
19
- });
20
- get awareness(): Awareness;
21
- private _handleDocUpdate;
22
- private _handleAwarenessUpdate;
23
- private _handleRemoteUpdate;
24
- private _readMessage;
25
- private _handleBeforeUnload;
26
- }
27
- /**
28
- * This mocks the replication across the swarm.
29
- */
30
- export declare class Replicator {
31
- private readonly _kind;
32
- private readonly _update;
33
- private _peers;
34
- constructor(_kind: TextKind);
35
- setPeers(peers: EditorModel[]): void;
36
- createPeer: (id: string, doc?: Doc) => EditorModel;
37
- }
38
- export type UseYjsModelOptions = {
39
- replicator: Replicator;
40
- id: string;
41
- doc?: Doc;
42
- };
43
- export declare const useYjsModel: ({ replicator, id, doc }: UseYjsModelOptions) => EditorModel;
44
- export {};
45
- //# sourceMappingURL=replicator.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../src/testing/replicator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAE,MAAM,4CAA4C,CAAC;AAEtE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,KAAK,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC;AAM9B;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,UAAU,CAAC,GAAG,CAAC;IACpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;gBAEf,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE;QAAE,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;QAAC,GAAG,EAAE,GAAG,CAAC;QAAC,SAAS,CAAC,EAAE,SAAS,CAAA;KAAE;IA4BtG,IAAI,SAAS,IAAI,SAAS,CAEzB;IAED,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,YAAY;IA0CpB,OAAO,CAAC,mBAAmB;CAG5B;AAED;;GAEG;AACH,qBAAa,UAAU;IAIT,OAAO,CAAC,QAAQ,CAAC,KAAK;IAHlC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IACnD,OAAO,CAAC,MAAM,CAAqB;gBAEN,KAAK,EAAE,QAAQ;IAE5C,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE;IAI7B,UAAU,OAAQ,MAAM,QAAO,GAAG,KAAe,WAAW,CAoB1D;CACH;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,WAAW,4BAA6B,kBAAkB,KAAG,WAEzE,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../../../src/util/cursor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C;;;;;;;;;GASG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,GAAG,MAAM,CAAC;IAC/D,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CACpC;AAOD,eAAO,MAAM,eAAe,yCAE1B,CAAC"}
@@ -1,3 +0,0 @@
1
- export * from './cursor';
2
- export * from './util';
3
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/util/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC"}
@@ -1,5 +0,0 @@
1
- /**
2
- * CodeMirror callbacks swallow errors so wrap handlers.
3
- */
4
- export declare const callbackWrapper: <T extends Function>(fn: T) => T;
5
- //# sourceMappingURL=util.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/util/util.ts"],"names":[],"mappings":"AAMA;;GAEG;AAEH,eAAO,MAAM,eAAe,kCAOR,CAAC"}
@@ -1,115 +0,0 @@
1
- //
2
- // Copyright 2023 DXOS.org
3
- //
4
-
5
- import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
6
- import { EditorState } from '@codemirror/state';
7
- import { EditorView } from '@codemirror/view';
8
- import { type StoryObj } from '@storybook/html';
9
- import { basicSetup } from 'codemirror';
10
- import { yCollab } from 'y-codemirror.next';
11
-
12
- import { EventSubscriptions } from '@dxos/async';
13
- import { generateName } from '@dxos/display-name';
14
- import { Client, type PublicKey } from '@dxos/react-client';
15
- import { type Space, TextObject } from '@dxos/react-client/echo';
16
- import { type Identity } from '@dxos/react-client/halo';
17
- import { joinCommonSpace, TestBuilder, textGenerator } from '@dxos/react-client/testing';
18
- import { YText } from '@dxos/text-model';
19
-
20
- import { YAwarenessProvider } from '../../hooks';
21
- import { cursorColor } from '../../styles';
22
- import { EditorDocument, types as schema } from '../../testing';
23
-
24
- export default {
25
- title: 'CodeMirror',
26
- };
27
-
28
- const testBuilder = new TestBuilder();
29
- const views: Record<number, EditorView> = {};
30
- const subscriptions = new EventSubscriptions();
31
-
32
- const updateEditor = async (id: number, editor: HTMLDivElement, identity: Identity, space: Space, text: TextObject) => {
33
- const doc = text.doc;
34
- const ytext = text.content;
35
- if (!(ytext instanceof YText) || !doc) {
36
- return;
37
- }
38
-
39
- const { awareness } = new YAwarenessProvider({ space, doc, channel: `yjs.awareness.${text.id}` });
40
- awareness.setLocalStateField('user', {
41
- name: identity.profile?.displayName ?? generateName(identity.identityKey.toHex()),
42
- // TODO(wittjosiah): Pick colours from theme based on identity key.
43
- color: cursorColor.color,
44
- colorLight: cursorColor.light,
45
- });
46
-
47
- const state = EditorState.create({
48
- doc: ytext.toString(),
49
- extensions: [basicSetup, markdown({ base: markdownLanguage }), yCollab(ytext, awareness)],
50
- });
51
-
52
- const view = views[id];
53
- if (view) {
54
- view.setState(state);
55
- } else {
56
- views[id] = new EditorView({ state, parent: editor });
57
- }
58
-
59
- if (id === 0) {
60
- subscriptions.clear();
61
- subscriptions.add(textGenerator({ text: ytext }));
62
- }
63
- };
64
-
65
- const setupEditor = async (id: number, client: Client, spaceKey: PublicKey, editor: HTMLDivElement) => {
66
- const space = await client.spaces.get(spaceKey)!;
67
- const query = space.db.query(EditorDocument.filter());
68
- query.subscribe(({ objects }) => {
69
- const text = objects[0]?.content;
70
- void (text && updateEditor(id, editor, client.halo.identity.get()!, space, text));
71
- });
72
-
73
- const text = query.objects[0]?.content;
74
- void (text && updateEditor(id, editor, client.halo.identity.get()!, space, text));
75
- };
76
-
77
- const setupSpace = async (count: number) => {
78
- const clients = [...Array(count)].map(() => new Client({ services: testBuilder.createLocal() }));
79
- await Promise.all(clients.map((client) => client.initialize()));
80
- await Promise.all(clients.map((client) => client.halo.createIdentity()));
81
- clients.map((client) => client.spaces.addSchema(schema));
82
-
83
- const space = await clients[0].spaces.create();
84
- const text = new TextObject('Hello, Storybook!');
85
- const document = new EditorDocument({ content: text });
86
- await space.db.add(document);
87
-
88
- await joinCommonSpace(clients, space.key);
89
-
90
- return { clients, spaceKey: space.key };
91
- };
92
-
93
- const count = 2;
94
-
95
- export const Default: StoryObj<{ id: number; client: Client; spaceKey: PublicKey }> = {
96
- render: ({ id, client, spaceKey }) => {
97
- const editor = document.createElement('div');
98
- editor.setAttribute('style', 'min-width: 0; flex: 1; padding: 1rem;');
99
- void setupEditor(id, client, spaceKey, editor);
100
- return editor;
101
- },
102
- decorators: [
103
- (story) => {
104
- const container = document.createElement('div');
105
- container.setAttribute('style', 'display: flex; justify-content: space-evenly');
106
- void setupSpace(count).then(({ clients, spaceKey }) => {
107
- clients.forEach((client, id) => {
108
- // TODO(wittjosiah): According to the docs these types should be compatible.
109
- container.appendChild(story({ args: { id, client, spaceKey } }) as HTMLElement);
110
- });
111
- });
112
- return container;
113
- },
114
- ],
115
- };
@@ -1,56 +0,0 @@
1
- //
2
- // Copyright 2023 DXOS.org
3
- //
4
-
5
- import '@dxosTheme';
6
-
7
- import React, { useState } from 'react';
8
-
9
- import { PublicKey } from '@dxos/react-client';
10
- import { TextKind } from '@dxos/react-client/echo';
11
- import { ClientRepeater, textGenerator, useDataGenerator } from '@dxos/react-client/testing';
12
- import { useId, Input } from '@dxos/react-ui';
13
- import { withTheme } from '@dxos/storybook-utils';
14
-
15
- import { MarkdownEditor } from './TextEditor';
16
- import { Replicator, useYjsModel } from '../../testing';
17
-
18
- export default {
19
- title: 'react-ui-editor/YJS',
20
- component: MarkdownEditor,
21
- decorators: [withTheme],
22
- };
23
-
24
- const replicator = new Replicator(TextKind.PLAIN);
25
-
26
- const Story = () => {
27
- const [generate, setGenerate] = useState(false);
28
- const generateId = useId('generate');
29
-
30
- const [id] = useState(PublicKey.random().toHex());
31
- const model = useYjsModel({ id, replicator });
32
-
33
- useDataGenerator({
34
- generator: generate ? textGenerator : undefined,
35
- options: { text: typeof model?.content !== 'string' ? (model?.content as any) : undefined },
36
- });
37
-
38
- return (
39
- <main className='flex flex-col flex-1 p-4 gap-4'>
40
- <div id={generateId} className='flex gap-2'>
41
- <Input.Root>
42
- <Input.Checkbox checked={generate} onCheckedChange={(checked) => setGenerate(!!checked)} />
43
- <Input.Label>Start</Input.Label>
44
- </Input.Root>
45
- </div>
46
- <div className='border'>
47
- <MarkdownEditor model={model} />
48
- </div>
49
- </main>
50
- );
51
- };
52
-
53
- export const Default = {
54
- // TODO(wittjosiah): Decorator for doing this without clients being initialized?
55
- render: () => <ClientRepeater count={2} Component={Story} />,
56
- };
@@ -1,98 +0,0 @@
1
- //
2
- // Copyright 2023 DXOS.org
3
- //
4
-
5
- import { type Range } from '@codemirror/state';
6
- import {
7
- ViewPlugin,
8
- type DecorationSet,
9
- EditorView,
10
- type ViewUpdate,
11
- Decoration,
12
- type BlockInfo,
13
- } from '@codemirror/view';
14
-
15
- import { mx } from '@dxos/react-ui-theme';
16
-
17
- import { getToken } from '../styles';
18
-
19
- const CODE_REGEX = /```[\s\S]*?```/gs;
20
-
21
- // TODO(burdon): Reconcile with theme.
22
- const styles = EditorView.baseTheme({
23
- '& .cm-codeblock': {
24
- fontFamily: getToken('fontFamily.mono', []).join(','),
25
- },
26
- '&light [aria-readonly="true"] .cm-codeblock': {
27
- background: getToken('extend.colors.neutral.50'),
28
- },
29
- '&dark [aria-readonly="true"] .cm-codeblock': {
30
- background: getToken('extend.colors.neutral.850'),
31
- },
32
- '& [aria-readonly="true"] .cm-codeblock': {
33
- display: 'block',
34
- paddingInline: '4px !important',
35
- },
36
- '& [aria-readonly="true"] .cm-codeblock-first': {
37
- paddingTop: '4px !important',
38
- borderTopLeftRadius: '4px',
39
- borderTopRightRadius: '4px',
40
- },
41
- '& [aria-readonly="true"] .cm-codeblock-last': {
42
- paddingBottom: '4px !important',
43
- borderBottomLeftRadius: '4px',
44
- borderBottomRightRadius: '4px',
45
- },
46
- });
47
-
48
- // TODO(burdon): Start from EditorView.lineBlockAt(pos).
49
- const getLineRange = (lines: BlockInfo[], from: number, to: number) => {
50
- const start = lines.findIndex((line) => line.from >= from);
51
- const end = lines.findIndex((line) => line.to >= to);
52
- return [start, end];
53
- };
54
-
55
- export const code = () => {
56
- const getDecorations = (view: EditorView) => {
57
- const decorations: Range<Decoration>[] = [];
58
- if (view.state.readOnly) {
59
- const text = view.state.doc.sliceString(0);
60
- const matches = text.matchAll(CODE_REGEX);
61
- const blocks = view.viewportLineBlocks;
62
- for (const match of matches) {
63
- const range = getLineRange(blocks, match.index!, match.index! + match[0].length);
64
- for (let i = range[0]; i <= range[1]; i++) {
65
- const block = blocks[i];
66
- decorations.push(
67
- Decoration.line({
68
- class: mx('cm-codeblock', i === range[0] && 'cm-codeblock-first', i === range[1] && 'cm-codeblock-last'),
69
- }).range(block.from),
70
- );
71
- }
72
- }
73
- }
74
-
75
- return Decoration.set(decorations);
76
- };
77
-
78
- return [
79
- ViewPlugin.fromClass(
80
- class {
81
- decorations: DecorationSet;
82
- constructor(view: EditorView) {
83
- this.decorations = getDecorations(view);
84
- }
85
-
86
- update(update: ViewUpdate) {
87
- if (update.docChanged || update.viewportChanged) {
88
- this.decorations = getDecorations(update.view);
89
- }
90
- }
91
- },
92
- {
93
- decorations: (value) => value.decorations,
94
- },
95
- ),
96
- styles,
97
- ];
98
- };
@@ -1,73 +0,0 @@
1
- //
2
- // Copyright 2023 DXOS.org
3
- //
4
-
5
- import {
6
- Decoration,
7
- type DecorationSet,
8
- EditorView,
9
- MatchDecorator,
10
- ViewPlugin,
11
- type ViewUpdate,
12
- WidgetType,
13
- } from '@codemirror/view';
14
-
15
- import { getToken } from '../styles';
16
-
17
- // TODO(burdon): Reconcile with theme.
18
- const styles = EditorView.baseTheme({
19
- '& .cm-hr': {
20
- // TODO(burdon): ???
21
- // Note that block-level decorations should not have vertical margins,
22
- borderBottom: `1px solid ${getToken('extend.colors.neutral.200')}`,
23
- },
24
- });
25
-
26
- class HorizontalRuleWidget extends WidgetType {
27
- constructor(readonly _pos: number) {
28
- super();
29
- }
30
-
31
- override eq(other: WidgetType) {
32
- return this._pos === (other as any as HorizontalRuleWidget)._pos;
33
- }
34
-
35
- toDOM(view: EditorView) {
36
- // TODO(burdon): Create <hr> element? Does this clash with markdown parser?
37
- const el = document.createElement('div');
38
- el.className = 'cm-hr';
39
- return el;
40
- }
41
- }
42
-
43
- const placeholderMatcher = new MatchDecorator({
44
- regexp: /^---$/g,
45
- decoration: (match, view, pos) =>
46
- Decoration.replace({
47
- widget: new HorizontalRuleWidget(pos),
48
- }),
49
- });
50
-
51
- export const hr = () => [
52
- styles,
53
- ViewPlugin.fromClass(
54
- class {
55
- rules: DecorationSet;
56
- constructor(view: EditorView) {
57
- this.rules = placeholderMatcher.createDeco(view);
58
- }
59
-
60
- update(update: ViewUpdate) {
61
- this.rules = placeholderMatcher.updateDeco(update, this.rules);
62
- }
63
- },
64
- {
65
- decorations: (instance) => instance.rules,
66
- // TODO(burdon): Is this really atomic (cursor can move into ---).
67
- provide: (plugin) =>
68
- EditorView.atomicRanges.of((view) => {
69
- return view.plugin(plugin)?.rules || Decoration.none;
70
- }),
71
- },
72
- ),
73
- ];
@@ -1,119 +0,0 @@
1
- //
2
- // Copyright 2023 DXOS.org
3
- //
4
-
5
- import {
6
- EditorView,
7
- Decoration,
8
- WidgetType,
9
- MatchDecorator,
10
- ViewPlugin,
11
- type DecorationSet,
12
- type ViewUpdate,
13
- } from '@codemirror/view';
14
-
15
- // TODO(burdon): Reconcile with theme.
16
- const styles = EditorView.baseTheme({
17
- '& .cm-task-item': {
18
- paddingLeft: '4px',
19
- paddingRight: '8px',
20
- },
21
- });
22
-
23
- class CheckboxWidget extends WidgetType {
24
- constructor(
25
- private _checked: boolean,
26
- private readonly _indent: number,
27
- private readonly _onCheck?: (check: boolean) => void,
28
- ) {
29
- super();
30
- }
31
-
32
- override eq(other: CheckboxWidget) {
33
- return this._checked === other._checked && this._indent === other._indent;
34
- }
35
-
36
- toDOM(view: EditorView) {
37
- const wrap = document.createElement('span');
38
- wrap.className = 'cm-task-item';
39
- wrap.setAttribute('aria-hidden', 'true');
40
- wrap.style.setProperty('margin-left', this._indent * 24 + 'px');
41
-
42
- const input = wrap.appendChild(document.createElement('input'));
43
- input.type = 'checkbox';
44
- input.checked = this._checked;
45
- if (!this._onCheck) {
46
- input.setAttribute('disabled', 'true');
47
- }
48
- if (this._onCheck) {
49
- input.onchange = (event: Event) => {
50
- this._onCheck?.((event.target as any).checked);
51
- return true;
52
- };
53
- }
54
-
55
- return wrap;
56
- }
57
-
58
- override ignoreEvent() {
59
- return false;
60
- }
61
- }
62
-
63
- export type TasklistOptions = {};
64
-
65
- export const tasklist = (options: TasklistOptions = {}) => {
66
- // TODO(burdon): Matcher isn't as precise as syntax tree.
67
- // Allows for indents to be greater than AST would allow.
68
- const taskMatcher = new MatchDecorator({
69
- regexp: /^(\s*)- \[([ xX])\]\s/g,
70
- decoration: (match, view, pos) => {
71
- const indent = Math.floor(match[1].length / 2);
72
- const checked = match[2] === 'x' || match[2] === 'X';
73
- return Decoration.replace({
74
- widget: new CheckboxWidget(
75
- checked,
76
- indent,
77
- view.state.readOnly
78
- ? undefined
79
- : (checked) => {
80
- const idx = pos + match[0].indexOf('[') + 1;
81
- view.dispatch({
82
- changes: {
83
- from: idx,
84
- to: idx + 1,
85
- insert: checked ? 'x' : ' ',
86
- },
87
- // TODO(burdon): Restore cursor position? More useful to move to end of line (can indent).
88
- selection: {
89
- anchor: idx + 3,
90
- },
91
- });
92
- },
93
- ),
94
- });
95
- },
96
- });
97
-
98
- const tasks = ViewPlugin.fromClass(
99
- class {
100
- tasks: DecorationSet;
101
- constructor(view: EditorView) {
102
- this.tasks = taskMatcher.createDeco(view);
103
- }
104
-
105
- update(update: ViewUpdate) {
106
- this.tasks = taskMatcher.updateDeco(update, this.tasks);
107
- }
108
- },
109
- {
110
- decorations: (value) => value.tasks,
111
- provide: (plugin) =>
112
- EditorView.atomicRanges.of((view) => {
113
- return view.plugin(plugin)?.tasks || Decoration.none;
114
- }),
115
- },
116
- );
117
-
118
- return [tasks, styles];
119
- };
@@ -1,21 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- import * as Y from 'yjs';
6
-
7
- import { arrayToString, stringToArray } from '@dxos/util';
8
-
9
- import { type CursorConverter } from '../../util';
10
-
11
- export const cursorConverter = (text: Y.Text): CursorConverter => ({
12
- toCursor: (index, assoc) => {
13
- return arrayToString(Y.encodeRelativePosition(Y.createRelativePositionFromTypeIndex(text, index, assoc)));
14
- },
15
- fromCursor: (cursor) => {
16
- return (
17
- Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(stringToArray(cursor)), text.doc!)?.index ??
18
- 0
19
- );
20
- },
21
- });
@@ -1,5 +0,0 @@
1
- //
2
- // Copyright 2023 DXOS.org
3
- //
4
-
5
- export * from './yjs';
@@ -1,35 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- import { expect } from 'chai';
6
- import * as Y from 'yjs';
7
-
8
- import { TextObject } from '@dxos/echo-schema';
9
- import { describe, test } from '@dxos/test';
10
- import { type YText } from '@dxos/text-model';
11
-
12
- describe('YJS', () => {
13
- // https://docs.yjs.dev/api/shared-types/y.text
14
- // https://github.com/yjs/yjs?tab=readme-ov-file#relative-positions
15
- test('absolute position', () => {
16
- const obj = new TextObject('hello world');
17
- const index = obj.text.indexOf('world');
18
- const relPos = Y.encodeRelativePosition(Y.createRelativePositionFromTypeIndex(obj.content as YText, index));
19
-
20
- {
21
- const cursor = Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(relPos), obj.doc!);
22
- expect(cursor!.index).to.equal(index);
23
- expect(obj.text.substring(cursor!.index)).to.equal('world');
24
- }
25
-
26
- (obj.content as YText).insert(index, 'cruel ');
27
- expect(obj.text).to.equal('hello cruel world');
28
-
29
- {
30
- const cursor = Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(relPos), obj.doc!);
31
- expect(cursor!.index).not.to.equal(index);
32
- expect(obj.text.substring(cursor!.index)).to.equal('world');
33
- }
34
- });
35
- });
@@ -1,16 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- import { yCollab } from 'y-codemirror.next';
6
- import type * as YP from 'y-protocols/awareness';
7
-
8
- import type { YText } from '@dxos/text-model';
9
-
10
- import { cursorConverter } from './cursor';
11
- import { CursorConverter } from '../../util';
12
-
13
- export const yjs = (content: YText, awareness?: YP.Awareness) => [
14
- CursorConverter.of(cursorConverter(content)),
15
- yCollab(content, awareness),
16
- ];