@dxos/plugin-thread 0.8.4-main.fcfe5033a5 → 0.8.4-staging.60fe92afc8

package/src/capabilities/undo-mappings.ts

@@ -1,46 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import * as Effect from 'effect/Effect';
-
-import { Capabilities, Capability, UndoMapping } from '@dxos/app-framework';
-
-import { meta } from '#meta';
-import { ThreadOperation } from '#operations';
-
-export default Capability.makeModule(
-  Effect.fnUntraced(function* () {
-    return Capability.contributes(Capabilities.UndoMapping, [
-      UndoMapping.make({
-        operation: ThreadOperation.Delete,
-        inverse: ThreadOperation.Restore,
-        deriveContext: (_input, output) => {
-          if (!output.thread || !output.anchor) {
-            return;
-          }
-          return {
-            thread: output.thread,
-            anchor: output.anchor,
-          };
-        },
-        message: ['thread-deleted.label', { ns: meta.id }],
-      }),
-      UndoMapping.make({
-        operation: ThreadOperation.DeleteMessage,
-        inverse: ThreadOperation.RestoreMessage,
-        deriveContext: (input, output) => {
-          if (!output.message || output.messageIndex === undefined) {
-            return;
-          }
-          return {
-            anchor: input.anchor,
-            message: output.message,
-            messageIndex: output.messageIndex,
-          };
-        },
-        message: ['message-deleted.label', { ns: meta.id }],
-      }),
-    ]);
-  }),
-);

package/src/components/Call/Call.tsx

@@ -1,93 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useAtomValue } from '@effect-atom/atom-react';
-import React, { type FC, type PropsWithChildren } from 'react';
-
-import { useCapability } from '@dxos/app-framework/ui';
-import { type ThemedClassName } from '@dxos/react-ui';
-
-import { useDebugMode } from '#hooks';
-import { ThreadCapabilities } from '#types';
-
-import { AudioStream } from '../Media';
-import { ParticipantGrid } from '../Participant';
-import { Toolbar, type ToolbarProps } from './Toolbar';
-
-//
-// Root
-//
-
-type CallRootProps = PropsWithChildren<ThemedClassName>;
-
-const CallRoot: FC<CallRootProps> = ({ children }) => {
-  return <div className='relative dx-container flex flex-col'>{children}</div>;
-};
-
-CallRoot.displayName = 'CallRoot';
-
-//
-// Audio
-//
-
-type CallAudioProps = {};
-
-const CallAudio: FC<CallAudioProps> = () => {
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const audioTracksToPlay = useAtomValue(call.audioTracksToPlayAtom);
-
-  return <AudioStream tracks={audioTracksToPlay} />;
-};
-
-CallAudio.displayName = 'CallAudio';
-
-//
-// Room
-//
-
-type CallGridProps = {
-  fullscreen?: boolean;
-};
-
-const CallGrid: FC<CallGridProps> = ({ fullscreen }) => {
-  const debug = useDebugMode();
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const self = useAtomValue(call.selfAtom);
-  const users = useAtomValue(call.usersAtom);
-
-  return (
-    <div className='grid grow p-4 dark:bg-neutral-900'>
-      <ParticipantGrid self={self} users={users} debug={debug} fullscreen={fullscreen} />
-    </div>
-  );
-};
-
-CallGrid.displayName = 'CallGrid';
-
-//
-// Toolbar
-//
-
-type CallToolbarProps = Pick<ToolbarProps, 'channel' | 'onLeave'>;
-
-const CallToolbar: FC<CallToolbarProps> = (props) => {
-  return (
-    <div className='absolute bottom-0 left-0 right-0 flex justify-center'>
-      <Toolbar isInRoom {...props} />
-    </div>
-  );
-};
-
-CallToolbar.displayName = 'CallToolbar';
-
-//
-// Export
-//
-
-export const Call = {
-  Root: CallRoot,
-  Grid: CallGrid,
-  Audio: CallAudio,
-  Toolbar: CallToolbar,
-};

package/src/components/Call/Toolbar.tsx

