@dxos/plugin-thread 0.8.4-main.f5c0578 → 0.8.4-main.fcc0d83b33

package/src/components/CommentsPanel/CommentsPanel.stories.tsx

@@ -0,0 +1,95 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { Obj, Query, Relation } from '@dxos/echo';
+import { TestSchema } from '@dxos/echo/testing';
+import { ClientPlugin } from '@dxos/plugin-client';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { random } from '@dxos/random';
+import { useQuery, useSpaces } from '@dxos/react-client/echo';
+import { useIdentity } from '@dxos/react-client/halo';
+import { useAsyncEffect } from '@dxos/react-ui';
+import { withLayout, withTheme, Loading } from '@dxos/react-ui/testing';
+import { AnchoredTo, Message, Thread } from '@dxos/types';
+
+import { translations } from '#translations';
+
+import { createCommentThread, createProposalThread } from '../../testing/data';
+import { CommentsPanel } from './CommentsPanel';
+
+random.seed(1);
+
+const DefaultStory = () => {
+  const identity = useIdentity();
+  const [space] = useSpaces();
+  const db = space?.db;
+  const anchors = useQuery(db, Query.type(AnchoredTo.AnchoredTo));
+
+  useAsyncEffect(async () => {
+    if (identity && db) {
+      const object = db.add(Obj.make(TestSchema.Expando, {}));
+      const thread1 = db.add(createCommentThread(identity));
+      const thread2 = db.add(createProposalThread(identity));
+      db.add(
+        Relation.make(AnchoredTo.AnchoredTo, {
+          [Relation.Source]: thread1,
+          [Relation.Target]: object,
+          anchor: 'test',
+        }),
+      );
+      db.add(
+        Relation.make(AnchoredTo.AnchoredTo, {
+          [Relation.Source]: thread2,
+          [Relation.Target]: object,
+          anchor: 'test',
+        }),
+      );
+    }
+  }, [identity, db]);
+
+  if (!identity || !db || !anchors) {
+    return <Loading data={{ identity: !!identity, db: !!db, anchors: !!anchors }} />;
+  }
+
+  return <CommentsPanel anchors={anchors} onThreadDelete={console.log} onAcceptProposal={console.log} />;
+};
+
+const meta = {
+  title: 'plugins/plugin-thread/components/Comments',
+  render: DefaultStory,
+  decorators: [
+    withTheme(),
+    withLayout({ layout: 'column' }),
+    // TODO(wittjosiah): This shouldn't depend on app framework (use withClientProvider instead).
+    //  Currently this is required due to useOnEditAnalytics.
+    withPluginManager({
+      plugins: [
+        OperationPlugin(),
+        RuntimePlugin(),
+        ClientPlugin({
+          types: [Message.Message, Thread.Thread, AnchoredTo.AnchoredTo],
+          onClientInitialized: ({ client }) =>
+            Effect.gen(function* () {
+              yield* initializeIdentity(client);
+            }),
+        }),
+      ],
+    }),
+  ],
+  parameters: {
+    translations,
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/CommentsPanel/CommentsPanel.tsx

@@ -0,0 +1,71 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React, { useEffect } from 'react';
+
+import { Obj, Relation } from '@dxos/echo';
+import { Icon, Message, Trans, useTranslation } from '@dxos/react-ui';
+import { type AnchoredTo, type Thread } from '@dxos/types';
+
+import { meta } from '#meta';
+
+import { CommentsThread, type CommentsThreadProps } from './CommentsThread';
+
+export type CommentsPanelProps = Omit<CommentsThreadProps, 'anchor' | 'current'> & {
+  anchors: AnchoredTo.AnchoredTo[];
+  currentId?: string;
+  showResolvedThreads?: boolean;
+};
+
+/**
+ * Root container for collection of comment threads.
+ */
+export const CommentsPanel = ({ anchors, currentId, showResolvedThreads, ...props }: CommentsPanelProps) => {
+  const { t } = useTranslation(meta.id);
+
+  // TODO(wittjosiah): There seems to be a race between thread and anchor being deleted.
+  const filteredAnchors = showResolvedThreads
+    ? anchors.filter((anchor) => !!Relation.getSource(anchor))
+    : anchors.filter((anchor) => {
+        const thread = Relation.getSource(anchor);
+        // TODO(dmaretskyi): Do Obj.instanceOf check instead.
+        return thread && (thread as any).status !== 'resolved';
+      });
+
+  useEffect(() => {
+    if (currentId) {
+      document.getElementById(currentId)?.scrollIntoView({ behavior: 'smooth', block: 'end' });
+    }
+  }, [currentId]);
+
+  if (filteredAnchors.length === 0) {
+    return (
+      <div role='none' className='p-form-padding'>
+        <Message.Root>
+          <Message.Title>
+            <Trans
+              {...{
+                t,
+                i18nKey: 'no-comments.message',
+                components: {
+                  commentIcon: <Icon icon='ph--chat-text--regular' size={4} classNames='w-block' />,
+                },
+              }}
+            />
+          </Message.Title>
+        </Message.Root>
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      {filteredAnchors.map((anchor) => {
+        const thread = Relation.getSource(anchor) as Thread.Thread;
+        const threadId = Obj.getDXN(thread).toString();
+        return <CommentsThread key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
+      })}
+    </div>
+  );
+};

package/src/components/{CommentsThreadContainer.tsx → CommentsPanel/CommentsThread.tsx}

@@ -4,37 +4,39 @@
 
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import { Ref, Relation } from '@dxos/echo';
-import { fullyQualifiedId, getSpace, useMembers } from '@dxos/react-client/echo';
+import { Obj, Relation } from '@dxos/echo';
+import { useObject } from '@dxos/echo-react';
+import { getSpace, useMembers } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { IconButton, Tag, Tooltip, useThemeContext, useTranslation } from '@dxos/react-ui';
-import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/react-ui-editor';
-import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
-import { MessageTextbox, type MessageTextboxProps, Thread, type ThreadRootProps } from '@dxos/react-ui-thread';
-import { type AnchoredTo } from '@dxos/schema';
-import { isNonNullable } from '@dxos/util';
-
-import { useStatus } from '../hooks';
-import { meta } from '../meta';
-import { type ThreadType } from '../types';
-import { getMessageMetadata } from '../util';
-
-import { command } from './command-extension';
-import { MessageContainer } from './MessageContainer';
-
-// TODO(burdon): Remove need for p-1.
-export const commentControlClassNames = '!p-1 transition-opacity';
-
-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;
+import {
+  MessageTextbox,
+  type MessageTextboxProps,
+  Thread as ThreadComponent,
+  type ThreadRootProps,
+} from '@dxos/react-ui-thread';
+import { type AnchoredTo, type Thread } from '@dxos/types';
+import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/ui-editor';
+import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/ui-theme';
+
+import { useStatus } from '#hooks';
+import { meta } from '#meta';
+
+import { command } from '../../extensions/command';
+import { getMessageMetadata } from '../../util';
+import { MessagePanel, buttonClassNames, buttonGroupClassNames } from '../MessagePanel';
+
+export type CommentsThreadProps = {
+  anchor: AnchoredTo.AnchoredTo;
+  onAttend?: (anchor: AnchoredTo.AnchoredTo) => void;
+  onComment?: (anchor: AnchoredTo.AnchoredTo, message: string) => void;
+  onResolve?: (anchor: AnchoredTo.AnchoredTo) => void;
+  onMessageDelete?: (anchor: AnchoredTo.AnchoredTo, messageId: string) => void;
+  onThreadDelete?: (anchor: AnchoredTo.AnchoredTo) => void;
+  onAcceptProposal?: (anchor: AnchoredTo.AnchoredTo, messageId: string) => void;
 } & Pick<ThreadRootProps, 'current'>;
 
-export const CommentsThreadContainer = ({
+export const CommentsThread = ({
   anchor,
   current,
   onAttend,
@@ -42,30 +44,32 @@ export const CommentsThreadContainer = ({
   onResolve,
   onMessageDelete,
   onThreadDelete,
-}: CommentsThreadContainerProps) => {
+  onAcceptProposal,
+}: CommentsThreadProps) => {
+  const { themeMode } = useThemeContext();
   const { t } = useTranslation(meta.id);
   const identity = useIdentity()!;
   const space = getSpace(anchor);
-  const members = useMembers(space?.key);
+  const members = useMembers(space?.id);
   const detached = !anchor.anchor;
-  const thread = Relation.getSource(anchor) as ThreadType;
-  const activity = useStatus(space, fullyQualifiedId(thread));
+  const thread = Relation.getSource(anchor) as Thread.Thread;
+  const [messages] = useObject(thread, 'messages');
+  const activity = useStatus(space, Obj.getDXN(thread).toString());
   const threadScrollRef = useRef<HTMLDivElement | null>(null);
-  const { themeMode } = useThemeContext();
 
-  const textboxMetadata = getMessageMetadata(fullyQualifiedId(thread), identity);
+  const textboxMetadata = getMessageMetadata(Obj.getDXN(thread).toString(), identity);
+
   // TODO(wittjosiah): This is a hack to reset the editor after a message is sent.
-  const [_count, _setCount] = useState(0);
-  const rerenderEditor = () => _setCount((count) => count + 1);
+  const [state, setState] = useState({});
   const messageRef = useRef('');
   const extensions = useMemo(
     () => [
-      createBasicExtensions({ placeholder: t('message placeholder') }),
+      createBasicExtensions({ placeholder: t('message.placeholder') }),
       createThemeExtensions({ themeMode }),
-      listener({ onChange: (text) => (messageRef.current = text) }),
+      listener({ onChange: ({ text }) => (messageRef.current = text) }),
       command,
     ],
-    [_count],
+    [state],
   );
 
   // TODO(thure): Factor out.
@@ -76,8 +80,9 @@ export const CommentsThreadContainer = ({
   const handleResolve = useCallback(() => onResolve?.(anchor), [onResolve, anchor]);
   const handleMessageDelete = useCallback((id: string) => onMessageDelete?.(anchor, id), [onMessageDelete, anchor]);
   const handleThreadDelete = useCallback(() => onThreadDelete?.(anchor), [onThreadDelete, anchor]);
+  const handleAcceptProposal = useCallback((id: string) => onAcceptProposal?.(anchor, id), [onAcceptProposal, anchor]);
 
-  const handleComment: MessageTextboxProps['onSend'] = useCallback(() => {
+  const handleComment = useCallback<NonNullable<MessageTextboxProps['onSend']>>(() => {
     if (!messageRef.current) {
       return false;
     }
@@ -85,15 +90,15 @@ export const CommentsThreadContainer = ({
     onComment?.(anchor, messageRef.current);
     messageRef.current = '';
     scrollToEnd('instant');
-    rerenderEditor();
+    setState({});
 
     return true;
   }, [anchor, identity]);
 
   return (
-    <Thread.Root
-      id={fullyQualifiedId(thread)}
-      classNames='pbs-2 border-be border-subduedSeparator last:border-none'
+    <ThreadComponent.Root
+      id={Obj.getDXN(thread).toString()}
+      classNames='pt-2 border-b border-subdued-separator last:border-none'
       current={current}
       onClickCapture={handleAttend}
       onFocusCapture={handleAttend}
@@ -101,28 +106,28 @@ export const CommentsThreadContainer = ({
       <div
         role='none'
         className={mx(
-          'col-span-2 grid grid-cols-[var(--rail-size)_1fr_min-content]',
+          'col-span-2 grid grid-cols-[var(--dx-rail-size)_1fr_min-content]',
           hoverableControls,
           hoverableFocusedWithinControls,
         )}
       >
         {detached ? (
-          <Tooltip.Trigger asChild content={t('detached thread label')} side='top'>
-            <Thread.Header detached>{thread.name}</Thread.Header>
+          <Tooltip.Trigger asChild content={t('detached-thread.label')} side='top'>
+            <ThreadComponent.Header detached>{thread.name}</ThreadComponent.Header>
           </Tooltip.Trigger>
         ) : (
-          <Thread.Header>{thread.name}</Thread.Header>
+          <ThreadComponent.Header>{thread.name}</ThreadComponent.Header>
         )}
-        <div className='flex flex-row items-center gap-0.5'>
-          {thread.status === 'staged' && <Tag palette='neutral'>{t('draft button')}</Tag>}
+        <div role='none' className={buttonGroupClassNames}>
+          {thread.status === 'staged' && <Tag palette='neutral'>{t('draft.button')}</Tag>}
           {onResolve && !(thread?.status === 'staged') && (
             <IconButton
               data-testid='thread.resolve'
               variant='ghost'
               icon={thread?.status === 'resolved' ? 'ph--check--fill' : 'ph--check--regular'}
               iconOnly
-              label={t('resolve thread label')}
-              classNames={[commentControlClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
+              label={t('resolve-thread.label')}
+              classNames={[buttonClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
               onClick={handleResolve}
             />
           )}
@@ -132,22 +137,22 @@ export const CommentsThreadContainer = ({
               variant='ghost'
               icon='ph--x--regular'
               iconOnly
-              label={t('delete thread label')}
-              classNames={[commentControlClassNames, hoverableControlItem]}
+              label={t('delete-thread.label')}
+              classNames={[buttonClassNames, hoverableControlItem]}
               onClick={handleThreadDelete}
             />
           )}
         </div>
       </div>
 
-      {/** TODO(dmaretskyi): How's `thread.messages` undefined? */}
-      {Ref.Array.targets(thread.messages?.filter(isNonNullable) ?? []).map((message) => (
-        <MessageContainer
-          key={message.id}
+      {messages?.map((ref) => (
+        <MessagePanel
+          key={ref.dxn.toString()}
           editable
-          message={message}
+          message={ref}
           members={members}
           onDelete={handleMessageDelete}
+          onAcceptProposal={handleAcceptProposal}
         />
       ))}
 
@@ -159,10 +164,9 @@ export const CommentsThreadContainer = ({
       */}
       <MessageTextbox extensions={extensions} onSend={handleComment} {...textboxMetadata} />
 
-      <Thread.Status activity={activity}>{t('activity message')}</Thread.Status>
+      <ThreadComponent.Status activity={activity}>{t('activity.message')}</ThreadComponent.Status>
 
-      {/* NOTE(thure): This can’t also be the `overflow-anchor` because `ScrollArea` injects an interceding node that contains this necessary ref’d element. */}
-      <div role='none' className='bs-px -mbs-px' ref={threadScrollRef} />
-    </Thread.Root>
+      <div role='none' className='h-px -mt-px' ref={threadScrollRef} />
+    </ThreadComponent.Root>
   );
 };

package/src/components/CommentsPanel/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './CommentsPanel';
+export * from './CommentsThread';

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 { useCapability } from '@dxos/app-framework/ui';
 import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+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,48 +2,54 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta, type StoryObj } 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 { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { getUserMediaTrack } from '../../calls';
-import { ResponsiveContainer } from '../ResponsiveGrid';
-
-import { VideoObject } from './VideoObject';
-
-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<{