@dxos/plugin-thread 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

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

@@ -5,28 +5,27 @@
 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 ObjectSurfaceProps } 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 { 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 { type Channel } from '#types';
+import { ChatContainer } from '../ChatContainer';
 
-import { Call } from './Call';
-import ChatContainer from './ChatContainer';
-
-export type ChannelContainerProps = SurfaceComponentProps<
+export type ChannelContainerProps = ObjectSurfaceProps<
   Channel.Channel | undefined,
   {
     roomId?: string;
@@ -38,19 +37,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 +122,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 && channel.defaultThread.target && 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>
+          <ChatContainer space={space} thread={channel.defaultThread.target} />
+        </Panel.Content>
+      </Panel.Root>
+    );
+  }
 
-export default ChannelContainer;
+  return null;
+};
 
 const DisplayNameMissing = () => {
   const { t } = useTranslation(meta.id);
@@ -148,19 +163,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 +186,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 +203,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,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ChannelContainer } from './ChannelContainer';
+
+export default ChannelContainer;

package/src/{components/Chat.stories.tsx → containers/ChatContainer/ChatContainer.stories.tsx}

@@ -5,23 +5,24 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { Capability, Common, OperationPlugin } 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 { 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 { withLayout, Loading } from '@dxos/react-ui/testing';
 import { Thread as ThreadComponent } from '@dxos/react-ui-thread';
-import { render } from '@dxos/storybook-utils';
 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';
+import { corePlugins } from '@dxos/plugin-testing';
 
 faker.seed(1);
 
@@ -41,28 +42,26 @@ const DefaultStory = () => {
   }, [identity]);
 
   if (!identity || !channel || !space || !channel.defaultThread.target) {
-    return null;
+    return <Loading data={{ identity: !!identity, space: !!space, channel: !!channel }} />;
   }
 