@@ -1,199 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { useAtomValue } from '@effect-atom/atom-react';
-import React from 'react';
-
-import { useCapability } from '@dxos/app-framework/ui';
-import { useAppGraph } from '@dxos/app-toolkit/ui';
-import { Obj } from '@dxos/echo';
-import { Node, useActionRunner } from '@dxos/plugin-graph';
-import { useActions, useNode } from '@dxos/plugin-graph';
-import {
-  Icon,
-  IconButton,
-  type IconButtonProps,
-  Toolbar as NaturalToolbar,
-  type ThemedClassName,
-  toLocalizedString,
-  useTranslation,
-} from '@dxos/react-ui';
-import { groupHoverControlItemWithTransition, mx } from '@dxos/ui-theme';
-
-import { meta } from '#meta';
-import { ThreadCapabilities } from '#types';
-import { type Channel } from '#types';
-
-export type ToolbarProps = ThemedClassName<{
-  channel?: Channel.Channel;
-  participants?: number;
-  autoHideControls?: boolean;
-  isInRoom?: boolean;
-  onJoin?: () => void;
-  onLeave?: () => void;
-}>;
-
-// TODO(wittjosiah): Use ToolbarMenu.
-export const Toolbar = ({
-  classNames,
-  channel,
-  participants,
-  autoHideControls = true,
-  onJoin,
-  onLeave,
-}: ToolbarProps) => {
-  const { t } = useTranslation(meta.id);
-  const { graph } = useAppGraph();
-  const runAction = useActionRunner();
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const media = useAtomValue(call.mediaAtom);
-  const joined = useAtomValue(call.joinedAtom);
-  const raisedHand = useAtomValue(call.raisedHandAtom);
-
-  // Channel app graph node.
-  const node = useNode(graph, channel && Obj.getDXN(channel).toString());
-  const actions = useActions(graph, node?.id).filter((action) => action.properties.disposition === 'toolbar');
-
-  // Screen sharing.
-  const isScreensharing = media.screenshareTrack !== undefined;
-  const canSharescreen =
-    typeof navigator.mediaDevices !== 'undefined' && navigator.mediaDevices.getDisplayMedia !== undefined;
-
-  // TODO(wittjosiah): In order to use toolbar, need to update to actually use the graph action callbacks directly.
-  return (
-    <div className={mx('z-20 flex justify-center m-8', autoHideControls && groupHoverControlItemWithTransition)}>
-      <NaturalToolbar.Root classNames={['p-2 bg-modal-surface rounded-md shadow-md', classNames]}>
-        <ToggleButton
-          active={media.audioEnabled}
-          state={{
-            on: {
-              icon: 'ph--microphone--regular',
-              label: t('mic-off.button'),
-              onClick: () => call.turnAudioOff(),
-              classNames: 'bg-call-active',
-            },
-            off: {
-              icon: 'ph--microphone-slash--duotone',
-              label: t('mic-on.button'),
-              onClick: () => call.turnAudioOn(),
-            },
-          }}
-        />
-        <ToggleButton
-          active={media.videoEnabled}
-          state={{
-            on: {
-              icon: 'ph--video-camera--regular',
-              label: t('camera-off.button'),
-              onClick: () => call.turnVideoOff(),
-            },
-            off: {
-              icon: 'ph--video-camera-slash--duotone',
-              label: t('camera-on.button'),
-              onClick: () => call.turnVideoOn(),
-            },
-          }}
-        />
-
-        {(participants !== undefined && (
-          <div className='flex justify-center items-center gap-2 w-[5rem] text-xs text-subdued'>
-            <Icon icon='ph--users--regular' />
-            <div>{participants}</div>
-          </div>
-        )) || <NaturalToolbar.Separator variant='gap' />}
-
-        {joined && (
-          <>
-            <ToggleButton
-              disabled={!canSharescreen}
-              active={isScreensharing}
-              state={{
-                on: {
-                  icon: 'ph--monitor--regular',
-                  label: t('screenshare-off.button'),
-                  onClick: () => call.turnScreenshareOff(),
-                },
-                off: {
-                  icon: 'ph--monitor-arrow-up--duotone',
-                  label: t('screenshare-on.button'),
-                  onClick: () => call.turnScreenshareOn(),
-                },
-              }}
-            />
-
-            {/* Companion actions. */}
-            {actions
-              .filter((action): action is Node.Action => Node.isAction(action))
-              .map((action) => (
-                <IconButton
-                  key={action.id}
-                  {...defaultButtonProps}
-                  icon={action.properties.icon}
-                  label={toLocalizedString(action.properties.label, t)}
-                  classNames={action.properties.classNames}
-                  onClick={() => node && void runAction(action, { parent: node })}
-                />
-              ))}
-
-            <ToggleButton
-              active={raisedHand}
-              state={{
-                on: {
-                  icon: 'ph--hand-waving--regular',
-                  label: t('lower-hand.button'),
-                  onClick: () => call.setRaisedHand(false),
-                },
-                off: {
-                  icon: 'ph--hand-palm--duotone',
-                  label: t('raise-hand.button'),
-                  onClick: () => call.setRaisedHand(true),
-                },
-              }}
-            />
-          </>
-        )}
-        {joined ? (
-          <IconButton
-            variant='destructive'
-            icon='ph--phone-x--regular'
-            label={t('leave-call.button')}
-            onClick={onLeave}
-          />
-        ) : (
-          <IconButton
-            variant='primary'
-            icon='ph--phone-incoming--regular'
-            label={t('join-call.button')}
-            onClick={onJoin}
-          />
-        )}
-      </NaturalToolbar.Root>
-    </div>
-  );
-};
-
-Toolbar.displayName = 'MeetingToolbar';
-
-type ToolbarButtonProps = Pick<IconButtonProps, 'disabled'> & {
-  active?: boolean;
-  state: {
-    on: Pick<IconButtonProps, 'icon' | 'label' | 'onClick' | 'classNames'>;
-    off: Pick<IconButtonProps, 'icon' | 'label' | 'onClick' | 'classNames'>;
-  };
-};
-
-const defaultButtonProps: Partial<IconButtonProps> = {
-  size: 5,
-  iconOnly: true,
-};
-
-const ToggleButton = ({ active, state }: ToolbarButtonProps) => (
-  <IconButton
-    {...defaultButtonProps}
-    classNames={[active ? (state.on.classNames ?? 'bg-call-active') : state.off.classNames]}
-    icon={active ? state.on.icon : state.off.icon}
-    label={active ? state.on.label : state.off.label}
-    onClick={active ? state.on.onClick : state.off.onClick}
-  />
-);

