@dxos/plugin-thread 0.8.4-main.9735255 → 0.8.4-main.abd8ff62ef

package/src/components/ResponsiveGrid/{ResponsiveContainer.tsx → ResponsivePanel.tsx}

@@ -11,18 +11,18 @@ import { mx } from '@dxos/ui-theme';
  * The container will scale to fit within its parent's bounds while preserving the aspect ratio.
  *
  * @example
- * <ResponsiveContainer>
+ * <ResponsivePanel>
  *   <VideoObject />
- * </ResponsiveContainer>
+ * </ResponsivePanel>
  */
-export const ResponsiveContainer = ({ children }: PropsWithChildren) => {
+export const ResponsivePanel = ({ children }: PropsWithChildren) => {
   return (
     // Outer container that takes full size of parent.
-    <div role='none' className='relative flex is-full bs-full'>
+    <div role='none' className='dx-expander relative flex'>
       {/* Absolute positioning layer for centering content. */}
       <div role='none' className='absolute inset-0 flex justify-center items-center'>
         {/* Content container that maintains given aspect ratio and proper scaling. */}
-        <div role='none' className={mx('max-bs-full max-is-full is-auto bs-auto aspect-video')}>
+        <div role='none' className={mx('max-h-full max-w-full w-auto h-auto aspect-video')}>
           {children}
         </div>
       </div>

package/src/components/ResponsiveGrid/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './ResponsiveContainer';
+export * from './ResponsivePanel';
 export * from './ResponsiveGrid';
 export * from './ResponsiveGridItem';

package/src/components/ThreadSettings/ThreadSettings.stories.tsx

@@ -0,0 +1,32 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '#translations';
+
+import { ThreadSettings } from './ThreadSettings';
+
+const meta = {
+  title: 'plugins/plugin-thread/components/ThreadSettings',
+  component: ThreadSettings,
+  tags: ['settings'],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof ThreadSettings>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    settings: {},
+  },
+};

package/src/components/ThreadSettings/ThreadSettings.tsx

@@ -0,0 +1,20 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React from 'react';
+
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { useTranslation } from '@dxos/react-ui';
+import { Settings as SettingsForm } from '@dxos/react-ui-form';
+
+import { meta } from '#meta';
+import { type Settings } from '#types';
+
+export type ThreadSettingsProps = AppSurface.SettingsArticleProps<Settings.Settings>;
+
+// TODO(burdon): Settings.
+export const ThreadSettings = ({ settings: _settings }: ThreadSettingsProps) => {
+  const { t: _t } = useTranslation(meta.id);
+  return <SettingsForm.Viewport></SettingsForm.Viewport>;
+};

package/src/components/ThreadSettings/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export { ThreadSettings as default } from './ThreadSettings';

package/src/components/index.ts

@@ -2,14 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
+import { type ComponentType, lazy } from 'react';
+
 export * from './Call';
-export * from './CallDebugPanel';
-export * from './CallSidebar';
-export * from './CommentsContainer';
-export * from './CommentsThreadContainer';
-export * from './MessageContainer';
-export * from './ThreadCompanion';
-export * from './ThreadSettings';
+export * from './Chat';
+export * from './CommentsPanel';
+export * from './MessagePanel';
 
-export { ChannelContainer } from './ChannelContainer';
-export { ChatContainer } from './ChatContainer';
+export const ThreadSettings: ComponentType<any> = lazy(() => import('./ThreadSettings'));

package/src/{components → containers/CallDebugPanel}/CallDebugPanel.tsx

@@ -10,8 +10,9 @@ import { JsonView, Panel } from '@dxos/devtools';
 import { log } from '@dxos/log';
 import { IconButton, Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 
-import { type EncodedTrackName, type GlobalState } from '../calls';
-import { meta } from '../meta';
+import { meta } from '#meta';
+
+import { type EncodedTrackName, type GlobalState } from '../../calls';
 
 export type CallDebugPanelProps = ThemedClassName<{ state?: GlobalState }>;
 
@@ -70,21 +71,21 @@ export const CallDebugPanel = ({ state }: CallDebugPanelProps) => {
       icon='ph--video-conference--regular'
       open={open}
       onToggle={handleToggle}
-      title={t('meeting status title')}
+      title={t('meeting-status.title')}
       info={<div className='flex items-center gap-2'> {state?.call.joined ? 'Active' : 'Inactive'}</div>}
       maxHeight={0}
     >
-      <div className='flex flex-col is-full text-xs'>
+      <div className='flex flex-col w-full text-xs'>
         <div className='flex items-center gap-2 items-center'>
           <Input.Root>
             <Input.Switch checked={showDetailedWebRTCStats} onCheckedChange={handleShowDetailedWebRTCStats} />
-            <Input.Label>{t('show webrtc stats title')}</Input.Label>
+            <Input.Label>{t('show-webrtc-stats.title')}</Input.Label>
           </Input.Root>
         </div>
         <div className='flex items-center gap-2 items-center'>
           <Input.Root>
             <Input.Switch checked={showServiceHistory} onCheckedChange={handleToggleServiceHistory} />
-            <Input.Label>{t('show calls history title')}</Input.Label>
+            <Input.Label>{t('show-calls-history.title')}</Input.Label>
           </Input.Root>
         </div>
         <div className='flex items-center gap-2 items-center'>
@@ -158,7 +159,7 @@ export type TableProps = {
 
 export const Table = ({ rows }: TableProps) => {
   return (
-    <div className='is-full text-xs font-mono'>
+    <div className='w-full text-xs font-mono'>
       {rows.map(([prefix, label, value, unit], i) => (
         <div key={i} className='grid grid-cols-[3fr_1fr_1fr_1fr]'>
           <div className='p-1'>{prefix}</div>

package/src/containers/CallDebugPanel/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export { CallDebugPanel as default } from './CallDebugPanel';

package/src/{components → containers/CallSidebar}/CallSidebar.tsx

@@ -5,16 +5,14 @@
 import { useAtomValue } from '@effect-atom/atom-react';
 import React from 'react';
 
-import { useCapability } from '@dxos/app-framework/react';
+import { useCapability } from '@dxos/app-framework/ui';
 
-import { ThreadCapabilities } from '../types';
+import { ThreadCapabilities } from '#types';
 
-import { ChannelContainer } from './ChannelContainer';
+import ChannelContainer from '../ChannelContainer';
 
 export const CallSidebar = () => {
   const call = useCapability(ThreadCapabilities.CallManager);
   const roomId = useAtomValue(call.roomIdAtom);
-  return <ChannelContainer subject={undefined} roomId={roomId} />;
+  return <ChannelContainer subject={undefined} attendableId={roomId ?? ''} roomId={roomId} role='article' />;
 };
-
-export default CallSidebar;

package/src/containers/CallSidebar/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export { CallSidebar as default } from './CallSidebar';

package/src/containers/ChannelChat/ChannelChat.tsx

@@ -0,0 +1,65 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React from 'react';
+
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { Filter, Obj, Query } from '@dxos/echo';
+import { type Space, useMembers, useQuery } from '@dxos/react-client/echo';
+import { useIdentity } from '@dxos/react-client/halo';
+import { type Channel, Message } from '@dxos/types';
+import { composable, composableProps } from '@dxos/ui-theme';
+
+import { Chat } from '#components';
+import { useStatus } from '#hooks';
+import { ThreadOperation } from '#operations';
+
+export type ChannelChatProps = {
+  space: Space;
+  channel: Channel.Channel;
+};
+
+/**
+ * Channel chat: composer pinned to the bottom of the panel, messages scrolling
+ * above it (newest at the bottom). Threading via `Message.threadId` is
+ * intentionally not reconstructed in this round.
+ */
+export const ChannelChat = composable<HTMLDivElement, ChannelChatProps>(
+  ({ space, channel, ...props }, forwardedRef) => {
+    const identity = useIdentity()!;
+    const members = useMembers(space.id);
+    const id = Obj.getDXN(channel).toString();
+    const activity = useStatus(space, id);
+    const { invokePromise } = useOperationInvoker();
+
+    const feed = channel.feed?.target;
+    const messages = useQuery(
+      space.db,
+      feed ? Query.select(Filter.type(Message.Message)).from(feed) : Query.select(Filter.nothing()),
+    ) as Message.Message[];
+
+    const handleSend = (text: string) => {
+      void invokePromise(ThreadOperation.AppendChannelMessage, {
+        channel,
+        sender: { identityDid: identity.did },
+        text,
+      });
+      return true;
+    };
+
+    return (
+      <Chat
+        {...composableProps(props)}
+        id={id}
+        identity={identity}
+        members={members}
+        messages={messages}
+        activity={activity}
+        onSend={handleSend}
+        orientation='bottom'
+        ref={forwardedRef}
+      />
+    );
+  },
+);

package/src/containers/ChannelChat/index.ts

@@ -0,0 +1,8 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { ChannelChat } from './ChannelChat';
+
+export { ChannelChat };
+export default ChannelChat;

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

@@ -0,0 +1,105 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+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 { Feed } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+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 { Channel, Message, Thread } from '@dxos/types';
+
+import { translations } from '#translations';
+
+import { ThreadPlugin } from '../../ThreadPlugin';
+import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
+
+// TODO(wittjosiah): Channel doesn't render full height.
+const DefaultStory = ({ roomId }: ChannelContainerProps) => {
+  const [space] = useSpaces();
+  const [channel] = useQuery(space?.db, Query.type(Channel.Channel));
+  if (!channel) {
+    return <Loading data={{ channel }} />;
+  }
+
+  return <ChannelContainer subject={channel} attendableId='story' roomId={roomId} role='article' />;
+};
+
+const meta = {
+  title: 'plugins/plugin-thread/containers/ChannelContainer',
+  component: ChannelContainer,
+  render: DefaultStory,
+  decorators: [
+    withTheme(),
+    withLayout({ layout: 'column' }),
+    withPluginManager({
+      capabilities: [
+        Capability.contributes(AppCapabilities.Schema, [Channel.Channel, Feed.Feed, Thread.Thread, Message.Message]),
+      ],
+      plugins: [
+        ...corePlugins(),
+        ClientPlugin({
+          types: [Channel.Channel, Feed.Feed, 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);
+              const channel = personalSpace.db.add(Channel.make({ name: 'general' }));
+              const feed = yield* Effect.promise(() => channel.feed.load());
+              const seed = [
+                Message.make({ sender: { role: 'user' }, blocks: [{ _tag: 'text', text: 'Hello, channel.' }] }),
+                Message.make({
+                  sender: { role: 'user' },
+                  blocks: [{ _tag: 'text', text: 'Messages are stored in the feed.' }],
+                }),
+              ];
+              yield* Feed.append(feed, seed).pipe(Effect.provide(createFeedServiceLayer(personalSpace.queues)));
+            }),
+        }),
+        SpacePlugin({}),
+        ThreadPlugin(),
+      ],
+    }),
+  ],
+  parameters: {
+    translations,
+  },
+} satisfies Meta<typeof ChannelContainer>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    // Fixed room for testing.
+    subject: undefined,
+    attendableId: 'story',
+    role: 'article',
+    roomId: '04a1d1911703b8e929d0649021a965',
+  },
+};

package/src/{components → containers/ChannelContainer}/ChannelContainer.tsx

@@ -5,28 +5,28 @@
 import { Atom, useAtomValue } from '@effect-atom/atom-react';
 import React, { type ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 
-import { type SurfaceComponentProps, useCapabilities, useCapability } from '@dxos/app-framework/react';
+import { useCapabilities, useCapability } from '@dxos/app-framework/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, 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 { Button, ElevationProvider, Input, Panel, useTranslation } from '@dxos/react-ui';
+import { Settings } from '@dxos/react-ui-form';
+import { Menu, MenuRootProps, createMenuAction, createMenuItemGroup, useMenuActions } from '@dxos/react-ui-menu';
 import { useSoundEffect } from '@dxos/react-ui-sfx';
-import { StackItem } from '@dxos/react-ui-stack';
+import { type Channel } from '@dxos/types';
+import { composable, composableProps } from '@dxos/ui-theme';
 
-import { meta } from '../meta';
-import { ThreadCapabilities } from '../types';
-import { type Channel } from '../types';
+import { Call } from '#components';
+import { meta } from '#meta';
+import { ThreadCapabilities } from '#types';
 
-import { Call } from './Call';
-import ChatContainer from './ChatContainer';
+import { ChannelChat } from '../ChannelChat';
 
-export type ChannelContainerProps = SurfaceComponentProps<
+export type ChannelContainerProps = AppSurface.ObjectArticleProps<
   Channel.Channel | undefined,
   {
     roomId?: string;
@@ -38,19 +38,24 @@ 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;
   const joinSound = useSoundEffect('JoinCall');
   const leaveSound = useSoundEffect('LeaveCall');
 
-  const extensions = useCapabilities(ThreadCapabilities.CallExtension);
   useEffect(() => {
     const ctx = new Context();
     callManager.left.on(ctx, (roomId) => {
@@ -118,27 +123,38 @@ export const ChannelContainer = ({ role, subject: channel, roomId: roomIdProp, f
   }, [extensions, roomId]);
 
   const isJoined = joined && currentRoomId === roomId;
+  if (isJoined) {
+    return (
+      <Panel.Root>
+        <Panel.Content>
+          {isNamed ? (
+            <Call.Root>
+              <Call.Grid fullscreen={fullscreen} />
+              <Call.Toolbar channel={channel} onLeave={handleLeave} />
+            </Call.Root>
+          ) : (
+            <DisplayNameMissing />
+          )}
+        </Panel.Content>
+      </Panel.Root>
+    );
+  }
 
-  return (
-    <StackItem.Content classNames={isJoined && 'bs-full'} toolbar={!isJoined}>
-      {isJoined && !isNamed && <DisplayNameMissing />}
-      {isJoined && isNamed && (
-        <Call.Root>
-          <Call.Grid fullscreen={fullscreen} />
-          <Call.Toolbar channel={channel} onLeave={handleLeave} />
-        </Call.Root>
-      )}
-      {!isJoined && channel && channel.defaultThread.target && space && (
-        <>
+  if (channel && space) {
+    return (
+      <Panel.Root classNames='dx-document'>
+        <Panel.Toolbar asChild>
           <ChannelToolbar attendableId={attendableId} role={role} onJoinCall={handleJoin} />
-          <ChatContainer space={space} thread={channel.defaultThread.target} classNames='container-max-width' />
-        </>
-      )}
-    </StackItem.Content>
-  );
-};
+        </Panel.Toolbar>
+        <Panel.Content asChild>
+          <ChannelChat space={space} channel={channel} />
+        </Panel.Content>
+      </Panel.Root>
+    );
+  }
 
-export default ChannelContainer;
+  return null;
+};
 
 const DisplayNameMissing = () => {
   const { t } = useTranslation(meta.id);
@@ -148,19 +164,19 @@ const DisplayNameMissing = () => {
   const handleSave = useCallback(() => client.halo.updateProfile({ displayName }), [client, displayName]);
 
   return (
-    <ControlGroup classNames='p-4 place-content-center'>
-      <ControlItemInput 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')}
-          classNames='md:min-is-64'
+          placeholder={t('display-name-input.placeholder')}
+          classNames='md:min-w-64'
         />
-      </ControlItemInput>
-      <ControlGroupButton disabled={!displayName} onClick={handleSave}>
-        {t('set display name label')}
-      </ControlGroupButton>
-    </ControlGroup>
+      </Settings.Item>
+      <Button classNames='md:col-span-2' disabled={!displayName} onClick={handleSave}>
+        {t('set-display-name.label')}
+      </Button>
+    </div>
   );
 };
 
@@ -171,15 +187,15 @@ 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',
             }),
           ],
-          edges: [{ source: 'root', target: 'video-call' }],
+          edges: [{ source: 'root', target: 'video-call', relation: 'child' }],
         };
       }),
     [],
@@ -188,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);
-
-  return (
-    <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>
-      <MenuProvider {...menuProps} attendableId={attendableId}>
-        <ToolbarMenu textBlockWidth />
-      </MenuProvider>
-    </ElevationProvider>
-  );
-};
+const ChannelToolbar = composable<HTMLDivElement, ChannelToolbarProps>(
+  ({ attendableId, role, onJoinCall, ...props }, forwardedRef) => {
+    const menuActions = useChannelToolbarActions(onJoinCall);
+
+    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

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { ChannelContainer as default } from './ChannelContainer';