@dxos/react-ui-editor 0.3.7-main.fcec8cd → 0.3.7

package/dist/types/src/components/Markdown/markdownTheme.d.ts

@@ -41,11 +41,11 @@ export declare const markdownTheme: {
     '& .cm-line *': {
         lineHeight: number;
     };
-    '& .cm-selectionBackground': {
-        background: string;
+    '&.cm-focused .cm-selectionBackground, & .cm-selectionBackground': {
+        background: any;
     };
-    '.dark & .cm-selectionBackground': {
-        background: string;
+    '.dark & .cm-selectionBackground, .dark &.cm-focused .cm-selectionBackground': {
+        background: any;
     };
     '& .cm-selectionMatch': {
         background: string;
@@ -87,6 +87,12 @@ export declare const markdownTheme: {
         paddingBlockStart: string;
         paddingBlockEnd: string;
     };
+    '& .cm-ySelection, & .cm-yLineSelection': {
+        mixBlendMode: string;
+    };
+    '.dark & .cm-ySelection, .dark & .cm-yLineSelection': {
+        mixBlendMode: string;
+    };
     '& .cm-ySelectionCaret': {
         display: string;
         insetBlockStart: string;

package/dist/types/src/components/Markdown/markdownTheme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdownTheme.d.ts","sourceRoot":"","sources":["../../../../../src/components/Markdown/markdownTheme.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAUtD,eAAO,MAAM,MAAM,YAAY,CAAC;AAChC,eAAO,MAAM,KAAK,YAAY,CAAC;AAC/B,eAAO,MAAM,IAAI,YAAY,CAAC;AAC9B,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC,eAAO,MAAM,KAAK,YAAY,CAAC;AAC/B,eAAO,MAAM,KAAK,YAAY,CAAC;AAC/B,eAAO,MAAM,MAAM,YAAY,CAAC;AAChC,eAAO,MAAM,IAAI,YAAY,CAAC;AAC9B,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC,eAAO,MAAM,MAAM,YAAY,CAAC;AAEhC,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAE7C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,eAAO,MAAM,MAAM,YAAY,CAAC;AAIhC,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkIzB,CAAC;AAEF,eAAO,MAAM,wBAAwB,gBA6EpC,CAAC"}
+{"version":3,"file":"markdownTheme.d.ts","sourceRoot":"","sources":["../../../../../src/components/Markdown/markdownTheme.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAUtD,eAAO,MAAM,MAAM,YAAY,CAAC;AAChC,eAAO,MAAM,KAAK,YAAY,CAAC;AAC/B,eAAO,MAAM,IAAI,YAAY,CAAC;AAC9B,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC,eAAO,MAAM,KAAK,YAAY,CAAC;AAC/B,eAAO,MAAM,KAAK,YAAY,CAAC;AAC/B,eAAO,MAAM,MAAM,YAAY,CAAC;AAChC,eAAO,MAAM,IAAI,YAAY,CAAC;AAC9B,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC,eAAO,MAAM,MAAM,YAAY,CAAC;AAEhC,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAE7C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,eAAO,MAAM,MAAM,YAAY,CAAC;AAIhC,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwIzB,CAAC;AAEF,eAAO,MAAM,wBAAwB,gBA6EpC,CAAC"}

package/dist/types/src/components/RichText/RichText.d.ts

@@ -1,20 +1,20 @@
 import { type Editor } from '@tiptap/react';
 import React from 'react';
-import { type ComposerModel, type ComposerSlots } from '../../model';
+import { type EditorModel, type EditorSlots } from '../../model';
 export type TipTapEditor = Editor;
 type UseEditorOptions = {
-    model?: ComposerModel;
+    model?: EditorModel;
     placeholder?: string;
-    slots?: Pick<ComposerSlots, 'editor'>;
+    slots?: Pick<EditorSlots, 'editor'>;
 };
-export type RichTextComposerProps = UseEditorOptions & {
-    slots?: ComposerSlots;
+export type RichTextEditorProps = UseEditorOptions & {
+    slots?: EditorSlots;
 };
 /**
  * @deprecated
  */
-export declare const RichTextComposer: React.ForwardRefExoticComponent<UseEditorOptions & {
-    slots?: ComposerSlots | undefined;
+export declare const RichTextEditor: React.ForwardRefExoticComponent<UseEditorOptions & {
+    slots?: EditorSlots | undefined;
 } & React.RefAttributes<Editor | null>>;
 export {};
 //# sourceMappingURL=RichText.d.ts.map

package/dist/types/src/components/RichText/RichText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RichText.d.ts","sourceRoot":"","sources":["../../../../../src/components/RichText/RichText.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,MAAM,EAAgD,MAAM,eAAe,CAAC;AAE1F,OAAO,KAAmD,MAAM,OAAO,CAAC;AAKxE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAkBrE,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC;AAElC,KAAK,gBAAgB,GAAG;IACtB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;CACvC,CAAC;AA2HF,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,GAAG;IACrD,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,gBAAgB;;uCAS3B,CAAC"}
+{"version":3,"file":"RichText.d.ts","sourceRoot":"","sources":["../../../../../src/components/RichText/RichText.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,MAAM,EAAgD,MAAM,eAAe,CAAC;AAE1F,OAAO,KAAmD,MAAM,OAAO,CAAC;AAKxE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAkBjE,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC;AAElC,KAAK,gBAAgB,GAAG;IACtB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;CACrC,CAAC;AA2HF,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,GAAG;IACnD,KAAK,CAAC,EAAE,WAAW,CAAC;CACrB,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,cAAc;;uCASzB,CAAC"}

package/dist/types/src/components/RichText/RichText.stories.d.ts

@@ -1,13 +1,13 @@
 import '@dxosTheme';
 import React from 'react';
-import { type RichTextComposerProps } from './RichText';
+import { type RichTextEditorProps } from './RichText';
 declare const _default: {
     component: React.ForwardRefExoticComponent<{
-        model?: import("../..").ComposerModel | undefined;
+        model?: import("../..").EditorModel | undefined;
         placeholder?: string | undefined;
-        slots?: Pick<import("../..").ComposerSlots, "editor"> | undefined;
+        slots?: Pick<import("../..").EditorSlots, "editor"> | undefined;
     } & {
-        slots?: import("../..").ComposerSlots | undefined;
+        slots?: import("../..").EditorSlots | undefined;
     } & React.RefAttributes<import("@tiptap/react").Editor | null>>;
 };
 export default _default;
@@ -20,7 +20,7 @@ export declare const Default: {
     };
 };
 export declare const WithYjs: {
-    render: (args: Omit<RichTextComposerProps, 'model'>) => JSX.Element;
+    render: (args: Omit<RichTextEditorProps, 'model'>) => JSX.Element;
     decorators: import("@storybook/csf").DecoratorFunction<import("@storybook/react/dist/types-0a347bb9").R, any>[];
 };
 //# sourceMappingURL=RichText.stories.d.ts.map

package/dist/types/src/components/RichText/RichText.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RichText.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/RichText/RichText.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,YAAY,CAAC;AAEpB,OAAO,KAAmB,MAAM,OAAO,CAAC;AAQxC,OAAO,EAAoB,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAC;;;;;;;;;;AAG1E,wBAEE;AAEF,eAAO,MAAM,OAAO;;;;;;;CAOnB,CAAC;AAGF,eAAO,MAAM,OAAO;mBACH,KAAK,qBAAqB,EAAE,OAAO,CAAC;;CAmCpD,CAAC"}
+{"version":3,"file":"RichText.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/RichText/RichText.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,YAAY,CAAC;AAEpB,OAAO,KAAmB,MAAM,OAAO,CAAC;AAQxC,OAAO,EAAkB,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;;;;;;;;;;AAGtE,wBAEE;AAEF,eAAO,MAAM,OAAO;;;;;;;CAOnB,CAAC;AAGF,eAAO,MAAM,OAAO;mBACH,KAAK,mBAAmB,EAAE,OAAO,CAAC;;CAmClD,CAAC"}

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

@@ -1,4 +1,4 @@
-export * from './Composer';
+export * from './Editor';
 export * from './Markdown';
 export * from './RichText';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAIA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/dist/types/src/model.d.ts

@@ -4,7 +4,7 @@ import type * as awarenessProtocol from 'y-protocols/awareness';
 import { 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';
-export type ComposerSlots = {
+export type EditorSlots = {
     root?: Omit<ComponentProps<'div'>, 'ref'>;
     editor?: {
         className?: string;
@@ -18,7 +18,7 @@ type Awareness = awarenessProtocol.Awareness;
 type Provider = {
     awareness: Awareness;
 };
-export type ComposerModel = {
+export type EditorModel = {
     id: string;
     content: string | YText | YXmlFragment;
     provider?: Provider;
@@ -32,6 +32,6 @@ export type UseTextModelOptions = {
     space?: Space;
     text?: TextObject;
 };
-export declare const useTextModel: ({ identity, space, text }: UseTextModelOptions) => ComposerModel | undefined;
+export declare const useTextModel: ({ identity, space, text }: UseTextModelOptions) => EditorModel | undefined;
 export {};
 //# sourceMappingURL=model.d.ts.map

package/dist/types/src/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/model.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,cAAc,EAAW,MAAM,OAAO,CAAC;AACrD,OAAO,KAAK,KAAK,iBAAiB,MAAM,uBAAuB,CAAC;AAEhE,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAI5D,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxD,CAAC;CACH,CAAC;AAEF,KAAK,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;AAC7C,KAAK,QAAQ,GAAG;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAGzC,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,YAAY,CAAC;IACvC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,IAAI,CAAC,EAAE;QACL,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB,CAAC;AAIF,eAAO,MAAM,YAAY,8BAA+B,mBAAmB,KAAG,aAAa,GAAG,SAwB7F,CAAC"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/model.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,cAAc,EAAW,MAAM,OAAO,CAAC;AACrD,OAAO,KAAK,KAAK,iBAAiB,MAAM,uBAAuB,CAAC;AAEhE,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAI5D,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxD,CAAC;CACH,CAAC;AAEF,KAAK,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;AAC7C,KAAK,QAAQ,GAAG;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAGzC,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,YAAY,CAAC;IACvC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,IAAI,CAAC,EAAE;QACL,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB,CAAC;AAIF,eAAO,MAAM,YAAY,8BAA+B,mBAAmB,KAAG,WAAW,GAAG,SAwB3F,CAAC"}

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

@@ -3,13 +3,13 @@
  **/
 import * as dxos_echo_schema from "@dxos/echo-schema";
 export declare const types: dxos_echo_schema.TypeCollection;
-export type ComposerDocumentProps = {
+export type EditorDocumentProps = {
     content: dxos_echo_schema.Text;
 };
-export declare class ComposerDocument extends dxos_echo_schema.TypedObject<ComposerDocumentProps> {
+export declare class EditorDocument extends dxos_echo_schema.TypedObject<EditorDocumentProps> {
     static readonly schema: dxos_echo_schema.Schema;
-    static filter(filter?: Partial<ComposerDocumentProps> | dxos_echo_schema.OperatorFilter<ComposerDocument>): dxos_echo_schema.Filter<ComposerDocument>;
-    constructor(initValues?: Partial<ComposerDocumentProps>, opts?: dxos_echo_schema.TypedObjectOptions);
+    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 +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,qBAAqB,GAAG;IAClC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;CAChC,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,gBAAgB,CAAC,WAAW,CAAC,qBAAqB,CAAC;IACvF,gBAAwB,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAExD,MAAM,CAAC,MAAM,CACX,MAAM,CAAC,EACH,OAAO,CAAC,qBAAqB,CAAC,GAC9B,gBAAgB,CAAC,cAAc,CAAC,gBAAgB,CAAC,GACpD,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAQ1C,UAAU,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EAC3C,IAAI,CAAC,EAAE,gBAAgB,CAAC,kBAAkB;IAIpC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;CACxC"}
+{"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/replicator.d.ts

@@ -3,7 +3,7 @@ import * as awarenessProtocol 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 ComposerModel } from '../model';
+import { type EditorModel } from '../model';
 type Awareness = awarenessProtocol.Awareness;
 /**
  * Yjs awareness provider in-memory.
@@ -32,14 +32,14 @@ export declare class Replicator {
     private readonly _update;
     private _peers;
     constructor(_kind: TextKind);
-    setPeers(peers: ComposerModel[]): void;
-    createPeer: (id: string, doc?: Doc) => ComposerModel;
+    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) => ComposerModel;
+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 +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,iBAAiB,MAAM,uBAAuB,CAAC;AAE3D,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,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C,KAAK,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;AAM7C;;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;IA+BtG,IAAI,SAAS,IAAI,SAAS,CAEzB;IAED,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,sBAAsB;IAY9B,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,CAAuB;gBAER,KAAK,EAAE,QAAQ;IAE5C,QAAQ,CAAC,KAAK,EAAE,aAAa,EAAE;IAI/B,UAAU,OAAQ,MAAM,QAAO,GAAG,KAAe,aAAa,CAmB5D;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,aAIzE,CAAC"}
+{"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,iBAAiB,MAAM,uBAAuB,CAAC;AAE3D,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,iBAAiB,CAAC,SAAS,CAAC;AAM7C;;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;IA+BtG,IAAI,SAAS,IAAI,SAAS,CAEzB;IAED,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,sBAAsB;IAY9B,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,CAmB1D;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,WAIzE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-editor",
-  "version": "0.3.7-main.fcec8cd",
+  "version": "0.3.7",
   "description": "Document editing experience within a DXOS shell.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -47,15 +47,15 @@
     "y-prosemirror": "~1.0.20",
     "y-protocols": "^1.0.5",
     "yjs": "^13.6.8",
-    "@dxos/debug": "0.3.7-main.fcec8cd",
-    "@dxos/display-name": "0.3.7-main.fcec8cd",
-    "@dxos/log": "0.3.7-main.fcec8cd",
-    "@dxos/protocols": "0.3.7-main.fcec8cd",
-    "@dxos/react-async": "0.3.7-main.fcec8cd",
-    "@dxos/react-ui": "0.3.7-main.fcec8cd",
-    "@dxos/react-ui-theme": "0.3.7-main.fcec8cd",
-    "@dxos/text-model": "0.3.7-main.fcec8cd",
-    "@dxos/util": "0.3.7-main.fcec8cd"
+    "@dxos/debug": "0.3.7",
+    "@dxos/display-name": "0.3.7",
+    "@dxos/log": "0.3.7",
+    "@dxos/protocols": "0.3.7",
+    "@dxos/react-async": "0.3.7",
+    "@dxos/react-ui": "0.3.7",
+    "@dxos/react-ui-theme": "0.3.7",
+    "@dxos/text-model": "0.3.7",
+    "@dxos/util": "0.3.7"
   },
   "devDependencies": {
     "@types/lodash.get": "^4.4.7",
@@ -63,15 +63,15 @@
     "@types/react-dom": "^18.0.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@dxos/config": "0.3.7-main.fcec8cd",
-    "@dxos/echo-schema": "0.3.7-main.fcec8cd",
-    "@dxos/echo-typegen": "0.3.7-main.fcec8cd",
-    "@dxos/react-client": "0.3.7-main.fcec8cd"
+    "@dxos/config": "0.3.7",
+    "@dxos/echo-schema": "0.3.7",
+    "@dxos/echo-typegen": "0.3.7",
+    "@dxos/react-client": "0.3.7"
   },
   "peerDependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@dxos/react-client": "0.3.7-main.fcec8cd"
+    "@dxos/react-client": "0.3.7"
   },
   "publishConfig": {
     "access": "public"

package/src/components/{Composer/Composer.stories.tsx → Editor/Editor.stories.tsx}

@@ -12,20 +12,20 @@ import { useIdentity } from '@dxos/react-client/halo';
 import { ClientDecorator, setupPeersInSpace, textGenerator, useDataGenerator } from '@dxos/react-client/testing';
 import { useId } from '@dxos/react-ui';
 
-import { Composer, type ComposerProps } from './Composer';
-import { ComposerDocument, types as schema } from '../../testing';
+import { Editor, type EditorProps } from './Editor';
+import { EditorDocument, types as schema } from '../../testing';
 
 export default {
-  component: Composer,
+  component: Editor,
 };
 
-const Story = ({ spaceKey, ...args }: Pick<ComposerProps, 'slots'> & { spaceKey: PublicKey }) => {
+const Story = ({ spaceKey, ...args }: Pick<EditorProps, 'slots'> & { spaceKey: PublicKey }) => {
   const [generate, setGenerate] = useState(false);
   const generateId = useId('generate');
 
   const identity = useIdentity();
   const space = useSpace(spaceKey);
-  const [document] = useQuery(space, ComposerDocument.filter());
+  const [document] = useQuery(space, EditorDocument.filter());
 
   useDataGenerator({
     generator: generate ? textGenerator : undefined,
@@ -39,7 +39,7 @@ const Story = ({ spaceKey, ...args }: Pick<ComposerProps, 'slots'> & { spaceKey:
         Generate Data
       </div>
       {document?.content.toString().length}
-      <Composer identity={identity} space={space} text={document?.content} {...args} />
+      <Editor identity={identity} space={space} text={document?.content} {...args} />
     </main>
   );
 };
@@ -48,7 +48,7 @@ const { spaceKey: markdownSpaceKey, clients: markdownClients } = await setupPeer
   count: 2,
   schema,
   onCreateSpace: async (space) => {
-    const document = new ComposerDocument({ content: new TextObject('Hello, Storybook!') });
+    const document = new EditorDocument({ content: new TextObject('Hello, Storybook!') });
     await space?.db.add(document);
   },
 });
@@ -62,7 +62,7 @@ const { spaceKey: richSpaceKey, clients: richClients } = await setupPeersInSpace
   count: 2,
   schema,
   onCreateSpace: async (space) => {
-    const document = new ComposerDocument({ content: new TextObject('Hello, Storybook!', TextKind.RICH) });
+    const document = new EditorDocument({ content: new TextObject('Hello, Storybook!', TextKind.RICH) });
     await space?.db.add(document);
   },
 });

package/src/components/Editor/Editor.tsx

@@ -0,0 +1,33 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React, { forwardRef, memo, type Ref } from 'react';
+
+import { YXmlFragment } from '@dxos/text-model';
+
+import { type EditorSlots, useTextModel, type UseTextModelOptions } from '../../model';
+import { MarkdownEditor, type MarkdownEditorRef } from '../Markdown';
+import { RichTextEditor, type TipTapEditor } from '../RichText';
+
+export type EditorProps = UseTextModelOptions & {
+  slots?: EditorSlots;
+};
+
+/**
+ * Memoized editor which depends on DXOS platform.
+ *
+ * Determines which editor to render based on the kind of text.
+ */
+// NOTE: Without `memo`, if parent component uses `observer` the editor re-renders excessively.
+// TODO(wittjosiah): Factor out?
+export const Editor = memo(
+  forwardRef<TipTapEditor | MarkdownEditorRef, EditorProps>(({ slots, ...options }, forwardedRef) => {
+    const model = useTextModel(options);
+    if (model?.content instanceof YXmlFragment) {
+      return <RichTextEditor ref={forwardedRef as Ref<TipTapEditor>} model={model} slots={slots} />;
+    } else {
+      return <MarkdownEditor ref={forwardedRef as Ref<MarkdownEditorRef>} model={model} slots={slots} />;
+    }
+  }),
+);

package/src/components/{Composer → Editor}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './Composer';
+export * from './Editor';

package/src/components/Markdown/Markdown.stories.tsx

@@ -11,11 +11,11 @@ import { TextKind } from '@dxos/react-client/echo';
 import { ClientDecorator, textGenerator, useDataGenerator } from '@dxos/react-client/testing';
 import { useId } from '@dxos/react-ui';
 
-import { MarkdownComposer } from './Markdown';
+import { MarkdownEditor } from './Markdown';
 import { Replicator, useYjsModel } from '../../testing';
 
 export default {
-  component: MarkdownComposer,
+  component: MarkdownEditor,
 };
 
 export const Default = {
@@ -47,7 +47,7 @@ export const WithYjs = {
           <input type='checkbox' onChange={(event) => setGenerate(event.target.checked)} />
           Generate Data
         </div>
-        <MarkdownComposer model={model} />
+        <MarkdownEditor model={model} />
       </main>
     );
   },

package/src/components/Markdown/Markdown.tsx

@@ -49,25 +49,25 @@ import { YText } from '@dxos/text-model';
 
 import { markdownTagsExtension } from './markdownTags';
 import { markdownDarkHighlighting, markdownTheme } from './markdownTheme';
-import { type ComposerModel, type ComposerSlots } from '../../model';
+import { type EditorModel, type EditorSlots } from '../../model';
 
 export const EditorModes = ['default', 'vim'] as const;
 export type EditorMode = (typeof EditorModes)[number];
 
-export type MarkdownComposerProps = {
-  model?: ComposerModel;
-  slots?: ComposerSlots;
+export type MarkdownEditorProps = {
+  model?: EditorModel;
+  slots?: EditorSlots;
   editorMode?: EditorMode;
   onChange?: (content: string | Text) => void;
 };
 
-export type MarkdownComposerRef = {
+export type MarkdownEditorRef = {
   editor: HTMLDivElement | null;
   state?: EditorState;
   view?: EditorView;
 };
 
-export const MarkdownComposer = forwardRef<MarkdownComposerRef, MarkdownComposerProps>(
+export const MarkdownEditor = forwardRef<MarkdownEditorRef, MarkdownEditorProps>(
   ({ model, slots = {}, onChange, editorMode }, forwardedRef) => {
     const { id, content, provider, peer } = model ?? {};
     const { themeMode } = useThemeContext();

package/src/components/Markdown/markdownTheme.ts

@@ -99,17 +99,17 @@ export const markdownTheme = {
   '& .cm-line *': {
     lineHeight: 1.6,
   },
-  '& .cm-selectionBackground': {
-    background: get(tokens, 'extend.colors.primary.150', '#00ffff') + 'aa',
+  '&.cm-focused .cm-selectionBackground, & .cm-selectionBackground': {
+    background: get(tokens, 'extend.colors.primary.150', '#00ffff'),
   },
-  '.dark & .cm-selectionBackground': {
-    background: get(tokens, 'extend.colors.primary.500', '#00ffff') + 'aa',
+  '.dark & .cm-selectionBackground, .dark &.cm-focused .cm-selectionBackground': {
+    background: get(tokens, 'extend.colors.primary.850', '#00ffff'),
   },
   '& .cm-selectionMatch': {
-    background: get(tokens, 'extend.colors.primary.100', '#00ffff') + '44',
+    background: get(tokens, 'extend.colors.primary.250', '#00ffff') + '44',
   },
   '.dark & .cm-selectionMatch': {
-    background: get(tokens, 'extend.colors.primary.400', '#00ffff') + '44',
+    background: get(tokens, 'extend.colors.primary.600', '#00ffff') + '44',
   },
   '& .cm-content': {
     caretColor: 'black',
@@ -145,6 +145,12 @@ export const markdownTheme = {
     paddingBlockStart: '.15em',
     paddingBlockEnd: '.15em',
   },
+  '& .cm-ySelection, & .cm-yLineSelection': {
+    mixBlendMode: 'multiply',
+  },
+  '.dark & .cm-ySelection, .dark & .cm-yLineSelection': {
+    mixBlendMode: 'screen',
+  },
   '& .cm-ySelectionCaret': {
     display: 'inline-block',
     insetBlockStart: '.1em',

package/src/components/RichText/RichText.stories.tsx

@@ -12,11 +12,11 @@ import { ClientDecorator, textGenerator, useDataGenerator } from '@dxos/react-cl
 import { useId } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
-import { RichTextComposer, type RichTextComposerProps } from './RichText';
+import { RichTextEditor, type RichTextEditorProps } from './RichText';
 import { Replicator, useYjsModel } from '../../testing';
 
 export default {
-  component: RichTextComposer,
+  component: RichTextEditor,
 };
 
 export const Default = {
@@ -30,7 +30,7 @@ export const Default = {
 
 const replicator = new Replicator(TextKind.RICH);
 export const WithYjs = {
-  render: (args: Omit<RichTextComposerProps, 'model'>) => {
+  render: (args: Omit<RichTextEditorProps, 'model'>) => {
     const [generate, setGenerate] = useState(false);
     const generateId = useId('generate');
 
@@ -48,7 +48,7 @@ export const WithYjs = {
           <input type='checkbox' onChange={(event) => setGenerate(event.target.checked)} />
           Generate Data
         </div>
-        <RichTextComposer
+        <RichTextEditor
           {...args}
           model={model}
           slots={{

package/src/components/RichText/RichText.tsx

@@ -14,7 +14,7 @@ import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { generateName } from '@dxos/display-name';
 import { mx } from '@dxos/react-ui-theme';
 
-import { type ComposerModel, type ComposerSlots } from '../../model';
+import { type EditorModel, type EditorSlots } from '../../model';
 import {
   blockquote,
   bold,
@@ -35,9 +35,9 @@ import { cursorColor } from '../../yjs';
 export type TipTapEditor = Editor;
 
 type UseEditorOptions = {
-  model?: ComposerModel;
+  model?: EditorModel;
   placeholder?: string;
-  slots?: Pick<ComposerSlots, 'editor'>;
+  slots?: Pick<EditorSlots, 'editor'>;
 };
 
 const useEditor = ({ model, placeholder = 'Enter text…', slots = {} }: UseEditorOptions) => {
@@ -161,15 +161,15 @@ const useEditor = ({ model, placeholder = 'Enter text…', slots = {} }: UseEdit
   );
 };
 
-export type RichTextComposerProps = UseEditorOptions & {
-  slots?: ComposerSlots;
+export type RichTextEditorProps = UseEditorOptions & {
+  slots?: EditorSlots;
 };
 
 /**
  * @deprecated
  */
 // TODO(burdon): Currently broken.
-export const RichTextComposer = forwardRef<Editor | null, RichTextComposerProps>((props, ref) => {
+export const RichTextEditor = forwardRef<Editor | null, RichTextEditorProps>((props, ref) => {
   const editor = useEditor(props);
   useImperativeHandle<Editor | null, Editor | null>(ref, () => editor, [editor]);
 

package/src/components/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2022 DXOS.org
 //
 
-export * from './Composer';
+export * from './Editor';
 export * from './Markdown';
 export * from './RichText';

package/src/model.ts

@@ -12,7 +12,7 @@ import type { YText, YXmlFragment } from '@dxos/text-model';
 
 import { SpaceAwarenessProvider } from './yjs';
 
-export type ComposerSlots = {
+export type EditorSlots = {
   root?: Omit<ComponentProps<'div'>, 'ref'>;
   editor?: {
     className?: string;
@@ -27,7 +27,7 @@ type Awareness = awarenessProtocol.Awareness;
 type Provider = { awareness: Awareness };
 
 // TODO(wittjosiah): Factor out to common package? @dxos/react-client?
-export type ComposerModel = {
+export type EditorModel = {
   id: string;
   content: string | YText | YXmlFragment;
   provider?: Provider;
@@ -44,8 +44,8 @@ export type UseTextModelOptions = {
 };
 
 // TODO(wittjosiah): Factor out to common package? @dxos/react-client?
-// TODO(burdon): Decouple space (make Composer less dependent on entire stack)?
-export const useTextModel = ({ identity, space, text }: UseTextModelOptions): ComposerModel | undefined => {
+// TODO(burdon): Decouple space (make Editor less dependent on entire stack)?
+export const useTextModel = ({ identity, space, text }: UseTextModelOptions): EditorModel | undefined => {
   const provider = useMemo(() => {
     if (!space || !text?.doc) {
       return undefined;

package/src/testing/proto/gen/schema.ts

@@ -6,35 +6,35 @@ import * as dxos_echo_schema from "@dxos/echo-schema";
 
 export const types = new dxos_echo_schema.TypeCollection();
 
-export type ComposerDocumentProps = {
+export type EditorDocumentProps = {
   content: dxos_echo_schema.Text;
 };
 
-export class ComposerDocument extends dxos_echo_schema.TypedObject<ComposerDocumentProps> {
+export class EditorDocument extends dxos_echo_schema.TypedObject<EditorDocumentProps> {
   declare static readonly schema: dxos_echo_schema.Schema;
 
   static filter(
     filter?:
-      | Partial<ComposerDocumentProps>
-      | dxos_echo_schema.OperatorFilter<ComposerDocument>
-  ): dxos_echo_schema.Filter<ComposerDocument> {
+      | Partial<EditorDocumentProps>
+      | dxos_echo_schema.OperatorFilter<EditorDocument>
+  ): dxos_echo_schema.Filter<EditorDocument> {
     return dxos_echo_schema.Filter.typename(
-      "dxos.testing.composer.ComposerDocument",
+      "dxos.testing.editor.EditorDocument",
       filter
     );
   }
 
   constructor(
-    initValues?: Partial<ComposerDocumentProps>,
+    initValues?: Partial<EditorDocumentProps>,
     opts?: dxos_echo_schema.TypedObjectOptions
   ) {
-    super({ ...initValues }, { schema: ComposerDocument.schema, ...opts });
+    super({ ...initValues }, { schema: EditorDocument.schema, ...opts });
   }
   declare content: dxos_echo_schema.Text;
 }
 
-types.registerPrototype(ComposerDocument, {
-  typename: "dxos.testing.composer.ComposerDocument",
+types.registerPrototype(EditorDocument, {
+  typename: "dxos.testing.editor.EditorDocument",
   props: [
     {
       id: "content",

package/src/testing/proto/schema.proto

@@ -6,9 +6,9 @@ syntax = "proto3";
 
 import "dxos/schema.proto";
 
-package dxos.testing.composer;
+package dxos.testing.editor;
 
-message ComposerDocument {
+message EditorDocument {
   option (object) = true;
 
   dxos.schema.Text content = 1;