@dxos/react-ui-thread 0.8.4-main.7ace549 → 0.8.4-main.8342792842

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@dxos/react-ui-thread",
-  "version": "0.8.4-main.7ace549",
+  "version": "0.8.4-main.8342792842",
   "description": "A set of components to use with threads, including comments and messages.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
@@ -24,33 +28,32 @@
     "src"
   ],
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
     "@radix-ui/react-primitive": "2.0.2",
     "date-fns": "^3.3.1",
-    "@dxos/react-ui-editor": "0.8.4-main.7ace549",
-    "@dxos/util": "0.8.4-main.7ace549"
+    "@dxos/ui-editor": "0.8.4-main.8342792842",
+    "@dxos/util": "0.8.4-main.8342792842",
+    "@dxos/react-ui-editor": "0.8.4-main.8342792842"
   },
   "devDependencies": {
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/echo": "0.8.4-main.7ace549",
-    "@dxos/echo-db": "0.8.4-main.7ace549",
-    "@dxos/keys": "0.8.4-main.7ace549",
-    "@dxos/live-object": "0.8.4-main.7ace549",
-    "@dxos/log": "0.8.4-main.7ace549",
-    "@dxos/random": "0.8.4-main.7ace549",
-    "@dxos/react-ui": "0.8.4-main.7ace549",
-    "@dxos/react-ui-theme": "0.8.4-main.7ace549",
-    "@dxos/storybook-utils": "0.8.4-main.7ace549"
+    "@dxos/echo": "0.8.4-main.8342792842",
+    "@dxos/echo-db": "0.8.4-main.8342792842",
+    "@dxos/keys": "0.8.4-main.8342792842",
+    "@dxos/log": "0.8.4-main.8342792842",
+    "@dxos/random": "0.8.4-main.8342792842",
+    "@dxos/react-ui": "0.8.4-main.8342792842",
+    "@dxos/storybook-utils": "0.8.4-main.8342792842",
+    "@dxos/ui-theme": "0.8.4-main.8342792842"
   },
   "peerDependencies": {
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.7ace549",
-    "@dxos/react-ui-theme": "0.8.4-main.7ace549"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.8342792842",
+    "@dxos/ui-theme": "0.8.4-main.8342792842"
   },
   "publishConfig": {
     "access": "public"

package/src/Message/Message.stories.tsx

@@ -7,7 +7,7 @@ import React, { useState } from 'react';
 
 import { PublicKey } from '@dxos/keys';
 import { withTheme } from '@dxos/react-ui/testing';
-import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/react-ui-theme';
+import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/ui-theme';
 
 import { type MessageEntity, MessageStoryText } from '../testing';
 import { Thread } from '../Thread';
@@ -39,7 +39,7 @@ const meta = {
   title: 'ui/react-ui-thread/Message',
   component: MessageRoot as any,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme()],
   parameters: {
     layout: 'fullscreen',
     translations,

package/src/Message/Message.tsx

@@ -5,10 +5,10 @@
 import { formatDistanceToNow } from 'date-fns/formatDistanceToNow';
 import React, { type ComponentPropsWithRef, type ComponentPropsWithoutRef, forwardRef } from 'react';
 
-// TODO(burdon): Remove dep.
 import { Avatar, type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { type UseTextEditorProps, keymap, listener, useTextEditor } from '@dxos/react-ui-editor';
-import { focusRing, mx } from '@dxos/react-ui-theme';
+import { type UseTextEditorProps, useTextEditor } from '@dxos/react-ui-editor';
+import { keymap, listener } from '@dxos/ui-editor';
+import { focusRing, mx } from '@dxos/ui-theme';
 import { hexToEmoji, hexToHue, isTruthy } from '@dxos/util';
 
 import { translationKey } from '../translations';

package/src/Thread/Comments.stories.tsx

@@ -5,27 +5,29 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { type FC, useEffect, useMemo, useRef, useState } from 'react';
 
-import { Expando } from '@dxos/echo/internal';
+import { Obj } from '@dxos/echo';
+import { TestSchema } from '@dxos/echo/testing';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { faker } from '@dxos/random';
 import { Icon, IconButton, useThemeContext } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
+import { useTextEditor } from '@dxos/react-ui-editor';
 import {
   type Comment,
   type CommentsOptions,
+  type EditorView,
   type Range,
   comments,
   createBasicExtensions,
   createThemeExtensions,
+  documentId,
   listener,
   scrollThreadIntoView,
-  useComments,
-  useTextEditor,
-} from '@dxos/react-ui-editor';
-import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/react-ui-theme';
+  setComments,
+} from '@dxos/ui-editor';
+import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/ui-theme';
 
-import { Obj } from '../../../../core/echo/echo/src';
 import { MessageBody, MessageHeading, MessageRoot, MessageTextbox } from '../Message';
 import { type MessageEntity } from '../testing';
 import { translations } from '../translations';
@@ -36,13 +38,31 @@ faker.seed(101);
 
 const authorId = PublicKey.random().toHex();
 
+/**
+ * @deprecated This hook will be removed in future versions. Use the new comment sync extension instead.
+ * Update comments state field.
+ */
+const useComments = (view: EditorView | null | undefined, id: string, comments?: Comment[]) => {
+  useEffect(() => {
+    if (view) {
+      // Check same document.
+      // NOTE: Hook might be called before editor state is updated.
+      if (id === view.state.facet(documentId)) {
+        view.dispatch({
+          effects: setComments.of({ id, comments: comments ?? [] }),
+        });
+      }
+    }
+  });
+};
+
 //
 // Editor
 //
 
 const Editor: FC<{
   id?: string;
-  item: Expando;
+  initialValue: string;
   comments: Comment[];
   selected?: string;
   onCreateComment: CommentsOptions['onCreate'];
@@ -51,7 +71,7 @@ const Editor: FC<{
   onSelectComment: CommentsOptions['onSelect'];
 }> = ({
   id = 'test',
-  item,
+  initialValue,
   selected: selectedValue,
   comments: commentRanges,
   onCreateComment,
@@ -65,7 +85,7 @@ const Editor: FC<{
   const { parentRef, view } = useTextEditor(
     () => ({
       id,
-      initialValue: item.content,
+      initialValue: initialValue,
       extensions: [
         createBasicExtensions(),
         createThemeExtensions({ themeMode }),
@@ -78,7 +98,7 @@ const Editor: FC<{
         }),
       ],
     }),
-    [id, item, themeMode],
+    [id, initialValue, themeMode],
   );
   useComments(view, id, commentRanges);
   useEffect(() => {
@@ -141,7 +161,7 @@ const StoryThread: FC<{
 
   const handleCreateMessage = () => {
     if (messageRef.current?.length) {
-      const message = Obj.make(Expando, {
+      const message = Obj.make(TestSchema.Expando, {
         timestamp: new Date().toISOString(),
         sender: { identityKey: authorId },
         text: messageRef.current,
@@ -197,12 +217,14 @@ const StoryThread: FC<{
   );
 };
 
-const Sidebar: FC<{
+type SidebarProps = {
   threads: StoryCommentThread[];
   selected?: string;
   onSelect: (thread: string) => void;
   onResolve: (thread: string) => void;
-}> = ({ threads, selected, onSelect, onResolve }) => {
+};
+
+const Sidebar = ({ threads, selected, onSelect, onResolve }: SidebarProps) => {
   // Sort by y-position.
   const sortedThreads = useMemo(() => {
     const sorted = [...threads];
@@ -236,7 +258,7 @@ type StoryProps = {
 };
 
 const DefaultStory = ({ text, autoCreate }: StoryProps) => {
-  const [item] = useState(() => Obj.make(Expando, { content: text ?? '' }));
+  const [item] = useState(() => Obj.make(TestSchema.Expando, { content: text ?? '' }));
   const [threads, setThreads] = useState<StoryCommentThread[]>([]);
   const [selected, setSelected] = useState<string>();
 
@@ -330,7 +352,7 @@ const DefaultStory = ({ text, autoCreate }: StoryProps) => {
     <main className='fixed inset-0 grid grid-cols-[1fr_24rem]'>
       <div role='none' className='max-bs-full overflow-y-auto p-4'>
         <Editor
-          item={item}
+          initialValue={item.content}
           selected={selected}
           comments={comments}
           onCreateComment={handleCreateComment}
@@ -356,7 +378,7 @@ const meta = {
   title: 'ui/react-ui-thread/Comments',
   component: StoryThread as any,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme()],
   parameters: {
     translations,
     layout: 'fullscreen',

package/src/Thread/Thread.stories.tsx

@@ -8,8 +8,8 @@ import React, { useMemo, useRef, useState } from 'react';
 import { PublicKey } from '@dxos/keys';
 import { faker } from '@dxos/random';
 import { withTheme } from '@dxos/react-ui/testing';
-import { createBasicExtensions, createThemeExtensions } from '@dxos/react-ui-editor';
-import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/react-ui-theme';
+import { createBasicExtensions, createThemeExtensions } from '@dxos/ui-editor';
+import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/ui-theme';
 
 import { MessageRoot, MessageTextbox } from '../Message';
 import { type MessageEntity, MessageStoryText } from '../testing';
@@ -85,7 +85,7 @@ const meta = {
   title: 'ui/react-ui-thread/Thread',
   component: Thread.Root,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme()],
   parameters: {
     layout: 'fullscreen',
     translations,

package/src/Thread/Thread.tsx

@@ -5,12 +5,12 @@
 import React, { type ComponentPropsWithRef, forwardRef } from 'react';
 
 import { Icon, type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { hoverableControlItem, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
+import { hoverableControlItem, hoverableFocusedWithinControls, mx } from '@dxos/ui-theme';
 
 import { translationKey } from '../translations';
 import type { ThreadEntity } from '../types';
 
-// TODO(burdon): Why is this exported?
+// TODO(burdon): Avoid exporting fragments.
 export const threadLayout = 'is-full place-self-start grid grid-cols-[var(--rail-size)_1fr]';
 
 //

package/src/testing.tsx

@@ -5,7 +5,7 @@
 import React from 'react';
 
 import { IconButton } from '@dxos/react-ui';
-import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
+import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/ui-theme';
 
 import { MessageBody, MessageHeading } from './Message';
 import { type MessageMetadata } from './types';

package/src/translations.ts

@@ -4,7 +4,7 @@
 
 import { type Resource } from '@dxos/react-ui';
 
-export const translationKey = 'react-ui-thread';
+export const translationKey = '@dxos/react-ui-thread';
 
 export const translations = [
   {