@dxos/plugin-thread 0.8.4-main.c1de068 → 0.8.4-main.c4373fc

package/src/components/ChannelContainer.stories.tsx

@@ -2,8 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
@@ -11,16 +9,18 @@ import { contributes } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { Query, useQuery, useSpace } from '@dxos/react-client/echo';
+import { withTheme } from '@dxos/react-ui/testing';
 import { DataType } from '@dxos/schema';
-import { withLayout, ColumnContainer } from '@dxos/storybook-utils';
+import { render } from '@dxos/storybook-utils';
 
-import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
 import { createThreadPlugins } from '../testing';
 import { translations } from '../translations';
 import { ChannelType, ThreadType } from '../types';
 
+import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
+
 // TODO(wittjosiah): Channel doesn't render full height.
-const Story = ({ roomId }: ChannelContainerProps) => {
+const DefaultStory = ({ roomId }: ChannelContainerProps) => {
   const space = useSpace();
   const [channel] = useQuery(space, Query.type(ChannelType));
   if (!channel) {
@@ -30,25 +30,26 @@ const Story = ({ roomId }: ChannelContainerProps) => {
   return <ChannelContainer channel={channel} roomId={roomId} />;
 };
 
-const meta: Meta<ChannelContainerProps> = {
+const meta = {
   title: 'plugins/plugin-thread/ChannelContainer',
   component: ChannelContainer,
-  render: (args) => <Story {...args} />,
+  render: render(DefaultStory),
   decorators: [
+    withTheme,
     withPluginManager({
       plugins: [...(await createThreadPlugins())],
       capabilities: [contributes(ClientCapabilities.Schema, [ChannelType, ThreadType, DataType.Message])],
     }),
-    withLayout({ Container: ColumnContainer, classNames: 'w-[40rem] overflow-hidden' }),
   ],
   parameters: {
+    layout: 'column',
     translations,
   },
-};
+} satisfies Meta<typeof ChannelContainer>;
 
 export default meta;
 
-type Story = StoryObj<ChannelContainerProps>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {

package/src/components/ChannelContainer.tsx

@@ -3,7 +3,7 @@
 //
 
 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';
@@ -12,18 +12,19 @@ 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 { meta } from '../meta';
 import { type ChannelType } from '../types';
 
+import { Call } from './Call';
+import ChatContainer from './ChatContainer';
+
 export type ChannelContainerProps = {
   channel?: ChannelType;
   roomId?: string;
@@ -113,7 +114,7 @@ export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }:
   const isJoined = callManager.joined && callManager.roomId === roomId;
 
   return (
-    <StackItem.Content toolbar={!isJoined} classNames={isJoined && 'h-full'}>
+    <StackItem.Content classNames={isJoined && 'bs-full'} toolbar={!isJoined}>
       {isJoined && !isNamed && <DisplayNameMissing />}
       {isJoined && isNamed && (
         <Call.Root>

package/src/components/Chat.stories.tsx

@@ -2,12 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useState } from 'react';
 
-import { type Meta } from '@storybook/react-vite';
-import React, { useEffect, 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 +13,36 @@ 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 { withTheme } from '@dxos/react-ui/testing';
 import { Thread } from '@dxos/react-ui-thread';
 import { DataType } from '@dxos/schema';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { render } from '@dxos/storybook-utils';
 
-import { ChatContainer } from './ChatContainer';
 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,19 +51,18 @@ 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<typeof Thread.Root> = {
+const meta = {
   title: 'plugins/plugin-thread/Chat',
-  component: Thread.Root,
-  render: () => <Story />,
+  component: Thread.Root as any,
+  render: render(DefaultStory),
   decorators: [
+    withTheme,
     withPluginManager({
       plugins: [IntentPlugin()],
       capabilities: [
@@ -78,11 +76,16 @@ const meta: Meta<typeof Thread.Root> = {
         ),
       ],
     }),
-    withTheme,
-    withLayout({ fullscreen: true }),
-    withClientProvider({ createSpace: true, types: [ThreadType, DataType.Message] }),
+    withClientProvider({ createSpace: true, types: [ThreadType, ChannelType, DataType.Message] }),
   ],
-  parameters: { translations },
-};
+  parameters: {
+    layout: 'fullscreen',
+    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';
@@ -21,13 +21,14 @@ import {
 import { DataType } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
-import { MessageContainer } from './MessageContainer';
-import { command } from './command-extension';
 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';
+
 export const ChatHeading = ({ attendableId }: { attendableId?: string }) => {
   const { t } = useTranslation(meta.id);
   return (
@@ -111,7 +112,10 @@ export const ChatContainer = ({ space, thread, context, current, autoFocusTextbo
     <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]'>

package/src/components/Comments.stories.tsx

@@ -2,10 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
-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';
@@ -14,14 +12,17 @@ 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 { useAsyncEffect } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
 import { AnchoredTo, DataType } from '@dxos/schema';
-import { layoutCentered, render, withLayout, withTheme } from '@dxos/storybook-utils';
+import { render } from '@dxos/storybook-utils';
 
-import { CommentsContainer } from './CommentsContainer';
-import { createCommentThread } from './testing';
 import { translations } from '../translations';
 import { ThreadType } from '../types';
 
+import { CommentsContainer } from './CommentsContainer';
+import { createCommentThread, createProposalThread } from './testing';
+
 faker.seed(1);
 
 const DefaultStory = () => {
@@ -29,27 +30,25 @@ const DefaultStory = () => {
   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]);
 
@@ -57,25 +56,21 @@ const DefaultStory = () => {
     return null;
   }
 
-  return (
-    <div className='w-[30rem] overflow-y-auto bg-baseSurface'>
-      <CommentsContainer anchors={anchors} onThreadDelete={console.log} />
-    </div>
-  );
+  return <CommentsContainer anchors={anchors} onThreadDelete={console.log} onAcceptProposal={console.log} />;
 };
 
-const meta: Meta = {
+const meta = {
   title: 'plugins/plugin-thread/Comments',
   render: render(DefaultStory),
   decorators: [
-    withTheme,
-    withLayout({ fullscreen: true, classNames: layoutCentered }),
+    withTheme, // TODO(wittjosiah): This shouldn't depend on app framework. Should use withClientProvider instead.
+    //   Currently this is required due to useOnEditAnalytics.
     withPluginManager({
       plugins: [
         IntentPlugin(),
         ClientPlugin({
           types: [DataType.Message, ThreadType, AnchoredTo],
-          onClientInitialized: async (_, client) => {
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),
@@ -83,10 +78,16 @@ const meta: Meta = {
     }),
   ],
   parameters: {
+    layout: {
+      type: 'column',
+      className: 'overflow-y-scroll',
+    },
     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,10 +9,11 @@ import { fullyQualifiedId } from '@dxos/react-client/echo';
 import { Callout, Icon, Trans, useTranslation } from '@dxos/react-ui';
 import { type AnchoredTo } from '@dxos/schema';
 
-import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
 import { meta } from '../meta';
 import { type ThreadType } from '../types';
 
+import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
+
 export type CommentsContainerProps = Omit<CommentsThreadContainerProps, 'anchor' | 'current'> & {
   anchors: AnchoredTo[];
   currentId?: string;

package/src/components/CommentsThreadContainer.tsx

@@ -14,15 +14,13 @@ import { MessageTextbox, type MessageTextboxProps, Thread, type ThreadRootProps
 import { type AnchoredTo } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
-import { MessageContainer } from './MessageContainer';
-import { command } from './command-extension';
 import { useStatus } from '../hooks';
 import { meta } from '../meta';
 import { type ThreadType } from '../types';
 import { getMessageMetadata } from '../util';
 
-// TODO(burdon): Remove need for p-1.
-export const commentControlClassNames = '!p-1 transition-opacity';
+import { command } from './command-extension';
+import { MessageContainer, buttonClassNames, buttonGroupClassNames } from './MessageContainer';
 
 export type CommentsThreadContainerProps = {
   anchor: AnchoredTo;
@@ -31,6 +29,7 @@ export type CommentsThreadContainerProps = {
   onResolve?: (anchor: AnchoredTo) => void;
   onMessageDelete?: (anchor: AnchoredTo, messageId: string) => void;
   onThreadDelete?: (anchor: AnchoredTo) => void;
+  onAcceptProposal?: (anchor: AnchoredTo, messageId: string) => void;
 } & Pick<ThreadRootProps, 'current'>;
 
 export const CommentsThreadContainer = ({
@@ -41,6 +40,7 @@ export const CommentsThreadContainer = ({
   onResolve,
   onMessageDelete,
   onThreadDelete,
+  onAcceptProposal,
 }: CommentsThreadContainerProps) => {
   const { t } = useTranslation(meta.id);
   const identity = useIdentity()!;
@@ -75,6 +75,7 @@ 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(() => {
     if (!messageRef.current) {
@@ -112,7 +113,7 @@ export const CommentsThreadContainer = ({
         ) : (
           <Thread.Header>{thread.name}</Thread.Header>
         )}
-        <div className='flex flex-row items-center gap-0.5'>
+        <div role='none' className={buttonGroupClassNames}>
           {thread.status === 'staged' && <Tag palette='neutral'>{t('draft button')}</Tag>}
           {onResolve && !(thread?.status === 'staged') && (
             <IconButton
@@ -121,7 +122,7 @@ export const CommentsThreadContainer = ({
               icon={thread?.status === 'resolved' ? 'ph--check--fill' : 'ph--check--regular'}
               iconOnly
               label={t('resolve thread label')}
-              classNames={[commentControlClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
+              classNames={[buttonClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
               onClick={handleResolve}
             />
           )}
@@ -132,7 +133,7 @@ export const CommentsThreadContainer = ({
               icon='ph--x--regular'
               iconOnly
               label={t('delete thread label')}
-              classNames={[commentControlClassNames, hoverableControlItem]}
+              classNames={[buttonClassNames, hoverableControlItem]}
               onClick={handleThreadDelete}
             />
           )}
@@ -147,6 +148,7 @@ export const CommentsThreadContainer = ({
           message={message}
           members={members}
           onDelete={handleMessageDelete}
+          onAcceptProposal={handleAcceptProposal}
         />
       ))}
 

package/src/components/Lobby/Lobby.tsx

@@ -5,7 +5,7 @@
 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 { type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
 import { ThreadCapabilities } from '../../capabilities';

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;