@dxos/plugin-thread 0.8.4-main.4a85c3132b → 0.8.4-main.51f1e5ca51

package/src/containers/ChannelContainer/ChannelContainer.stories.tsx

@@ -3,43 +3,74 @@
 //
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
 import { Capability } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { Query, useDatabase, useQuery } from '@dxos/react-client/echo';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
-import { render } from '@dxos/storybook-utils';
+import { ClientPlugin } from '@dxos/plugin-client';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { SpacePlugin } from '@dxos/plugin-space';
+import { corePlugins } from '@dxos/plugin-testing';
+import { Config } from '@dxos/react-client';
+import { Query, useQuery, useSpaces } from '@dxos/react-client/echo';
+import { withLayout, withTheme, Loading } from '@dxos/react-ui/testing';
 import { Message, Thread } from '@dxos/types';
 
-import { createThreadPlugins } from '../../testing';
-import { translations } from '../../translations';
-import { Channel } from '../../types';
+import { translations } from '#translations';
+import { Channel } from '#types';
 
+import { ThreadPlugin } from '../../ThreadPlugin';
 import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
 
 // TODO(wittjosiah): Channel doesn't render full height.
 const DefaultStory = ({ roomId }: ChannelContainerProps) => {
-  const db = useDatabase();
-  const [channel] = useQuery(db, Query.type(Channel.Channel));
+  const [space] = useSpaces();
+  const [channel] = useQuery(space?.db, Query.type(Channel.Channel));
   if (!channel) {
-    return null;
+    return <Loading data={{ channel }} />;
   }
 
-  return <ChannelContainer subject={channel} roomId={roomId} />;
+  return <ChannelContainer subject={channel} attendableId='story' roomId={roomId} role='article' />;
 };
 
 const meta = {
   title: 'plugins/plugin-thread/containers/ChannelContainer',
   component: ChannelContainer,
-  render: render(DefaultStory),
+  render: DefaultStory,
   decorators: [
     withTheme(),
     withLayout({ layout: 'column' }),
     withPluginManager({
-      plugins: [...(await createThreadPlugins())],
       capabilities: [Capability.contributes(AppCapabilities.Schema, [Channel.Channel, Thread.Thread, Message.Message])],
+      plugins: [
+        ...corePlugins(),
+        ClientPlugin({
+          types: [Channel.Channel, Thread.Thread, Message.Message],
+          config: new Config({
+            runtime: {
+              services: {
+                edge: {
+                  url: 'https://edge.dxos.workers.dev/',
+                },
+                iceProviders: [
+                  {
+                    urls: 'https://edge.dxos.workers.dev/ice',
+                  },
+                ],
+              },
+            },
+          }),
+          onClientInitialized: ({ client }) =>
+            Effect.gen(function* () {
+              const { personalSpace } = yield* initializeIdentity(client);
+              personalSpace.db.add(Channel.make());
+            }),
+        }),
+        SpacePlugin({}),
+        ThreadPlugin(),
+      ],
     }),
   ],
   parameters: {
@@ -55,6 +86,8 @@ export const Default: Story = {
   args: {
     // Fixed room for testing.
     subject: undefined,
+    attendableId: 'story',
+    role: 'article',
     roomId: '04a1d1911703b8e929d0649021a965',
   },
 };

package/src/containers/ChannelContainer/ChannelContainer.tsx

@@ -6,26 +6,27 @@ import { Atom, useAtomValue } from '@effect-atom/atom-react';
 import React, { type ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { useCapabilities, useCapability } from '@dxos/app-framework/ui';
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Context } from '@dxos/context';
 import { failUndefined } from '@dxos/debug';
-import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
 import { getSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { ElevationProvider, Input, Panel, useTranslation } from '@dxos/react-ui';
+import { Button, ElevationProvider, Input, Panel, useTranslation } from '@dxos/react-ui';
 import { Settings } from '@dxos/react-ui-form';
-import { Menu, createMenuAction, createMenuItemGroup, useMenuActions } from '@dxos/react-ui-menu';
+import { Menu, MenuRootProps, createMenuAction, createMenuItemGroup, useMenuActions } from '@dxos/react-ui-menu';
 import { useSoundEffect } from '@dxos/react-ui-sfx';
+import { composable, composableProps } from '@dxos/ui-theme';
 
-import { Call } from '../../components';
-import { meta } from '../../meta';
-import { ThreadCapabilities } from '../../types';
-import { type Channel } from '../../types';
-import ChatContainer from '../ChatContainer';
+import { Call } from '#components';
+import { meta } from '#meta';
+import { ThreadCapabilities } from '#types';
+import { type Channel } from '#types';
 
-export type ChannelContainerProps = SurfaceComponentProps<
+import { ChatContainer } from '../ChatContainer';
+
+export type ChannelContainerProps = AppSurface.ObjectArticleProps<
   Channel.Channel | undefined,
   {
     roomId?: string;
@@ -37,13 +38,18 @@ export type ChannelContainerProps = SurfaceComponentProps<
  * Renders a call when active, otherwise renders the channel chat.
  */
 // TODO(burdon): Create Radix style layout.
-export const ChannelContainer = ({ role, subject: channel, roomId: roomIdProp, fullscreen }: ChannelContainerProps) => {
+export const ChannelContainer = ({
+  role,
+  subject: channel,
+  attendableId,
+  roomId: roomIdProp,
+  fullscreen,
+}: ChannelContainerProps) => {
   const space = getSpace(channel);
   const callManager = useCapability(ThreadCapabilities.CallManager);
   const extensions = useCapabilities(ThreadCapabilities.CallExtension);
   const joined = useAtomValue(callManager.joinedAtom);
   const currentRoomId = useAtomValue(callManager.roomIdAtom);
-  const attendableId = channel ? Obj.getDXN(channel).toString() : undefined;
   const roomId = roomIdProp ?? attendableId ?? failUndefined();
   const identity = useIdentity();
   const isNamed = !!identity?.profile?.displayName;
@@ -136,7 +142,7 @@ export const ChannelContainer = ({ role, subject: channel, roomId: roomIdProp, f
 
   if (channel && channel.defaultThread.target && space) {
     return (
-      <Panel.Root classNames='dx-article'>
+      <Panel.Root classNames='dx-document'>
         <Panel.Toolbar asChild>
           <ChannelToolbar attendableId={attendableId} role={role} onJoinCall={handleJoin} />
         </Panel.Toolbar>
@@ -158,19 +164,19 @@ const DisplayNameMissing = () => {
   const handleSave = useCallback(() => client.halo.updateProfile({ displayName }), [client, displayName]);
 
   return (
-    <Settings.Group classNames='p-4 place-content-center'>
-      <Settings.ItemInput title={t('display name label')} description={t('display name description')}>
+    <div className='space-y-trim-md p-4 place-content-center'>
+      <Settings.Item title={t('display-name.label')} description={t('display-name.description')}>
         <Input.TextInput
           value={displayName}
           onChange={handleChange}
-          placeholder={t('display name input placeholder')}
+          placeholder={t('display-name-input.placeholder')}
           classNames='md:min-w-64'
         />
-      </Settings.ItemInput>
-      <Settings.GroupButton disabled={!displayName} onClick={handleSave}>
-        {t('set display name label')}
-      </Settings.GroupButton>
-    </Settings.Group>
+      </Settings.Item>
+      <Button classNames='md:col-span-2' disabled={!displayName} onClick={handleSave}>
+        {t('set-display-name.label')}
+      </Button>
+    </div>
   );
 };
 
@@ -181,10 +187,10 @@ const useChannelToolbarActions = (onJoinCall?: () => void) => {
         return {
           nodes: [
             createMenuItemGroup('root', {
-              label: ['channel toolbar title', { ns: meta.id }],
+              label: ['channel-toolbar.title', { ns: meta.id }],
             }),
             createMenuAction('video-call', () => onJoinCall?.(), {
-              label: ['start video call label', { ns: meta.id }],
+              label: ['start-video-call.menu', { ns: meta.id }],
               icon: 'ph--video-camera--regular',
               type: 'video-call',
             }),
@@ -198,20 +204,20 @@ const useChannelToolbarActions = (onJoinCall?: () => void) => {
   return useMenuActions(creator);
 };
 
-type ChannelToolbarProps = {
-  attendableId?: string;
-  role?: string;
+type ChannelToolbarProps = Pick<MenuRootProps, 'attendableId'> & {
   onJoinCall?: () => void;
 };
 
-const ChannelToolbar = ({ attendableId, role, onJoinCall }: ChannelToolbarProps) => {
-  const menuProps = useChannelToolbarActions(onJoinCall);
+const ChannelToolbar = composable<HTMLDivElement, ChannelToolbarProps>(
+  ({ attendableId, role, onJoinCall, ...props }, forwardedRef) => {
+    const menuActions = useChannelToolbarActions(onJoinCall);
 
-  return (
-    <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>
-      <Menu.Root {...menuProps} attendableId={attendableId}>
-        <Menu.Toolbar textBlockWidth />
-      </Menu.Root>
-    </ElevationProvider>
-  );
-};
+    return (
+      <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>
+        <Menu.Root {...menuActions} attendableId={attendableId}>
+          <Menu.Toolbar {...composableProps(props)} ref={forwardedRef} />
+        </Menu.Root>
+      </ElevationProvider>
+    );
+  },
+);

package/src/containers/ChannelContainer/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { ChannelContainer } from './ChannelContainer';
-
-export default ChannelContainer;
+export { ChannelContainer as default } from './ChannelContainer';

package/src/containers/ChatContainer/ChatContainer.stories.tsx

@@ -5,26 +5,26 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { Capabilities, Capability, OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Surface } from '@dxos/app-framework/ui';
-import { faker } from '@dxos/random';
+import { corePlugins } from '@dxos/plugin-testing';
+import { random } from '@dxos/random';
 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 { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Thread as ThreadComponent } from '@dxos/react-ui-thread';
-import { render } from '@dxos/storybook-utils';
+import { withLayout, Loading } from '@dxos/react-ui/testing';
 import { Message, Thread } from '@dxos/types';
 
-import { translations } from '../../translations';
-import { Channel } from '../../types';
+import { translations } from '#translations';
+import { Channel } from '#types';
 
 import { ChatContainer } from './ChatContainer';
 
-faker.seed(1);
+random.seed(1);
 
 const DefaultStory = () => {
   const client = useClient();
@@ -42,7 +42,7 @@ const DefaultStory = () => {
   }, [identity]);
 
   if (!identity || !channel || !space || !channel.defaultThread.target) {
-    return null;
+    return <Loading data={{ identity: !!identity, space: !!space, channel: !!channel }} />;
   }
 
   return <ChatContainer space={space} thread={channel.defaultThread.target} />;
@@ -51,14 +51,13 @@ const DefaultStory = () => {
 const meta = {
   title: 'plugins/plugin-thread/containers/ChatContainer',
   component: ThreadComponent.Root as any,
-  render: render(DefaultStory),
+  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()],
+      plugins: corePlugins(),
       capabilities: [
         Capability.contributes(
           Capabilities.ReactSurface,

package/src/containers/ChatContainer/ChatContainer.tsx

@@ -7,8 +7,7 @@ import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { Obj, Ref } from '@dxos/echo';
 import { type Space, useMembers } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { Icon, ScrollArea, type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
-import { StackItem } from '@dxos/react-ui-stack';
+import { ScrollArea, type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
 import {
   MessageTextbox,
   type MessageTextboxProps,
@@ -18,26 +17,15 @@ import {
 } from '@dxos/react-ui-thread';
 import { Message, type Thread } from '@dxos/types';
 import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/ui-editor';
-import { mx } from '@dxos/ui-theme';
+import { composable, composableProps, mx } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
-import { MessageContainer } from '../../components';
-import { command } from '../../components/command-extension';
-import { useStatus } from '../../hooks';
-import { meta } from '../../meta';
-import { getMessageMetadata } from '../../util';
+import { MessagePanel } from '#components';
+import { useStatus } from '#hooks';
+import { meta } from '#meta';
 
-export const ChatHeading = ({ attendableId }: { attendableId?: string }) => {
-  const { t } = useTranslation(meta.id);
-  return (
-    <div role='none' className='flex items-center'>
-      <StackItem.SigilButton attendableId={attendableId}>
-        <Icon icon='ph--chat--regular' size={5} />
-      </StackItem.SigilButton>
-      <StackItem.HeadingLabel attendableId={attendableId}>{t('chat heading')}</StackItem.HeadingLabel>
-    </div>
-  );
-};
+import { command } from '../../extensions';
+import { getMessageMetadata } from '../../util';
 
 export type ChatContainerProps = ThemedClassName<
   {
@@ -48,102 +36,91 @@ export type ChatContainerProps = ThemedClassName<
   } & Pick<ThreadRootProps, 'current'>
 >;
 
-export const ChatContainer = ({
-  classNames,
-  space,
-  thread,
-  context,
-  current,
-  autoFocusTextbox,
-}: ChatContainerProps) => {
-  const { t } = useTranslation(meta.id);
-  const { themeMode } = useThemeContext();
-
-  const id = Obj.getDXN(thread).toString();
-  const identity = useIdentity()!;
-  const members = useMembers(space?.id);
-  const activity = useStatus(space, id);
-  const [autoFocus, setAutoFocus] = useState(autoFocusTextbox);
-  const threadScrollRef = useRef<HTMLDivElement | null>(null);
-
-  // 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 textboxMetadata = getMessageMetadata(id, identity);
-  const messageRef = useRef('');
-  const extensions = useMemo(
-    () => [
-      createBasicExtensions({ placeholder: t('message placeholder') }),
-      createThemeExtensions({ themeMode }),
-      listener({ onChange: ({ text }) => (messageRef.current = text) }),
-      command,
-    ],
-    [themeMode, _count],
-  );
-
-  // TODO(thure): Factor out.
-  // TODO(thure): `flex-col-reverse` does not work to start the container scrolled to the end while also using
-  //  `ScrollArea`. This is the least-bad way I found to scroll to the end on mount. Note that 0ms was insufficient
-  //  for the desired effect; this is likely hardware-dependent and should be reevaluated.
-  const scrollToEnd = (behavior: ScrollBehavior) =>
-    setTimeout(() => threadScrollRef.current?.scrollIntoView({ behavior, block: 'end' }), 10);
-
-  useLayoutEffect(() => {
-    scrollToEnd('instant');
-  }, []);
-
-  // TODO(burdon): Change to model.
-  const handleCreate: MessageTextboxProps['onSend'] = () => {
-    if (!messageRef.current?.length) {
-      return false;
-    }
-
-    Obj.change(thread, (t) => {
-      t.messages.push(
-        Ref.make(
-          Obj.make(Message.Message, {
-            created: new Date().toISOString(),
-            sender: { identityDid: identity.did },
-            blocks: [{ _tag: 'text', text: messageRef.current }],
-            properties: context ? { context: Ref.make(context) } : undefined,
-          }),
-        ),
-      );
-    });
-
-    messageRef.current = '';
-    setAutoFocus(true);
-    scrollToEnd('smooth');
-    rerenderEditor();
-    return true;
-  };
-
-  return (
-    <ThreadComponent.Root
-      current={current}
-      id={id}
-      classNames={[
-        'h-full grid-rows-[1fr_min-content_min-content] overflow-hidden',
-        'transition-[padding-h-end] [[data-sidebar-left-state=open]_&]:lg:pb-0',
-        classNames,
-      ]}
-    >
-      <ScrollArea.Root classNames='col-span-2' orientation='vertical'>
-        <ScrollArea.Viewport ref={threadScrollRef}>
-          <div role='none' className={mx(threadLayout, 'place-self-end')}>
-            {thread.messages
-              .map((message) => message.target)
-              .filter(isNonNullable)
-              .map((message) => (
-                <MessageContainer key={message.id} message={message} members={members} />
-              ))}
-          </div>
-        </ScrollArea.Viewport>
-      </ScrollArea.Root>
-
-      <MessageTextbox extensions={extensions} autoFocus={autoFocus} onSend={handleCreate} {...textboxMetadata} />
-      <ThreadComponent.Status activity={activity}>{t('activity message')}</ThreadComponent.Status>
-    </ThreadComponent.Root>
-  );
-};
+export const ChatContainer = composable<HTMLDivElement, ChatContainerProps>(
+  ({ space, thread, context, autoFocusTextbox, current, ...props }, forwardedRef) => {
+    const { t } = useTranslation(meta.id);
+    const { themeMode } = useThemeContext();
+
+    const id = Obj.getDXN(thread).toString();
+    const identity = useIdentity()!;
+    const members = useMembers(space?.id);
+    const activity = useStatus(space, id);
+    const [autoFocus, setAutoFocus] = useState(autoFocusTextbox);
+    const threadScrollRef = useRef<HTMLDivElement | null>(null);
+
+    // 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 textboxMetadata = getMessageMetadata(id, identity);
+    const messageRef = useRef('');
+    const extensions = useMemo(
+      () => [
+        createBasicExtensions({ placeholder: t('message.placeholder') }),
+        createThemeExtensions({ themeMode }),
+        listener({ onChange: ({ text }) => (messageRef.current = text) }),
+        command,
+      ],
+      [themeMode, _count],
+    );
+
+    const scrollToEnd = (behavior: ScrollBehavior) =>
+      setTimeout(() => threadScrollRef.current?.scrollIntoView({ behavior, block: 'end' }), 10);
+
+    useLayoutEffect(() => {
+      scrollToEnd('instant');
+    }, []);
+
+    const handleCreate: MessageTextboxProps['onSend'] = () => {
+      if (!messageRef.current?.length) {
+        return false;
+      }
+
+      Obj.update(thread, (thread) => {
+        thread.messages.push(
+          Ref.make(
+            Obj.make(Message.Message, {
+              created: new Date().toISOString(),
+              sender: { identityDid: identity.did },
+              blocks: [{ _tag: 'text', text: messageRef.current }],
+              properties: context ? { context: Ref.make(context) } : undefined,
+            }),
+          ),
+        );
+      });
+
+      messageRef.current = '';
+      setAutoFocus(true);
+      scrollToEnd('smooth');
+      rerenderEditor();
+      return true;
+    };
+
+    return (
+      <ThreadComponent.Root
+        {...composableProps(props, {
+          classNames: 'dx-container grid-rows-[1fr_min-content_min-content]',
+        })}
+        id={id}
+        current={current}
+        ref={forwardedRef}
+      >
+        <ScrollArea.Root classNames='col-span-2' orientation='vertical'>
+          <ScrollArea.Viewport ref={threadScrollRef}>
+            <div role='none' className={mx(threadLayout, 'place-self-end')}>
+              {thread.messages
+                .map((message) => message.target)
+                .filter(isNonNullable)
+                .map((message) => (
+                  <MessagePanel key={message.id} message={message} members={members} />
+                ))}
+            </div>
+          </ScrollArea.Viewport>
+        </ScrollArea.Root>
+
+        <MessageTextbox extensions={extensions} autoFocus={autoFocus} onSend={handleCreate} {...textboxMetadata} />
+        <ThreadComponent.Status activity={activity}>{t('activity.message')}</ThreadComponent.Status>
+      </ThreadComponent.Root>
+    );
+  },
+);

package/src/containers/ChatContainer/index.ts

@@ -4,4 +4,5 @@
 
 import { ChatContainer } from './ChatContainer';
 
+export { ChatContainer };
 export default ChatContainer;