@dxos/plugin-thread 0.8.4-main.fcfe5033a5 → 0.8.4-staging.60fe92afc8

package/src/components/Lobby/Lobby.tsx

@@ -1,122 +0,0 @@
-//
-// 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/ui';
-import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { mx } from '@dxos/ui-theme';
-
-import { meta } from '#meta';
-import { ThreadCapabilities } from '#types';
-
-import { Toolbar, type ToolbarProps } from '../Call';
-import { VideoObject } from '../Media';
-import { ResponsivePanel } from '../ResponsiveGrid';
-
-// TODO(wittjosiah): Repurpose lobby for preview.
-
-const SWARM_PEEK_INTERVAL = 1_000;
-
-//
-// Root
-//
-
-type LobbyRootProps = PropsWithChildren<ThemedClassName>;
-
-const LobbyRoot: FC<LobbyRootProps> = ({ children }) => {
-  return <div className='relative flex flex-col grow overflow-hidden group'>{children}</div>;
-};
-
-LobbyRoot.displayName = 'LobbyRoot';
-
-//
-// Preview
-//
-
-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 (!media.videoEnabled) {
-      setClassNames('');
-      return;
-    }
-
-    // Video element will expand once the stream is available.
-    const timeout = setTimeout(() => {
-      setClassNames('outline-neutral-900 opacity-100');
-    }, 500);
-
-    return () => clearTimeout(timeout);
-  }, [media.videoEnabled]);
-
-  return (
-    <div className='grid grow p-4'>
-      <ResponsivePanel>
-        {(media.videoEnabled && (
-          <VideoObject
-            videoStream={media.videoStream}
-            flip
-            muted
-            classNames={mx(
-              'rounded-md outline outline-2 outline-transparent opacity-0 transition-all duration-500',
-              classNames,
-            )}
-          />
-        )) || <div className='p-4 outline outline-separator rounded-md'>{t('camera-off.label')}</div>}
-      </ResponsivePanel>
-    </div>
-  );
-};
-
-LobbyPreview.displayName = 'LobbyPreview';
-
-//
-// Toolbar
-//
-
-type LobbyToolbarProps = ThemedClassName<
-  {
-    roomId: string;
-  } & Pick<ToolbarProps, 'onJoin'>
->;
-
-const LobbyToolbar: FC<LobbyToolbarProps> = ({ roomId, ...props }) => {
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const [count, setCount] = useState<number>(0);
-
-  // TODO(wittjosiah): Leaving the room doesn't remove you from the swarm.
-  useEffect(() => {
-    void call.peek(roomId).then((count) => setCount(count));
-    const interval = setInterval(() => {
-      void call.peek(roomId).then((count) => setCount(count));
-    }, SWARM_PEEK_INTERVAL);
-
-    return () => clearInterval(interval);
-  }, [call, roomId]);
-
-  return (
-    <div className='absolute bottom-0 left-0 right-0 flex justify-center'>
-      <Toolbar participants={count} isInRoom={false} {...props} />
-    </div>
-  );
-};
-
-LobbyToolbar.displayName = 'LobbyToolbar';
-
-//
-// Export
-//
-
-export const Lobby = {
-  Root: LobbyRoot,
-  Preview: LobbyPreview,
-  Toolbar: LobbyToolbar,
-};

package/src/components/Lobby/index.ts

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

package/src/components/Media/AudioStream.tsx

@@ -1,67 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import React, { type FC, useEffect, useRef } from 'react';
-
-export type AudioStreamProps = {
-  tracks: MediaStreamTrack[];
-};
-
-export const AudioStream: FC<AudioStreamProps> = ({ tracks }) => {
-  const mediaStreamRef = useRef(new MediaStream());
-  const ref = useRef<HTMLAudioElement>(null);
-
-  useEffect(() => {
-    const audio = ref.current;
-    if (!audio) {
-      return;
-    }
-
-    const mediaStream = mediaStreamRef.current;
-    audio.srcObject = mediaStream;
-  }, []);
-
-  const resetSrcObject = () => {
-    const audio = ref.current;
-    const mediaStream = mediaStreamRef.current;
-    if (!audio || !mediaStream) {
-      return;
-    }
-
-    // Need to set srcObject again in Chrome and call play() again for Safari
-    // https://www.youtube.com/live/Tkx3OGrwVk8?si=K--P_AzNnAGrjraV&t=2533
-    // Calling play() this way to make Chrome happy otherwise it throws an error.
-    audio.addEventListener('canplay', () => audio.play(), { once: true });
-    audio.srcObject = mediaStream;
-  };
-
-  return (
-    <>
-      <audio ref={ref} autoPlay />
-      {tracks.map((track) => (
-        <AudioTrack key={track.id} track={track} mediaStream={mediaStreamRef.current} resetSrcObject={resetSrcObject} />
-      ))}
-    </>
-  );
-};
-
-type AudioTrackParams = {
-  track: MediaStreamTrack;
-  mediaStream: MediaStream;
-  resetSrcObject: () => void;
-};
-
-const AudioTrack = ({ track, mediaStream, resetSrcObject }: AudioTrackParams) => {
-  useEffect(() => {
-    const currentTrack = track;
-    mediaStream.addTrack(currentTrack);
-    resetSrcObject();
-    return () => {
-      mediaStream.removeTrack(currentTrack);
-      resetSrcObject();
-    };
-  }, [track, mediaStream]);
-
-  return null;
-};

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

