@dxos/plugin-thread 0.8.4-main.67995b8 → 0.8.4-main.70d3990

package/src/components/Comments.stories.tsx

@@ -2,10 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
-import React, { useEffect } from 'react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
@@ -14,42 +12,42 @@ 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 { AnchoredTo, DataType } from '@dxos/schema';
-import { layoutCentered, render, withLayout, withTheme } from '@dxos/storybook-utils';
+import { useAsyncEffect } from '@dxos/react-ui';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { render } from '@dxos/storybook-utils';
+import { AnchoredTo, Message, Thread } from '@dxos/types';
 
-import { CommentsContainer } from './CommentsContainer';
-import { createCommentThread } from './testing';
 import { translations } from '../translations';
-import { ThreadType } from '../types';
+
+import { CommentsContainer } from './CommentsContainer';
+import { createCommentThread, createProposalThread } from './testing';
 
 faker.seed(1);
 
 const DefaultStory = () => {
   const identity = useIdentity();
   const space = useSpace();
-  const anchors = useQuery(space, Query.type(AnchoredTo));
+  const anchors = useQuery(space, Query.type(AnchoredTo.AnchoredTo));
 
-  useEffect(() => {
+  useAsyncEffect(async () => {
     if (identity && space) {
-      const t = setTimeout(async () => {
-        const object = space.db.add(Obj.make(Type.Expando, {}));
-        const thread1 = space.db.add(createCommentThread(identity));
-        const thread2 = space.db.add(createCommentThread(identity));
-        space.db.add(
-          Relation.make(AnchoredTo, {
-            [Relation.Source]: thread1,
-            [Relation.Target]: object,
-          }),
-        );
-        space.db.add(
-          Relation.make(AnchoredTo, {
-            [Relation.Source]: thread2,
-            [Relation.Target]: object,
-          }),
-        );
-      });
-
-      return () => clearTimeout(t);
+      const object = space.db.add(Obj.make(Type.Expando, {}));
+      const thread1 = space.db.add(createCommentThread(identity));
+      const thread2 = space.db.add(createProposalThread(identity));
+      space.db.add(
+        Relation.make(AnchoredTo.AnchoredTo, {
+          [Relation.Source]: thread1,
+          [Relation.Target]: object,
+          anchor: 'test',
+        }),
+      );
+      space.db.add(
+        Relation.make(AnchoredTo.AnchoredTo, {
+          [Relation.Source]: thread2,
+          [Relation.Target]: object,
+          anchor: 'test',
+        }),
+      );
     }
   }, [identity, space]);
 
@@ -57,25 +55,23 @@ const DefaultStory = () => {
     return null;
   }
 
-  return (
-    <div className='w-[30rem] overflow-y-auto bg-baseSurface'>
-      <CommentsContainer anchors={anchors} onThreadDelete={console.log} />
-    </div>
-  );
+  return <CommentsContainer anchors={anchors} onThreadDelete={console.log} onAcceptProposal={console.log} />;
 };
 
-const meta: Meta = {
+const meta = {
   title: 'plugins/plugin-thread/Comments',
   render: render(DefaultStory),
   decorators: [
     withTheme,
-    withLayout({ fullscreen: true, classNames: layoutCentered }),
+    withLayout({ container: 'column', scroll: true }),
+    // TODO(wittjosiah): This shouldn't depend on app framework (use withClientProvider instead).
+    //  Currently this is required due to useOnEditAnalytics.
     withPluginManager({
       plugins: [
         IntentPlugin(),
         ClientPlugin({
-          types: [DataType.Message, ThreadType, AnchoredTo],
-          onClientInitialized: async (_, client) => {
+          types: [Message.Message, Thread.Thread, AnchoredTo.AnchoredTo],
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),
@@ -85,8 +81,10 @@ const meta: Meta = {
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-export const Default = {};
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/CommentsContainer.tsx

@@ -4,17 +4,16 @@
 
 import React, { useEffect } from 'react';
 
-import { Relation } from '@dxos/echo';
-import { fullyQualifiedId } from '@dxos/react-client/echo';
+import { Obj, Relation } from '@dxos/echo';
 import { Callout, Icon, Trans, useTranslation } from '@dxos/react-ui';
-import { type AnchoredTo } from '@dxos/schema';
+import { type AnchoredTo, type Thread } from '@dxos/types';
 
-import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
 import { meta } from '../meta';
-import { type ThreadType } from '../types';
+
+import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
 
 export type CommentsContainerProps = Omit<CommentsThreadContainerProps, 'anchor' | 'current'> & {
-  anchors: AnchoredTo[];
+  anchors: AnchoredTo.AnchoredTo[];
   currentId?: string;
   showResolvedThreads?: boolean;
 };
@@ -62,8 +61,8 @@ export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...
   return (
     <div>
       {filteredAnchors.map((anchor) => {
-        const thread = Relation.getSource(anchor) as ThreadType;
-        const threadId = fullyQualifiedId(thread);
+        const thread = Relation.getSource(anchor) as Thread.Thread;
+        const threadId = Obj.getDXN(thread).toString();
         return <CommentsThreadContainer key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
       })}
     </div>

package/src/components/CommentsThreadContainer.tsx

@@ -4,33 +4,36 @@
 
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import { Ref, Relation } from '@dxos/echo';
-import { fullyQualifiedId, getSpace, useMembers } from '@dxos/react-client/echo';
+import { Obj, Ref, Relation } from '@dxos/echo';
+import { getSpace, useMembers } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { IconButton, Tag, Tooltip, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/react-ui-editor';
 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 {
+  MessageTextbox,
+  type MessageTextboxProps,
+  Thread as ThreadComponent,
+  type ThreadRootProps,
+} from '@dxos/react-ui-thread';
+import { type AnchoredTo, type Thread } from '@dxos/types';
 import { isNonNullable } from '@dxos/util';
 
-import { MessageContainer } from './MessageContainer';
-import { command } from './command-extension';
 import { useStatus } from '../hooks';
 import { meta } from '../meta';
-import { type ThreadType } from '../types';
 import { getMessageMetadata } from '../util';
 
-// TODO(burdon): Remove need for p-1.
-export const commentControlClassNames = '!p-1 transition-opacity';
+import { command } from './command-extension';
+import { MessageContainer, buttonClassNames, buttonGroupClassNames } from './MessageContainer';
 
 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;
+  anchor: AnchoredTo.AnchoredTo;
+  onAttend?: (anchor: AnchoredTo.AnchoredTo) => void;
+  onComment?: (anchor: AnchoredTo.AnchoredTo, message: string) => void;
+  onResolve?: (anchor: AnchoredTo.AnchoredTo) => void;
+  onMessageDelete?: (anchor: AnchoredTo.AnchoredTo, messageId: string) => void;
+  onThreadDelete?: (anchor: AnchoredTo.AnchoredTo) => void;
+  onAcceptProposal?: (anchor: AnchoredTo.AnchoredTo, messageId: string) => void;
 } & Pick<ThreadRootProps, 'current'>;
 
 export const CommentsThreadContainer = ({
@@ -41,30 +44,31 @@ export const CommentsThreadContainer = ({
   onResolve,
   onMessageDelete,
   onThreadDelete,
+  onAcceptProposal,
 }: CommentsThreadContainerProps) => {
+  const { themeMode } = useThemeContext();
   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 thread = Relation.getSource(anchor) as Thread.Thread;
+  const activity = useStatus(space, Obj.getDXN(thread).toString());
   const threadScrollRef = useRef<HTMLDivElement | null>(null);
-  const { themeMode } = useThemeContext();
 
-  const textboxMetadata = getMessageMetadata(fullyQualifiedId(thread), identity);
+  const textboxMetadata = getMessageMetadata(Obj.getDXN(thread).toString(), identity);
+
   // 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: t('message placeholder') }),
       createThemeExtensions({ themeMode }),
-      listener({ onChange: (text) => (messageRef.current = text) }),
+      listener({ onChange: ({ text }) => (messageRef.current = text) }),
       command,
     ],
-    [_count],
+    [state],
   );
 
   // TODO(thure): Factor out.
@@ -75,6 +79,7 @@ export const CommentsThreadContainer = ({
   const handleResolve = useCallback(() => onResolve?.(anchor), [onResolve, anchor]);
   const handleMessageDelete = useCallback((id: string) => onMessageDelete?.(anchor, id), [onMessageDelete, anchor]);
   const handleThreadDelete = useCallback(() => onThreadDelete?.(anchor), [onThreadDelete, anchor]);
+  const handleAcceptProposal = useCallback((id: string) => onAcceptProposal?.(anchor, id), [onAcceptProposal, anchor]);
 
   const handleComment: MessageTextboxProps['onSend'] = useCallback(() => {
     if (!messageRef.current) {
@@ -84,14 +89,14 @@ export const CommentsThreadContainer = ({
     onComment?.(anchor, messageRef.current);
     messageRef.current = '';
     scrollToEnd('instant');
-    rerenderEditor();
+    setState({});
 
     return true;
   }, [anchor, identity]);
 
   return (
-    <Thread.Root
-      id={fullyQualifiedId(thread)}
+    <ThreadComponent.Root
+      id={Obj.getDXN(thread).toString()}
       classNames='pbs-2 border-be border-subduedSeparator last:border-none'
       current={current}
       onClickCapture={handleAttend}
@@ -107,12 +112,12 @@ export const CommentsThreadContainer = ({
       >
         {detached ? (
           <Tooltip.Trigger asChild content={t('detached thread label')} side='top'>
-            <Thread.Header detached>{thread.name}</Thread.Header>
+            <ThreadComponent.Header detached>{thread.name}</ThreadComponent.Header>
           </Tooltip.Trigger>
         ) : (
-          <Thread.Header>{thread.name}</Thread.Header>
+          <ThreadComponent.Header>{thread.name}</ThreadComponent.Header>
         )}
-        <div className='flex flex-row items-center gap-0.5'>
+        <div role='none' className={buttonGroupClassNames}>
           {thread.status === 'staged' && <Tag palette='neutral'>{t('draft button')}</Tag>}
           {onResolve && !(thread?.status === 'staged') && (
             <IconButton
@@ -121,7 +126,7 @@ export const CommentsThreadContainer = ({
               icon={thread?.status === 'resolved' ? 'ph--check--fill' : 'ph--check--regular'}
               iconOnly
               label={t('resolve thread label')}
-              classNames={[commentControlClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
+              classNames={[buttonClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
               onClick={handleResolve}
             />
           )}
@@ -132,7 +137,7 @@ export const CommentsThreadContainer = ({
               icon='ph--x--regular'
               iconOnly
               label={t('delete thread label')}
-              classNames={[commentControlClassNames, hoverableControlItem]}
+              classNames={[buttonClassNames, hoverableControlItem]}
               onClick={handleThreadDelete}
             />
           )}
@@ -147,6 +152,7 @@ export const CommentsThreadContainer = ({
           message={message}
           members={members}
           onDelete={handleMessageDelete}
+          onAcceptProposal={handleAcceptProposal}
         />
       ))}
 
@@ -158,10 +164,10 @@ export const CommentsThreadContainer = ({
       */}
       <MessageTextbox extensions={extensions} onSend={handleComment} {...textboxMetadata} />
 
-      <Thread.Status activity={activity}>{t('activity message')}</Thread.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} />
-    </Thread.Root>
+    </ThreadComponent.Root>
   );
 };

package/src/components/Lobby/Lobby.tsx

@@ -4,8 +4,8 @@
 
 import React, { type FC, type PropsWithChildren, useEffect, useState } from 'react';
 
-import { useCapability } from '@dxos/app-framework';
-import { useTranslation, type ThemedClassName } from '@dxos/react-ui';
+import { useCapability } from '@dxos/app-framework/react';
+import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
 import { ThreadCapabilities } from '../../capabilities';

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

@@ -2,47 +2,55 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { scheduleTask } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { log } from '@dxos/log';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { VideoObject } from './VideoObject';
 import { getUserMediaTrack } from '../../calls';
 import { ResponsiveContainer } from '../ResponsiveGrid';
 
-const meta: Meta<typeof VideoObject> = {
-  title: 'plugins/plugin-thread/VideoObject',
-  component: VideoObject,
-  render: (args) => {
-    log.info('render');
-    const [videoStream, setVideoStream] = useState<MediaStream>();
-    useEffect(() => {
-      const ctx = new Context();
-      scheduleTask(ctx, async () => {
+import { VideoObject, type VideoObjectProps } from './VideoObject';
+
+const DefaultStory = (props: VideoObjectProps) => {
+  log.info('render');
+  const [videoStream, setVideoStream] = useState<MediaStream>();
+  useEffect(() => {
+    const ctx = new Context();
+    scheduleTask(ctx, async () => {
+      try {
         const stream = new MediaStream();
         stream.addTrack(await getUserMediaTrack('videoinput'));
         setVideoStream(stream);
-      });
-
-      return () => {
-        void ctx.dispose();
-        videoStream?.getTracks().forEach((track) => track.stop());
-      };
-    }, []);
-
-    return (
-      <ResponsiveContainer>
-        <VideoObject videoStream={videoStream} {...args} flip />
-      </ResponsiveContainer>
-    );
+      } catch (err) {
+        log.catch(err);
+      }
+    });
+
+    return () => {
+      void ctx.dispose();
+      videoStream?.getTracks().forEach((track) => track.stop());
+    };
+  }, []);
+
+  return (
+    <ResponsiveContainer>
+      <VideoObject videoStream={videoStream} flip {...props} />
+    </ResponsiveContainer>
+  );
+};
+
+const meta = {
+  title: 'plugins/plugin-thread/VideoObject',
+  component: VideoObject,
+  render: DefaultStory,
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
   },
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'justify-center' })],
 };
 
 export default meta;

package/src/components/Media/VideoObject.tsx

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

package/src/components/MessageContainer.tsx

@@ -3,33 +3,45 @@
 //
 
 import { EditorView } from '@codemirror/view';
+import type * as Schema from 'effect/Schema';
 import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
 
-import { Surface } from '@dxos/app-framework';
-import { type Obj, Ref, type Type } from '@dxos/echo';
+import { Surface } from '@dxos/app-framework/react';
+import { type Obj, Ref } 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 { type Identity, useIdentity } from '@dxos/react-client/halo';
 import { IconButton, useOnTransition, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, useTextEditor } from '@dxos/react-ui-editor';
 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 { type ContentBlock, type Message } from '@dxos/types';
 
-import { commentControlClassNames } from './CommentsThreadContainer';
-import { command } from './command-extension';
 import { useOnEditAnalytics } from '../hooks';
 import { meta } from '../meta';
 import { getMessageMetadata } from '../util';
 
+import { command } from './command-extension';
+
+export const buttonGroupClassNames = 'flex flex-row items-center gap-0.5 pie-2';
+export const buttonClassNames = '!p-1 transition-opacity';
+
 export type MessageContainerProps = {
-  message: DataType.Message;
+  // TODO(wittjosiah): Find a simpler way to define this type.
+  message: Obj.Obj<Schema.Schema.Type<typeof Message.Message>>;
   members: SpaceMember[];
   editable?: boolean;
   onDelete?: (id: string) => void;
+  onAcceptProposal?: (id: string) => void;
 };
 
-export const MessageContainer = ({ message, members, editable = false, onDelete }: MessageContainerProps) => {
+export const MessageContainer = ({
+  message,
+  members,
+  editable = false,
+  onDelete,
+  onAcceptProposal,
+}: MessageContainerProps) => {
   const { t } = useTranslation(meta.id);
   const senderIdentity = members.find(
     (member) =>
@@ -39,8 +51,11 @@ export const MessageContainer = ({ message, members, editable = false, onDelete
   const messageMetadata = getMessageMetadata(message.id, senderIdentity);
   const userIsAuthor = useIdentity()?.did === messageMetadata.authorId;
   const [editing, setEditing] = useState(false);
+  const handleEdit = useCallback(() => setEditing((editing) => !editing), []);
   const handleDelete = useCallback(() => onDelete?.(message.id), [message, onDelete]);
+  const handleAcceptProposal = useCallback(() => onAcceptProposal?.(message.id), [message, onAcceptProposal]);
   const textBlock = message.blocks.find((block) => block._tag === 'text');
+  const proposalBlock = message.blocks.find((block) => block._tag === 'proposal');
   const references = message.blocks.filter((block) => block._tag === 'reference').map((block) => block.reference);
 
   useOnEditAnalytics(message, textBlock, !!editing);
@@ -48,7 +63,7 @@ export const MessageContainer = ({ message, members, editable = false, onDelete
   return (
     <MessageRoot {...messageMetadata} classNames={[hoverableControls, hoverableFocusedWithinControls]}>
       <MessageHeading authorName={messageMetadata.authorName} timestamp={messageMetadata.timestamp}>
-        <div className='flex flex-row items-center gap-0.5'>
+        <div role='none' className={buttonGroupClassNames}>
           {userIsAuthor && editable && (
             <IconButton
               data-testid={editing ? 'thread.message.save' : 'thread.message.edit'}
@@ -56,8 +71,20 @@ export const MessageContainer = ({ message, members, editable = false, onDelete
               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)}
+              classNames={[buttonClassNames, hoverableControlItem]}
+              onClick={handleEdit}
+            />
+          )}
+          {/* TODO(wittjosiah): Proposal controls should probably be hoisted to thread level. */}
+          {proposalBlock && onAcceptProposal && (
+            <IconButton
+              data-testid='thread.message.accept'
+              variant='ghost'
+              icon='ph--check--regular'
+              iconOnly
+              label={t('accept proposal label')}
+              classNames={[buttonClassNames, hoverableControlItem]}
+              onClick={handleAcceptProposal}
             />
           )}
           {onDelete && (
@@ -67,21 +94,22 @@ export const MessageContainer = ({ message, members, editable = false, onDelete
               icon='ph--x--regular'
               iconOnly
               label={t('delete message label')}
-              classNames={[commentControlClassNames, hoverableControlItem]}
-              onClick={() => handleDelete()}
+              classNames={[buttonClassNames, hoverableControlItem]}
+              onClick={handleDelete}
             />
           )}
         </div>
       </MessageHeading>
       {textBlock && <TextboxBlock block={textBlock} isAuthor={userIsAuthor} editing={editing} />}
+      {proposalBlock && <ProposalBlock block={proposalBlock} />}
       {Ref.Array.targets(references).map((reference, index) => (
-        <MessagePart key={index} part={reference} />
+        <MessagePart key={index} part={reference as Obj.Any} />
       ))}
     </MessageRoot>
   );
 };
 
-const MessagePart = ({ part }: { part: Type.Expando }) => {
+const MessagePart = ({ part }: { part: Obj.Any }) => {
   return <MessageBlockObjectTile subject={part} />;
 };
 
@@ -90,7 +118,7 @@ const TextboxBlock = ({
   isAuthor,
   editing,
 }: {
-  block: DataType.MessageBlock.Text;
+  block: ContentBlock.Text;
   editing?: boolean;
   isAuthor?: boolean;
   identity?: Identity;
@@ -132,6 +160,14 @@ const TextboxBlock = ({
   return <div role='none' ref={parentRef} className='mie-4' {...focusAttributes} />;
 };
 
+const ProposalBlock = ({ block }: { block: ContentBlock.Proposal }) => {
+  return (
+    <div role='none' className='mie-4 italic'>
+      {block.text}
+    </div>
+  );
+};
+
 const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: Obj.Any }>(({ subject }, forwardedRef) => {
   // TODO(burdon): Use annotation to get title.
   let title = (subject as any).name ?? (subject as any).title ?? (subject as any).type ?? 'Object';
@@ -142,7 +178,7 @@ const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: Obj.Any }>(
   return (
     <div
       role='group'
-      className={mx('grid col-span-3 py-1 pr-4', hoverableControls, hoverableFocusedWithinControls)}
+      className={mx('grid col-span-3 plb-1 pr-4', hoverableControls, hoverableFocusedWithinControls)}
       ref={forwardedRef}
     >
       <Surface role='card' limit={1} data={{ subject }} fallback={title} />

package/src/components/Participant/Participant.tsx

@@ -4,7 +4,7 @@
 
 import React, { memo, useMemo } from 'react';
 
-import { useCapability } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 
 import { type EncodedTrackName, type UserState } from '../../calls';
 import { ThreadCapabilities } from '../../capabilities';
@@ -17,15 +17,21 @@ export const Participant = memo(({ item: user, debug, ...props }: ResponsiveGrid
   const call = useCapability(ThreadCapabilities.CallManager);
   const isSelf: boolean = call.self.id !== undefined && user.id !== undefined && user.id.startsWith(call.self.id);
   const isScreenshare = user.id?.endsWith(SCREENSHARE_SUFFIX);
-  const pulledVideoStream = call.getVideoStream(
-    isScreenshare || !isSelf ? (user.tracks?.video as EncodedTrackName) : undefined,
-  );
+
+  const pulledVideoStream =
+    !isSelf && isScreenshare && user.tracks?.screenshareEnabled
+      ? call.getVideoStream(user.tracks?.screenshare as EncodedTrackName)
+      : !isSelf && !isScreenshare && user.tracks?.videoEnabled
+        ? call.getVideoStream(user.tracks?.video as EncodedTrackName)
+        : undefined;
 
   const videoStream = useMemo<MediaStream | undefined>(() => {
-    if (isSelf && !isScreenshare) {
-      return call.media.videoStream;
-    } else if (isSelf && isScreenshare) {
-      return call.media.screenshareVideoStream;
+    if (isSelf) {
+      if (isScreenshare) {
+        return call.media.screenshareVideoStream;
+      } else if (!isScreenshare) {
+        return call.media.videoStream;
+      }
     } else if (!isSelf) {
       return pulledVideoStream;
     }

package/src/components/Participant/ParticipantGrid.tsx

@@ -6,10 +6,11 @@ import React, { useEffect, useMemo, useState } from 'react';
 
 import { type ThemedClassName } from '@dxos/react-ui';
 
-import { Participant, SCREENSHARE_SUFFIX } from './Participant';
 import { type UserState } from '../../calls';
 import { ResponsiveGrid } from '../ResponsiveGrid';
 
+import { Participant, SCREENSHARE_SUFFIX } from './Participant';
+
 const getId = (user: UserState): string => user.id!;
 
 export type ParticipantGridProps = ThemedClassName<{