package/src/components/Call/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './Call';
-export * from './Toolbar';

package/src/components/CommentsPanel/CommentsPanel.stories.tsx

@@ -1,93 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import * as Effect from 'effect/Effect';
-import React from 'react';
-
-import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
-import { withPluginManager } from '@dxos/app-framework/testing';
-import { Obj, Query, Relation } from '@dxos/echo';
-import { TestSchema } from '@dxos/echo/testing';
-import { ClientPlugin } from '@dxos/plugin-client';
-import { initializeIdentity } from '@dxos/plugin-client/testing';
-import { random } from '@dxos/random';
-import { useDatabase, useQuery } from '@dxos/react-client/echo';
-import { useIdentity } from '@dxos/react-client/halo';
-import { useAsyncEffect } from '@dxos/react-ui';
-import { withLayout, withTheme, Loading } from '@dxos/react-ui/testing';
-import { AnchoredTo, Message, Thread } from '@dxos/types';
-
-import { createCommentThread, createProposalThread } from '../../testing/data';
-import { translations } from '../../translations';
-import { CommentsPanel } from './CommentsPanel';
-
-random.seed(1);
-
-const DefaultStory = () => {
-  const identity = useIdentity();
-  const db = useDatabase();
-  const anchors = useQuery(db, Query.type(AnchoredTo.AnchoredTo));
-
-  useAsyncEffect(async () => {
-    if (identity && db) {
-      const object = db.add(Obj.make(TestSchema.Expando, {}));
-      const thread1 = db.add(createCommentThread(identity));
-      const thread2 = db.add(createProposalThread(identity));
-      db.add(
-        Relation.make(AnchoredTo.AnchoredTo, {
-          [Relation.Source]: thread1,
-          [Relation.Target]: object,
-          anchor: 'test',
-        }),
-      );
-      db.add(
-        Relation.make(AnchoredTo.AnchoredTo, {
-          [Relation.Source]: thread2,
-          [Relation.Target]: object,
-          anchor: 'test',
-        }),
-      );
-    }
-  }, [identity, db]);
-
-  if (!identity || !db || !anchors) {
-    return <Loading data={{ identity: !!identity, db: !!db, anchors: !!anchors }} />;
-  }
-
-  return <CommentsPanel anchors={anchors} onThreadDelete={console.log} onAcceptProposal={console.log} />;
-};
-
-const meta = {
-  title: 'plugins/plugin-thread/components/Comments',
-  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(),
-        ClientPlugin({
-          types: [Message.Message, Thread.Thread, AnchoredTo.AnchoredTo],
-          onClientInitialized: ({ client }) =>
-            Effect.gen(function* () {
-              yield* initializeIdentity(client);
-            }),
-        }),
-      ],
-    }),
-  ],
-  parameters: {
-    translations,
-  },
-} satisfies Meta<typeof DefaultStory>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {};

