@dxos/react-ui-editor 0.3.11-main.ec7a2b3 → 0.3.11-main.ee2b64c

package/src/hooks/useTextModel.ts

@@ -2,55 +2,19 @@
 // Copyright 2023 DXOS.org
 //
 
-import { StateField, type Extension } from '@codemirror/state';
-import { useEffect, useState } from 'react';
-import type * as YP from 'y-protocols/awareness';
+import get from 'lodash.get';
+import { type Dispatch, type SetStateAction, useEffect, useState } from 'react';
 
-import { isAutomergeObject, type DocAccessor, type Space, type TextObject } from '@dxos/react-client/echo';
+import { generateName } from '@dxos/display-name';
+import { type AutomergeTextCompat, getRawDoc } from '@dxos/echo-schema';
+import { invariant } from '@dxos/invariant';
+import { isAutomergeObject, type Space, type TextObject } from '@dxos/react-client/echo';
 import { type Identity } from '@dxos/react-client/halo';
-import type { YText, YXmlFragment } from '@dxos/text-model';
 
-import { createAutomergeModel } from './automerge';
-import { createYjsModel } from './yjs';
-
-// TODO(burdon): Factor out defs.
-
-/**
- * State field makes the model available to other extensions.
- */
-export const modelState = StateField.define<EditorModel | undefined>({
-  create: () => undefined,
-  update: (model) => model,
-});
-
-export type Range = {
-  from: number;
-  to: number;
-};
-
-export type CommentRange = {
-  id: string;
-  cursor: string; // TODO(burdon): Rename range.
-};
-
-// TODO(wittjosiah): Factor out to common package? @dxos/react-client?
-export type EditorModel = {
-  id: string;
-  text: () => string;
-  extension?: Extension;
-
-  // TODO(burdon): Remove.
-  content: string | YText | YXmlFragment | DocAccessor;
-
-  // TODO(burdon): Move into extension.
-  awareness?: YP.Awareness;
-
-  // TODO(burdon): Remove.
-  peer?: {
-    id: string;
-    name?: string;
-  };
-};
+import { SpaceAwarenessProvider } from './awareness-provider';
+import { type EditorModel, modelState } from './defs';
+import { automerge, awareness } from '../extensions';
+import { cursorColor } from '../styles';
 
 // TODO(burdon): Remove space/identity dependency. Define interface for the framework re content and presence.
 export type UseTextModelProps = {
@@ -59,8 +23,6 @@ export type UseTextModelProps = {
   text?: TextObject;
 };
 
-// TODO(burdon): Remove YJS/Automerge deps (from UI component -- create abstraction; incl. all ECHO/Space deps).
-// TODO(wittjosiah): Factor out to common package? @dxos/react-client?
 export const useTextModel = (props: UseTextModelProps): EditorModel | undefined => {
   const { identity, space, text } = props;
   const [model, setModel] = useState<EditorModel | undefined>();
@@ -68,13 +30,61 @@ export const useTextModel = (props: UseTextModelProps): EditorModel | undefined
   return model;
 };
 
-const createModel = (props: UseTextModelProps) => {
-  const { text } = props;
-  if (isAutomergeObject(text)) {
-    return createAutomergeModel(props);
-  } else if (text?.doc) {
-    return createYjsModel(props);
-  } else {
-    return undefined;
+/**
+ * For use primarily in stories & tests so the dependence on TextObject can be avoided.
+ * @param id
+ * @param defaultContent
+ */
+export const useInMemoryTextModel = ({
+  id,
+  defaultContent,
+}: {
+  id: string;
+  defaultContent?: string;
+}): EditorModel & { setContent: Dispatch<SetStateAction<string>> } => {
+  const [content, setContent] = useState(defaultContent ?? '');
+  return { id, content, setContent, text: () => content };
+};
+
+const createModel = ({ space, identity, text }: UseTextModelProps) => {
+  invariant(isAutomergeObject(text));
+  const obj = text as any as AutomergeTextCompat;
+  const doc = getRawDoc(obj, [obj.field]);
+
+  const awarenessProvider =
+    space &&
+    new SpaceAwarenessProvider({
+      space,
+      channel: `automerge.awareness.${obj.id}`,
+      info: {
+        displayName: identity ? identity.profile?.displayName ?? generateName(identity.identityKey.toHex()) : undefined,
+        color: cursorColor.color,
+        lightColor: cursorColor.light,
+      },
+      peerId: identity?.identityKey.toHex() ?? 'Anonymous',
+    });
+
+  const extensions = [
+    //
+    modelState.init(() => model),
+    automerge({ handle: doc.handle, path: doc.path }),
+  ];
+  if (awarenessProvider) {
+    extensions.push(awareness(awarenessProvider));
   }
+
+  const model: EditorModel = {
+    id: obj.id,
+    content: doc,
+    text: () => get(doc.handle.docSync(), doc.path),
+    extension: extensions,
+    peer: identity
+      ? {
+          id: identity.identityKey.toHex(),
+          name: identity.profile?.displayName,
+        }
+      : undefined,
+  };
+
+  return model;
 };

package/src/index.ts

@@ -5,7 +5,7 @@
 export { TextKind } from '@dxos/protocols/proto/dxos/echo/model/text';
 export { Doc, YText, YXmlFragment } from '@dxos/text-model';
 export { type Extension } from '@codemirror/state';
-export { type EditorView } from '@codemirror/view';
+export { type EditorView, keymap } from '@codemirror/view';
 
 export * from './components';
 export * from './extensions';

package/src/styles/markdown.ts

@@ -8,18 +8,17 @@ export type HeadingLevel = 1 | 2 | 3 | 4 | 5 | 6;
 
 // TODO(burdon): Better way to align vertically than negative margin? Font-specific?
 // https://tailwindcss.com/docs/font-weight
-export const headings: Record<HeadingLevel, string[]> = {
-  1: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-4xl', '-ml-[10px]'],
-  2: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-3xl', '-ml-[8px]'],
-  3: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-2xl', '-ml-[7px]'],
-  4: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-xl', '-ml-[6px]'],
-  5: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-lg', '-ml-[5px]'],
-  6: ['mbs-4 mbe-2 font-medium text-inherit no-underline', '-ml-[4px]'],
+export const headings: Record<HeadingLevel, string> = {
+  1: 'mbs-4 mbe-2 font-medium text-inherit no-underline text-4xl',
+  2: 'mbs-4 mbe-2 font-medium text-inherit no-underline text-3xl',
+  3: 'mbs-4 mbe-2 font-medium text-inherit no-underline text-2xl',
+  4: 'mbs-4 mbe-2 font-medium text-inherit no-underline text-xl',
+  5: 'mbs-4 mbe-2 font-medium text-inherit no-underline text-lg',
+  6: 'mbs-4 mbe-2 font-medium text-inherit no-underline',
 };
 
-export const heading = (level: HeadingLevel, readonly?: boolean) => {
-  const [style, offset] = headings[level];
-  return mx(style, readonly && offset);
+export const heading = (level: HeadingLevel) => {
+  return headings[level];
 };
 
 export const text = 'text-neutral-800 dark:text-neutral-200';

package/src/themes/default.ts

@@ -49,9 +49,11 @@ export const defaultTheme: ThemeStyles = {
   '&.cm-focused': {
     outline: 'none',
   },
+
   '.cm-scroller': {
-    overflow: 'visible',
+    // overflow: 'visible',
     fontFamily: get(tokens, 'fontFamily.mono', []).join(','),
+    lineHeight: 1.4,
   },
 
   '.cm-content': {
@@ -60,11 +62,11 @@ export const defaultTheme: ThemeStyles = {
     fontSize: '16px',
   },
   '&light .cm-content': {
-    color: get(tokens, 'extend.colors.neutral.900', 'black'),
+    color: get(tokens, 'extend.semanticColors.base.fg.light', 'black'),
     caretColor: 'black',
   },
   '&dark .cm-content': {
-    color: get(tokens, 'extend.colors.neutral.100', 'white'),
+    color: get(tokens, 'extend.semanticColors.base.fg.dark', 'white'),
     caretColor: 'white',
   },
 
@@ -77,8 +79,11 @@ export const defaultTheme: ThemeStyles = {
   '&dark .cm-cursor, &dark .cm-dropCursor': {
     borderLeft: '2px solid white',
   },
-  '.cm-placeholder': {
-    fontWeight: 100,
+  '&light .cm-placeholder': {
+    color: get(tokens, 'extend.semanticColors.description.light', 'rgba(0,0,0,.2)'),
+  },
+  '&dark .cm-placeholder': {
+    color: get(tokens, 'extend.semanticColors.description.dark', 'rgba(255,255,255,.2)'),
   },
 
   //
@@ -86,11 +91,9 @@ export const defaultTheme: ThemeStyles = {
   //
   '.cm-line': {
     paddingInline: 0,
-    // TODO(burdon): Other values leave gaps between lines when highlighted.
-    // lineHeight: 'normal',
   },
   '.cm-activeLine': {
-    background: 'inherit',
+    background: 'transparent',
   },
 
   //

package/src/util.ts

@@ -2,17 +2,40 @@
 // Copyright 2024 DXOS.org
 //
 
+import type { Transaction } from '@codemirror/state';
+
 import { log } from '@dxos/log';
 
 /**
  * CodeMirror callbacks swallow errors so wrap handlers.
  */
-// TODO(burdon): Figure out how to systematize this.
+// TODO(burdon): EditorView.exceptionSink should catch errors.
 export const callbackWrapper = <T extends Function>(fn: T): T =>
   ((...args: any[]) => {
     try {
       return fn(...args);
-    } catch (error) {
-      log.catch(error);
+    } catch (err) {
+      log.catch(err);
     }
   }) as unknown as T;
+
+export const logChanges = (trs: readonly Transaction[]) => {
+  const changes = trs
+    .flatMap((tr) => {
+      if (tr.changes.empty) {
+        return undefined;
+      }
+
+      const changes: any[] = [];
+      tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) =>
+        changes.push(JSON.stringify({ fromA, toA, fromB, toB, inserted: inserted.toString() })),
+      );
+
+      return changes;
+    })
+    .filter(Boolean);
+
+  if (changes.length) {
+    console.log('changes', changes);
+  }
+};

package/dist/types/src/components/TextEditor/codemirror.stories.d.ts

@@ -1,12 +0,0 @@
-import { type StoryObj } from '@storybook/html';
-import { Client, type PublicKey } from '@dxos/react-client';
-declare const _default: {
-    title: string;
-};
-export default _default;
-export declare const Default: StoryObj<{
-    id: number;
-    client: Client;
-    spaceKey: PublicKey;
-}>;
-//# sourceMappingURL=codemirror.stories.d.ts.map

package/dist/types/src/components/TextEditor/codemirror.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"codemirror.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/TextEditor/codemirror.stories.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAMhD,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;;;;AAU5D,wBAEE;AAqEF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,SAAS,CAAA;CAAE,CAoBjF,CAAC"}

package/dist/types/src/components/TextEditor/comments.stories.d.ts

@@ -1,26 +0,0 @@
-import '@dxosTheme';
-import { type EditorView } from '@codemirror/view';
-import React from 'react';
-type StoryProps = {
-    text?: string;
-    autoCreate?: boolean;
-};
-declare const _default: {
-    title: string;
-    component: React.ForwardRefExoticComponent<import("./TextEditor").TextEditorProps & React.RefAttributes<EditorView>>;
-    decorators: import("@storybook/react").Decorator[];
-    render: (args: StoryProps) => JSX.Element;
-};
-export default _default;
-export declare const Default: {
-    args: {
-        text: string;
-    };
-};
-export declare const Demo: {
-    args: {
-        text: string;
-        autoCreate: boolean;
-    };
-};
-//# sourceMappingURL=comments.stories.d.ts.map

package/dist/types/src/components/TextEditor/comments.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"comments.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/TextEditor/comments.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,UAAU,EAAU,MAAM,kBAAkB,CAAC;AAG3D,OAAO,KAAwD,MAAM,OAAO,CAAC;AAmM7E,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;;;;;mBAoFe,UAAU;;AAJ3B,wBAKE;AAWF,eAAO,MAAM,OAAO;;;;CAInB,CAAC;AAEF,eAAO,MAAM,IAAI;;;;;CAKhB,CAAC"}

package/dist/types/src/components/TextEditor/yjs.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"yjs.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/TextEditor/yjs.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,YAAY,CAAC;AAEpB,OAAO,KAAmB,MAAM,OAAO,CAAC;;;;;;AAWxC,wBAIE;AA+BF,eAAO,MAAM,OAAO;;CAGnB,CAAC"}

package/dist/types/src/extensions/code.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../../../src/extensions/code.ts"],"names":[],"mappings":"AAsDA,eAAO,MAAM,IAAI,+CAmDhB,CAAC"}

package/dist/types/src/extensions/hr.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"hr.d.ts","sourceRoot":"","sources":["../../../../src/extensions/hr.ts"],"names":[],"mappings":"AAkDA,eAAO,MAAM,EAAE,+CAsBd,CAAC"}

package/dist/types/src/extensions/image.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../../src/extensions/image.ts"],"names":[],"mappings":"AAKA,OAAO,EAAoB,KAAK,SAAS,EAA4C,MAAM,mBAAmB,CAAC;AAG/G,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC;AAE9B,eAAO,MAAM,KAAK,aAAa,YAAY,KAAQ,SA8BlD,CAAC"}

package/dist/types/src/extensions/link.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../../src/extensions/link.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,mBAAmB,CAAC;AAkBpE,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,IAAI,aAAa,WAAW,KAAQ,SAsDhD,CAAC"}

package/dist/types/src/extensions/table.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../src/extensions/table.ts"],"names":[],"mappings":"AAKA,OAAO,EAAoB,KAAK,QAAQ,EAAmB,UAAU,EAAoB,MAAM,mBAAmB,CAAC;AASnH,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC;AAE9B;;;GAGG;AACH,eAAO,MAAM,KAAK,aAAa,YAAY,8BAM1C,CAAC"}

package/dist/types/src/extensions/tasklist.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tasklist.d.ts","sourceRoot":"","sources":["../../../../src/extensions/tasklist.ts"],"names":[],"mappings":"AA8DA,MAAM,MAAM,eAAe,GAAG,EAAE,CAAC;AAEjC,eAAO,MAAM,QAAQ,aAAa,eAAe,4CAsDhD,CAAC"}

package/dist/types/src/extensions/yjs/cursor.d.ts

@@ -1,4 +0,0 @@
-import * as Y from 'yjs';
-import { type CursorConverter } from '../cursor';
-export declare const cursorConverter: (text: Y.Text) => CursorConverter;
-//# sourceMappingURL=cursor.d.ts.map

package/dist/types/src/extensions/yjs/cursor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/yjs/cursor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAIzB,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,eAW7C,CAAC"}

package/dist/types/src/extensions/yjs/index.d.ts

@@ -1,2 +0,0 @@
-export * from './yjs';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/src/extensions/yjs/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/yjs/index.ts"],"names":[],"mappings":"AAIA,cAAc,OAAO,CAAC"}

package/dist/types/src/extensions/yjs/yjs.d.ts

@@ -1,4 +0,0 @@
-import type * as YP from 'y-protocols/awareness';
-import type { YText } from '@dxos/text-model';
-export declare const yjs: (content: YText, awareness?: YP.Awareness) => import("@codemirror/state").Extension[];
-//# sourceMappingURL=yjs.d.ts.map

package/dist/types/src/extensions/yjs/yjs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"yjs.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/yjs/yjs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAK9C,eAAO,MAAM,GAAG,YAAa,KAAK,cAAc,GAAG,SAAS,4CAG3D,CAAC"}

package/dist/types/src/extensions/yjs/yjs.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=yjs.test.d.ts.map

package/dist/types/src/extensions/yjs/yjs.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"yjs.test.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/yjs/yjs.test.ts"],"names":[],"mappings":""}

package/dist/types/src/hooks/automerge.d.ts

@@ -1,3 +0,0 @@
-import { type EditorModel, type UseTextModelProps } from './useTextModel';
-export declare const createAutomergeModel: ({ space, identity, text }: UseTextModelProps) => EditorModel;
-//# sourceMappingURL=automerge.d.ts.map

package/dist/types/src/hooks/automerge.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"automerge.d.ts","sourceRoot":"","sources":["../../../../src/hooks/automerge.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,WAAW,EAAc,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAItF,eAAO,MAAM,oBAAoB,8BAA+B,iBAAiB,KAAG,WAqCnF,CAAC"}

package/dist/types/src/hooks/yjs.d.ts

@@ -1,27 +0,0 @@
-import { Observable } from 'lib0/observable';
-import * as YP from 'y-protocols/awareness';
-import { type Doc } from 'yjs';
-import { type Space } from '@dxos/react-client/echo';
-import { type EditorModel, type UseTextModelProps } from './useTextModel';
-export declare const createYjsModel: ({ identity, space, text }: UseTextModelProps) => EditorModel;
-/**
- * Yjs awareness provider on top of a DXOS space.
- */
-export declare class YAwarenessProvider extends Observable<any> {
-    private readonly _space;
-    private readonly _awareness;
-    private readonly _clientId;
-    private readonly _channel;
-    constructor({ space, doc, channel, awareness, }: {
-        space: Space;
-        doc: Doc;
-        channel: string;
-        awareness?: YP.Awareness;
-    });
-    get awareness(): YP.Awareness;
-    private _handleAwarenessUpdate;
-    private _handleSpaceMessage;
-    private _readMessage;
-    private _handleBeforeUnload;
-}
-//# sourceMappingURL=yjs.d.ts.map

package/dist/types/src/hooks/yjs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"yjs.d.ts","sourceRoot":"","sources":["../../../../src/hooks/yjs.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,KAAK,CAAC;AAI/B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAIrD,OAAO,EAAE,KAAK,WAAW,EAAc,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGtF,eAAO,MAAM,cAAc,8BAA+B,iBAAiB,KAAG,WAqB7E,CAAC;AAOF;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,UAAU,CAAC,GAAG,CAAC;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;gBAEtB,EACV,KAAK,EACL,GAAG,EACH,OAAO,EACP,SAAS,GACV,EAAE;QACD,KAAK,EAAE,KAAK,CAAC;QACb,GAAG,EAAE,GAAG,CAAC;QACT,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC;KAC1B;IA4BD,IAAI,SAAS,IAAI,EAAE,CAAC,SAAS,CAE5B;IAED,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,YAAY;IAoCpB,OAAO,CAAC,mBAAmB;CAG5B"}

package/dist/types/src/testing/index.d.ts

@@ -1,3 +0,0 @@
-export * from './proto';
-export * from './replicator';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/src/testing/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC"}

package/dist/types/src/testing/proto/gen/schema.d.ts

@@ -1,15 +0,0 @@
-/**
- * @generated @dxos/echo-typegen src/testing/proto/schema.proto
- **/
-import * as dxos_echo_schema from "@dxos/echo-schema";
-export declare const types: dxos_echo_schema.TypeCollection;
-export type EditorDocumentProps = {
-    content: dxos_echo_schema.Text;
-};
-export declare class EditorDocument extends dxos_echo_schema.TypedObject<EditorDocumentProps> {
-    static readonly schema: dxos_echo_schema.Schema;
-    static filter(filter?: Partial<EditorDocumentProps> | dxos_echo_schema.OperatorFilter<EditorDocument>): dxos_echo_schema.Filter<EditorDocument>;
-    constructor(initValues?: Partial<EditorDocumentProps>, opts?: dxos_echo_schema.TypedObjectOptions);
-    content: dxos_echo_schema.Text;
-}
-//# sourceMappingURL=schema.d.ts.map

package/dist/types/src/testing/proto/gen/schema.d.ts.map

@@ -1 +0,0 @@
-{"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"}

package/dist/types/src/testing/proto/index.d.ts

@@ -1,2 +0,0 @@
-export * from './gen/schema';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/src/testing/proto/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/testing/proto/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC"}

package/dist/types/src/testing/replicator.d.ts

@@ -1,45 +0,0 @@
-import { Observable } from 'lib0/observable';
-import * as YP from 'y-protocols/awareness';
-import { Doc } from 'yjs';
-import { Event } from '@dxos/async';
-import { TextKind } from '@dxos/protocols/proto/dxos/echo/model/text';
-import { type EditorModel } from '../hooks';
-type Awareness = YP.Awareness;
-/**
- * Yjs awareness provider in-memory.
- */
-export declare class AwarenessProvider extends Observable<any> {
-    private readonly _remoteUpdate;
-    private readonly _awareness;
-    private readonly _doc;
-    constructor({ update, doc, awareness }: {
-        update: Event<Uint8Array>;
-        doc: Doc;
-        awareness?: Awareness;
-    });
-    get awareness(): Awareness;
-    private _handleDocUpdate;
-    private _handleAwarenessUpdate;
-    private _handleRemoteUpdate;
-    private _readMessage;
-    private _handleBeforeUnload;
-}
-/**
- * This mocks the replication across the swarm.
- */
-export declare class Replicator {
-    private readonly _kind;
-    private readonly _update;
-    private _peers;
-    constructor(_kind: TextKind);
-    setPeers(peers: EditorModel[]): void;
-    createPeer: (id: string, doc?: Doc) => EditorModel;
-}
-export type UseYjsModelOptions = {
-    replicator: Replicator;
-    id: string;
-    doc?: Doc;
-};
-export declare const useYjsModel: ({ replicator, id, doc }: UseYjsModelOptions) => EditorModel;
-export {};
-//# sourceMappingURL=replicator.d.ts.map

package/dist/types/src/testing/replicator.d.ts.map

@@ -1 +0,0 @@
-{"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"}

package/src/components/TextEditor/codemirror.stories.ts

@@ -1,115 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
-import { EditorState } from '@codemirror/state';
-import { EditorView } from '@codemirror/view';
-import { type StoryObj } from '@storybook/html';
-import { basicSetup } from 'codemirror';
-import { yCollab } from 'y-codemirror.next';
-
-import { EventSubscriptions } from '@dxos/async';
-import { generateName } from '@dxos/display-name';
-import { Client, type PublicKey } from '@dxos/react-client';
-import { type Space, TextObject } from '@dxos/react-client/echo';
-import { type Identity } from '@dxos/react-client/halo';
-import { joinCommonSpace, TestBuilder, textGenerator } from '@dxos/react-client/testing';
-import { YText } from '@dxos/text-model';
-
-import { YAwarenessProvider } from '../../hooks';
-import { cursorColor } from '../../styles';
-import { EditorDocument, types as schema } from '../../testing';
-
-export default {
-  title: 'CodeMirror',
-};
-
-const testBuilder = new TestBuilder();
-const views: Record<number, EditorView> = {};
-const subscriptions = new EventSubscriptions();
-
-const updateEditor = async (id: number, editor: HTMLDivElement, identity: Identity, space: Space, text: TextObject) => {
-  const doc = text.doc;
-  const ytext = text.content;
-  if (!(ytext instanceof YText) || !doc) {
-    return;
-  }
-
-  const { awareness } = new YAwarenessProvider({ space, doc, channel: `yjs.awareness.${text.id}` });
-  awareness.setLocalStateField('user', {
-    name: identity.profile?.displayName ?? generateName(identity.identityKey.toHex()),
-    // TODO(wittjosiah): Pick colours from theme based on identity key.
-    color: cursorColor.color,
-    colorLight: cursorColor.light,
-  });
-
-  const state = EditorState.create({
-    doc: ytext.toString(),
-    extensions: [basicSetup, markdown({ base: markdownLanguage }), yCollab(ytext, awareness)],
-  });
-
-  const view = views[id];
-  if (view) {
-    view.setState(state);
-  } else {
-    views[id] = new EditorView({ state, parent: editor });
-  }
-
-  if (id === 0) {
-    subscriptions.clear();
-    subscriptions.add(textGenerator({ text: ytext }));
-  }
-};
-
-const setupEditor = async (id: number, client: Client, spaceKey: PublicKey, editor: HTMLDivElement) => {
-  const space = await client.spaces.get(spaceKey)!;
-  const query = space.db.query(EditorDocument.filter());
-  query.subscribe(({ objects }) => {
-    const text = objects[0]?.content;
-    void (text && updateEditor(id, editor, client.halo.identity.get()!, space, text));
-  });
-
-  const text = query.objects[0]?.content;
-  void (text && updateEditor(id, editor, client.halo.identity.get()!, space, text));
-};
-
-const setupSpace = async (count: number) => {
-  const clients = [...Array(count)].map(() => new Client({ services: testBuilder.createLocal() }));
-  await Promise.all(clients.map((client) => client.initialize()));
-  await Promise.all(clients.map((client) => client.halo.createIdentity()));
-  clients.map((client) => client.spaces.addSchema(schema));
-
-  const space = await clients[0].spaces.create();
-  const text = new TextObject('Hello, Storybook!');
-  const document = new EditorDocument({ content: text });
-  await space.db.add(document);
-
-  await joinCommonSpace(clients, space.key);
-
-  return { clients, spaceKey: space.key };
-};
-
-const count = 2;
-
-export const Default: StoryObj<{ id: number; client: Client; spaceKey: PublicKey }> = {
-  render: ({ id, client, spaceKey }) => {
-    const editor = document.createElement('div');
-    editor.setAttribute('style', 'min-width: 0; flex: 1; padding: 1rem;');
-    void setupEditor(id, client, spaceKey, editor);
-    return editor;
-  },
-  decorators: [
-    (story) => {
-      const container = document.createElement('div');
-      container.setAttribute('style', 'display: flex; justify-content: space-evenly');
-      void setupSpace(count).then(({ clients, spaceKey }) => {
-        clients.forEach((client, id) => {
-          // TODO(wittjosiah): According to the docs these types should be compatible.
-          container.appendChild(story({ args: { id, client, spaceKey } }) as HTMLElement);
-        });
-      });
-      return container;
-    },
-  ],
-};