@dxos/plugin-thread 0.8.4-main.67995b8 → 0.8.4-main.69d29f4

package/src/components/Lobby/Lobby.tsx

@@ -2,14 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
+import { useAtomValue } from '@effect-atom/atom-react';
 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 { mx } from '@dxos/react-ui-theme';
+import { useCapability } from '@dxos/app-framework/react';
+import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { mx } from '@dxos/ui-theme';
 
-import { ThreadCapabilities } from '../../capabilities';
 import { meta } from '../../meta';
+import { ThreadCapabilities } from '../../types';
 import { Toolbar, type ToolbarProps } from '../Call';
 import { VideoObject } from '../Media';
 import { ResponsiveContainer } from '../ResponsiveGrid';
@@ -39,9 +40,10 @@ type LobbyPreviewProps = {};
 const LobbyPreview: FC<LobbyPreviewProps> = () => {
   const { t } = useTranslation(meta.id);
   const call = useCapability(ThreadCapabilities.CallManager);
+  const media = useAtomValue(call.mediaAtom);
   const [classNames, setClassNames] = useState('');
   useEffect(() => {
-    if (!call.media.videoEnabled) {
+    if (!media.videoEnabled) {
       setClassNames('');
       return;
     }
@@ -52,14 +54,14 @@ const LobbyPreview: FC<LobbyPreviewProps> = () => {
     }, 500);
 
     return () => clearTimeout(timeout);
-  }, [call.media.videoEnabled]);
+  }, [media.videoEnabled]);
 
   return (
     <div className='grid grow p-4'>
       <ResponsiveContainer>
-        {(call.media.videoEnabled && (
+        {(media.videoEnabled && (
           <VideoObject
-            videoStream={call.media.videoStream}
+            videoStream={media.videoStream}
             flip
             muted
             classNames={mx(

package/src/components/Media/AudioStream.tsx

@@ -46,13 +46,13 @@ export const AudioStream: FC<AudioStreamProps> = ({ tracks }) => {
   );
 };
 
-type AudioTrackProps = {
+type AudioTrackParams = {
   track: MediaStreamTrack;
   mediaStream: MediaStream;
   resetSrcObject: () => void;
 };
 
-const AudioTrack = ({ track, mediaStream, resetSrcObject }: AudioTrackProps) => {
+const AudioTrack = ({ track, mediaStream, resetSrcObject }: AudioTrackParams) => {
   useEffect(() => {
     const currentTrack = track;
     mediaStream.addTrack(currentTrack);

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

@@ -5,7 +5,7 @@
 import React, { type JSX, forwardRef, memo, useEffect, useRef } from 'react';
 
 import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 export type VideoObjectProps = Omit<JSX.IntrinsicElements['video'], 'className' | 'ref'> &
   ThemedClassName<{
@@ -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

@@ -5,50 +5,91 @@
 import { EditorView } from '@codemirror/view';
 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 { useObject } from '@dxos/echo-react';
 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 { useTextEditor } from '@dxos/react-ui-editor';
+import { Card } from '@dxos/react-ui-mosaic';
 import { MessageHeading, MessageRoot } from '@dxos/react-ui-thread';
-import { type DataType } from '@dxos/schema';
+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 { 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;
+  message: Obj.Obj<Message.Message> | Ref.Ref<Obj.Obj<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: messageOrRef,
+  members,
+  editable = false,
+  onDelete,
+  onAcceptProposal,
+}: MessageContainerProps) => {
   const { t } = useTranslation(meta.id);
+  const [message, updateMessage] = useObject(messageOrRef);
+  const identity = useIdentity();
+  const [editing, setEditing] = useState(false);
+
+  const textBlockIndex = message?.blocks.findIndex((block) => block._tag === 'text') ?? -1;
+
+  const handleEdit = useCallback(() => setEditing((editing) => !editing), []);
+  const handleDelete = useCallback(() => message && onDelete?.(message.id), [message, onDelete]);
+  const handleAcceptProposal = useCallback(
+    () => message && onAcceptProposal?.(message.id),
+    [message, onAcceptProposal],
+  );
+  const handleTextBlockChange = useCallback(
+    (newText: string) => {
+      updateMessage((m) => {
+        const targetBlock = m.blocks[textBlockIndex];
+        if (targetBlock && targetBlock._tag === 'text') {
+          targetBlock.text = newText;
+        }
+      });
+    },
+    [updateMessage, textBlockIndex],
+  );
+
+  const textBlock =
+    message && textBlockIndex !== -1 ? (message.blocks[textBlockIndex] as ContentBlock.Text) : undefined;
+  useOnEditAnalytics(message, textBlock, !!editing);
+
+  if (!message) {
+    return null;
+  }
+
   const senderIdentity = members.find(
     (member) =>
       (message.sender.identityDid && member.identity.did === message.sender.identityDid) ||
       (message.sender.identityKey && PublicKey.equals(member.identity.identityKey, message.sender.identityKey)),
   )?.identity;
   const messageMetadata = getMessageMetadata(message.id, senderIdentity);
-  const userIsAuthor = useIdentity()?.did === messageMetadata.authorId;
-  const [editing, setEditing] = useState(false);
-  const handleDelete = useCallback(() => onDelete?.(message.id), [message, onDelete]);
-  const textBlock = message.blocks.find((block) => block._tag === 'text');
+  const userIsAuthor = identity?.did === messageMetadata.authorId;
+  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}>
-        <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 +97,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 +120,24 @@ 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} />}
+      {textBlock && (
+        <TextboxBlock block={textBlock} isAuthor={userIsAuthor} editing={editing} onSave={handleTextBlockChange} />
+      )}
+      {proposalBlock && <ProposalBlock block={proposalBlock} />}
       {Ref.Array.targets(references).map((reference, index) => (
-        <MessagePart key={index} part={reference} />
+        <MessagePart key={index} part={reference as Obj.Unknown} />
       ))}
     </MessageRoot>
   );
 };
 
-const MessagePart = ({ part }: { part: Type.Expando }) => {
+const MessagePart = ({ part }: { part: Obj.Unknown }) => {
   return <MessageBlockObjectTile subject={part} />;
 };
 
@@ -89,11 +145,13 @@ const TextboxBlock = ({
   block,
   isAuthor,
   editing,
+  onSave,
 }: {
-  block: DataType.MessageBlock.Text;
+  block: ContentBlock.Text;
   editing?: boolean;
   isAuthor?: boolean;
   identity?: Identity;
+  onSave?: (newText: string) => void;
 }) => {
   const { themeMode } = useThemeContext();
   const inMemoryContentRef = useRef(block.text);
@@ -103,8 +161,8 @@ const TextboxBlock = ({
   }, []);
 
   const saveDocumentChange = useCallback(() => {
-    block.text = inMemoryContentRef.current;
-  }, [block]);
+    onSave?.(inMemoryContentRef.current);
+  }, [onSave]);
 
   useOnTransition(editing, true, false, saveDocumentChange);
 
@@ -132,7 +190,15 @@ const TextboxBlock = ({
   return <div role='none' ref={parentRef} className='mie-4' {...focusAttributes} />;
 };
 
-const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: Obj.Any }>(({ subject }, forwardedRef) => {
+const ProposalBlock = ({ block }: { block: ContentBlock.Proposal }) => {
+  return (
+    <div role='none' className='mie-4 italic'>
+      {block.text}
+    </div>
+  );
+};
+
+const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: Obj.Unknown }>(({ subject }, forwardedRef) => {
   // TODO(burdon): Use annotation to get title.
   let title = (subject as any).name ?? (subject as any).title ?? (subject as any).type ?? 'Object';
   if (typeof title !== 'string') {
@@ -140,12 +206,11 @@ const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: Obj.Any }>(
   }
 
   return (
-    <div
-      role='group'
-      className={mx('grid col-span-3 py-1 pr-4', hoverableControls, hoverableFocusedWithinControls)}
+    <Card.Root
+      className={mx('grid col-span-3 plb-1 pr-4', hoverableControls, hoverableFocusedWithinControls)}
       ref={forwardedRef}
     >
-      <Surface role='card' limit={1} data={{ subject }} fallback={title} />
-    </div>
+      <Surface role='card-content' limit={1} data={{ subject }} fallback={title} />
+    </Card.Root>
   );
 });

package/src/components/Participant/Participant.tsx

@@ -2,12 +2,13 @@
 // Copyright 2024 DXOS.org
 //
 
+import { useAtomValue } from '@effect-atom/atom-react';
 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';
+import { ThreadCapabilities } from '../../types';
 import { VideoObject } from '../Media';
 import { ResponsiveGridItem, type ResponsiveGridItemProps } from '../ResponsiveGrid';
 
@@ -15,21 +16,39 @@ export const SCREENSHARE_SUFFIX = '_screenshare';
 
 export const Participant = memo(({ item: user, debug, ...props }: ResponsiveGridItemProps<UserState>) => {
   const call = useCapability(ThreadCapabilities.CallManager);
-  const isSelf: boolean = call.self.id !== undefined && user.id !== undefined && user.id.startsWith(call.self.id);
+  const self = useAtomValue(call.selfAtom);
+  const media = useAtomValue(call.mediaAtom);
+  const isSelf: boolean = self.id !== undefined && user.id !== undefined && user.id.startsWith(self.id);
   const isScreenshare = user.id?.endsWith(SCREENSHARE_SUFFIX);
-  const pulledVideoStream = call.getVideoStream(
-    isScreenshare || !isSelf ? (user.tracks?.video as EncodedTrackName) : undefined,
-  );
+
+  // Get pulled video stream for non-self users.
+  const pulledVideoStream = useMemo<MediaStream | undefined>(() => {
+    if (isSelf) {
+      return undefined;
+    }
+    const trackName =
+      isScreenshare && user.tracks?.screenshareEnabled
+        ? (user.tracks?.screenshare as EncodedTrackName)
+        : !isScreenshare && user.tracks?.videoEnabled
+          ? (user.tracks?.video as EncodedTrackName)
+          : undefined;
+    return trackName ? media.pulledVideoStreams[trackName]?.stream : undefined;
+  }, [
+    isSelf,
+    isScreenshare,
+    media.pulledVideoStreams,
+    user.tracks?.screenshare,
+    user.tracks?.video,
+    user.tracks?.screenshareEnabled,
+    user.tracks?.videoEnabled,
+  ]);
 
   const videoStream = useMemo<MediaStream | undefined>(() => {
-    if (isSelf && !isScreenshare) {
-      return call.media.videoStream;
-    } else if (isSelf && isScreenshare) {
-      return call.media.screenshareVideoStream;
-    } else if (!isSelf) {
-      return pulledVideoStream;
+    if (isSelf) {
+      return isScreenshare ? media.screenshareVideoStream : media.videoStream;
     }
-  }, [isSelf, isScreenshare, call.media.videoStream, call.media.screenshareVideoStream, pulledVideoStream]);
+    return pulledVideoStream;
+  }, [isSelf, isScreenshare, media.videoStream, media.screenshareVideoStream, pulledVideoStream]);
 
   return (
     <ResponsiveGridItem
@@ -37,8 +56,8 @@ export const Participant = memo(({ item: user, debug, ...props }: ResponsiveGrid
       item={user}
       name={user.name}
       self={isSelf}
-      screenshare={!!call.media.screenshareVideoStream}
-      video={call.media.videoEnabled}
+      screenshare={!!media.screenshareVideoStream}
+      video={media.videoEnabled}
       mute={user ? !user.tracks?.audioEnabled : false}
       wave={user.raisedHand}
       speaking={user.speaking}

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

@@ -2,25 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { ResponsiveContainer } from './ResponsiveContainer';
 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 })],
+  decorators: [withTheme],
   parameters: {
+    layout: 'fullscreen',
     translations,
   },
-};
+} satisfies Meta<typeof ResponsiveContainer>;
 
 export default meta;
 

package/src/components/ResponsiveGrid/ResponsiveContainer.tsx

@@ -4,7 +4,7 @@
 
 import React, { type PropsWithChildren } from 'react';
 
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 /**
  * A container component that maintains the child's aspect ratio while centering its content.
@@ -18,11 +18,11 @@ import { mx } from '@dxos/react-ui-theme';
 export const ResponsiveContainer = ({ children }: PropsWithChildren) => {
   return (
     // Outer container that takes full size of parent.
-    <div role='none' className='relative flex w-full h-full'>
+    <div role='none' className='relative flex is-full bs-full'>
       {/* Absolute positioning layer for centering content. */}
       <div role='none' className='absolute inset-0 flex justify-center items-center'>
         {/* Content container that maintains given aspect ratio and proper scaling. */}
-        <div role='none' className={mx('max-h-full max-w-full w-auto h-auto aspect-video')}>
+        <div role='none' className={mx('max-bs-full max-is-full is-auto bs-auto aspect-video')}>
           {children}
         </div>
       </div>

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

@@ -2,17 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+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 { withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '../../translations';
 
 import { ResponsiveGrid, type ResponsiveGridProps } from './ResponsiveGrid';
 import { ResponsiveGridItem, type ResponsiveGridItemProps } from './ResponsiveGridItem';
-import { translations } from '../../translations';
 
 type TestItem = {
   id: string;
@@ -42,7 +41,7 @@ const TestCell = ({ item, ...props }: ResponsiveGridItemProps<TestItem>) => {
       {item.type === 'image' && <img className='aspect-video object-contain' src={item.imageUrl} />}
       {item.type === 'video' && (
         <video
-          className='w-full aspect-video object-cover rounded-md'
+          className='is-full aspect-video object-cover rounded-md'
           src={item.videoUrl}
           playsInline
           autoPlay
@@ -56,46 +55,49 @@ 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>
-    );
-  },
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'justify-center' })],
+  component: ResponsiveGrid as any,
+  render: DefaultStory,
+  decorators: [withTheme],
   parameters: {
+    layout: 'fullscreen',
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 const videoUrls = [
   'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4',
@@ -117,7 +119,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.