@dxos/plugin-thread 0.8.3 → 0.8.4-main.1da679c

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

@@ -2,97 +2,37 @@
 // 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(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>
-  );
-};
+import { command } from './command-extension';
+import { MessageContainer, buttonClassNames, buttonGroupClassNames } from './MessageContainer';
 
-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'>;
+  onAcceptProposal?: (anchor: AnchoredTo, messageId: string) => void;
+} & Pick<ThreadRootProps, 'current'>;
 
-export const CommentContainer = ({
+export const CommentsThreadContainer = ({
   anchor,
   current,
   onAttend,
@@ -100,14 +40,15 @@ export const CommentContainer = ({
   onResolve,
   onMessageDelete,
   onThreadDelete,
-}: CommentContainerProps) => {
+  onAcceptProposal,
+}: 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();
 
@@ -134,6 +75,7 @@ export const CommentContainer = ({
   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) {
@@ -149,7 +91,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,29 +108,50 @@ 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 role='none' className={buttonGroupClassNames}>
           {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={[buttonClassNames, 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={[buttonClassNames, 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
           message={message}
           members={members}
           onDelete={handleMessageDelete}
+          onAcceptProposal={handleAcceptProposal}
         />
       ))}
+
       {/*
         TODO(wittjosiah): Can't autofocus this generally.
           There can be multiple threads with inputs and they can't all be focused.
@@ -190,9 +159,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/Lobby/Lobby.tsx

@@ -5,7 +5,7 @@
 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 { 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

@@ -4,44 +4,47 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+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 { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { VideoObject } from './VideoObject';
 import { getUserMediaTrack } from '../../calls';
 import { ResponsiveContainer } from '../ResponsiveGrid';
 
-const meta: Meta<typeof VideoObject> = {
+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 () => {
+      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} flip {...props} />
+    </ResponsiveContainer>
+  );
+};
+
+const meta = {
   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 () => {
-        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>
-    );
-  },
+  render: DefaultStory,
   decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'justify-center' })],
 };
 

package/src/components/MessageContainer.tsx

@@ -3,43 +3,44 @@
 //
 
 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 { 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 {
-  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 { 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];
+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;
   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) =>
       (message.sender.identityDid && member.identity.did === message.sender.identityDid) ||
@@ -48,49 +49,58 @@ 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 { 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 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);
 
   return (
     <MessageRoot {...messageMetadata} classNames={[hoverableControls, hoverableFocusedWithinControls]}>
       <MessageHeading authorName={messageMetadata.authorName} timestamp={messageMetadata.timestamp}>
-        <ButtonGroup classNames='mie-1'>
+        <div role='none' className={buttonGroupClassNames}>
           {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={[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 && (
-            <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={[buttonClassNames, hoverableControlItem]}
+              onClick={handleDelete}
+            />
           )}
-        </ButtonGroup>
+        </div>
       </MessageHeading>
       {textBlock && <TextboxBlock block={textBlock} isAuthor={userIsAuthor} editing={editing} />}
-      {RefArray.targets(references).map((reference, index) => (
+      {proposalBlock && <ProposalBlock block={proposalBlock} />}
+      {Ref.Array.targets(references).map((reference, index) => (
         <MessagePart key={index} part={reference} />
       ))}
     </MessageRoot>
@@ -148,6 +158,14 @@ const TextboxBlock = ({
   return <div role='none' ref={parentRef} className='mie-4' {...focusAttributes} />;
 };
 
+const ProposalBlock = ({ block }: { block: DataType.MessageBlock.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';

package/src/components/Participant/Participant.tsx

@@ -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<{

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

@@ -4,23 +4,24 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } 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> = {
+import { ResponsiveContainer } from './ResponsiveContainer';
+
+const meta = {
   title: 'plugins/plugin-thread/ResponsiveContainer',
   component: ResponsiveContainer,
   decorators: [withTheme, withLayout({ fullscreen: true })],
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof ResponsiveContainer>;
 
 export default meta;
 

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

@@ -4,15 +4,16 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { faker } from '@dxos/random';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { translations } from '../../translations';
 
 import { ResponsiveGrid, type ResponsiveGridProps } from './ResponsiveGrid';
 import { ResponsiveGridItem, type ResponsiveGridItemProps } from './ResponsiveGridItem';
-import translations from '../../translations';
 
 type TestItem = {
   id: string;
@@ -56,46 +57,48 @@ const TestCell = ({ item, ...props }: ResponsiveGridItemProps<TestItem>) => {
 
 type StoryProps = ResponsiveGridProps<TestItem> & { random?: boolean; autoHideGallery?: boolean };
 
-const meta: Meta<StoryProps> = {
+const DefaultStory = (props: StoryProps) => {
+  const [pinned, setPinned] = useState<string | undefined>(
+    (props.pinned ?? props.items.length > 1) ? props.items[0]?.id : undefined,
+  );
+  const [items, setItems] = useState<TestItem[]>(props.items);
+  useEffect(() => {
+    if (!props.random) {
+      return;
+    }
+
+    const interval = setInterval(() => {
+      setItems((items) => {
+        const p = Math.random();
+        if (p < 0.5) {
+          return items;
+        } else if (p < 0.99 && items.length > 1) {
+          return items.slice(0, -1);
+        } else {
+          return [...items, createItem(items[0]?.type)];
+        }
+      });
+    }, 3_000);
+
+    return () => clearInterval(interval);
+  }, []);
+
+  return (
+    <div className='grid grow p-4'>
+      <ResponsiveGrid {...props} Cell={TestCell} items={items} pinned={pinned} onPinnedChange={setPinned} />
+    </div>
+  );
+};
+
+const meta = {
   title: 'plugins/plugin-thread/ResponsiveGrid',
-  component: ResponsiveGrid,
-  render: (args) => {
-    const [pinned, setPinned] = useState<string | undefined>(
-      args.pinned ?? args.items.length > 1 ? args.items[0]?.id : undefined,
-    );
-    const [items, setItems] = useState<TestItem[]>(args.items);
-    useEffect(() => {
-      if (!args.random) {
-        return;
-      }
-
-      const interval = setInterval(() => {
-        setItems((items) => {
-          const p = Math.random();
-          if (p < 0.5) {
-            return items;
-          } else if (p < 0.99 && items.length > 1) {
-            return items.slice(0, -1);
-          } else {
-            return [...items, createItem(items[0]?.type)];
-          }
-        });
-      }, 3_000);
-
-      return () => clearInterval(interval);
-    }, []);
-
-    return (
-      <div className='grid grow p-4'>
-        <ResponsiveGrid {...args} Cell={TestCell} items={items} pinned={pinned} onPinnedChange={setPinned} />
-      </div>
-    );
-  },
+  component: ResponsiveGrid as any,
+  render: DefaultStory,
   decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'justify-center' })],
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 const videoUrls = [
   'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4',
@@ -117,7 +120,7 @@ const createItem = (type?: 'image' | 'video') => {
 
 export default meta;
 
-type Story = StoryObj<StoryProps>;
+type Story = StoryObj<typeof meta>;
 
 // TODO(burdon): Story to join/leave repeatedly to test stable position.
 

package/src/components/ResponsiveGrid/ResponsiveGrid.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type ComponentType, type FC, useLayoutEffect, useState, useEffect, useMemo, useCallback } from 'react';
+import React, { type ComponentType, type FC, useCallback, useEffect, useLayoutEffect, useMemo, useState } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
 
 import { invariant } from '@dxos/invariant';