@dxos/plugin-thread 0.8.3-staging.0fa589b → 0.8.4-main.03d5cd7b56

package/src/components/Lobby/Lobby.tsx

@@ -2,17 +2,19 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { type FC, type PropsWithChildren, useEffect, useState } from 'react';
+import { useAtomValue } from '@effect-atom/atom-react';
+import React, { 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/ui';
+import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { mx } from '@dxos/ui-theme';
+
+import { meta } from '#meta';
+import { ThreadCapabilities } from '#types';
 
-import { ThreadCapabilities } from '../../capabilities';
-import { meta } from '../../meta';
 import { Toolbar, type ToolbarProps } from '../Call';
 import { VideoObject } from '../Media';
-import { ResponsiveContainer } from '../ResponsiveGrid';
+import { ResponsivePanel } from '../ResponsiveGrid';
 
 // TODO(wittjosiah): Repurpose lobby for preview.
 
@@ -24,7 +26,8 @@ const SWARM_PEEK_INTERVAL = 1_000;
 
 type LobbyRootProps = PropsWithChildren<ThemedClassName>;
 
-const LobbyRoot: FC<LobbyRootProps> = ({ children }) => {
+// TODO(burdon): Make headless?
+const LobbyRoot = ({ children }: LobbyRootProps) => {
   return <div className='relative flex flex-col grow overflow-hidden group'>{children}</div>;
 };
 
@@ -36,12 +39,13 @@ LobbyRoot.displayName = 'LobbyRoot';
 
 type LobbyPreviewProps = {};
 
-const LobbyPreview: FC<LobbyPreviewProps> = () => {
+const LobbyPreview = (_props: 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 +56,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 && (
+      <ResponsivePanel>
+        {(media.videoEnabled && (
           <VideoObject
-            videoStream={call.media.videoStream}
+            videoStream={media.videoStream}
             flip
             muted
             classNames={mx(
@@ -67,8 +71,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>
   );
 };
@@ -85,7 +89,7 @@ type LobbyToolbarProps = ThemedClassName<
   } & Pick<ToolbarProps, 'onJoin'>
 >;
 
-const LobbyToolbar: FC<LobbyToolbarProps> = ({ roomId, ...props }) => {
+const LobbyToolbar = ({ roomId, ...props }: LobbyToolbarProps) => {
   const call = useCapability(ThreadCapabilities.CallManager);
   const [count, setCount] = useState<number>(0);
 

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,54 @@
 // Copyright 2025 DXOS.org
 //
 
-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/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 { ResponsivePanel } from '../ResponsiveGrid';
+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 (
+    <ResponsivePanel>
+      <VideoObject videoStream={videoStream} flip {...props} />
+    </ResponsivePanel>
+  );
+};
+
+const meta = {
+  title: 'plugins/plugin-thread/components/VideoObject',
+  component: VideoObject,
+  render: DefaultStory,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
+  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<{

package/src/components/MessagePanel/MessagePanel.tsx

@@ -0,0 +1,221 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { EditorView } from '@codemirror/view';
+import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
+
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/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 { 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 { command } from '../../extensions/command';
+import { getMessageMetadata } from '../../util';
+
+export const buttonGroupClassNames = 'flex flex-row items-center gap-0.5 pe-2';
+export const buttonClassNames = 'p-1! transition-opacity';
+
+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 MessagePanel = ({
+  message: messageOrRef,
+  members,
+  editable = false,
+  onDelete,
+  onAcceptProposal,
+}: MessagePanelProps) => {
+  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;
+  // Pass `message.sender` as the fallback so externally-synced messages
+  // (Slack, etc.) display the source-side sender name instead of "Anonymous"
+  // when no DXOS identity matches.
+  const messageMetadata = getMessageMetadata(message.id, senderIdentity, message.sender);
+  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);
+
+  return (
+    <MessageRoot {...messageMetadata} classNames={[hoverableControls, hoverableFocusedWithinControls]}>
+      <MessageHeading authorName={messageMetadata.authorName} timestamp={messageMetadata.timestamp}>
+        <div className={buttonGroupClassNames}>
+          {userIsAuthor && editable && (
+            <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 && (
+            <IconButton
+              data-testid='thread.message.delete'
+              variant='ghost'
+              icon='ph--x--regular'
+              iconOnly
+              label={t('delete-message.label')}
+              classNames={[buttonClassNames, hoverableControlItem]}
+              onClick={handleDelete}
+            />
+          )}
+        </div>
+      </MessageHeading>
+      {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 as Obj.Unknown} />
+      ))}
+    </MessageRoot>
+  );
+};
+
+const MessagePart = ({ part }: { part: Obj.Unknown }) => {
+  return <MessageBlockObjectTile subject={part} />;
+};
+
+const TextboxBlock = ({
+  block,
+  isAuthor,
+  editing,
+  onSave,
+}: {
+  block: ContentBlock.Text;
+  editing?: boolean;
+  isAuthor?: boolean;
+  identity?: Identity;
+  onSave?: (newText: string) => void;
+}) => {
+  const { themeMode } = useThemeContext();
+  const inMemoryContentRef = useRef(block.text);
+
+  const handleDocumentChange = useCallback((newState: string) => {
+    inMemoryContentRef.current = newState;
+  }, []);
+
+  const saveDocumentChange = useCallback(() => {
+    onSave?.(inMemoryContentRef.current);
+  }, [onSave]);
+
+  useOnTransition(editing, true, false, saveDocumentChange);
+
+  const { parentRef, focusAttributes, view } = useTextEditor(
+    () => ({
+      initialValue: block.text,
+      extensions: [
+        createBasicExtensions({ readOnly: !isAuthor || !editing }),
+        createThemeExtensions({ themeMode }),
+        command,
+        EditorView.updateListener.of((update) => {
+          if (update.docChanged) {
+            handleDocumentChange(update.state.doc.toString());
+          }
+        }),
+      ],
+    }),
+    [block.text, editing, isAuthor, themeMode, handleDocumentChange],
+  );
+
+  useEffect(() => {
+    editing && view?.focus();
+  }, [editing, view]);
+
+  return <div ref={parentRef} className='me-4' {...focusAttributes} />;
+};
+
+const ProposalBlock = ({ block }: { block: ContentBlock.Proposal }) => {
+  return <div className='me-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') {
+    title = title?.content ?? '';
+  }
+
+  return (
+    <Card.Root
+      className={mx('grid col-span-3 py-1 pr-4', hoverableControls, hoverableFocusedWithinControls)}
+      ref={forwardedRef}
+    >
+      <Surface.Surface
+        type={AppSurface.Card}
+        limit={1}
+        data={{ subject } satisfies AppSurface.ObjectCardData}
+        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

@@ -2,12 +2,14 @@
 // 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/ui';
+
+import { ThreadCapabilities } from '#types';
 
 import { type EncodedTrackName, type UserState } from '../../calls';
-import { ThreadCapabilities } from '../../capabilities';
 import { VideoObject } from '../Media';
 import { ResponsiveGridItem, type ResponsiveGridItemProps } from '../ResponsiveGrid';
 
@@ -15,21 +17,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 +57,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,9 +6,9 @@ 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!;
 

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';
+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 { random } from '@dxos/random';
+import { withLayout, 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;
@@ -54,48 +53,51 @@ const TestCell = ({ item, ...props }: ResponsiveGridItemProps<TestItem>) => {
   );
 };
 
-type StoryProps = ResponsiveGridProps<TestItem> & { random?: boolean; autoHideGallery?: boolean };
-
-const meta: Meta<StoryProps> = {
-  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' })],
+type DefaultStoryProps = ResponsiveGridProps<TestItem> & { random?: boolean; autoHideGallery?: boolean };
+
+const DefaultStory = (props: DefaultStoryProps) => {
+  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/components/ResponsiveGrid',
+  component: ResponsiveGrid as any,
+  render: DefaultStory,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
+    layout: 'fullscreen',
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 const videoUrls = [
   'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4',
@@ -105,19 +107,19 @@ const videoUrls = [
 ];
 
 const createItem = (type?: 'image' | 'video') => {
-  const id = faker.string.uuid();
+  const id = random.string.uuid();
   return {
     id,
     type,
-    name: faker.person.fullName(),
+    name: random.person.fullName(),
     imageUrl: `https://placehold.co/3200x1800/333/999?font=roboto&text=${id.slice(0, 2)}`,
-    videoUrl: faker.helpers.arrayElement(videoUrls),
+    videoUrl: random.helpers.arrayElement(videoUrls),
   };
 };
 
 export default meta;
 
-type Story = StoryObj<StoryProps>;
+type Story = StoryObj<typeof meta>;
 
 // TODO(burdon): Story to join/leave repeatedly to test stable position.