package/src/components/CommentsPanel/CommentsPanel.tsx

@@ -1,71 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import React, { useEffect } from 'react';
-
-import { Obj, Relation } from '@dxos/echo';
-import { Icon, Message, Trans, useTranslation } from '@dxos/react-ui';
-import { type AnchoredTo, type Thread } from '@dxos/types';
-
-import { meta } from '#meta';
-
-import { CommentsThread, type CommentsThreadProps } from './CommentsThread';
-
-export type CommentsPanelProps = Omit<CommentsThreadProps, 'anchor' | 'current'> & {
-  anchors: AnchoredTo.AnchoredTo[];
-  currentId?: string;
-  showResolvedThreads?: boolean;
-};
-
-/**
- * Root container for collection of comment threads.
- */
-export const CommentsPanel = ({ anchors, currentId, showResolvedThreads, ...props }: CommentsPanelProps) => {
-  const { t } = useTranslation(meta.id);
-
-  // TODO(wittjosiah): There seems to be a race between thread and anchor being deleted.
-  const filteredAnchors = showResolvedThreads
-    ? anchors.filter((anchor) => !!Relation.getSource(anchor))
-    : anchors.filter((anchor) => {
-        const thread = Relation.getSource(anchor);
-        // TODO(dmaretskyi): Do Obj.instanceOf check instead.
-        return thread && (thread as any).status !== 'resolved';
-      });
-
-  useEffect(() => {
-    if (currentId) {
-      document.getElementById(currentId)?.scrollIntoView({ behavior: 'smooth', block: 'end' });
-    }
-  }, [currentId]);
-
-  if (filteredAnchors.length === 0) {
-    return (
-      <div role='none' className='p-form-padding'>
-        <Message.Root>
-          <Message.Title>
-            <Trans
-              {...{
-                t,
-                i18nKey: 'no-comments.message',
-                components: {
-                  commentIcon: <Icon icon='ph--chat-text--regular' size={4} classNames='w-block' />,
-                },
-              }}
-            />
-          </Message.Title>
-        </Message.Root>
-      </div>
-    );
-  }
-
-  return (
-    <div>
-      {filteredAnchors.map((anchor) => {
-        const thread = Relation.getSource(anchor) as Thread.Thread;
-        const threadId = Obj.getDXN(thread).toString();
-        return <CommentsThread key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
-      })}
-    </div>
-  );
-};

package/src/components/CommentsPanel/CommentsThread.tsx

