@dxos/plugin-thread 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/src/components/Call/Toolbar.tsx

@@ -5,7 +5,8 @@
 import { useAtomValue } from '@effect-atom/atom-react';
 import React from 'react';
 
-import { useAppGraph, useCapability } from '@dxos/app-framework/react';
+import { useCapability } from '@dxos/app-framework/ui';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { Node, useActionRunner } from '@dxos/plugin-graph';
 import { useActions, useNode } from '@dxos/plugin-graph';
@@ -20,9 +21,9 @@ import {
 } from '@dxos/react-ui';
 import { groupHoverControlItemWithTransition, mx } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
-import { ThreadCapabilities } from '../../types';
-import { type Channel } from '../../types';
+import { meta } from '#meta';
+import { ThreadCapabilities } from '#types';
+import { type Channel } from '#types';
 
 export type ToolbarProps = ThemedClassName<{
   channel?: Channel.Channel;
@@ -62,21 +63,20 @@ export const Toolbar = ({
   // TODO(wittjosiah): In order to use toolbar, need to update to actually use the graph action callbacks directly.
   return (
     <div className={mx('z-20 flex justify-center m-8', autoHideControls && groupHoverControlItemWithTransition)}>
-      <NaturalToolbar.Root classNames={['p-2 bg-modalSurface rounded-md shadow-md', classNames]}>
+      <NaturalToolbar.Root classNames={['p-2 bg-modal-surface rounded-md shadow-md', classNames]}>
         <ToggleButton
           active={media.audioEnabled}
           state={{
             on: {
               icon: 'ph--microphone--regular',
-              label: t('mic off'),
+              label: t('mic-off.button'),
               onClick: () => call.turnAudioOff(),
-              classNames: 'bg-callActive',
+              classNames: 'bg-call-active',
             },
             off: {
               icon: 'ph--microphone-slash--duotone',
-              label: t('mic on'),
+              label: t('mic-on.button'),
               onClick: () => call.turnAudioOn(),
-              classNames: [joined && 'bg-callAlert'],
             },
           }}
         />
@@ -85,20 +85,20 @@ export const Toolbar = ({
           state={{
             on: {
               icon: 'ph--video-camera--regular',
-              label: t('camera off'),
+              label: t('camera-off.button'),
               onClick: () => call.turnVideoOff(),
             },
             off: {
               icon: 'ph--video-camera-slash--duotone',
-              label: t('camera on'),
+              label: t('camera-on.button'),
               onClick: () => call.turnVideoOn(),
             },
           }}
         />
 
         {(participants !== undefined && (
-          <div className='flex justify-center items-center gap-2 is-[5rem] text-xs text-subdued'>
-            <Icon icon='ph--users--regular' size={4} />
+          <div className='flex justify-center items-center gap-2 w-[5rem] text-xs text-subdued'>
+            <Icon icon='ph--users--regular' />
             <div>{participants}</div>
           </div>
         )) || <NaturalToolbar.Separator variant='gap' />}
@@ -111,12 +111,12 @@ export const Toolbar = ({
               state={{
                 on: {
                   icon: 'ph--monitor--regular',
-                  label: t('screenshare off'),
+                  label: t('screenshare-off.button'),
                   onClick: () => call.turnScreenshareOff(),
                 },
                 off: {
                   icon: 'ph--monitor-arrow-up--duotone',
-                  label: t('screenshare on'),
+                  label: t('screenshare-on.button'),
                   onClick: () => call.turnScreenshareOn(),
                 },
               }}
@@ -141,13 +141,12 @@ export const Toolbar = ({
               state={{
                 on: {
                   icon: 'ph--hand-waving--regular',
-                  label: t('lower hand'),
+                  label: t('lower-hand.button'),
                   onClick: () => call.setRaisedHand(false),
-                  classNames: [joined && 'bg-callAlert'],
                 },
                 off: {
                   icon: 'ph--hand-palm--duotone',
-                  label: t('raise hand'),
+                  label: t('raise-hand.button'),
                   onClick: () => call.setRaisedHand(true),
                 },
               }}
@@ -155,9 +154,19 @@ export const Toolbar = ({
           </>
         )}
         {joined ? (
-          <IconButton variant='destructive' icon='ph--phone-x--regular' label={t('leave call')} onClick={onLeave} />
+          <IconButton
+            variant='destructive'
+            icon='ph--phone-x--regular'
+            label={t('leave-call.button')}
+            onClick={onLeave}
+          />
         ) : (
-          <IconButton variant='primary' icon='ph--phone-incoming--regular' label={t('join call')} onClick={onJoin} />
+          <IconButton
+            variant='primary'
+            icon='ph--phone-incoming--regular'
+            label={t('join-call.button')}
+            onClick={onJoin}
+          />
         )}
       </NaturalToolbar.Root>
     </div>
@@ -182,7 +191,7 @@ const defaultButtonProps: Partial<IconButtonProps> = {
 const ToggleButton = ({ active, state }: ToolbarButtonProps) => (
   <IconButton
     {...defaultButtonProps}
-    classNames={[active ? (state.on.classNames ?? 'bg-callActive') : state.off.classNames]}
+    classNames={[active ? (state.on.classNames ?? 'bg-call-active') : state.off.classNames]}
     icon={active ? state.on.icon : state.off.icon}
     label={active ? state.on.label : state.off.label}
     onClick={active ? state.on.onClick : state.off.onClick}

package/src/components/{Comments.stories.tsx → CommentsPanel/CommentsPanel.stories.tsx}

@@ -6,23 +6,23 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { OperationPlugin } from '@dxos/app-framework';
+import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj, Query, Relation } from '@dxos/echo';
 import { TestSchema } from '@dxos/echo/testing';
 import { ClientPlugin } from '@dxos/plugin-client';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { faker } from '@dxos/random';
 import { useDatabase, useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { useAsyncEffect } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
-import { render } from '@dxos/storybook-utils';
+import { withLayout, withTheme, Loading } from '@dxos/react-ui/testing';
 import { AnchoredTo, Message, Thread } from '@dxos/types';
 
-import { translations } from '../translations';
+import { translations } from '../../translations';
 
-import { CommentsContainer } from './CommentsContainer';
-import { createCommentThread, createProposalThread } from './testing';
+import { CommentsPanel } from './CommentsPanel';
+import { createCommentThread, createProposalThread } from '../../testing/data';
 
 faker.seed(1);
 
@@ -54,28 +54,29 @@ const DefaultStory = () => {
   }, [identity, db]);
 
   if (!identity || !db || !anchors) {
-    return null;
+    return <Loading data={{ identity: !!identity, db: !!db, anchors: !!anchors }} />;
   }
 
-  return <CommentsContainer anchors={anchors} onThreadDelete={console.log} onAcceptProposal={console.log} />;
+  return <CommentsPanel anchors={anchors} onThreadDelete={console.log} onAcceptProposal={console.log} />;
 };
 
 const meta = {
-  title: 'plugins/plugin-thread/Comments',
-  render: render(DefaultStory),
+  title: 'plugins/plugin-thread/components/Comments',
+  render: DefaultStory,
   decorators: [
-    withTheme,
-    withLayout({ layout: 'column', scroll: true }),
+    withTheme(),
+    withLayout({ layout: 'column' }),
     // TODO(wittjosiah): This shouldn't depend on app framework (use withClientProvider instead).
     //  Currently this is required due to useOnEditAnalytics.
     withPluginManager({
       plugins: [
         OperationPlugin(),
+        RuntimePlugin(),
         ClientPlugin({
           types: [Message.Message, Thread.Thread, AnchoredTo.AnchoredTo],
           onClientInitialized: ({ client }) =>
             Effect.gen(function* () {
-              yield* Effect.promise(() => client.halo.createIdentity());
+              yield* initializeIdentity(client);
             }),
         }),
       ],

package/src/components/{CommentsContainer.tsx → CommentsPanel/CommentsPanel.tsx}

@@ -5,14 +5,14 @@
 import React, { useEffect } from 'react';
 
 import { Obj, Relation } from '@dxos/echo';
-import { Callout, Icon, Trans, useTranslation } from '@dxos/react-ui';
+import { Icon, Message, Trans, useTranslation } from '@dxos/react-ui';
 import { type AnchoredTo, type Thread } from '@dxos/types';
 
-import { meta } from '../meta';
+import { meta } from '#meta';
 
-import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
+import { CommentsThread, type CommentsThreadProps } from './CommentsThread';
 
-export type CommentsContainerProps = Omit<CommentsThreadContainerProps, 'anchor' | 'current'> & {
+export type CommentsPanelProps = Omit<CommentsThreadProps, 'anchor' | 'current'> & {
   anchors: AnchoredTo.AnchoredTo[];
   currentId?: string;
   showResolvedThreads?: boolean;
@@ -21,7 +21,7 @@ export type CommentsContainerProps = Omit<CommentsThreadContainerProps, 'anchor'
 /**
  * Root container for collection of comment threads.
  */
-export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...props }: CommentsContainerProps) => {
+export const CommentsPanel = ({ anchors, currentId, showResolvedThreads, ...props }: CommentsPanelProps) => {
   const { t } = useTranslation(meta.id);
 
   // TODO(wittjosiah): There seems to be a race between thread and anchor being deleted.
@@ -29,7 +29,8 @@ export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...
     ? anchors.filter((anchor) => !!Relation.getSource(anchor))
     : anchors.filter((anchor) => {
         const thread = Relation.getSource(anchor);
-        return thread && thread.status !== 'resolved';
+        // TODO(dmaretskyi): Do Obj.instanceOf check instead.
+        return thread && (thread as any).status !== 'resolved';
       });
 
   useEffect(() => {
@@ -40,20 +41,20 @@ export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...
 
   if (filteredAnchors.length === 0) {
     return (
-      <div role='none' className='plb-cardSpacingBlock pli-cardSpacingInline'>
-        <Callout.Root>
-          <Callout.Title>
+      <div role='none' className='p-form-padding'>
+        <Message.Root>
+          <Message.Title>
             <Trans
               {...{
                 t,
-                i18nKey: 'no comments message',
+                i18nKey: 'no-comments.message',
                 components: {
-                  commentIcon: <Icon icon='ph--chat-text--regular' size={4} classNames='inline-block' />,
+                  commentIcon: <Icon icon='ph--chat-text--regular' size={4} classNames='w-block' />,
                 },
               }}
             />
-          </Callout.Title>
-        </Callout.Root>
+          </Message.Title>
+        </Message.Root>
       </div>
     );
   }
@@ -63,7 +64,7 @@ export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...
       {filteredAnchors.map((anchor) => {
         const thread = Relation.getSource(anchor) as Thread.Thread;
         const threadId = Obj.getDXN(thread).toString();
-        return <CommentsThreadContainer key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
+        return <CommentsThread key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
       })}
     </div>
   );

package/src/components/{CommentsThreadContainer.tsx → CommentsPanel/CommentsThread.tsx}

@@ -19,14 +19,14 @@ import { type AnchoredTo, type Thread } from '@dxos/types';
 import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/ui-editor';
 import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/ui-theme';
 
-import { useStatus } from '../hooks';
-import { meta } from '../meta';
-import { getMessageMetadata } from '../util';
+import { useStatus } from '#hooks';
+import { meta } from '#meta';
+import { getMessageMetadata } from '../../util';
 
-import { command } from './command-extension';
-import { MessageContainer, buttonClassNames, buttonGroupClassNames } from './MessageContainer';
+import { command } from '../../extensions/command';
+import { MessagePanel, buttonClassNames, buttonGroupClassNames } from '../MessagePanel';
 
-export type CommentsThreadContainerProps = {
+export type CommentsThreadProps = {
   anchor: AnchoredTo.AnchoredTo;
   onAttend?: (anchor: AnchoredTo.AnchoredTo) => void;
   onComment?: (anchor: AnchoredTo.AnchoredTo, message: string) => void;
@@ -36,7 +36,7 @@ export type CommentsThreadContainerProps = {
   onAcceptProposal?: (anchor: AnchoredTo.AnchoredTo, messageId: string) => void;
 } & Pick<ThreadRootProps, 'current'>;
 
-export const CommentsThreadContainer = ({
+export const CommentsThread = ({
   anchor,
   current,
   onAttend,
@@ -45,7 +45,7 @@ export const CommentsThreadContainer = ({
   onMessageDelete,
   onThreadDelete,
   onAcceptProposal,
-}: CommentsThreadContainerProps) => {
+}: CommentsThreadProps) => {
   const { themeMode } = useThemeContext();
   const { t } = useTranslation(meta.id);
   const identity = useIdentity()!;
@@ -64,7 +64,7 @@ export const CommentsThreadContainer = ({
   const messageRef = useRef('');
   const extensions = useMemo(
     () => [
-      createBasicExtensions({ placeholder: t('message placeholder') }),
+      createBasicExtensions({ placeholder: t('message.placeholder') }),
       createThemeExtensions({ themeMode }),
       listener({ onChange: ({ text }) => (messageRef.current = text) }),
       command,
@@ -82,7 +82,7 @@ export const CommentsThreadContainer = ({
   const handleThreadDelete = useCallback(() => onThreadDelete?.(anchor), [onThreadDelete, anchor]);
   const handleAcceptProposal = useCallback((id: string) => onAcceptProposal?.(anchor, id), [onAcceptProposal, anchor]);
 
-  const handleComment: MessageTextboxProps['onSend'] = useCallback(() => {
+  const handleComment = useCallback<NonNullable<MessageTextboxProps['onSend']>>(() => {
     if (!messageRef.current) {
       return false;
     }
@@ -98,7 +98,7 @@ export const CommentsThreadContainer = ({
   return (
     <ThreadComponent.Root
       id={Obj.getDXN(thread).toString()}
-      classNames='pbs-2 border-be border-subduedSeparator last:border-none'
+      classNames='pt-2 border-b border-subdued-separator last:border-none'
       current={current}
       onClickCapture={handleAttend}
       onFocusCapture={handleAttend}
@@ -106,27 +106,27 @@ export const CommentsThreadContainer = ({
       <div
         role='none'
         className={mx(
-          'col-span-2 grid grid-cols-[var(--rail-size)_1fr_min-content]',
+          'col-span-2 grid grid-cols-[var(--dx-rail-size)_1fr_min-content]',
           hoverableControls,
           hoverableFocusedWithinControls,
         )}
       >
         {detached ? (
-          <Tooltip.Trigger asChild content={t('detached thread label')} side='top'>
+          <Tooltip.Trigger asChild content={t('detached-thread.label')} side='top'>
             <ThreadComponent.Header detached>{thread.name}</ThreadComponent.Header>
           </Tooltip.Trigger>
         ) : (
           <ThreadComponent.Header>{thread.name}</ThreadComponent.Header>
         )}
         <div role='none' className={buttonGroupClassNames}>
-          {thread.status === 'staged' && <Tag palette='neutral'>{t('draft button')}</Tag>}
+          {thread.status === 'staged' && <Tag palette='neutral'>{t('draft.button')}</Tag>}
           {onResolve && !(thread?.status === 'staged') && (
             <IconButton
               data-testid='thread.resolve'
               variant='ghost'
               icon={thread?.status === 'resolved' ? 'ph--check--fill' : 'ph--check--regular'}
               iconOnly
-              label={t('resolve thread label')}
+              label={t('resolve-thread.label')}
               classNames={[buttonClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
               onClick={handleResolve}
             />
@@ -137,7 +137,7 @@ export const CommentsThreadContainer = ({
               variant='ghost'
               icon='ph--x--regular'
               iconOnly
-              label={t('delete thread label')}
+              label={t('delete-thread.label')}
               classNames={[buttonClassNames, hoverableControlItem]}
               onClick={handleThreadDelete}
             />
@@ -146,7 +146,7 @@ export const CommentsThreadContainer = ({
       </div>
 
       {messages?.map((ref) => (
-        <MessageContainer
+        <MessagePanel
           key={ref.dxn.toString()}
           editable
           message={ref}
@@ -164,10 +164,9 @@ export const CommentsThreadContainer = ({
       */}
       <MessageTextbox extensions={extensions} onSend={handleComment} {...textboxMetadata} />
 
-      <ThreadComponent.Status activity={activity}>{t('activity message')}</ThreadComponent.Status>
+      <ThreadComponent.Status activity={activity}>{t('activity.message')}</ThreadComponent.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} />
+      <div role='none' className='h-px -mt-px' ref={threadScrollRef} />
     </ThreadComponent.Root>
   );
 };

package/src/components/CommentsPanel/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './CommentsPanel';
+export * from './CommentsThread';

package/src/components/Lobby/Lobby.tsx

@@ -5,15 +5,15 @@
 import { useAtomValue } from '@effect-atom/atom-react';
 import React, { type FC, type PropsWithChildren, useEffect, useState } from 'react';
 
-import { useCapability } from '@dxos/app-framework/react';
+import { useCapability } from '@dxos/app-framework/ui';
 import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
-import { ThreadCapabilities } from '../../types';
+import { meta } from '#meta';
+import { ThreadCapabilities } from '#types';
 import { Toolbar, type ToolbarProps } from '../Call';
 import { VideoObject } from '../Media';
-import { ResponsiveContainer } from '../ResponsiveGrid';
+import { ResponsivePanel } from '../ResponsiveGrid';
 
 // TODO(wittjosiah): Repurpose lobby for preview.
 
@@ -58,7 +58,7 @@ const LobbyPreview: FC<LobbyPreviewProps> = () => {
 
   return (
     <div className='grid grow p-4'>
-      <ResponsiveContainer>
+      <ResponsivePanel>
         {(media.videoEnabled && (
           <VideoObject
             videoStream={media.videoStream}
@@ -69,8 +69,8 @@ const LobbyPreview: FC<LobbyPreviewProps> = () => {
               classNames,
             )}
           />
-        )) || <div className='p-4 outline outline-separator rounded-md'>{t('camera off label')}</div>}
-      </ResponsiveContainer>
+        )) || <div className='p-4 outline outline-separator rounded-md'>{t('camera-off.label')}</div>}
+      </ResponsivePanel>
     </div>
   );
 };

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

@@ -8,10 +8,10 @@ import React, { useEffect, useState } from 'react';
 import { scheduleTask } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { log } from '@dxos/log';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { getUserMediaTrack } from '../../calls';
-import { ResponsiveContainer } from '../ResponsiveGrid';
+import { ResponsivePanel } from '../ResponsiveGrid';
 
 import { VideoObject, type VideoObjectProps } from './VideoObject';
 
@@ -37,17 +37,17 @@ const DefaultStory = (props: VideoObjectProps) => {
   }, []);
 
   return (
-    <ResponsiveContainer>
+    <ResponsivePanel>
       <VideoObject videoStream={videoStream} flip {...props} />
-    </ResponsiveContainer>
+    </ResponsivePanel>
   );
 };
 
 const meta = {
-  title: 'plugins/plugin-thread/VideoObject',
+  title: 'plugins/plugin-thread/components/VideoObject',
   component: VideoObject,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
     layout: 'fullscreen',
   },

package/src/components/Media/VideoObject.tsx

@@ -32,7 +32,7 @@ export const VideoObject = memo(
     return (
       <video
         className={mx(
-          'is-full aspect-video',
+          'w-full aspect-video',
           flip && 'scale-x-[-1]',
           contain ? 'object-contain' : 'object-cover',
           classNames,

package/src/components/{MessageContainer.tsx → MessagePanel/MessagePanel.tsx}

@@ -5,44 +5,44 @@
 import { EditorView } from '@codemirror/view';
 import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
 
-import { Surface } from '@dxos/app-framework/react';
+import { Surface } from '@dxos/app-framework/ui';
 import { type Obj, Ref } from '@dxos/echo';
 import { useObject } from '@dxos/echo-react';
 import { PublicKey } from '@dxos/react-client';
 import { type SpaceMember } from '@dxos/react-client/echo';
 import { type Identity, useIdentity } from '@dxos/react-client/halo';
 import { IconButton, useOnTransition, useThemeContext, useTranslation } from '@dxos/react-ui';
+import { Card } from '@dxos/react-ui';
 import { useTextEditor } from '@dxos/react-ui-editor';
-import { Card } from '@dxos/react-ui-mosaic';
 import { MessageHeading, MessageRoot } from '@dxos/react-ui-thread';
 import { type ContentBlock, type Message } from '@dxos/types';
 import { createBasicExtensions, createThemeExtensions } from '@dxos/ui-editor';
 import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/ui-theme';
 
-import { useOnEditAnalytics } from '../hooks';
-import { meta } from '../meta';
-import { getMessageMetadata } from '../util';
+import { useOnEditAnalytics } from '#hooks';
+import { meta } from '#meta';
+import { getMessageMetadata } from '../../util';
 
-import { command } from './command-extension';
+import { command } from '../../extensions/command';
 
-export const buttonGroupClassNames = 'flex flex-row items-center gap-0.5 pie-2';
-export const buttonClassNames = '!p-1 transition-opacity';
+export const buttonGroupClassNames = 'flex flex-row items-center gap-0.5 pe-2';
+export const buttonClassNames = 'p-1! transition-opacity';
 
-export type MessageContainerProps = {
-  message: Obj.Obj<Message.Message> | Ref.Ref<Obj.Obj<Message.Message>>;
+export type MessagePanelProps = {
+  message: Obj.OfShape<Message.Message> | Ref.Ref<Obj.OfShape<Message.Message>>;
   members: SpaceMember[];
   editable?: boolean;
   onDelete?: (id: string) => void;
   onAcceptProposal?: (id: string) => void;
 };
 
-export const MessageContainer = ({
+export const MessagePanel = ({
   message: messageOrRef,
   members,
   editable = false,
   onDelete,
   onAcceptProposal,
-}: MessageContainerProps) => {
+}: MessagePanelProps) => {
   const { t } = useTranslation(meta.id);
   const [message, updateMessage] = useObject(messageOrRef);
   const identity = useIdentity();
@@ -108,7 +108,7 @@ export const MessageContainer = ({
               variant='ghost'
               icon='ph--check--regular'
               iconOnly
-              label={t('accept proposal label')}
+              label={t('accept-proposal.label')}
               classNames={[buttonClassNames, hoverableControlItem]}
               onClick={handleAcceptProposal}
             />
@@ -119,7 +119,7 @@ export const MessageContainer = ({
               variant='ghost'
               icon='ph--x--regular'
               iconOnly
-              label={t('delete message label')}
+              label={t('delete-message.label')}
               classNames={[buttonClassNames, hoverableControlItem]}
               onClick={handleDelete}
             />
@@ -187,12 +187,12 @@ const TextboxBlock = ({
     editing && view?.focus();
   }, [editing, view]);
 
-  return <div role='none' ref={parentRef} className='mie-4' {...focusAttributes} />;
+  return <div role='none' ref={parentRef} className='me-4' {...focusAttributes} />;
 };
 
 const ProposalBlock = ({ block }: { block: ContentBlock.Proposal }) => {
   return (
-    <div role='none' className='mie-4 italic'>
+    <div role='none' className='me-4 italic'>
       {block.text}
     </div>
   );
@@ -207,10 +207,10 @@ const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: Obj.Unknown
 
   return (
     <Card.Root
-      className={mx('grid col-span-3 plb-1 pr-4', hoverableControls, hoverableFocusedWithinControls)}
+      className={mx('grid col-span-3 py-1 pr-4', hoverableControls, hoverableFocusedWithinControls)}
       ref={forwardedRef}
     >
-      <Surface role='card-content' limit={1} data={{ subject }} fallback={title} />
+      <Surface.Surface role='card--content' limit={1} data={{ subject }} fallback={title} />
     </Card.Root>
   );
 });

package/src/components/MessagePanel/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './MessagePanel';

package/src/components/Participant/Participant.tsx

@@ -5,10 +5,10 @@
 import { useAtomValue } from '@effect-atom/atom-react';
 import React, { memo, useMemo } from 'react';
 
-import { useCapability } from '@dxos/app-framework/react';
+import { useCapability } from '@dxos/app-framework/ui';
 
 import { type EncodedTrackName, type UserState } from '../../calls';
-import { ThreadCapabilities } from '../../types';
+import { ThreadCapabilities } from '#types';
 import { VideoObject } from '../Media';
 import { ResponsiveGridItem, type ResponsiveGridItemProps } from '../ResponsiveGrid';