@dxos/react-ui-editor 0.8.4-main.cb12b3f963 → 0.8.4-main.d05539e30a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-editor",
-  "version": "0.8.4-main.cb12b3f963",
+  "version": "0.8.4-main.d05539e30a",
   "description": "Text editor components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": false,
   "type": "module",
@@ -50,7 +50,7 @@
     "@codemirror/search": "^6.5.11",
     "@codemirror/state": "^6.5.2",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@fluentui/react-tabster": "9.26.11",
     "@lezer/common": "^1.2.2",
     "@lezer/generator": "^1.7.1",
@@ -69,31 +69,31 @@
     "lodash.merge": "^4.6.2",
     "lodash.sortby": "^4.7.0",
     "style-mod": "^4.1.0",
-    "@dxos/app-graph": "0.8.4-main.cb12b3f963",
-    "@dxos/async": "0.8.4-main.cb12b3f963",
-    "@dxos/debug": "0.8.4-main.cb12b3f963",
-    "@dxos/client": "0.8.4-main.cb12b3f963",
-    "@dxos/context": "0.8.4-main.cb12b3f963",
-    "@dxos/display-name": "0.8.4-main.cb12b3f963",
-    "@dxos/echo": "0.8.4-main.cb12b3f963",
-    "@dxos/effect": "0.8.4-main.cb12b3f963",
-    "@dxos/invariant": "0.8.4-main.cb12b3f963",
-    "@dxos/echo-db": "0.8.4-main.cb12b3f963",
-    "@dxos/lit-ui": "0.8.4-main.cb12b3f963",
-    "@dxos/log": "0.8.4-main.cb12b3f963",
-    "@dxos/protocols": "0.8.4-main.cb12b3f963",
-    "@dxos/react-hooks": "0.8.4-main.cb12b3f963",
-    "@dxos/react-ui-mosaic": "0.8.4-main.cb12b3f963",
-    "@dxos/react-ui-menu": "0.8.4-main.cb12b3f963",
-    "@dxos/ui": "0.8.4-main.cb12b3f963",
-    "@dxos/ui-editor": "0.8.4-main.cb12b3f963",
-    "@dxos/util": "0.8.4-main.cb12b3f963",
-    "@dxos/ui-theme": "0.8.4-main.cb12b3f963"
+    "@dxos/app-graph": "0.8.4-main.d05539e30a",
+    "@dxos/async": "0.8.4-main.d05539e30a",
+    "@dxos/client": "0.8.4-main.d05539e30a",
+    "@dxos/context": "0.8.4-main.d05539e30a",
+    "@dxos/echo": "0.8.4-main.d05539e30a",
+    "@dxos/display-name": "0.8.4-main.d05539e30a",
+    "@dxos/effect": "0.8.4-main.d05539e30a",
+    "@dxos/echo-db": "0.8.4-main.d05539e30a",
+    "@dxos/invariant": "0.8.4-main.d05539e30a",
+    "@dxos/debug": "0.8.4-main.d05539e30a",
+    "@dxos/lit-ui": "0.8.4-main.d05539e30a",
+    "@dxos/log": "0.8.4-main.d05539e30a",
+    "@dxos/protocols": "0.8.4-main.d05539e30a",
+    "@dxos/react-hooks": "0.8.4-main.d05539e30a",
+    "@dxos/react-ui-menu": "0.8.4-main.d05539e30a",
+    "@dxos/ui": "0.8.4-main.d05539e30a",
+    "@dxos/react-ui-mosaic": "0.8.4-main.d05539e30a",
+    "@dxos/ui-editor": "0.8.4-main.d05539e30a",
+    "@dxos/ui-theme": "0.8.4-main.d05539e30a",
+    "@dxos/util": "0.8.4-main.d05539e30a"
   },
   "devDependencies": {
     "@automerge/automerge": "3.2.6",
-    "@automerge/automerge-repo": "2.6.0-subduction.17",
-    "@automerge/automerge-repo-network-broadcastchannel": "2.6.0-subduction.17",
+    "@automerge/automerge-repo": "2.6.0-subduction.20",
+    "@automerge/automerge-repo-network-broadcastchannel": "2.6.0-subduction.20",
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/ai": "0.33.2",
     "@effect/platform": "0.94.4",
@@ -114,23 +114,23 @@
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "react-test-renderer": "~19.2.0",
-    "vite": "^8.0.10",
+    "vite": "^8.0.13",
     "vite-plugin-top-level-await": "^1.6.0",
     "vite-plugin-wasm": "^3.6.0",
-    "@dxos/echo-atom": "0.8.4-main.cb12b3f963",
-    "@dxos/config": "0.8.4-main.cb12b3f963",
-    "@dxos/echo": "0.8.4-main.cb12b3f963",
-    "@dxos/random": "0.8.4-main.cb12b3f963",
-    "@dxos/keyboard": "0.8.4-main.cb12b3f963",
-    "@dxos/react-client": "0.8.4-main.cb12b3f963",
-    "@dxos/react-ui": "0.8.4-main.cb12b3f963",
-    "@dxos/react-ui-attention": "0.8.4-main.cb12b3f963",
-    "@dxos/storybook-utils": "0.8.4-main.cb12b3f963",
-    "@dxos/schema": "0.8.4-main.cb12b3f963",
-    "@dxos/ui-theme": "0.8.4-main.cb12b3f963",
-    "@dxos/ui-types": "0.8.4-main.cb12b3f963",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.cb12b3f963",
-    "@dxos/ai": "0.8.4-main.cb12b3f963"
+    "@dxos/ai": "0.8.4-main.d05539e30a",
+    "@dxos/config": "0.8.4-main.d05539e30a",
+    "@dxos/echo": "0.8.4-main.d05539e30a",
+    "@dxos/echo-atom": "0.8.4-main.d05539e30a",
+    "@dxos/keyboard": "0.8.4-main.d05539e30a",
+    "@dxos/random": "0.8.4-main.d05539e30a",
+    "@dxos/react-client": "0.8.4-main.d05539e30a",
+    "@dxos/react-ui-attention": "0.8.4-main.d05539e30a",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.d05539e30a",
+    "@dxos/react-ui": "0.8.4-main.d05539e30a",
+    "@dxos/storybook-utils": "0.8.4-main.d05539e30a",
+    "@dxos/ui-theme": "0.8.4-main.d05539e30a",
+    "@dxos/ui-types": "0.8.4-main.d05539e30a",
+    "@dxos/schema": "0.8.4-main.d05539e30a"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -138,9 +138,9 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.cb12b3f963",
-    "@dxos/react-client": "0.8.4-main.cb12b3f963",
-    "@dxos/react-ui": "0.8.4-main.cb12b3f963"
+    "@dxos/react-client": "0.8.4-main.d05539e30a",
+    "@dxos/react-ui": "0.8.4-main.d05539e30a",
+    "@dxos/ui-theme": "0.8.4-main.d05539e30a"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Editor/Editor.tsx

@@ -110,11 +110,7 @@ type EditorContentProps = ThemedClassName<PropsWithChildren<{}>>;
  * Content component that wraps the toolbar and editor view area.
  */
 const EditorContent = ({ classNames, children }: EditorContentProps) => {
-  return (
-    <div role='none' className={mx('grid grid-rows-[min-content_1fr] h-full overflow-hidden', classNames)}>
-      {children}
-    </div>
-  );
+  return <div className={mx('grid grid-rows-[min-content_1fr] h-full overflow-hidden', classNames)}>{children}</div>;
 };
 
 EditorContent.displayName = EDITOR_CONTENT_NAME;

package/src/components/Editor/EditorView.tsx

@@ -88,9 +88,8 @@ export const EditorView = forwardRef<EditorController, EditorViewProps>(
 
     return (
       <div
-        role='none'
         className={mx(
-          'w-full outline-hidden focus:border-accent-surface focus-within:border-neutral-focus-indicator',
+          'w-full outline-hidden focus:border-accent-surface focus-within:border-focus-ring-subtle',
           classNames,
         )}
         {...(focusable ? focusAttributes : {})}

package/src/components/EditorMenuProvider/EditorMenuProvider.tsx

@@ -137,7 +137,7 @@ export const EditorMenuProvider = ({
       </Popover.Portal>
 
       {/* Content */}
-      <div role='none' className='contents' ref={setRoot}>
+      <div className='contents' ref={setRoot}>
         {children}
       </div>
     </Popover.Root>

package/src/components/EditorMenuProvider/popover.ts

@@ -53,6 +53,7 @@ export const popover = (options: PopoverOptions = {}): Extension => {
       placeholder({
         // TODO(burdon): Translations.
         content: `Press '${Array.isArray(options.trigger) ? options.trigger[0] : options.trigger}' for commands`,
+        focusOnly: true,
         ...options.placeholder,
       }),
   ].filter(isTruthy);

package/src/components/EditorPreviewProvider/EditorPreviewProvider.tsx

@@ -68,7 +68,7 @@ export const EditorPreviewProvider = ({ children, onLookup }: EditorPreviewProvi
     <EditorPreviewContextProvider pending={value.pending} link={value.link} target={value.target}>
       <Popover.Root open={open} onOpenChange={setOpen}>
         <Popover.VirtualTrigger virtualRef={triggerRef as unknown as RefObject<HTMLButtonElement>} />
-        <div role='none' className='contents' ref={setRoot}>
+        <div className='contents' ref={setRoot}>
           {children}
         </div>
       </Popover.Root>

package/src/extensions/assistant-extension.tsx

@@ -74,15 +74,15 @@ export const assistant = (options: AssistantOptions): Extension[] => {
       },
       /** @apply dx-button */
       '.cm-panel button': {
-        color: 'var(--color-base-surface-text) !important',
+        color: 'var(--color-base-foreground) !important',
       },
       '.cm-panel.cm-panel-lint ul': {
-        color: 'var(--color-base-surface-text) !important',
+        color: 'var(--color-base-foreground) !important',
         backgroundColor: 'var(--color-base-surface) !important',
         marginRight: '2rem !important',
       },
       '.cm-panel.cm-panel-lint ul [aria-selected]': {
-        color: 'var(--color-base-surface-text) !important',
+        color: 'var(--color-base-foreground) !important',
         backgroundColor: 'var(--color-base-surface) !important',
       },
       '.cm-panel.cm-panel-lint ul li': {

package/src/stories/Automerge.stories.tsx

@@ -2,17 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Repo } from '@automerge/automerge-repo';
+import { Repo, initSubduction } from '@automerge/automerge-repo';
 import { BroadcastChannelNetworkAdapter } from '@automerge/automerge-repo-network-broadcastchannel';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useCallback, useEffect, useState } from 'react';
 
-import { Obj, Ref } from '@dxos/echo';
+import { Obj, Query, Ref } from '@dxos/echo';
 import { DocAccessor, createDocAccessor } from '@dxos/echo-db';
 import { TestSchema } from '@dxos/echo/testing';
 import { log } from '@dxos/log';
 import { type Messenger } from '@dxos/protocols';
-import { Query, useQuery, useSpace } from '@dxos/react-client/echo';
+import { useQuery, useSpace } from '@dxos/react-client/echo';
 import { type Identity, useIdentity } from '@dxos/react-client/halo';
 import { useClientStory, withMultiClientProvider } from '@dxos/react-client/testing';
 import { Button, useThemeContext } from '@dxos/react-ui';
@@ -60,6 +60,9 @@ const DefaultStory = () => {
 
   useEffect(() => {
     queueMicrotask(async () => {
+      // Subduction-fork `Repo` constructs a `MemorySigner` internally; WASM must be
+      // initialized first or the constructor throws `'set_subduction_logger' of undefined`.
+      await initSubduction();
       const repo1 = new Repo({ network: [new BroadcastChannelNetworkAdapter()] });
       const repo2 = new Repo({ network: [new BroadcastChannelNetworkAdapter()] });
 

package/src/stories/EditorToolbar.stories.tsx

@@ -52,7 +52,7 @@ const DefaultStory = ({ autoFocus, initialValue, placeholder, viewMode = 'source
     <Editor.Root extensions={extensions} viewMode={viewMode}>
       <Editor.Content>
         <Editor.Toolbar classNames='dx-document' />
-        <div role='none' className='dx-container dx-document bg-base-surface'>
+        <div className='dx-container dx-document bg-base-surface'>
           <Editor.View autoFocus={autoFocus} initialValue={initialValue} selectionEnd />
         </div>
       </Editor.Content>

package/src/stories/components/util.tsx

@@ -206,7 +206,7 @@ export const links: Completion[] = [
 export const names = ['adam', 'alice', 'alison', 'bob', 'carol', 'charlie', 'sayuri', 'shoko'];
 
 const hover =
-  'rounded-xs text-base-surface-text text-primary-600 hover:text-primary-500 dark:text-primary-300 hover:dark:text-primary-200';
+  'rounded-xs text-base-foreground text-primary-600 hover:text-primary-500 dark:text-primary-300 hover:dark:text-primary-200';
 
 export const renderLinkTooltip: RenderCallback<{ url: string }> = (el, { url }) => {
   el.appendChild(