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

package/src/components/ResponsiveGrid/ResponsiveGrid.tsx

@@ -2,16 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type ComponentType, type FC, useLayoutEffect, useState, useEffect, useMemo, useCallback } from 'react';
+import React, { type ComponentType, type FC, useCallback, useEffect, useLayoutEffect, useMemo, useState } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
 
 import { invariant } from '@dxos/invariant';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { type Size } from '@dxos/react-ui-dnd';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
-import { ResponsiveContainer } from './ResponsiveContainer';
 import { type ResponsiveGridItemProps } from './ResponsiveGridItem';
+import { ResponsivePanel } from './ResponsivePanel';
 
 const ASPECT_RATIO = 16 / 9;
 const MIN_GALLERY_HEIGHT = 250;
@@ -136,7 +136,7 @@ export const ResponsiveGrid = <T extends object = any>({
   );
 
   return (
-    <div ref={containerRef} className={mx('relative w-full h-full', classNames)}>
+    <div ref={containerRef} className={mx('dx-expander relative', classNames)}>
       {/* Placeholder elements to calculate layout. */}
       <div className='absolute inset-0 flex flex-col grow gap-2'>
         {/* Pinned item. */}
@@ -206,7 +206,7 @@ export const ResponsiveGrid = <T extends object = any>({
 
 const SoloItem: FC<Pick<ResponsiveGridProps, 'debug'> & { id: string }> = ({ debug, id }) => {
   return (
-    <ResponsiveContainer>
+    <ResponsivePanel>
       <div
         {...{ 'data-grid-item': id }}
         className={mx('aspect-video overflow-hidden', debug && 'z-20 border-2 border-primary-500')}
@@ -214,7 +214,7 @@ const SoloItem: FC<Pick<ResponsiveGridProps, 'debug'> & { id: string }> = ({ deb
         {/* Maximum size placeholder image forces aspect ratio. */}
         <img alt='placeholder video' className={mx('opacity-0', maxImageSize)} />
       </div>
-    </ResponsiveContainer>
+    </ResponsivePanel>
   );
 };
 

package/src/components/ResponsiveGrid/ResponsiveGridItem.tsx

@@ -2,13 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useEffect, useState, type CSSProperties, type PropsWithChildren } from 'react';
+import React, { type CSSProperties, type PropsWithChildren, useEffect, useState } from 'react';
 
-import { Icon, IconButton, useTranslation, type ThemedClassName } from '@dxos/react-ui';
+import { Icon, IconButton, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { Waveform } from '@dxos/react-ui-sfx';
-import { groupHoverControlItemWithTransition, mx } from '@dxos/react-ui-theme';
+import { groupHoverControlItemWithTransition, mx } from '@dxos/ui-theme';
 
-import { THREAD_PLUGIN } from '../../meta';
+import { meta } from '#meta';
 
 export type ResponsiveGridItemProps<T extends object = any> = PropsWithChildren<
   ThemedClassName<{
@@ -45,16 +45,16 @@ export const ResponsiveGridItem = <T extends object = any>({
   speaking,
   onClick,
 }: ResponsiveGridItemProps<T>) => {
-  const { t } = useTranslation(THREAD_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const iconProps: Record<string, { icon: string; label: string; classNames?: string }> = {
     wave: {
       icon: 'ph--hand-waving--duotone',
-      label: t('icon wave'),
+      label: t('icon-wave.label'),
       classNames: 'animate-pulse bg-orange-500',
     },
     mute: {
       icon: 'ph--microphone-slash--regular',
-      label: t('icon muted'),
+      label: t('icon-muted.label'),
     },
   };
 
@@ -76,7 +76,7 @@ export const ResponsiveGridItem = <T extends object = any>({
   return (
     <div
       className={mx(
-        'relative w-full h-full group',
+        'dx-expander relative group',
         'rounded-md outline outline-2 outline-neutral-900 transition-[outline-color] duration-500',
         speakingIndicator ? 'outline-green-500' : !video && 'outline-separator',
         classNames,
@@ -89,11 +89,11 @@ export const ResponsiveGridItem = <T extends object = any>({
       {onClick && (
         <div className='z-10 absolute top-1 right-1 flex'>
           <IconButton
-            classNames={mx('p-1 min-bs-1 rounded', groupHoverControlItemWithTransition)}
+            classNames={mx('p-1 min-h-1 rounded-sm', groupHoverControlItemWithTransition)}
             iconOnly
             icon={pinned ? 'ph--x--regular' : 'ph--arrows-out--regular'}
             size={pinned ? 5 : 4}
-            label={pinned ? t('icon unpin') : t('icon pin')}
+            label={pinned ? t('icon-unpin.label') : t('icon-pin.label')}
             onClick={() => onClick?.(item)}
           />
         </div>
@@ -106,7 +106,10 @@ export const ResponsiveGridItem = <T extends object = any>({
           {/* {self && <Icon icon='ph--asterisk--regular' size={pinned ? 5 : 4} />} */}
           {screenshare && <Icon icon='ph--broadcast--regular' size={pinned ? 5 : 4} />}
           <div
-            className={mx('bg-neutral-800 text-neutral-100 py-0.5 truncate rounded', pinned ? 'px-2' : 'px-1 text-xs')}
+            className={mx(
+              'bg-neutral-800 text-neutral-100 py-0.5 truncate rounded-sm',
+              pinned ? 'px-2' : 'px-1 text-xs',
+            )}
           >
             {name}
           </div>
@@ -118,7 +121,7 @@ export const ResponsiveGridItem = <T extends object = any>({
         {(speaking && <Waveform active size={pinned ? 5 : 4} />) ||
           (props && (
             <IconButton
-              classNames={mx('p-1 min-bs-1 rounded', props?.classNames)}
+              classNames={mx('p-1 min-h-1 rounded-sm', props?.classNames)}
               icon={props?.icon}
               label={props?.label}
               size={pinned ? 5 : 4}

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

@@ -2,29 +2,29 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '#translations';
 
-import { ResponsiveContainer } from './ResponsiveContainer';
-import translations from '../../translations';
 import { VideoObject as VideoObjectComponent } from '../Media';
+import { ResponsivePanel } from './ResponsivePanel';
 
-const meta: Meta<typeof ResponsiveContainer> = {
-  title: 'plugins/plugin-thread/ResponsiveContainer',
-  component: ResponsiveContainer,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
+const meta = {
+  title: 'plugins/plugin-thread/components/ResponsivePanel',
+  component: ResponsivePanel,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
+    layout: 'fullscreen',
     translations,
   },
-};
+} satisfies Meta<typeof ResponsivePanel>;
 
 export default meta;
 
-type Story = StoryObj<typeof ResponsiveContainer>;
+type Story = StoryObj<typeof ResponsivePanel>;
 
 export const Image: Story = {
   args: {

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

@@ -4,21 +4,21 @@
 
 import React, { type PropsWithChildren } from 'react';
 
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 /**
  * A container component that maintains the child's aspect ratio while centering its content.
  * 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 w-full h-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. */}

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,17 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import { lazy } from 'react';
+import { type ComponentType, lazy } from 'react';
 
-export const ChannelContainer = lazy(() => import('./ChannelContainer'));
-export const ChatContainer = lazy(() => import('./ChatContainer'));
-
-// TODO(wittjosiah): Suspense boundary for sidebar?
 export * from './Call';
-export * from './CallDebugPanel';
-export * from './CallSidebar';
-export * from './CommentContainer';
-export * from './CommentsContainer';
-export * from './MessageContainer';
-export * from './ThreadComplementary';
-export * from './ThreadSettings';
+export * from './Chat';
+export * from './CommentsPanel';
+export * from './MessagePanel';
+
+export const ThreadSettings: ComponentType<any> = lazy(() => import('./ThreadSettings'));

package/src/containers/CallDebugPanel/CallDebugPanel.tsx

@@ -0,0 +1,173 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { WebRTCStats, type WebRTCStatsEvent } from '@peermetrics/webrtc-stats';
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { truncateKey } from '@dxos/debug';
+import { JsonView, Panel } from '@dxos/devtools';
+import { log } from '@dxos/log';
+import { IconButton, Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+
+import { meta } from '#meta';
+
+import { type EncodedTrackName, type GlobalState } from '../../calls';
+
+export type CallDebugPanelProps = ThemedClassName<{ state?: GlobalState }>;
+
+export const CallDebugPanel = ({ state }: CallDebugPanelProps) => {
+  const { t } = useTranslation(meta.id);
+
+  const [open, setOpen] = useState(false);
+  const handleToggle = () => setOpen(!open);
+  const [showServiceHistory, setShowServiceHistory] = useState(false);
+  const handleToggleServiceHistory = () => setShowServiceHistory(!showServiceHistory);
+
+  const handleCopyRaw = async () => {
+    await navigator.clipboard.writeText(JSON.stringify({ users: state?.call?.users, stats }, null, 2));
+  };
+
+  const [showDetailedWebRTCStats, setShowDetailedWebRTCStats] = useState(false);
+  const handleShowDetailedWebRTCStats = () => setShowDetailedWebRTCStats(!showDetailedWebRTCStats);
+
+  const webrtcStats = useMemo(
+    () =>
+      new WebRTCStats({
+        getStatsInterval: 1000,
+      }),
+    [],
+  );
+  const [stats, setStats] = useState<WebRTCStatsEvent['data']>();
+
+  useEffect(() => {
+    const pc = state?.media.peer?.session?.peerConnection;
+    const handleStats = (stats: WebRTCStatsEvent) => {
+      setStats(stats.data);
+    };
+    let added = false;
+    if (pc && showDetailedWebRTCStats) {
+      webrtcStats.addConnection({ pc, peerId: 1, connectionId: '1' });
+      webrtcStats.on('stats', handleStats as never);
+      added = true;
+    }
+    return () => {
+      try {
+        if (pc && added) {
+          webrtcStats.removeConnection({ pc });
+          webrtcStats.removeListener('stats', handleStats as never);
+        }
+      } catch (error) {
+        log.error('error removing webrtc stats', { error, pc, peerId: 1, connectionId: '1' });
+      }
+    };
+  }, [state?.media.peer?.session?.peerConnection, showDetailedWebRTCStats]);
+
+  const rows = useMemo(() => getCallStatusTable(state), [state?.call.users, state?.media.pulledAudioTracks]);
+
+  return (
+    <Panel
+      id='meeting-status'
+      icon='ph--video-conference--regular'
+      open={open}
+      onToggle={handleToggle}
+      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 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.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.Root>
+        </div>
+        <div className='flex items-center gap-2 items-center'>
+          <IconButton icon='ph--copy--regular' label={'copy raw'} onClick={handleCopyRaw} />
+        </div>
+        <Table rows={rows} />
+        {showDetailedWebRTCStats && <JsonView data={{ stats }} />}
+        {showServiceHistory && <JsonView data={{ history: state?.media.peer?.history.get() }} />}
+      </div>
+    </Panel>
+  );
+};
+
+const getCallStatusTable = (state?: GlobalState): TableProps['rows'] => {
+  if (!state || !state.call?.users) {
+    return [];
+  }
+
+  const self = state.call.self;
+  const users = state.call.users
+    .filter((user) => user.id !== self!.id)
+    .map((user) => {
+      const isOk = {
+        audio:
+          user.tracks?.audio &&
+          state.media.pulledAudioTracks[user.tracks?.audio as EncodedTrackName]?.ctx.disposed === false,
+        video:
+          user.tracks?.video &&
+          state.media.pulledVideoStreams[user.tracks?.video as EncodedTrackName]?.ctx.disposed === false,
+        screenshare:
+          user.tracks?.screenshare &&
+          state.media.pulledVideoStreams[user.tracks?.screenshare as EncodedTrackName]?.ctx.disposed === false,
+      };
+
+      return {
+        ...user,
+        isOk,
+      };
+    });
+
+  return [
+    ['users', state.call.users.length ?? 0],
+    [
+      '*self* ' + (self?.name ?? truncateKey(self!.id, 8)),
+      self?.tracks?.audio && state.media.pushedAudioTrack ? 'AUD ✅' : 'AUD ❌',
+      self?.tracks?.video && state.media.pushedVideoTrack ? 'VID ✅' : 'VID ❌',
+      self?.tracks?.screenshareEnabled
+        ? self.tracks.screenshareEnabled && state.media.pushedScreenshareTrack
+          ? 'SCR ✅'
+          : 'SCR ❌'
+        : undefined,
+    ],
+
+    ...users.map((user) => [
+      user.name ?? truncateKey(user.id, 8),
+      user.isOk.audio ? 'AUD ✅' : 'AUD ❌',
+      user.isOk.video ? 'VID ✅' : 'VID ❌',
+      user.tracks?.screenshareEnabled ? (user.isOk.screenshare ? 'SCR ✅' : 'SCR ❌') : undefined,
+    ]),
+    ['ICE', state.media.peer?.session?.peerConnection.iceConnectionState ?? 'no connection'],
+  ];
+};
+
+export namespace Unit {
+  export const KB = (n?: number) => ((n ?? 0) / 1_000).toFixed(2);
+}
+
+export type TableProps = {
+  rows: (string | number | undefined)[][];
+};
+
+export const Table = ({ rows }: TableProps) => {
+  return (
+    <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>
+          <div className='p-1'>{label}</div>
+          <div className='p-1'>{value}</div>
+          <div className='p-1'>{unit}</div>
+        </div>
+      ))}
+    </div>
+  );
+};

package/src/containers/CallDebugPanel/index.ts

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

package/src/containers/CallSidebar/CallSidebar.tsx

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

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,75 @@
+//
+// 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.
+ *
+ * Externally-synced channels (any Channel carrying foreign-key `Obj.Meta`,
+ * e.g. Slack/Discord-sourced rooms) render read-only — the composer is
+ * suppressed because there's no local-write path back to the source.
+ */
+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 readOnly = Obj.getMeta(channel).keys.length > 0;
+
+    const handleSend = (text: string) => {
+      if (readOnly) {
+        return false;
+      }
+      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'
+        readOnly={readOnly}
+        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;