-  return (
-    <main className='is-full max-is-proseMaxWidth mli-auto bs-full overflow-hidden'>
-      <ChatContainer space={space} thread={channel.defaultThread.target} />
-    </main>
-  );
+  return <ChatContainer space={space} thread={channel.defaultThread.target} />;
 };
 
 const meta = {
-  title: 'plugins/plugin-thread/Chat',
+  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()],
+      plugins: corePlugins(),
       capabilities: [
         Capability.contributes(
-          Common.Capability.ReactSurface,
-          Common.createSurface({
+          Capabilities.ReactSurface,
+          Surface.create({
             id: 'test',
             role: 'card',
             component: ({ role }) => <span>{JSON.stringify({ role })}</span>,
@@ -70,7 +69,10 @@ const meta = {
         ),
       ],
     }),
-    withClientProvider({ createSpace: true, types: [Thread.Thread, Channel.Channel, Message.Message] }),
+    withClientProvider({
+      createSpace: true,
+      types: [Thread.Thread, Channel.Channel, Message.Message],
+    }),
   ],
   parameters: {
     layout: 'fullscreen',

package/src/containers/ChatContainer/ChatContainer.tsx

@@ -0,0 +1,130 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+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 { ScrollArea, type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
+import {
+  MessageTextbox,
+  type MessageTextboxProps,
+  Thread as ThreadComponent,
+  type ThreadRootProps,
+  threadLayout,
+} from '@dxos/react-ui-thread';
+import { Message, type Thread } from '@dxos/types';
+import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/ui-editor';
+import { composable, composableProps, mx } from '@dxos/ui-theme';
+import { isNonNullable } from '@dxos/util';
+
+import { MessagePanel } from '#components';
+import { command } from '../../extensions';
+import { useStatus } from '#hooks';
+import { meta } from '#meta';
+import { getMessageMetadata } from '../../util';
+
+export type ChatContainerProps = ThemedClassName<
+  {
+    space: Space;
+    thread: Thread.Thread;
+    context?: Obj.Unknown;
+    autoFocusTextbox?: boolean;
+  } & Pick<ThreadRootProps, 'current'>
+>;
+
+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],
+    );
+
+    // 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, (obj) => {
+        obj.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

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

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

@@ -5,30 +5,40 @@
 import { useAtomValue } from '@effect-atom/atom-react';
 import React, { useCallback, useMemo } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useCapabilities, useCapability, useOperationInvoker } from '@dxos/app-framework/react';
+import { Capabilities } from '@dxos/app-framework';
+import { useCapabilities, useCapability, useOperationInvoker, usePluginManager } from '@dxos/app-framework/ui';
+import { AppCapabilities, CollaborationOperation, LayoutOperation } from '@dxos/app-toolkit';
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
 import { Ref, useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { useTranslation } from '@dxos/react-ui';
-import { useAttended } from '@dxos/react-ui-attention';
-import { Layout } from '@dxos/react-ui-mosaic';
+import { Panel, ScrollArea, Toolbar, useTranslation } from '@dxos/react-ui';
+import { getParentId, useAttention } from '@dxos/react-ui-attention';
 import { Tabs } from '@dxos/react-ui-tabs';
 import { AnchoredTo, Thread } from '@dxos/types';
-import { mx } from '@dxos/ui-theme';
 
-import { CommentsContainer, type CommentsContainerProps } from '../components';
-import { meta } from '../meta';
-import { ThreadCapabilities, ThreadOperation, type ViewState } from '../types';
+import { CommentsPanel, type CommentsPanelProps } from '#components';
+import { meta } from '#meta';
+import { ThreadCapabilities, type ViewState } from '#types';
+import { ThreadOperation } from '#operations';
+import { ObjectSurfaceProps } from '@dxos/app-toolkit/ui';
 
 const initialViewState: ViewState = { showResolvedThreads: false };
 
-export const ThreadCompanion = ({ subject }: { subject: any }) => {
+export type ThreadCompanionProps = ObjectSurfaceProps<
+  Thread.Thread,
+  {
+    attendableId?: string;
+  }
+>;
+
+export const ThreadCompanion = ({ attendableId, subject }: ThreadCompanionProps) => {
   const { t } = useTranslation(meta.id);
+  const manager = usePluginManager();
   const { invokePromise } = useOperationInvoker();
   const identity = useIdentity();
   const subjectId = Obj.getDXN(subject).toString();
-  const registry = useCapability(Common.Capability.AtomRegistry);
+  const parentId = attendableId ? getParentId(attendableId) : undefined;
+  const registry = useCapability(Capabilities.AtomRegistry);
 
   const stateAtom = useCapability(ThreadCapabilities.State);
   const viewStoreAtom = useCapability(ThreadCapabilities.ViewState);
@@ -56,7 +66,7 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
     [registry, viewStoreAtom, subjectId],
   );
 
-  const anchorSorts = useCapabilities(Common.Capability.AnchorSort);
+  const anchorSorts = useCapabilities(AppCapabilities.AnchorSort);
   const sort = useMemo(
     () => anchorSorts.find(({ key }) => key === Obj.getTypename(subject))?.sort,
     [anchorSorts, subject],
@@ -69,7 +79,8 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
     .filter((anchor) => Obj.instanceOf(Thread.Thread, Relation.getSource(anchor)))
     .concat(drafts ?? []);
 
-  const attended = useAttended();
+  const { hasAttention, isAncestor, isRelated } = useAttention(parentId);
+  const isAttended = hasAttention || isAncestor || isRelated;
 
   const handleAttend = useCallback(
     (anchor: AnchoredTo.AnchoredTo) => {
@@ -79,17 +90,26 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
       if (state.current !== threadId) {
         registry.set(stateAtom, { ...registry.get(stateAtom), current: threadId });
 
-        // TODO(wittjosiah): Should this be a thread-specific intent?
-        //  The layout doesn't know about threads and this working depends on other plugins conditionally handling it.
-        //  This may be overloading this intent or highjacking its intended purpose.
-        void invokePromise(Common.LayoutOperation.ScrollIntoView, {
-          subject: Obj.getDXN(subject).toString(),
-          cursor: anchor.anchor,
-          ref: threadId,
-        });
+        // Scroll plank into view (deck handler).
+        void invokePromise(LayoutOperation.ScrollIntoView, { subject: parentId });
+
+        // Scroll within content to anchor (metadata-driven, per typename).
+        if (anchor.anchor && parentId) {
+          const typename = Obj.getTypename(subject);
+          const metadata = manager.capabilities
+            .getAll(AppCapabilities.Metadata)
+            .find(({ id }) => id === typename)?.metadata;
+          if (metadata?.scrollToAnchor) {
+            void invokePromise(metadata.scrollToAnchor, {
+              subject: parentId,
+              cursor: anchor.anchor,
+              ref: threadId,
+            });
+          }
+        }
       }
     },
-    [state.current, invokePromise, subject, registry, stateAtom],
+    [state.current, invokePromise, registry, stateAtom, parentId, subject, manager],
   );
 
   const handleComment = useCallback(
@@ -130,7 +150,7 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
     [invokePromise, subject],
   );
 
-  const handleAcceptProposal = useCallback<NonNullable<CommentsContainerProps['onAcceptProposal']>>(
+  const handleAcceptProposal = useCallback<NonNullable<CommentsPanelProps['onAcceptProposal']>>(
     async (anchor, messageId) => {
       const thread = Relation.getSource(anchor) as Thread.Thread;
       const messageIndex = thread.messages.findIndex(Ref.hasObjectId(messageId));
@@ -140,7 +160,7 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
         return;
       }
 
-      await invokePromise(Common.CollaborationOperation.AcceptProposal, {
+      await invokePromise(CollaborationOperation.AcceptProposal, {
         subject,
         anchor: anchor.anchor,
         proposal,
@@ -151,9 +171,9 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
   );
 
   const comments = (
-    <CommentsContainer
+    <CommentsPanel
       anchors={anchors}
-      currentId={attended.includes(subjectId) ? state.current : undefined}
+      currentId={isAttended ? state.current : undefined}
       showResolvedThreads={showResolvedThreads}
       onAttend={handleAttend}
       onComment={handleComment}
@@ -165,29 +185,33 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
   );
 
   return (
-    <Layout.Main toolbar>
-      <Tabs.Root
-        value={showResolvedThreads ? 'all' : 'unresolved'}
-        orientation='horizontal'
-        classNames={[
-          'contents [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:overflow-y-auto [&_[role="tabpanel"]]:scrollbar-thin',
-        ]}
-        onValueChange={onChangeViewState}
-      >
-        {/* TODO(burdon): Standardize (like Tollbar). */}
-        <Tabs.Tablist classNames={mx('bg-toolbarSurface border-be border-subduedSeparator')}>
-          <Tabs.Tab value='unresolved' classNames='text-sm'>
-            {t('show unresolved label')}
-          </Tabs.Tab>
-          <Tabs.Tab value='all' classNames='text-sm'>
-            {t('show all label')}
-          </Tabs.Tab>
-        </Tabs.Tablist>
-        <div className='overflow-y-auto'>
-          <Tabs.Tabpanel value='all'>{showResolvedThreads && comments}</Tabs.Tabpanel>
-          <Tabs.Tabpanel value='unresolved'>{!showResolvedThreads && comments}</Tabs.Tabpanel>
-        </div>
-      </Tabs.Root>
-    </Layout.Main>
+    <Tabs.Root
+      orientation='horizontal'
+      value={showResolvedThreads ? 'all' : 'unresolved'}
+      onValueChange={onChangeViewState}
+    >
+      <Panel.Root>
+        <Panel.Toolbar asChild>
+          <Toolbar.Root>
+            <Tabs.Tablist classNames='p-0'>
+              <Tabs.Tab classNames='text-sm' value='unresolved'>
+                {t('show-unresolved.label')}
+              </Tabs.Tab>
+              <Tabs.Tab classNames='text-sm' value='all'>
+                {t('show-all.label')}
+              </Tabs.Tab>
+            </Tabs.Tablist>
+          </Toolbar.Root>
+        </Panel.Toolbar>
+        <Panel.Content asChild>
+          <ScrollArea.Root thin>
+            <ScrollArea.Viewport>
+              <Tabs.Panel value='all'>{showResolvedThreads && comments}</Tabs.Panel>
+              <Tabs.Panel value='unresolved'>{!showResolvedThreads && comments}</Tabs.Panel>
+            </ScrollArea.Viewport>
+          </ScrollArea.Root>
+        </Panel.Content>
+      </Panel.Root>
+    </Tabs.Root>
   );
 };

package/src/containers/ThreadCompanion/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { ThreadCompanion } from './ThreadCompanion';
+
+export default ThreadCompanion;

package/src/containers/index.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export const CallDebugPanel: ComponentType<any> = lazy(() => import('./CallDebugPanel'));
+export const CallSidebar: ComponentType<any> = lazy(() => import('./CallSidebar'));
+export const ChannelContainer: ComponentType<any> = lazy(() => import('./ChannelContainer'));
+export const ChatContainer: ComponentType<any> = lazy(() => import('./ChatContainer'));
+export const ThreadCompanion: ComponentType<any> = lazy(() => import('./ThreadCompanion'));

package/src/{components/command-extension.ts → extensions/command.ts}

@@ -29,7 +29,7 @@ const parser = StreamLanguage.define<{ count: number }>({
 const styles = HighlightStyle.define([
   {
     tag: tags.tagName,
-    class: mx('dx-tag dx-tag--indigo text-baseText font-medium'),
+    class: mx('dx-tag dx-tag--indigo text-base-surface-text font-medium'),
   },
 ]);