@@ -1,59 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-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 { withLayout, withTheme } from '@dxos/react-ui/testing';
-
-import { getUserMediaTrack } from '../../calls';
-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);
-      } 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',
-  },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof VideoObject>;
-
-export const SelfView: Story = {};

package/src/components/Media/VideoObject.tsx

@@ -1,58 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import React, { type JSX, forwardRef, memo, useEffect, useRef } from 'react';
-
-import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/ui-theme';
-
-export type VideoObjectProps = Omit<JSX.IntrinsicElements['video'], 'className' | 'ref'> &
-  ThemedClassName<{
-    videoStream?: MediaStream;
-    flip?: boolean;
-    // TODO(burdon): If screenshare then contain.
-    contain?: boolean;
-  }>;
-
-export const VideoObject = memo(
-  forwardRef<HTMLVideoElement, VideoObjectProps>(({ videoStream, classNames, flip, contain, ...rest }, ref) => {
-    const internalRef = useRef<HTMLVideoElement | null>(null);
-
-    useEffect(() => {
-      const video = internalRef.current;
-      if (video && videoStream) {
-        video.srcObject = videoStream;
-        video.setAttribute('autoplay', 'true');
-        video.setAttribute('playsinline', 'true');
-      }
-    }, [videoStream, internalRef.current]);
-
-    // NOTE: The video element typically has a max size of 1280x720.
-    return (
-      <video
-        className={mx(
-          'w-full aspect-video',
-          flip && 'scale-x-[-1]',
-          contain ? 'object-contain' : 'object-cover',
-          classNames,
-        )}
-        ref={(v) => {
-          internalRef.current = v;
-          if (ref === null) {
-            return;
-          }
-
-          if (typeof ref === 'function') {
-            ref(v);
-          } else {
-            ref.current = v;
-          }
-        }}
-        {...rest}
-      />
-    );
-  }),
-);
-
-VideoObject.displayName = 'VideoObject';

package/src/components/Media/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './AudioStream';
-export * from './VideoObject';

package/src/components/MessagePanel/MessagePanel.tsx

@@ -1,222 +0,0 @@
-//
-// 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;
-  const messageMetadata = getMessageMetadata(message.id, senderIdentity);
-  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 role='none' 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 role='none' ref={parentRef} className='me-4' {...focusAttributes} />;
-};
-
-const ProposalBlock = ({ block }: { block: ContentBlock.Proposal }) => {
-  return (
-    <div role='none' 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

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

package/src/components/Participant/Participant.tsx

@@ -1,77 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { useAtomValue } from '@effect-atom/atom-react';
-import React, { memo, useMemo } from 'react';
-
-import { useCapability } from '@dxos/app-framework/ui';
-
-import { ThreadCapabilities } from '#types';
-
-import { type EncodedTrackName, type UserState } from '../../calls';
-import { VideoObject } from '../Media';
-import { ResponsiveGridItem, type ResponsiveGridItemProps } from '../ResponsiveGrid';
-
-export const SCREENSHARE_SUFFIX = '_screenshare';
-
-export const Participant = memo(({ item: user, debug, ...props }: ResponsiveGridItemProps<UserState>) => {
-  const call = useCapability(ThreadCapabilities.CallManager);
-  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);
-
-  // 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) {
-      return isScreenshare ? media.screenshareVideoStream : media.videoStream;
-    }
-    return pulledVideoStream;
-  }, [isSelf, isScreenshare, media.videoStream, media.screenshareVideoStream, pulledVideoStream]);
-
-  return (
-    <ResponsiveGridItem
-      {...props}
-      item={user}
-      name={user.name}
-      self={isSelf}
-      screenshare={!!media.screenshareVideoStream}
-      video={media.videoEnabled}
-      mute={user ? !user.tracks?.audioEnabled : false}
-      wave={user.raisedHand}
-      speaking={user.speaking}
-      debug={debug}
-    >
-      <VideoObject
-        videoStream={videoStream}
-        flip={isSelf && !isScreenshare}
-        contain={!!isScreenshare}
-        classNames='rounded-md'
-      />
-    </ResponsiveGridItem>
-  );
-});
-
-Participant.displayName = 'Participant';