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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-editor",
-  "version": "0.8.4-main.d05539e30a",
+  "version": "0.8.4-main.d9fc60f731",
   "description": "Text editor components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -35,68 +35,68 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.2.6",
-    "@codemirror/autocomplete": "^6.19.0",
-    "@codemirror/commands": "^6.8.1",
+    "@automerge/automerge": "3.3.0-fragments.1",
+    "@codemirror/autocomplete": "^6.20.2",
+    "@codemirror/commands": "^6.10.3",
     "@codemirror/lang-html": "^6.4.11",
-    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-javascript": "^6.2.5",
     "@codemirror/lang-json": "^6.0.2",
-    "@codemirror/lang-markdown": "6.3.4",
+    "@codemirror/lang-markdown": "6.5.0",
     "@codemirror/lang-xml": "^6.1.0",
-    "@codemirror/lang-yaml": "^6.1.2",
-    "@codemirror/language": "^6.11.3",
-    "@codemirror/language-data": "^6.5.1",
-    "@codemirror/lint": "6.8.5",
-    "@codemirror/search": "^6.5.11",
-    "@codemirror/state": "^6.5.2",
+    "@codemirror/lang-yaml": "^6.1.3",
+    "@codemirror/language": "^6.12.3",
+    "@codemirror/language-data": "^6.5.2",
+    "@codemirror/lint": "6.9.6",
+    "@codemirror/search": "^6.7.0",
+    "@codemirror/state": "^6.6.0",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.38.5",
+    "@codemirror/view": "^6.43.0",
     "@fluentui/react-tabster": "9.26.11",
-    "@lezer/common": "^1.2.2",
-    "@lezer/generator": "^1.7.1",
-    "@lezer/highlight": "^1.2.1",
-    "@lezer/markdown": "^1.3.1",
+    "@lezer/common": "^1.5.2",
+    "@lezer/generator": "^1.8.0",
+    "@lezer/highlight": "^1.2.3",
+    "@lezer/markdown": "^1.6.3",
     "@radix-ui/react-context": "1.1.1",
     "@radix-ui/react-use-controllable-state": "1.1.0",
-    "@replit/codemirror-vim": "^6.2.1",
+    "@replit/codemirror-vim": "^6.3.0",
     "@replit/codemirror-vscode-keymap": "^6.0.2",
     "@uiw/codemirror-theme-vscode": "^4.25.2",
     "ajv": "^8.18.0",
     "bind-event-listener": "^3.0.0",
-    "codemirror": "^6.0.1",
+    "codemirror": "^6.0.2",
     "lib0": "^0.2.65",
     "lodash.defaultsdeep": "^4.6.1",
     "lodash.merge": "^4.6.2",
     "lodash.sortby": "^4.7.0",
     "style-mod": "^4.1.0",
