@dxos/plugin-thread 0.8.3 → 0.8.4-main.c1de068

package/src/components/ChannelContainer.tsx

@@ -7,6 +7,7 @@ import React, { useCallback, useEffect, useMemo, useState, type ChangeEvent } fr
 
 import { useCapabilities, useCapability } from '@dxos/app-framework';
 import { Context } from '@dxos/context';
+import { failUndefined } from '@dxos/debug';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
 import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
@@ -20,7 +21,7 @@ import { StackItem } from '@dxos/react-ui-stack';
 import { Call } from './Call';
 import ChatContainer from './ChatContainer';
 import { ThreadCapabilities } from '../capabilities';
-import { THREAD_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type ChannelType } from '../types';
 
 export type ChannelContainerProps = {
@@ -36,7 +37,7 @@ export type ChannelContainerProps = {
 export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }: ChannelContainerProps) => {
   const space = getSpace(channel);
   const callManager = useCapability(ThreadCapabilities.CallManager);
-  const roomId = channel ? fullyQualifiedId(channel) : _roomId;
+  const roomId = _roomId ?? (channel ? fullyQualifiedId(channel) : failUndefined());
   const identity = useIdentity();
   const isNamed = !!identity?.profile?.displayName;
   const joinSound = useSoundEffect('JoinCall');
@@ -133,7 +134,7 @@ export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }:
 export default ChannelContainer;
 
 const DisplayNameMissing = () => {
-  const { t } = useTranslation(THREAD_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const client = useClient();
   const [displayName, setDisplayName] = useState('');
   const handleChange = useCallback((event: ChangeEvent<HTMLInputElement>) => setDisplayName(event.target.value), []);
@@ -163,10 +164,10 @@ const useChannelToolbarActions = (onJoinCall?: () => void) => {
         return {
           nodes: [
             createMenuItemGroup('root', {
-              label: ['channel toolbar title', { ns: THREAD_PLUGIN }],
+              label: ['channel toolbar title', { ns: meta.id }],
             }),
             createMenuAction('video-call', () => onJoinCall?.(), {
-              label: ['start video call label', { ns: THREAD_PLUGIN }],
+              label: ['start video call label', { ns: meta.id }],
               icon: 'ph--video-camera--regular',
               type: 'video-call',
             }),

package/src/components/Chat.stories.tsx

@@ -4,7 +4,7 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { Capabilities, contributes, createSurface, IntentPlugin } from '@dxos/app-framework';
@@ -20,7 +20,7 @@ import { DataType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { ChatContainer } from './ChatContainer';
-import translations from '../translations';
+import { translations } from '../translations';
 import { ChannelType, ThreadType } from '../types';
 
 faker.seed(1);
@@ -60,9 +60,9 @@ const Story = () => {
 
 export const Default = {};
 
-const meta: Meta = {
+const meta: Meta<typeof Thread.Root> = {
   title: 'plugins/plugin-thread/Chat',
-  component: Thread,
+  component: Thread.Root,
   render: () => <Story />,
   decorators: [
     withPluginManager({

package/src/components/ChatContainer.tsx

@@ -15,9 +15,8 @@ import {
   MessageTextbox,
   type MessageTextboxProps,
   Thread,
-  ThreadFooter,
+  type ThreadRootProps,
   threadLayout,
-  type ThreadProps,
 } from '@dxos/react-ui-thread';
 import { DataType } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
@@ -25,12 +24,12 @@ import { isNonNullable } from '@dxos/util';
 import { MessageContainer } from './MessageContainer';
 import { command } from './command-extension';
 import { useStatus } from '../hooks';
-import { THREAD_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type ThreadType } from '../types';
 import { getMessageMetadata } from '../util';
 
 export const ChatHeading = ({ attendableId }: { attendableId?: string }) => {
-  const { t } = useTranslation(THREAD_PLUGIN);
+  const { t } = useTranslation(meta.id);
   return (
     <div role='none' className='flex items-center'>
       <StackItem.SigilButton attendableId={attendableId}>
@@ -46,14 +45,14 @@ export type ChatContainerProps = {
   thread: ThreadType;
   context?: Obj.Any;
   autoFocusTextbox?: boolean;
-} & Pick<ThreadProps, 'current'>;
+} & Pick<ThreadRootProps, 'current'>;
 
 export const ChatContainer = ({ space, thread, context, current, autoFocusTextbox }: ChatContainerProps) => {
+  const { t } = useTranslation(meta.id);
   const id = fullyQualifiedId(thread);
   const identity = useIdentity()!;
   const members = useMembers(space?.key);
   const activity = useStatus(space, id);
-  const { t } = useTranslation(THREAD_PLUGIN);
   // 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);
@@ -93,9 +92,9 @@ export const ChatContainer = ({ space, thread, context, current, autoFocusTextbo
     thread.messages.push(
       Ref.make(
         Obj.make(DataType.Message, {
-          sender: { identityDid: identity.did },
           created: new Date().toISOString(),
-          blocks: [{ type: 'text', text: messageRef.current }],
+          sender: { identityDid: identity.did },
+          blocks: [{ _tag: 'text', text: messageRef.current }],
           properties: context ? { context: Ref.make(context) } : undefined,
         }),
       ),
@@ -109,7 +108,7 @@ export const ChatContainer = ({ space, thread, context, current, autoFocusTextbo
   };
 
   return (
-    <Thread
+    <Thread.Root
       current={current}
       id={id}
       classNames='bs-full grid-rows-[1fr_min-content_min-content] overflow-hidden transition-[padding-block-end] [[data-sidebar-inline-start-state=open]_&]:lg:pbe-0'
@@ -131,9 +130,11 @@ export const ChatContainer = ({ space, thread, context, current, autoFocusTextbo
           </ScrollArea.Scrollbar>
         </ScrollArea.Viewport>
       </ScrollArea.Root>
+
       <MessageTextbox extensions={extensions} autoFocus={autoFocus} onSend={handleCreate} {...textboxMetadata} />
-      <ThreadFooter activity={activity}>{t('activity message')}</ThreadFooter>
-    </Thread>
+
+      <Thread.Status activity={activity}>{t('activity message')}</Thread.Status>
+    </Thread.Root>
   );
 };
 

package/src/components/Comments.stories.tsx

@@ -4,29 +4,29 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta } from '@storybook/react-vite';
 import React, { useEffect } from 'react';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj, Query, Relation, Type } from '@dxos/echo';
+import { ClientPlugin } from '@dxos/plugin-client';
 import { faker } from '@dxos/random';
 import { useQuery, useSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { type ClientRepeatedComponentProps, ClientRepeater } from '@dxos/react-client/testing';
 import { AnchoredTo, DataType } from '@dxos/schema';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { layoutCentered, render, withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { CommentsContainer } from './CommentsContainer';
 import { createCommentThread } from './testing';
-import translations from '../translations';
+import { translations } from '../translations';
 import { ThreadType } from '../types';
 
 faker.seed(1);
 
-const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
+const DefaultStory = () => {
   const identity = useIdentity();
-  const space = useSpace(spaceKey);
+  const space = useSpace();
   const anchors = useQuery(space, Query.type(AnchoredTo));
 
   useEffect(() => {
@@ -58,26 +58,33 @@ const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
   }
 
   return (
-    <div className='flex justify-center overflow-y-auto bg-white dark:bg-black'>
-      <div className='flex flex-col w-[30rem]'>
-        <CommentsContainer anchors={anchors} onThreadDelete={console.log} />
-      </div>
+    <div className='w-[30rem] overflow-y-auto bg-baseSurface'>
+      <CommentsContainer anchors={anchors} onThreadDelete={console.log} />
     </div>
   );
 };
 
 const meta: Meta = {
   title: 'plugins/plugin-thread/Comments',
-  // TODO(wittjosiah): Use decorator.
-  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, DataType.Message]} />,
+  render: render(DefaultStory),
   decorators: [
     withTheme,
-    withLayout({ fullscreen: true }),
+    withLayout({ fullscreen: true, classNames: layoutCentered }),
     withPluginManager({
-      plugins: [IntentPlugin()],
+      plugins: [
+        IntentPlugin(),
+        ClientPlugin({
+          types: [DataType.Message, ThreadType, AnchoredTo],
+          onClientInitialized: async (_, client) => {
+            await client.halo.createIdentity();
+          },
+        }),
+      ],
     }),
   ],
-  parameters: { translations },
+  parameters: {
+    translations,
+  },
 };
 
 export default meta;

package/src/components/CommentsContainer.tsx

@@ -9,21 +9,22 @@ import { fullyQualifiedId } from '@dxos/react-client/echo';
 import { Callout, Icon, Trans, useTranslation } from '@dxos/react-ui';
 import { type AnchoredTo } from '@dxos/schema';
 
-import { CommentContainer, type CommentContainerProps } from './CommentContainer';
-import { THREAD_PLUGIN } from '../meta';
+import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
+import { meta } from '../meta';
 import { type ThreadType } from '../types';
 
-export type ThreadsContainerProps = Omit<CommentContainerProps, 'anchor' | 'current'> & {
+export type CommentsContainerProps = Omit<CommentsThreadContainerProps, 'anchor' | 'current'> & {
   anchors: AnchoredTo[];
   currentId?: string;
   showResolvedThreads?: boolean;
 };
 
 /**
- * Comment threads.
+ * Root container for collection of comment threads.
  */
-export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...props }: ThreadsContainerProps) => {
-  const { t } = useTranslation(THREAD_PLUGIN);
+export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...props }: CommentsContainerProps) => {
+  const { t } = useTranslation(meta.id);
+
   // TODO(wittjosiah): There seems to be a race between thread and anchor being deleted.
   const filteredAnchors = showResolvedThreads
     ? anchors.filter((anchor) => !!Relation.getSource(anchor))
@@ -58,9 +59,13 @@ export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...
     );
   }
 
-  return filteredAnchors.map((anchor) => {
-    const thread = Relation.getSource(anchor) as ThreadType;
-    const threadId = fullyQualifiedId(thread);
-    return <CommentContainer key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
-  });
+  return (
+    <div>
+      {filteredAnchors.map((anchor) => {
+        const thread = Relation.getSource(anchor) as ThreadType;
+        const threadId = fullyQualifiedId(thread);
+        return <CommentsThreadContainer key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
+      })}
+    </div>
+  );
 };

package/src/components/{CommentContainer.tsx → CommentsThreadContainer.tsx}

@@ -2,97 +2,38 @@
 // Copyright 2023 DXOS.org
 //
 
-import { CheckCircle, X } from '@phosphor-icons/react';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import { Relation } from '@dxos/echo';
-import { RefArray } from '@dxos/live-object';
+import { Ref, Relation } from '@dxos/echo';
 import { fullyQualifiedId, getSpace, useMembers } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { Button, Tag, Tooltip, useThemeContext, useTranslation } from '@dxos/react-ui';
+import { IconButton, Tag, Tooltip, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/react-ui-editor';
-import {
-  getSize,
-  hoverableControlItem,
-  hoverableControls,
-  hoverableFocusedWithinControls,
-  mx,
-} from '@dxos/react-ui-theme';
-import {
-  MessageTextbox,
-  type MessageTextboxProps,
-  Thread,
-  ThreadFooter,
-  ThreadHeading,
-  type ThreadProps,
-} from '@dxos/react-ui-thread';
+import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
+import { MessageTextbox, type MessageTextboxProps, Thread, type ThreadRootProps } from '@dxos/react-ui-thread';
 import { type AnchoredTo } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
 import { MessageContainer } from './MessageContainer';
 import { command } from './command-extension';
 import { useStatus } from '../hooks';
-import { THREAD_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type ThreadType } from '../types';
 import { getMessageMetadata } from '../util';
 
-const sizeClass = getSize(4);
+// TODO(burdon): Remove need for p-1.
+export const commentControlClassNames = '!p-1 transition-opacity';
 
-// TODO(thure): #8149
-const commentControlClassNames = '!p-1 !min-bs-0 transition-opacity';
-
-const ToggleResolvedButton = ({
-  isResolved,
-  onResolve,
-}: {
-  isResolved: boolean | undefined;
-  onResolve: () => void;
-}) => {
-  const { t } = useTranslation(THREAD_PLUGIN);
-  const label = t(isResolved ? 'mark as unresolved label' : 'mark as resolved label');
-  return (
-    <Tooltip.Trigger asChild content={label}>
-      <Button
-        variant='ghost'
-        data-testid='thread.toggle-resolved'
-        onClick={onResolve}
-        classNames={[commentControlClassNames, !isResolved && hoverableControlItem]}
-      >
-        <span className='sr-only'>{label}</span>
-        {isResolved ? <CheckCircle className={sizeClass} weight='fill' /> : <CheckCircle className={sizeClass} />}
-      </Button>
-    </Tooltip.Trigger>
-  );
-};
-
-const DeleteThreadButton = ({ onDelete }: { onDelete: () => void }) => {
-  const { t } = useTranslation(THREAD_PLUGIN);
-  const label = t('delete thread label');
-  return (
-    <Tooltip.Trigger asChild content={label}>
-      <Button
-        variant='ghost'
-        data-testid='thread.delete'
-        onClick={onDelete}
-        classNames={[commentControlClassNames, hoverableControlItem]}
-      >
-        <span className='sr-only'>{label}</span>
-        <X className={sizeClass} />
-      </Button>
-    </Tooltip.Trigger>
-  );
-};
-
-export type CommentContainerProps = {
+export type CommentsThreadContainerProps = {
   anchor: AnchoredTo;
   onAttend?: (anchor: AnchoredTo) => void;
   onComment?: (anchor: AnchoredTo, message: string) => void;
   onResolve?: (anchor: AnchoredTo) => void;
   onMessageDelete?: (anchor: AnchoredTo, messageId: string) => void;
   onThreadDelete?: (anchor: AnchoredTo) => void;
-} & Pick<ThreadProps, 'current'>;
+} & Pick<ThreadRootProps, 'current'>;
 
-export const CommentContainer = ({
+export const CommentsThreadContainer = ({
   anchor,
   current,
   onAttend,
@@ -100,14 +41,14 @@ export const CommentContainer = ({
   onResolve,
   onMessageDelete,
   onThreadDelete,
-}: CommentContainerProps) => {
+}: CommentsThreadContainerProps) => {
+  const { t } = useTranslation(meta.id);
   const identity = useIdentity()!;
   const space = getSpace(anchor);
   const members = useMembers(space?.key);
   const detached = !anchor.anchor;
   const thread = Relation.getSource(anchor) as ThreadType;
   const activity = useStatus(space, fullyQualifiedId(thread));
-  const { t } = useTranslation(THREAD_PLUGIN);
   const threadScrollRef = useRef<HTMLDivElement | null>(null);
   const { themeMode } = useThemeContext();
 
@@ -149,7 +90,13 @@ export const CommentContainer = ({
   }, [anchor, identity]);
 
   return (
-    <Thread onClickCapture={handleAttend} onFocusCapture={handleAttend} current={current} id={fullyQualifiedId(thread)}>
+    <Thread.Root
+      id={fullyQualifiedId(thread)}
+      classNames='pbs-2 border-be border-subduedSeparator last:border-none'
+      current={current}
+      onClickCapture={handleAttend}
+      onFocusCapture={handleAttend}
+    >
       <div
         role='none'
         className={mx(
@@ -160,21 +107,40 @@ export const CommentContainer = ({
       >
         {detached ? (
           <Tooltip.Trigger asChild content={t('detached thread label')} side='top'>
-            <ThreadHeading detached>{thread.name}</ThreadHeading>
+            <Thread.Header detached>{thread.name}</Thread.Header>
           </Tooltip.Trigger>
         ) : (
-          <ThreadHeading>{thread.name}</ThreadHeading>
+          <Thread.Header>{thread.name}</Thread.Header>
         )}
-        <div className='flex flex-row items-center pli-1'>
+        <div className='flex flex-row items-center gap-0.5'>
           {thread.status === 'staged' && <Tag palette='neutral'>{t('draft button')}</Tag>}
           {onResolve && !(thread?.status === 'staged') && (
-            <ToggleResolvedButton isResolved={thread?.status === 'resolved'} onResolve={handleResolve} />
+            <IconButton
+              data-testid='thread.resolve'
+              variant='ghost'
+              icon={thread?.status === 'resolved' ? 'ph--check--fill' : 'ph--check--regular'}
+              iconOnly
+              label={t('resolve thread label')}
+              classNames={[commentControlClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
+              onClick={handleResolve}
+            />
+          )}
+          {onThreadDelete && (
+            <IconButton
+              data-testid='thread.delete'
+              variant='ghost'
+              icon='ph--x--regular'
+              iconOnly
+              label={t('delete thread label')}
+              classNames={[commentControlClassNames, hoverableControlItem]}
+              onClick={handleThreadDelete}
+            />
           )}
-          {onThreadDelete && <DeleteThreadButton onDelete={handleThreadDelete} />}
         </div>
       </div>
+
       {/** TODO(dmaretskyi): How's `thread.messages` undefined? */}
-      {RefArray.targets(thread.messages?.filter(isNonNullable) ?? []).map((message) => (
+      {Ref.Array.targets(thread.messages?.filter(isNonNullable) ?? []).map((message) => (
         <MessageContainer
           key={message.id}
           editable
@@ -183,6 +149,7 @@ export const CommentContainer = ({
           onDelete={handleMessageDelete}
         />
       ))}
+
       {/*
         TODO(wittjosiah): Can't autofocus this generally.
           There can be multiple threads with inputs and they can't all be focused.
@@ -190,9 +157,11 @@ export const CommentContainer = ({
           Need to find a way to autofocus in one scenario only: when a new thread is created.
       */}
       <MessageTextbox extensions={extensions} onSend={handleComment} {...textboxMetadata} />
-      <ThreadFooter activity={activity}>{t('activity message')}</ThreadFooter>
+
+      <Thread.Status activity={activity}>{t('activity message')}</Thread.Status>
+
       {/* NOTE(thure): This can’t also be the `overflow-anchor` because `ScrollArea` injects an interceding node that contains this necessary ref’d element. */}
       <div role='none' className='bs-px -mbs-px' ref={threadScrollRef} />
-    </Thread>
+    </Thread.Root>
   );
 };

package/src/components/Media/VideoObject.stories.tsx

@@ -4,7 +4,7 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type StoryObj, type Meta } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { scheduleTask } from '@dxos/async';

package/src/components/MessageContainer.tsx

@@ -3,35 +3,25 @@
 //
 
 import { EditorView } from '@codemirror/view';
-import { Check, PencilSimple, X } from '@phosphor-icons/react';
 import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
 
 import { Surface } from '@dxos/app-framework';
-import { type Obj, type Type } from '@dxos/echo';
-import { RefArray } from '@dxos/live-object';
+import { type Obj, Ref, type Type } from '@dxos/echo';
 import { PublicKey } from '@dxos/react-client';
 import { type SpaceMember } from '@dxos/react-client/echo';
 import { useIdentity, type Identity } from '@dxos/react-client/halo';
-import { Button, ButtonGroup, Tooltip, useOnTransition, useThemeContext, useTranslation } from '@dxos/react-ui';
+import { IconButton, useOnTransition, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, useTextEditor } from '@dxos/react-ui-editor';
-import {
-  getSize,
-  hoverableControlItem,
-  hoverableControls,
-  hoverableFocusedWithinControls,
-  mx,
-} from '@dxos/react-ui-theme';
+import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
 import { MessageHeading, MessageRoot } from '@dxos/react-ui-thread';
 import { type DataType } from '@dxos/schema';
 
+import { commentControlClassNames } from './CommentsThreadContainer';
 import { command } from './command-extension';
 import { useOnEditAnalytics } from '../hooks';
-import { THREAD_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { getMessageMetadata } from '../util';
 
-// TODO(thure): #8149
-const messageControlClassNames = ['!p-1 !min-bs-0 transition-opacity', hoverableControlItem];
-
 export type MessageContainerProps = {
   message: DataType.Message;
   members: SpaceMember[];
@@ -40,6 +30,7 @@ export type MessageContainerProps = {
 };
 
 export const MessageContainer = ({ message, members, editable = false, onDelete }: MessageContainerProps) => {
+  const { t } = useTranslation(meta.id);
   const senderIdentity = members.find(
     (member) =>
       (message.sender.identityDid && member.identity.did === message.sender.identityDid) ||
@@ -49,48 +40,41 @@ export const MessageContainer = ({ message, members, editable = false, onDelete
   const userIsAuthor = useIdentity()?.did === messageMetadata.authorId;
   const [editing, setEditing] = useState(false);
   const handleDelete = useCallback(() => onDelete?.(message.id), [message, onDelete]);
-  const { t } = useTranslation(THREAD_PLUGIN);
-  const editLabel = t(editing ? 'save message label' : 'edit message label');
-  const deleteLabel = t('delete message label');
-  const textBlock = message.blocks.find((block) => block.type === 'text');
-  const references = message.blocks.filter((block) => block.type === 'reference').map((block) => block.reference);
+  const textBlock = message.blocks.find((block) => block._tag === 'text');
+  const references = message.blocks.filter((block) => block._tag === 'reference').map((block) => block.reference);
 
   useOnEditAnalytics(message, textBlock, !!editing);
 
   return (
     <MessageRoot {...messageMetadata} classNames={[hoverableControls, hoverableFocusedWithinControls]}>
       <MessageHeading authorName={messageMetadata.authorName} timestamp={messageMetadata.timestamp}>
-        <ButtonGroup classNames='mie-1'>
+        <div className='flex flex-row items-center gap-0.5'>
           {userIsAuthor && editable && (
-            <Tooltip.Trigger asChild content={editLabel}>
-              <Button
-                variant='ghost'
-                data-testid={editing ? 'thread.message.save' : 'thread.message.edit'}
-                classNames={messageControlClassNames}
-                onClick={() => setEditing((editing) => !editing)}
-              >
-                <span className='sr-only'>{editLabel}</span>
-                {editing ? <Check className={getSize(4)} /> : <PencilSimple className={getSize(4)} />}
-              </Button>
-            </Tooltip.Trigger>
+            <IconButton
+              data-testid={editing ? 'thread.message.save' : 'thread.message.edit'}
+              variant='ghost'
+              icon={editing ? 'ph--check--regular' : 'ph--pencil-simple--regular'}
+              iconOnly
+              label={t(editing ? 'save message label' : 'edit message label')}
+              classNames={[commentControlClassNames, hoverableControlItem]}
+              onClick={() => setEditing((editing) => !editing)}
+            />
           )}
           {onDelete && (
-            <Tooltip.Trigger asChild content={deleteLabel}>
-              <Button
-                variant='ghost'
-                data-testid='thread.message.delete'
-                classNames={messageControlClassNames}
-                onClick={() => handleDelete()}
-              >
-                <span className='sr-only'>{deleteLabel}</span>
-                <X className={getSize(4)} />
-              </Button>
-            </Tooltip.Trigger>
+            <IconButton
+              data-testid='thread.message.delete'
+              variant='ghost'
+              icon='ph--x--regular'
+              iconOnly
+              label={t('delete message label')}
+              classNames={[commentControlClassNames, hoverableControlItem]}
+              onClick={() => handleDelete()}
+            />
           )}
-        </ButtonGroup>
+        </div>
       </MessageHeading>
       {textBlock && <TextboxBlock block={textBlock} isAuthor={userIsAuthor} editing={editing} />}
-      {RefArray.targets(references).map((reference, index) => (
+      {Ref.Array.targets(references).map((reference, index) => (
         <MessagePart key={index} part={reference} />
       ))}
     </MessageRoot>

package/src/components/ResponsiveGrid/ResponsiveContainer.stories.tsx

@@ -4,13 +4,13 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type StoryObj, type Meta } from '@storybook/react-vite';
 import React from 'react';
 
 import { withTheme, withLayout } from '@dxos/storybook-utils';
 
 import { ResponsiveContainer } from './ResponsiveContainer';
-import translations from '../../translations';
+import { translations } from '../../translations';
 import { VideoObject as VideoObjectComponent } from '../Media';
 
 const meta: Meta<typeof ResponsiveContainer> = {