@dxos/react-ui-editor 0.4.10-main.3aa8c1b → 0.4.10-main.3acb4a8

package/src/components/Toolbar/Toolbar.stories.tsx

@@ -7,10 +7,10 @@ import '@dxosTheme';
 import React, { type FC, useState } from 'react';
 
 import { TextV0Type } from '@braneframe/types';
-import * as E from '@dxos/echo-schema';
-import { createDocAccessor } from '@dxos/echo-schema';
+import { create } from '@dxos/echo-schema';
 import { PublicKey } from '@dxos/keys';
 import { faker } from '@dxos/random';
+import { createDocAccessor } from '@dxos/react-client/echo';
 import { Tooltip, useThemeContext } from '@dxos/react-ui';
 import { textBlockWidth } from '@dxos/react-ui-theme';
 import { withTheme } from '@dxos/storybook-utils';
@@ -37,7 +37,7 @@ faker.seed(101);
 
 const Story: FC<{ content: string }> = ({ content }) => {
   const { themeMode } = useThemeContext();
-  const [text] = useState(E.object(TextV0Type, { content }));
+  const [text] = useState(create(TextV0Type, { content }));
   const [formattingState, formattingObserver] = useFormattingState();
   const { parentRef, view } = useTextEditor(() => {
     return {

package/src/extensions/automerge/automerge.stories.tsx

@@ -8,11 +8,11 @@ import { BroadcastChannelNetworkAdapter } from '@automerge/automerge-repo-networ
 import '@preact/signals-react';
 import React, { useEffect, useMemo, useState } from 'react';
 
+import { TextV0Type } from '@braneframe/types';
 import { Repo } from '@dxos/automerge/automerge-repo';
-import { Filter, DocAccessor, TextCompatibilitySchema } from '@dxos/echo-schema';
-import * as E from '@dxos/echo-schema';
+import { create, type Expando } from '@dxos/echo-schema';
 import { type PublicKey } from '@dxos/keys';
-import { useSpace } from '@dxos/react-client/echo';
+import { Filter, DocAccessor, createDocAccessor, useSpace } from '@dxos/react-client/echo';
 import { ClientRepeater } from '@dxos/react-client/testing';
 import { useThemeContext } from '@dxos/react-ui';
 import { withTheme } from '@dxos/storybook-utils';
@@ -98,9 +98,9 @@ const EchoStory = ({ spaceKey }: { spaceKey: PublicKey }) => {
   // const identity = useIdentity();
   const space = useSpace(spaceKey);
   const source = useMemo<DocAccessor | undefined>(() => {
-    const { objects = [] } = space?.db.query<E.Expando>(Filter.from({ type: 'test' })) ?? {};
+    const { objects = [] } = space?.db.query<Expando>(Filter.from({ type: 'test' })) ?? {};
     if (objects.length) {
-      return E.createDocAccessor(objects[0].content, ['content']);
+      return createDocAccessor(objects[0].content, ['content']);
     }
   }, [space]);
 
@@ -125,9 +125,9 @@ export const WithEcho = {
         createSpace
         onCreateSpace={async (space) => {
           space.db.add(
-            E.object({
+            create({
               type: 'test',
-              content: E.object(TextCompatibilitySchema, { content: initialContent }),
+              content: create(TextV0Type, { content: initialContent }),
             }),
           );
         }}

package/src/extensions/automerge/automerge.ts

@@ -8,7 +8,7 @@ import { StateField, type Extension } from '@codemirror/state';
 import { EditorView, ViewPlugin } from '@codemirror/view';
 
 import { next as A } from '@dxos/automerge/automerge';
-import { type DocAccessor } from '@dxos/echo-schema';
+import { type DocAccessor } from '@dxos/react-client/echo';
 
 import { cursorConverter } from './cursor';
 import { updateHeadsEffect, isReconcile, type State } from './defs';

package/src/extensions/automerge/cursor.ts

@@ -2,8 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
-import { toCursor, type DocAccessor, fromCursor } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
+import { toCursor, type DocAccessor, fromCursor } from '@dxos/react-client/echo';
 
 import { type CursorConverter } from '../cursor';
 

package/src/extensions/automerge/sync.ts

@@ -8,7 +8,7 @@ import { type StateField } from '@codemirror/state';
 import { type EditorView } from '@codemirror/view';
 
 import { next as A } from '@dxos/automerge/automerge';
-import { type IDocHandle } from '@dxos/echo-schema';
+import { type IDocHandle } from '@dxos/react-client/echo';
 
 import { getLastHeads, getPath, type State, reconcileAnnotation, updateHeads, isReconcile } from './defs';
 import { updateAutomerge } from './update-automerge';

package/src/extensions/automerge/update-automerge.ts

@@ -7,7 +7,7 @@
 import { type EditorState, type StateField, type Transaction, type Text } from '@codemirror/state';
 
 import { next as A, type Heads } from '@dxos/automerge/automerge';
-import { type IDocHandle } from '@dxos/echo-schema';
+import { type IDocHandle } from '@dxos/react-client/echo';
 
 import { type State } from './defs';
 

package/src/extensions/factories.ts

@@ -21,9 +21,8 @@ import {
 import defaultsDeep from 'lodash.defaultsdeep';
 
 import { generateName } from '@dxos/display-name';
-import { type DocAccessor } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
-import { type Space } from '@dxos/react-client/echo';
+import { type DocAccessor, type Space } from '@dxos/react-client/echo';
 import { type Identity } from '@dxos/react-client/halo';
 import { type ThemeMode } from '@dxos/react-ui';
 import { type HuePalette, hueTokens } from '@dxos/react-ui-theme';

package/src/hooks/useTextEditor.ts

@@ -36,9 +36,9 @@ export const useTextEditor = (cb: () => UseTextEditorProps = () => ({}), deps: D
       log('create', { id });
 
       // https://codemirror.net/docs/ref/#state.EditorStateConfig
+      // NOTE: Don't set selection here in case it is invalid (and crashes the state); dispatch below.
       const state = EditorState.create({
         doc,
-        selection,
         extensions: [
           id && documentId.of(id),
           // TODO(burdon): Doesn't catch errors in keymap functions.