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

package/src/components/ChannelContainer.tsx

@@ -3,26 +3,28 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
-import React, { useCallback, useEffect, useMemo, useState, type ChangeEvent } from 'react';
+import React, { type ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { useCapabilities, useCapability } from '@dxos/app-framework';
 import { Context } from '@dxos/context';
+import { failUndefined } from '@dxos/debug';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
 import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { useTranslation, Input, ElevationProvider, type ThemedClassName } from '@dxos/react-ui';
-import { ControlGroup, ControlItemInput, ControlGroupButton } from '@dxos/react-ui-form';
-import { ToolbarMenu, MenuProvider, createMenuAction, useMenuActions, createMenuItemGroup } from '@dxos/react-ui-menu';
+import { ElevationProvider, Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { ControlGroup, ControlGroupButton, ControlItemInput } from '@dxos/react-ui-form';
+import { MenuProvider, ToolbarMenu, createMenuAction, createMenuItemGroup, useMenuActions } from '@dxos/react-ui-menu';
 import { useSoundEffect } from '@dxos/react-ui-sfx';
 import { StackItem } from '@dxos/react-ui-stack';
 
-import { Call } from './Call';
-import ChatContainer from './ChatContainer';
 import { ThreadCapabilities } from '../capabilities';
-import { THREAD_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type ChannelType } from '../types';
 
+import { Call } from './Call';
+import ChatContainer from './ChatContainer';
+
 export type ChannelContainerProps = {
   channel?: ChannelType;
   roomId?: string;
@@ -36,7 +38,7 @@ export type ChannelContainerProps = {
 export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }: ChannelContainerProps) => {
   const space = getSpace(channel);
   const callManager = useCapability(ThreadCapabilities.CallManager);
-  const roomId = channel ? fullyQualifiedId(channel) : _roomId;
+  const roomId = _roomId ?? (channel ? fullyQualifiedId(channel) : failUndefined());
   const identity = useIdentity();
   const isNamed = !!identity?.profile?.displayName;
   const joinSound = useSoundEffect('JoinCall');
@@ -133,7 +135,7 @@ export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }:
 export default ChannelContainer;
 
 const DisplayNameMissing = () => {
-  const { t } = useTranslation(THREAD_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const client = useClient();
   const [displayName, setDisplayName] = useState('');
   const handleChange = useCallback((event: ChangeEvent<HTMLInputElement>) => setDisplayName(event.target.value), []);
@@ -163,10 +165,10 @@ const useChannelToolbarActions = (onJoinCall?: () => void) => {
         return {
           nodes: [
             createMenuItemGroup('root', {
-              label: ['channel toolbar title', { ns: THREAD_PLUGIN }],
+              label: ['channel toolbar title', { ns: meta.id }],
             }),
             createMenuAction('video-call', () => onJoinCall?.(), {
-              label: ['start video call label', { ns: THREAD_PLUGIN }],
+              label: ['start video call label', { ns: meta.id }],
               icon: 'ph--video-camera--regular',
               type: 'video-call',
             }),

package/src/components/Chat.stories.tsx

@@ -4,10 +4,10 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
-import React, { useEffect, useState } from 'react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useState } from 'react';
 
-import { Capabilities, contributes, createSurface, IntentPlugin } from '@dxos/app-framework';
+import { Capabilities, IntentPlugin, contributes, createSurface } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj, Ref } from '@dxos/echo';
 import { faker } from '@dxos/random';
@@ -15,35 +15,35 @@ import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { withClientProvider } from '@dxos/react-client/testing';
+import { useAsyncEffect } from '@dxos/react-ui';
 import { Thread } from '@dxos/react-ui-thread';
 import { DataType } from '@dxos/schema';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { render, withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { ChatContainer } from './ChatContainer';
-import translations from '../translations';
+import { translations } from '../translations';
 import { ChannelType, ThreadType } from '../types';
 
+import { ChatContainer } from './ChatContainer';
+
 faker.seed(1);
 
-const Story = () => {
+const DefaultStory = () => {
   const client = useClient();
   const identity = useIdentity();
   const [space, setSpace] = useState<Space>();
   const [channel, setChannel] = useState<ChannelType | null>();
 
-  useEffect(() => {
+  useAsyncEffect(async () => {
     if (identity) {
-      setTimeout(async () => {
-        const space = await client.spaces.create();
-        const channel = space.db.add(
-          Obj.make(ChannelType, {
-            defaultThread: Ref.make(Obj.make(ThreadType, { messages: [], status: 'active' })),
-            threads: [],
-          }),
-        );
-        setSpace(space);
-        setChannel(channel);
-      });
+      const space = await client.spaces.create();
+      const channel = space.db.add(
+        Obj.make(ChannelType, {
+          defaultThread: Ref.make(Obj.make(ThreadType, { messages: [], status: 'active' })),
+          threads: [],
+        }),
+      );
+      setSpace(space);
+      setChannel(channel);
     }
   }, [identity]);
 
@@ -52,18 +52,16 @@ const Story = () => {
   }
 
   return (
-    <main className='max-is-prose mli-auto bs-dvh overflow-hidden'>
+    <main className='is-full max-is-prose mli-auto bs-dvh overflow-hidden'>
       <ChatContainer space={space} thread={channel.defaultThread.target} />
     </main>
   );
 };
 
-export const Default = {};
-
-const meta: Meta = {
+const meta = {
   title: 'plugins/plugin-thread/Chat',
-  component: Thread,
-  render: () => <Story />,
+  component: Thread.Root as any,
+  render: render(DefaultStory),
   decorators: [
     withPluginManager({
       plugins: [IntentPlugin()],
@@ -80,9 +78,13 @@ const meta: Meta = {
     }),
     withTheme,
     withLayout({ fullscreen: true }),
-    withClientProvider({ createSpace: true, types: [ThreadType, DataType.Message] }),
+    withClientProvider({ createSpace: true, types: [ThreadType, ChannelType, DataType.Message] }),
   ],
   parameters: { translations },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/ChatContainer.tsx

@@ -5,7 +5,7 @@
 import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
 
 import { Obj, Ref } from '@dxos/echo';
-import { fullyQualifiedId, type Space, useMembers } from '@dxos/react-client/echo';
+import { type Space, fullyQualifiedId, useMembers } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { Icon, ScrollArea, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/react-ui-editor';
@@ -15,22 +15,22 @@ import {
   MessageTextbox,
   type MessageTextboxProps,
   Thread,
-  ThreadFooter,
+  type ThreadRootProps,
   threadLayout,
-  type ThreadProps,
 } from '@dxos/react-ui-thread';
 import { DataType } 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';
 
+import { command } from './command-extension';
+import { MessageContainer } from './MessageContainer';
+
 export const ChatHeading = ({ attendableId }: { attendableId?: string }) => {
-  const { t } = useTranslation(THREAD_PLUGIN);
+  const { t } = useTranslation(meta.id);
   return (
     <div role='none' className='flex items-center'>
       <StackItem.SigilButton attendableId={attendableId}>
@@ -46,14 +46,14 @@ export type ChatContainerProps = {
   thread: ThreadType;
   context?: Obj.Any;
   autoFocusTextbox?: boolean;
-} & Pick<ThreadProps, 'current'>;
+} & Pick<ThreadRootProps, 'current'>;
 
 export const ChatContainer = ({ space, thread, context, current, autoFocusTextbox }: ChatContainerProps) => {
+  const { t } = useTranslation(meta.id);
   const id = fullyQualifiedId(thread);
   const identity = useIdentity()!;
   const members = useMembers(space?.key);
   const activity = useStatus(space, id);
-  const { t } = useTranslation(THREAD_PLUGIN);
   // 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);
@@ -93,9 +93,9 @@ export const ChatContainer = ({ space, thread, context, current, autoFocusTextbo
     thread.messages.push(
       Ref.make(
         Obj.make(DataType.Message, {
-          sender: { identityDid: identity.did },
           created: new Date().toISOString(),
-          blocks: [{ type: 'text', text: messageRef.current }],
+          sender: { identityDid: identity.did },
+          blocks: [{ _tag: 'text', text: messageRef.current }],
           properties: context ? { context: Ref.make(context) } : undefined,
         }),
       ),
@@ -109,10 +109,13 @@ export const ChatContainer = ({ space, thread, context, current, autoFocusTextbo
   };
 
   return (
-    <Thread
+    <Thread.Root
       current={current}
       id={id}
-      classNames='bs-full grid-rows-[1fr_min-content_min-content] overflow-hidden transition-[padding-block-end] [[data-sidebar-inline-start-state=open]_&]:lg:pbe-0'
+      classNames={[
+        'bs-full is-full max-is-prose mli-auto grid-rows-[1fr_min-content_min-content] overflow-hidden',
+        'transition-[padding-block-end] [[data-sidebar-inline-start-state=open]_&]:lg:pbe-0',
+      ]}
     >
       <ScrollArea.Root classNames='col-span-2'>
         <ScrollArea.Viewport classNames='overflow-anchored after:overflow-anchor after:block after:bs-px after:-mbs-px [&>div]:min-bs-full [&>div]:!grid [&>div]:grid-rows-[1fr_0]'>
@@ -131,9 +134,11 @@ export const ChatContainer = ({ space, thread, context, current, autoFocusTextbo
           </ScrollArea.Scrollbar>
         </ScrollArea.Viewport>
       </ScrollArea.Root>
+
       <MessageTextbox extensions={extensions} autoFocus={autoFocus} onSend={handleCreate} {...textboxMetadata} />
-      <ThreadFooter activity={activity}>{t('activity message')}</ThreadFooter>
-    </Thread>
+
+      <Thread.Status activity={activity}>{t('activity message')}</Thread.Status>
+    </Thread.Root>
   );
 };
 

package/src/components/Comments.stories.tsx

@@ -4,52 +4,52 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
-import React, { useEffect } from 'react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj, Query, Relation, Type } from '@dxos/echo';
+import { ClientPlugin } from '@dxos/plugin-client';
 import { faker } from '@dxos/random';
 import { useQuery, useSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { type ClientRepeatedComponentProps, ClientRepeater } from '@dxos/react-client/testing';
+import { useAsyncEffect } from '@dxos/react-ui';
 import { AnchoredTo, DataType } from '@dxos/schema';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { layoutCentered, render, withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { CommentsContainer } from './CommentsContainer';
-import { createCommentThread } from './testing';
-import translations from '../translations';
+import { translations } from '../translations';
 import { ThreadType } from '../types';
 
+import { CommentsContainer } from './CommentsContainer';
+import { createCommentThread, createProposalThread } from './testing';
+
 faker.seed(1);
 
-const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
+const DefaultStory = () => {
   const identity = useIdentity();
-  const space = useSpace(spaceKey);
+  const space = useSpace();
   const anchors = useQuery(space, Query.type(AnchoredTo));
 
-  useEffect(() => {
+  useAsyncEffect(async () => {
     if (identity && space) {
-      const t = setTimeout(async () => {
-        const object = space.db.add(Obj.make(Type.Expando, {}));
-        const thread1 = space.db.add(createCommentThread(identity));
-        const thread2 = space.db.add(createCommentThread(identity));
-        space.db.add(
-          Relation.make(AnchoredTo, {
-            [Relation.Source]: thread1,
-            [Relation.Target]: object,
-          }),
-        );
-        space.db.add(
-          Relation.make(AnchoredTo, {
-            [Relation.Source]: thread2,
-            [Relation.Target]: object,
-          }),
-        );
-      });
-
-      return () => clearTimeout(t);
+      const object = space.db.add(Obj.make(Type.Expando, {}));
+      const thread1 = space.db.add(createCommentThread(identity));
+      const thread2 = space.db.add(createProposalThread(identity));
+      space.db.add(
+        Relation.make(AnchoredTo, {
+          [Relation.Source]: thread1,
+          [Relation.Target]: object,
+          anchor: 'test',
+        }),
+      );
+      space.db.add(
+        Relation.make(AnchoredTo, {
+          [Relation.Source]: thread2,
+          [Relation.Target]: object,
+          anchor: 'test',
+        }),
+      );
     }
   }, [identity, space]);
 
@@ -58,28 +58,39 @@ const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
   }
 
   return (
-    <div className='flex justify-center overflow-y-auto bg-white dark:bg-black'>
-      <div className='flex flex-col w-[30rem]'>
-        <CommentsContainer anchors={anchors} onThreadDelete={console.log} />
-      </div>
+    <div className='w-[30rem] overflow-y-auto bg-baseSurface'>
+      <CommentsContainer anchors={anchors} onThreadDelete={console.log} onAcceptProposal={console.log} />
     </div>
   );
 };
 
-const meta: Meta = {
+const meta = {
   title: 'plugins/plugin-thread/Comments',
-  // TODO(wittjosiah): Use decorator.
-  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, DataType.Message]} />,
+  render: render(DefaultStory),
   decorators: [
     withTheme,
-    withLayout({ fullscreen: true }),
+    withLayout({ fullscreen: true, classNames: layoutCentered }),
+    // TODO(wittjosiah): This shouldn't depend on app framework. Should use withClientProvider instead.
+    //   Currently this is required due to useOnEditAnalytics.
     withPluginManager({
-      plugins: [IntentPlugin()],
+      plugins: [
+        IntentPlugin(),
+        ClientPlugin({
+          types: [DataType.Message, ThreadType, AnchoredTo],
+          onClientInitialized: async ({ client }) => {
+            await client.halo.createIdentity();
+          },
+        }),
+      ],
     }),
   ],
-  parameters: { translations },
-};
+  parameters: {
+    translations,
+  },
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-export const Default = {};
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/CommentsContainer.tsx

@@ -9,21 +9,23 @@ import { fullyQualifiedId } from '@dxos/react-client/echo';
 import { Callout, Icon, Trans, useTranslation } from '@dxos/react-ui';
 import { type AnchoredTo } from '@dxos/schema';
 
-import { CommentContainer, type CommentContainerProps } from './CommentContainer';
-import { THREAD_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type ThreadType } from '../types';
 
-export type ThreadsContainerProps = Omit<CommentContainerProps, 'anchor' | 'current'> & {
+import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
+
+export type CommentsContainerProps = Omit<CommentsThreadContainerProps, 'anchor' | 'current'> & {
   anchors: AnchoredTo[];
   currentId?: string;
   showResolvedThreads?: boolean;
 };
 
 /**
- * Comment threads.
+ * Root container for collection of comment threads.
  */
-export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...props }: ThreadsContainerProps) => {
-  const { t } = useTranslation(THREAD_PLUGIN);
+export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...props }: CommentsContainerProps) => {
+  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))
@@ -58,9 +60,13 @@ export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...
     );
   }
 
-  return filteredAnchors.map((anchor) => {
-    const thread = Relation.getSource(anchor) as ThreadType;
-    const threadId = fullyQualifiedId(thread);
-    return <CommentContainer key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
-  });
+  return (
+    <div>
+      {filteredAnchors.map((anchor) => {
+        const thread = Relation.getSource(anchor) as ThreadType;
+        const threadId = fullyQualifiedId(thread);
+        return <CommentsThreadContainer key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
+      })}
+    </div>
+  );
 };