-    "@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"
+    "@dxos/async": "0.8.4-main.d9fc60f731",
+    "@dxos/app-graph": "0.8.4-main.d9fc60f731",
+    "@dxos/client": "0.8.4-main.d9fc60f731",
+    "@dxos/context": "0.8.4-main.d9fc60f731",
+    "@dxos/display-name": "0.8.4-main.d9fc60f731",
+    "@dxos/debug": "0.8.4-main.d9fc60f731",
+    "@dxos/echo-db": "0.8.4-main.d9fc60f731",
+    "@dxos/echo": "0.8.4-main.d9fc60f731",
+    "@dxos/effect": "0.8.4-main.d9fc60f731",
+    "@dxos/invariant": "0.8.4-main.d9fc60f731",
+    "@dxos/lit-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/log": "0.8.4-main.d9fc60f731",
+    "@dxos/protocols": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-mosaic": "0.8.4-main.d9fc60f731",
+    "@dxos/react-hooks": "0.8.4-main.d9fc60f731",
+    "@dxos/ui": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-editor": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-theme": "0.8.4-main.d9fc60f731",
+    "@dxos/util": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-menu": "0.8.4-main.d9fc60f731"
   },
   "devDependencies": {
-    "@automerge/automerge": "3.2.6",
-    "@automerge/automerge-repo": "2.6.0-subduction.20",
-    "@automerge/automerge-repo-network-broadcastchannel": "2.6.0-subduction.20",
+    "@automerge/automerge": "3.3.0-fragments.1",
+    "@automerge/automerge-repo": "2.6.0-subduction.23",
+    "@automerge/automerge-repo-network-broadcastchannel": "2.6.0-subduction.23",
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/ai": "0.33.2",
-    "@effect/platform": "0.94.4",
+    "@effect/ai": "0.35.0",
+    "@effect/platform": "0.96.1",
     "@types/chai": "^4.2.15",
     "@types/chai-dom": "^1.11.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
@@ -107,40 +107,40 @@
     "@types/react-test-renderer": "^17.0.2",
     "chai": "^4.4.1",
     "chai-dom": "^1.11.0",
-    "effect": "3.20.0",
+    "effect": "3.21.2",
     "happy-dom": "^20.0.0",
-    "jsdom": "^27.0.0",
+    "jsdom": "^29.1.1",
     "mocha": "^10.6.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "react-test-renderer": "~19.2.0",
-    "vite": "^8.0.13",
+    "vite": "^8.0.14",
     "vite-plugin-top-level-await": "^1.6.0",
     "vite-plugin-wasm": "^3.6.0",
-    "@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"
+    "@dxos/ai": "0.8.4-main.d9fc60f731",
+    "@dxos/keyboard": "0.8.4-main.d9fc60f731",
+    "@dxos/config": "0.8.4-main.d9fc60f731",
+    "@dxos/echo-atom": "0.8.4-main.d9fc60f731",
+    "@dxos/random": "0.8.4-main.d9fc60f731",
+    "@dxos/react-client": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-attention": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.d9fc60f731",
+    "@dxos/schema": "0.8.4-main.d9fc60f731",
+    "@dxos/storybook-utils": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-theme": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-types": "0.8.4-main.d9fc60f731",
+    "@dxos/echo": "0.8.4-main.d9fc60f731"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.94.4",
-    "effect": "3.20.0",
+    "@effect/platform": "0.96.1",
+    "effect": "3.21.2",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-client": "0.8.4-main.d05539e30a",
-    "@dxos/react-ui": "0.8.4-main.d05539e30a",
-    "@dxos/ui-theme": "0.8.4-main.d05539e30a"
+    "@dxos/ui-theme": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/react-client": "0.8.4-main.d9fc60f731"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Editor/EditorView.tsx

@@ -88,10 +88,7 @@ export const EditorView = forwardRef<EditorController, EditorViewProps>(
 
     return (
       <div
-        className={mx(
-          'w-full outline-hidden focus:border-accent-surface focus-within:border-focus-ring-subtle',
-          classNames,
-        )}
+        className={mx('w-full outline-hidden focus:border-accent-bg focus-within:border-focus-ring-subtle', classNames)}
         {...(focusable ? focusAttributes : {})}
         ref={parentRef}
       />

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-foreground) !important',
+        color: 'var(--color-base-fg) !important',
       },
       '.cm-panel.cm-panel-lint ul': {
-        color: 'var(--color-base-foreground) !important',
+        color: 'var(--color-base-fg) !important',
         backgroundColor: 'var(--color-base-surface) !important',
         marginRight: '2rem !important',
       },
       '.cm-panel.cm-panel-lint ul [aria-selected]': {
-        color: 'var(--color-base-foreground) !important',
+        color: 'var(--color-base-fg) !important',
         backgroundColor: 'var(--color-base-surface) !important',
       },
       '.cm-panel.cm-panel-lint ul li': {

package/src/stories/Popover.stories.tsx

@@ -81,7 +81,7 @@ const LinkStory = (args: DefaultStoryProps) => {
             label: object.name,
             icon: 'ph--user--regular',
             onSelect: ({ view, head }) => {
-              const link = `[${object.name}](${Obj.getDXN(object)})`;
+              const link = `[${object.name}](${Obj.getURI(object)})`;
               if (text?.startsWith('@')) {
                 insertAtLineStart(view, head, `!${link}\n`);
               } else {

package/src/stories/Preview.stories.tsx

@@ -59,13 +59,13 @@ const PreviewCard = () => {
       <Popover.Content onOpenAutoFocus={(event) => event.preventDefault()}>
         <Popover.Viewport classNames='dx-card-popover-width'>
           <Card.Root border={false}>
-            <Card.Toolbar>
+            <Card.Header>
               <Card.Icon icon='ph--file-text--regular' />
               <Card.Title>{target.label}</Card.Title>
               <Popover.Close asChild>
-                <Card.CloseIconButton />
+                <Card.ActionIconButton action='close' />
               </Popover.Close>
-            </Card.Toolbar>
+            </Card.Header>
             <Card.Row>
               <Card.Text variant='description'>{target.text}</Card.Text>
             </Card.Row>
@@ -165,7 +165,7 @@ const PreviewBlockComponent = ({ link, el, view }: { link: PreviewLinkRef; el: H
     <Menu.Root>
       <Card.Root classNames={hoverableControls}>
         {!view?.state.readOnly && (
-          <Card.Toolbar>
+          <Card.Header>
             <Card.Icon icon='ph--bookmark--regular' />
             <Card.Title>{link.label}</Card.Title>
             {/* TODO(wittjosiah): Reconcile with Card.Menu. */}
@@ -173,7 +173,7 @@ const PreviewBlockComponent = ({ link, el, view }: { link: PreviewLinkRef; el: H
               <Toolbar.IconButton iconOnly variant='ghost' icon='ph--dots-three-vertical--regular' label='Menu' />
             </Menu.Trigger>
             <Menu.Content items={menuItems} />
-          </Card.Toolbar>
+          </Card.Header>
         )}
         {target && (
           <Card.Row>

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-foreground text-primary-600 hover:text-primary-500 dark:text-primary-300 hover:dark:text-primary-200';
+  'rounded-xs text-base-fg 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(

package/src/util/react.tsx

@@ -6,8 +6,8 @@ import React, { type FC } from 'react';
 import { createRoot } from 'react-dom/client';
 
 import { ThemeProvider, Tooltip } from '@dxos/react-ui';
+import { defaultTx } from '@dxos/react-ui';
 import { type RenderCallback } from '@dxos/ui-editor/types';
-import { defaultTx } from '@dxos/ui-theme';
 
 /**
  * @deprecated Use `trim` from `@dxos/util`.