@@ -1,172 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import React, { useCallback, useMemo, useRef, useState } from 'react';
-
-import { Obj, Relation } from '@dxos/echo';
-import { useObject } from '@dxos/echo-react';
-import { getSpace, useMembers } from '@dxos/react-client/echo';
-import { useIdentity } from '@dxos/react-client/halo';
-import { IconButton, Tag, Tooltip, useThemeContext, useTranslation } from '@dxos/react-ui';
-import {
-  MessageTextbox,
-  type MessageTextboxProps,
-  Thread as ThreadComponent,
-  type ThreadRootProps,
-} from '@dxos/react-ui-thread';
-import { type AnchoredTo, type Thread } from '@dxos/types';
-import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/ui-editor';
-import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/ui-theme';
-
-import { useStatus } from '#hooks';
-import { meta } from '#meta';
-
-import { command } from '../../extensions/command';
-import { getMessageMetadata } from '../../util';
-import { MessagePanel, buttonClassNames, buttonGroupClassNames } from '../MessagePanel';
-
-export type CommentsThreadProps = {
-  anchor: AnchoredTo.AnchoredTo;
-  onAttend?: (anchor: AnchoredTo.AnchoredTo) => void;
-  onComment?: (anchor: AnchoredTo.AnchoredTo, message: string) => void;
-  onResolve?: (anchor: AnchoredTo.AnchoredTo) => void;
-  onMessageDelete?: (anchor: AnchoredTo.AnchoredTo, messageId: string) => void;
-  onThreadDelete?: (anchor: AnchoredTo.AnchoredTo) => void;
-  onAcceptProposal?: (anchor: AnchoredTo.AnchoredTo, messageId: string) => void;
-} & Pick<ThreadRootProps, 'current'>;
-
-export const CommentsThread = ({
-  anchor,
-  current,
-  onAttend,
-  onComment,
-  onResolve,
-  onMessageDelete,
-  onThreadDelete,
-  onAcceptProposal,
-}: CommentsThreadProps) => {
-  const { themeMode } = useThemeContext();
-  const { t } = useTranslation(meta.id);
-  const identity = useIdentity()!;
-  const space = getSpace(anchor);
-  const members = useMembers(space?.id);
-  const detached = !anchor.anchor;
-  const thread = Relation.getSource(anchor) as Thread.Thread;
-  const [messages] = useObject(thread, 'messages');
-  const activity = useStatus(space, Obj.getDXN(thread).toString());
-  const threadScrollRef = useRef<HTMLDivElement | null>(null);
-
-  const textboxMetadata = getMessageMetadata(Obj.getDXN(thread).toString(), identity);
-
-  // TODO(wittjosiah): This is a hack to reset the editor after a message is sent.
-  const [state, setState] = useState({});
-  const messageRef = useRef('');
-  const extensions = useMemo(
-    () => [
-      createBasicExtensions({ placeholder: t('message.placeholder') }),
-      createThemeExtensions({ themeMode }),
-      listener({ onChange: ({ text }) => (messageRef.current = text) }),
-      command,
-    ],
-    [state],
-  );
-
-  // TODO(thure): Factor out.
-  const scrollToEnd = (behavior: ScrollBehavior) =>
-    setTimeout(() => threadScrollRef.current?.scrollIntoView({ behavior, block: 'end' }), 10);
-
-  const handleAttend = useCallback(() => onAttend?.(anchor), [onAttend, anchor]);
-  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 = useCallback<NonNullable<MessageTextboxProps['onSend']>>(() => {
-    if (!messageRef.current) {
-      return false;
-    }
-
-    onComment?.(anchor, messageRef.current);
-    messageRef.current = '';
-    scrollToEnd('instant');
-    setState({});
-
-    return true;
-  }, [anchor, identity]);
-
-  return (
-    <ThreadComponent.Root
-      id={Obj.getDXN(thread).toString()}
-      classNames='pt-2 border-b border-subdued-separator last:border-none'
-      current={current}
-      onClickCapture={handleAttend}
-      onFocusCapture={handleAttend}
-    >
-      <div
-        role='none'
-        className={mx(
-          'col-span-2 grid grid-cols-[var(--dx-rail-size)_1fr_min-content]',
-          hoverableControls,
-          hoverableFocusedWithinControls,
-        )}
-      >
-        {detached ? (
-          <Tooltip.Trigger asChild content={t('detached-thread.label')} side='top'>
-            <ThreadComponent.Header detached>{thread.name}</ThreadComponent.Header>
-          </Tooltip.Trigger>
-        ) : (
-          <ThreadComponent.Header>{thread.name}</ThreadComponent.Header>
-        )}
-        <div role='none' className={buttonGroupClassNames}>
-          {thread.status === 'staged' && <Tag palette='neutral'>{t('draft.button')}</Tag>}
-          {onResolve && !(thread?.status === 'staged') && (
-            <IconButton
-              data-testid='thread.resolve'
-              variant='ghost'
-              icon={thread?.status === 'resolved' ? 'ph--check--fill' : 'ph--check--regular'}
-              iconOnly
-              label={t('resolve-thread.label')}
-              classNames={[buttonClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
-              onClick={handleResolve}
-            />
-          )}
-          {onThreadDelete && (
-            <IconButton
-              data-testid='thread.delete'
-              variant='ghost'
-              icon='ph--x--regular'
-              iconOnly
-              label={t('delete-thread.label')}
-              classNames={[buttonClassNames, hoverableControlItem]}
-              onClick={handleThreadDelete}
-            />
-          )}
-        </div>
-      </div>
-
-      {messages?.map((ref) => (
-        <MessagePanel
-          key={ref.dxn.toString()}
-          editable
-          message={ref}
-          members={members}
-          onDelete={handleMessageDelete}
-          onAcceptProposal={handleAcceptProposal}
-        />
-      ))}
-
-      {/*
-        TODO(wittjosiah): Can't autofocus this generally.
-          There can be multiple threads with inputs and they can't all be focused.
-          Also, it steals focus from documents when first rendered.
-          Need to find a way to autofocus in one scenario only: when a new thread is created.
-      */}
-      <MessageTextbox extensions={extensions} onSend={handleComment} {...textboxMetadata} />
-
-      <ThreadComponent.Status activity={activity}>{t('activity.message')}</ThreadComponent.Status>
-
-      <div role='none' className='h-px -mt-px' ref={threadScrollRef} />
-    </ThreadComponent.Root>
-  );
-};

package/src/components/CommentsPanel/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-export * from './CommentsPanel';
-export * from './CommentsThread';