@dxos/react-ui-thread 0.8.4-main.c4373fc → 0.8.4-main.c85a9c8dae

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@dxos/react-ui-thread",
-  "version": "0.8.4-main.c4373fc",
+  "version": "0.8.4-main.c85a9c8dae",
   "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.c4373fc",
-    "@dxos/util": "0.8.4-main.c4373fc"
+    "@dxos/react-ui-editor": "0.8.4-main.c85a9c8dae",
+    "@dxos/ui-editor": "0.8.4-main.c85a9c8dae",
+    "@dxos/util": "0.8.4-main.c85a9c8dae"
   },
   "devDependencies": {
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/keys": "0.8.4-main.c4373fc",
-    "@dxos/echo": "0.8.4-main.c4373fc",
-    "@dxos/log": "0.8.4-main.c4373fc",
-    "@dxos/live-object": "0.8.4-main.c4373fc",
-    "@dxos/echo-db": "0.8.4-main.c4373fc",
-    "@dxos/random": "0.8.4-main.c4373fc",
-    "@dxos/react-ui": "0.8.4-main.c4373fc",
-    "@dxos/storybook-utils": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-theme": "0.8.4-main.c4373fc"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/echo": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo-db": "0.8.4-main.c85a9c8dae",
+    "@dxos/random": "0.8.4-main.c85a9c8dae",
+    "@dxos/log": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
+    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae",
+    "@dxos/keys": "0.8.4-main.c85a9c8dae",
+    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
   },
   "peerDependencies": {
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-theme": "0.8.4-main.c4373fc"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
+    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
   },
   "publishConfig": {
     "access": "public"

package/src/Message/Message.stories.tsx

@@ -6,8 +6,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 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 { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/ui-theme';
 
 import { type MessageEntity, MessageStoryText } from '../testing';
 import { Thread } from '../Thread';
@@ -25,7 +25,7 @@ const DefaultStory = () => {
   });
 
   return (
-    <div className='mli-auto is-96 overflow-y-auto'>
+    <div className='mx-auto w-96 overflow-y-auto'>
       <Thread.Root id='t1'>
         <MessageRoot {...message} classNames={[hoverableControls, hoverableFocusedWithinControls]}>
           <MessageStoryText {...message} onDelete={() => console.log('delete')} />
@@ -39,7 +39,7 @@ const meta = {
   title: 'ui/react-ui-thread/Message',
   component: MessageRoot as any,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   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';
@@ -16,9 +16,9 @@ import { type MessageMetadata } from '../types';
 
 const avatarSize = 7;
 
-export type MessageRootProps = ThemedClassName<ComponentPropsWithRef<'div'>> &
-  MessageMetadata &
-  Partial<{ continues: boolean }>;
+export type MessageRootProps = ThemedClassName<
+  ComponentPropsWithRef<'div'> & MessageMetadata & Partial<{ continues: boolean }>
+>;
 
 // TODO(burdon): Show authorName on tooltip.
 export const MessageRoot = forwardRef<HTMLDivElement, MessageRootProps>(
@@ -36,16 +36,16 @@ export const MessageRoot = forwardRef<HTMLDivElement, MessageRootProps>(
           className={mx('grid grid-cols-subgrid col-span-2', classNames)}
           ref={forwardedRef}
         >
-          <div role='none' className='flex flex-col items-center gap-2 pbs-1'>
+          <div role='none' className='flex flex-col items-center gap-2 pt-1'>
             <Avatar.Content
               size={avatarSize}
               hue={authorAvatarProps?.hue || hexToHue(authorId ?? '0')}
               fallback={authorAvatarProps?.emoji || hexToEmoji(authorId ?? '0')}
               {...(authorImgSrc && { imgSrc: authorImgSrc })}
             />
-            {continues && <div role='none' className='is-px grow bg-separator' />}
+            {continues && <div role='none' className='w-px grow bg-separator' />}
           </div>
-          <div role='none' className='plb-1 min-is-0'>
+          <div role='none' className='py-1 min-w-0'>
             {children}
           </div>
         </div>
@@ -84,7 +84,7 @@ export const MessageTime = ({ timestamp }: MessageTimeProps) => {
   const { dtLocale } = useTranslation(translationKey);
   const dt = timestamp ? new Date(timestamp) : undefined;
   return (
-    <time className='block text-subdued text-xs pbe-0.5' dateTime={dt?.toISOString()}>
+    <time className='block text-subdued text-xs pb-0.5' dateTime={dt?.toISOString()}>
       {dt ? formatDistanceToNow(dt, { locale: dtLocale, addSuffix: true }) : ''}
     </time>
   );
@@ -149,7 +149,7 @@ export const MessageTextbox = ({
       extensions: [
         keymap.of(keyBindings({ onSend, onClear })),
         listener({
-          onFocus: (focusing) => {
+          onFocus: ({ focusing }) => {
             if (focusing) {
               onEditorFocus?.();
             }
@@ -167,7 +167,7 @@ export const MessageTextbox = ({
       <div
         role='none'
         ref={parentRef}
-        className={mx('plb-0.5 mie-1 rounded-sm', focusRing, disabled && 'opacity-50')}
+        className={mx('py-0.5 me-1 rounded-xs', focusRing, disabled && 'opacity-50')}
         {...focusAttributes}
       />
     </MessageRoot>

package/src/Thread/Comments.stories.tsx

@@ -5,28 +5,28 @@
 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 { live } from '@dxos/echo/internal';
-import { createDocAccessor, createObject } from '@dxos/echo-db';
+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 { Button, Icon, useThemeContext } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
+import { Icon, IconButton, useThemeContext } from '@dxos/react-ui';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { useTextEditor } from '@dxos/react-ui-editor';
 import {
   type Comment,
   type CommentsOptions,
+  type EditorView,
   type Range,
-  automerge,
   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 { MessageBody, MessageHeading, MessageRoot, MessageTextbox } from '../Message';
 import { type MessageEntity } from '../testing';
@@ -38,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'];
@@ -53,7 +71,7 @@ const Editor: FC<{
   onSelectComment: CommentsOptions['onSelect'];
 }> = ({
   id = 'test',
-  item,
+  initialValue,
   selected: selectedValue,
   comments: commentRanges,
   onCreateComment,
@@ -67,11 +85,10 @@ const Editor: FC<{
   const { parentRef, view } = useTextEditor(
     () => ({
       id,
-      initialValue: item.content,
+      initialValue: initialValue,
       extensions: [
         createBasicExtensions(),
         createThemeExtensions({ themeMode }),
-        automerge(createDocAccessor(item, ['content'])),
         comments({
           id,
           onCreate: onCreateComment,
@@ -81,7 +98,7 @@ const Editor: FC<{
         }),
       ],
     }),
-    [id, item, themeMode],
+    [id, initialValue, themeMode],
   );
   useComments(view, id, commentRanges);
   useEffect(() => {
@@ -114,19 +131,21 @@ const StoryThread: FC<{
   onSelect: () => void;
   onResolve: () => void;
 }> = ({ thread, selected, onSelect, onResolve }) => {
-  const containerRef = useRef<HTMLDivElement>(null);
   const { themeMode } = useThemeContext();
+  const containerRef = useRef<HTMLDivElement>(null);
+
   // TODO(wittjosiah): This is a hack to reset the editor after a message is sent.
-  const [_count, _setCount] = useState(0);
-  const rerenderEditor = () => _setCount((count) => count + 1);
+  const [state, setState] = useState({});
   const messageRef = useRef('');
   const extensions = useMemo(
     () => [
       createBasicExtensions({ placeholder: 'Enter comment' }),
       createThemeExtensions({ themeMode }),
-      listener({ onChange: (text) => (messageRef.current = text) }),
+      listener({
+        onChange: ({ text }) => (messageRef.current = text),
+      }),
     ],
-    [themeMode, _count],
+    [themeMode, state],
   );
 
   const [autoFocus, setAutoFocus] = useState(false);
@@ -142,7 +161,7 @@ const StoryThread: FC<{
 
   const handleCreateMessage = () => {
     if (messageRef.current?.length) {
-      const message = live(Expando, {
+      const message = Obj.make(TestSchema.Expando, {
         timestamp: new Date().toISOString(),
         sender: { identityKey: authorId },
         text: messageRef.current,
@@ -151,7 +170,7 @@ const StoryThread: FC<{
 
       messageRef.current = '';
       setAutoFocus(true);
-      rerenderEditor();
+      setState({});
     }
   };
 
@@ -185,20 +204,27 @@ const StoryThread: FC<{
           onSend={handleCreateMessage}
         />
         <Thread.Status />
-        <Button variant='ghost' classNames='px-1' title='Resolve' onClick={onResolve}>
-          <Icon icon='ph--check--regular' />
-        </Button>
+        <IconButton
+          variant='ghost'
+          icon='ph--check--regular'
+          iconOnly
+          classNames='px-1'
+          label='Resolve'
+          onClick={onResolve}
+        />
       </div>
     </Thread.Root>
   );
 };
 
-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];
@@ -232,7 +258,7 @@ type StoryProps = {
 };
 
 const DefaultStory = ({ text, autoCreate }: StoryProps) => {
-  const [item] = useState(createObject(live(Expando, { content: text ?? '' })));
+  const [item] = useState(() => Obj.make(TestSchema.Expando, { content: text ?? '' }));
   const [threads, setThreads] = useState<StoryCommentThread[]>([]);
   const [selected, setSelected] = useState<string>();
 
@@ -324,9 +350,9 @@ const DefaultStory = ({ text, autoCreate }: StoryProps) => {
 
   return (
     <main className='fixed inset-0 grid grid-cols-[1fr_24rem]'>
-      <div role='none' className='max-bs-full overflow-y-auto p-4'>
+      <div role='none' className='max-h-full overflow-y-auto p-4'>
         <Editor
-          item={item}
+          initialValue={item.content}
           selected={selected}
           comments={comments}
           onCreateComment={handleCreateComment}
@@ -336,7 +362,7 @@ const DefaultStory = ({ text, autoCreate }: StoryProps) => {
         />
       </div>
 
-      <div role='none' className='max-bs-full overflow-y-auto p-4'>
+      <div role='none' className='max-h-full overflow-y-auto p-4'>
         <Sidebar
           threads={visibleThreads}
           selected={selected}
@@ -352,7 +378,7 @@ const meta = {
   title: 'ui/react-ui-thread/Comments',
   component: StoryThread as any,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
     translations,
     layout: 'fullscreen',

package/src/Thread/Thread.stories.tsx

@@ -7,9 +7,9 @@ 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 { withLayout, withTheme } from '@dxos/react-ui/testing';
+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';
@@ -59,7 +59,7 @@ const DefaultStory = () => {
   };
 
   return (
-    <div className='mli-auto is-96 overflow-y-auto'>
+    <div className='mx-auto w-96 overflow-y-auto'>
       <Thread.Root id='t1'>
         {messages.map((message) => (
           <MessageRoot key={message.id} classNames={[hoverableControls, hoverableFocusedWithinControls]} {...message}>
@@ -85,7 +85,7 @@ const meta = {
   title: 'ui/react-ui-thread/Thread',
   component: Thread.Root,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
     layout: 'fullscreen',
     translations,

package/src/Thread/Thread.tsx

@@ -5,13 +5,13 @@
 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?
-export const threadLayout = 'is-full place-self-start grid grid-cols-[var(--rail-size)_1fr]';
+// TODO(burdon): Avoid exporting fragments.
+export const threadLayout = 'w-full place-self-start grid grid-cols-[var(--dx-rail-size)_1fr]';
 
 //
 // Root
@@ -30,7 +30,7 @@ const ThreadRoot = forwardRef<HTMLDivElement, ThreadRootProps>(
         className={mx(
           threadLayout,
           hoverableFocusedWithinControls,
-          'bg-[var(--surface-bg)] current-related attention-surface [--controls-opacity:0]',
+          'bg-[var(--surface-bg)] current-related dx-attention-surface [--controls-opacity:0]',
           classNames,
         )}
         ref={forwardedRef}
@@ -45,10 +45,10 @@ const ThreadRoot = forwardRef<HTMLDivElement, ThreadRootProps>(
 // Heading
 //
 
-type ThreadHeaderProps = ThemedClassName<ComponentPropsWithRef<'div'>> & { detached?: boolean };
+type ThreadHeaderProps = ComponentPropsWithRef<'div'> & { detached?: boolean };
 
 const ThreadHeader = forwardRef<HTMLParagraphElement, ThreadHeaderProps>(
-  ({ classNames, children, detached, ...props }, forwardedRef) => {
+  ({ children, detached, ...props }, forwardedRef) => {
     return (
       <>
         <div role='none' className='flex items-center justify-center text-description'>
@@ -59,10 +59,7 @@ const ThreadHeader = forwardRef<HTMLParagraphElement, ThreadHeaderProps>(
             role='heading'
             data-testid='thread.heading'
             {...props}
-            className={mx(
-              'mie-2 text-description font-medium truncate italic',
-              detached && 'line-through decoration-1',
-            )}
+            className={mx('me-2 text-description font-medium truncate italic', detached && 'line-through decoration-1')}
             ref={forwardedRef}
           >
             {children}
@@ -88,17 +85,17 @@ const ThreadStatus = forwardRef<HTMLDivElement, ThreadStatusProps>(
       <div
         {...props}
         className={mx(
-          'col-start-2 grid grid-cols-[min-content_1fr_max-content] pb-2 pie-2 text-xs text-description',
+          'col-start-2 grid grid-cols-[min-content_1fr_max-content] pb-2 pe-2 text-xs text-description',
           classNames,
         )}
         ref={forwardedRef}
       >
         <Icon
           icon='ph--spinner--bold'
-          classNames='is-6 bs-4 invisible data-[visible=show]:visible animate-spin-slow'
+          classNames='w-6 h-4 invisible data-[visible=show]:visible animate-spin-slow'
           data-visible={activity ? 'show' : 'hide'}
         />
-        <span className='truncate min-is-0' aria-live='polite'>
+        <span className='truncate min-w-0' aria-live='polite'>
           {activity ? children : null}
         </span>
         <span className={mx('text-end', hoverableControlItem)}>{t('enter to send message')}</span>
@@ -113,4 +110,4 @@ export const Thread = {
   Status: ThreadStatus,
 };
 
-export type { ThreadRootProps, ThreadHeaderProps as ThreadHeadingProps, ThreadStatusProps };
+export type { ThreadRootProps, ThreadHeaderProps, ThreadStatusProps };

package/src/testing.tsx

@@ -4,8 +4,8 @@
 
 import React from 'react';
 
-import { Button, Icon } from '@dxos/react-ui';
-import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
+import { IconButton } from '@dxos/react-ui';
+import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/ui-theme';
 
 import { MessageBody, MessageHeading } from './Message';
 import { type MessageMetadata } from './types';
@@ -25,13 +25,14 @@ export const MessageStoryText = ({ text, onDelete, authorName, timestamp }: Mess
     <>
       <MessageHeading authorName={authorName} timestamp={timestamp}>
         {onDelete && (
-          <Button
+          <IconButton
+            icon='ph--x--regular'
+            iconOnly
+            label='Delete'
             variant='ghost'
-            classNames={['p-1.5 min-bs-0 mie-1 items-start transition-opacity', hoverableControlItem]}
+            classNames={['p-1.5 min-h-0 me-1 items-start transition-opacity', hoverableControlItem]}
             onClick={() => onDelete()}
-          >
-            <Icon icon='ph--x--regular' />
-          </Button>
+          />
         )}
       </MessageHeading>
       <MessageBody>{text}</MessageBody>
@@ -49,7 +50,7 @@ export const MessageStoryBlock = <PartValue,>({ part }: MessagePartProps<PartVal
       role='none'
       className={mx('grid grid-cols-subgrid col-span-3', hoverableControls, hoverableFocusedWithinControls)}
     >
-      <pre className='font-mono max-is-full overflow-x-auto col-span-3'>
+      <pre className='font-mono max-w-full overflow-x-auto col-span-3'>
         <code>{JSON.stringify(part, undefined, 2)}</code>
       </pre>
     </div>

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 = [
   {