@dxos/plugin-thread 0.8.4-main.2e9d522 → 0.8.4-main.548089c

package/src/components/ResponsiveGrid/ResponsiveGrid.tsx

@@ -2,7 +2,7 @@
 // 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';
@@ -136,13 +136,13 @@ export const ResponsiveGrid = <T extends object = any>({
   );
 
   return (
-    <div ref={containerRef} className={mx('relative w-full h-full', classNames)}>
+    <div ref={containerRef} className={mx('relative is-full bs-full', classNames)}>
       {/* Placeholder elements to calculate layout. */}
       <div className='absolute inset-0 flex flex-col grow gap-2'>
         {/* Pinned item. */}
         {pinnedItem && (
           <div
-            className={mx('flex grow-[2] shrink overflow-hidden justify-center items-center', hideGallery && 'h-full')}
+            className={mx('flex grow-[2] shrink overflow-hidden justify-center items-center', hideGallery && 'bs-full')}
             style={hideGallery ? {} : { height: dividerHeight }}
           >
             <SoloItem id={getId(pinnedItem)} debug={debug} />
@@ -157,7 +157,7 @@ export const ResponsiveGrid = <T extends object = any>({
             style={hideGallery ? {} : { minHeight: MIN_GALLERY_HEIGHT }}
           >
             {mainItems.length === 1 && (
-              <div style={{ width: cellWidth }} className='flex h-full'>
+              <div style={{ width: cellWidth }} className='flex bs-full'>
                 <SoloItem id={getId(mainItems[0])} debug={debug} />
               </div>
             )}
@@ -176,7 +176,7 @@ export const ResponsiveGrid = <T extends object = any>({
                     key={getId(item)}
                     {...{ 'data-grid-item': getId(item) }}
                     className={mx(
-                      'aspect-video max-h-full max-w-full w-auto h-auto',
+                      'aspect-video max-bs-full max-is-full w-auto h-auto',
                       debug && 'border border-primary-500',
                     )}
                   />

package/src/components/ResponsiveGrid/ResponsiveGridItem.tsx

@@ -2,9 +2,9 @@
 // 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';
 
@@ -76,7 +76,7 @@ export const ResponsiveGridItem = <T extends object = any>({
   return (
     <div
       className={mx(
-        'relative w-full h-full group',
+        'relative is-full bs-full group',
         'rounded-md outline outline-2 outline-neutral-900 transition-[outline-color] duration-500',
         speakingIndicator ? 'outline-green-500' : !video && 'outline-separator',
         classNames,
@@ -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 plb-0.5 truncate rounded',
+              pinned ? 'pli-2' : 'pli-1 text-xs',
+            )}
           >
             {name}
           </div>

package/src/components/ThreadComplementary.tsx

@@ -4,34 +4,28 @@
 
 import React, { useCallback, useMemo } from 'react';
 
-import {
-  Capabilities,
-  LayoutAction,
-  createIntent,
-  useCapability,
-  useCapabilities,
-  useIntentDispatcher,
-} from '@dxos/app-framework';
+import { Capabilities, CollaborationActions, LayoutAction, createIntent } from '@dxos/app-framework';
+import { useCapabilities, useCapability, useIntentDispatcher } from '@dxos/app-framework/react';
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
-import { fullyQualifiedId, getSpace, useQuery } from '@dxos/react-client/echo';
+import { Ref, getSpace, useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { useThemeContext, useTranslation } from '@dxos/react-ui';
+import { useTranslation } from '@dxos/react-ui';
 import { useAttended } from '@dxos/react-ui-attention';
 import { StackItem } from '@dxos/react-ui-stack';
 import { Tabs } from '@dxos/react-ui-tabs';
-import { AnchoredTo } from '@dxos/schema';
+import { mx } from '@dxos/react-ui-theme';
+import { AnchoredTo } from '@dxos/types';
 
 import { ThreadCapabilities } from '../capabilities';
-import { CommentsContainer } from '../components';
+import { CommentsContainer, type CommentsContainerProps } from '../components';
 import { meta } from '../meta';
-import { ThreadAction, ThreadType } from '../types';
+import { Thread, ThreadAction } from '../types';
 
 export const ThreadComplementary = ({ subject }: { subject: any }) => {
   const { t } = useTranslation(meta.id);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const identity = useIdentity();
-  const { tx } = useThemeContext();
-  const subjectId = fullyQualifiedId(subject);
+  const subjectId = Obj.getDXN(subject).toString();
 
   const { state, getViewState } = useCapability(ThreadCapabilities.MutableState);
   const drafts = state.drafts[subjectId];
@@ -51,18 +45,18 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
   );
 
   const space = getSpace(subject);
-  const objectsAnchoredTo = useQuery(space, Query.select(Filter.ids(subject.id)).targetOf(AnchoredTo));
+  const objectsAnchoredTo = useQuery(space, Query.select(Filter.ids(subject.id)).targetOf(AnchoredTo.AnchoredTo));
   const anchors = objectsAnchoredTo
     .toSorted((a, b) => sort?.(a, b) ?? 0)
-    .filter((anchor) => Obj.instanceOf(ThreadType, Relation.getSource(anchor)))
+    .filter((anchor) => Obj.instanceOf(Thread.Thread, Relation.getSource(anchor)))
     .concat(drafts ?? []);
 
   const attended = useAttended();
 
   const handleAttend = useCallback(
-    (anchor: AnchoredTo) => {
-      const thread = Relation.getSource(anchor) as ThreadType;
-      const threadId = fullyQualifiedId(thread);
+    (anchor: AnchoredTo.AnchoredTo) => {
+      const thread = Relation.getSource(anchor) as Thread.Thread;
+      const threadId = Obj.getDXN(thread).toString();
 
       if (state.current !== threadId) {
         state.current = threadId;
@@ -73,7 +67,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
         void dispatch(
           createIntent(LayoutAction.ScrollIntoView, {
             part: 'current',
-            subject: fullyQualifiedId(subject),
+            subject: Obj.getDXN(subject).toString(),
             options: {
               cursor: anchor.anchor,
               ref: threadId,
@@ -86,31 +80,68 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
   );
 
   const handleComment = useCallback(
-    async (anchor: AnchoredTo, text: string) => {
+    async (anchor: AnchoredTo.AnchoredTo, text: string) => {
       await dispatch(
-        createIntent(ThreadAction.AddMessage, { anchor, subject, sender: { identityDid: identity?.did }, text }),
+        createIntent(ThreadAction.AddMessage, {
+          anchor,
+          subject,
+          sender: { identityDid: identity?.did },
+          text,
+        }),
       );
 
-      const thread = Relation.getSource(anchor) as ThreadType;
-      state.current = fullyQualifiedId(thread);
+      const thread = Relation.getSource(anchor) as Thread.Thread;
+      state.current = Obj.getDXN(thread).toString();
     },
     [dispatch, identity, subject],
   );
 
   const handleResolve = useCallback(
-    (anchor: AnchoredTo) =>
-      dispatch(createIntent(ThreadAction.ToggleResolved, { thread: Relation.getSource(anchor) as ThreadType })),
+    (anchor: AnchoredTo.AnchoredTo) =>
+      dispatch(
+        createIntent(ThreadAction.ToggleResolved, {
+          thread: Relation.getSource(anchor) as Thread.Thread,
+        }),
+      ),
     [dispatch],
   );
 
   const handleThreadDelete = useCallback(
-    (anchor: AnchoredTo) => dispatch(createIntent(ThreadAction.Delete, { anchor, subject })),
+    (anchor: AnchoredTo.AnchoredTo) => dispatch(createIntent(ThreadAction.Delete, { anchor, subject })),
     [dispatch, subject],
   );
 
   const handleMessageDelete = useCallback(
-    (anchor: AnchoredTo, messageId: string) =>
-      dispatch(createIntent(ThreadAction.DeleteMessage, { anchor, subject, messageId })),
+    (anchor: AnchoredTo.AnchoredTo, messageId: string) =>
+      dispatch(
+        createIntent(ThreadAction.DeleteMessage, {
+          anchor,
+          subject,
+          messageId,
+        }),
+      ),
+    [dispatch, subject],
+  );
+
+  const handleAcceptProposal = useCallback<NonNullable<CommentsContainerProps['onAcceptProposal']>>(
+    async (anchor, messageId) => {
+      const thread = Relation.getSource(anchor) as Thread.Thread;
+      const messageIndex = thread.messages.findIndex(Ref.hasObjectId(messageId));
+      const message = thread.messages[messageIndex]?.target;
+      const proposal = message?.blocks.find((block) => block._tag === 'proposal');
+      if (!proposal || !anchor.anchor) {
+        return;
+      }
+
+      await dispatch(
+        createIntent(CollaborationActions.AcceptProposal, {
+          subject,
+          anchor: anchor.anchor,
+          proposal,
+        }),
+      );
+      await dispatch(createIntent(ThreadAction.ToggleResolved, { thread }));
+    },
     [dispatch, subject],
   );
 
@@ -124,6 +155,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
       onResolve={handleResolve}
       onMessageDelete={handleMessageDelete}
       onThreadDelete={handleThreadDelete}
+      onAcceptProposal={handleAcceptProposal}
     />
   );
 
@@ -132,10 +164,13 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
       <Tabs.Root
         value={showResolvedThreads ? 'all' : 'unresolved'}
         orientation='horizontal'
-        classNames='contents [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:overflow-y-auto [&_[role="tabpanel"]]:scrollbar-thin'
+        classNames={[
+          'contents [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:overflow-y-auto [&_[role="tabpanel"]]:scrollbar-thin',
+        ]}
         onValueChange={onChangeViewState}
       >
-        <Tabs.Tablist classNames={tx('toolbar.root', 'toolbar', {})}>
+        {/* TODO(burdon): Standardize (like Tollbar). */}
+        <Tabs.Tablist classNames={mx('bg-toolbarSurface border-b border-subduedSeparator')}>
           <Tabs.Tab value='unresolved' classNames='text-sm'>
             {t('show unresolved label')}
           </Tabs.Tab>
@@ -143,8 +178,10 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
             {t('show all label')}
           </Tabs.Tab>
         </Tabs.Tablist>
-        <Tabs.Tabpanel value='all'>{showResolvedThreads && comments}</Tabs.Tabpanel>
-        <Tabs.Tabpanel value='unresolved'>{!showResolvedThreads && comments}</Tabs.Tabpanel>
+        <div className='overflow-y-auto'>
+          <Tabs.Tabpanel value='all'>{showResolvedThreads && comments}</Tabs.Tabpanel>
+          <Tabs.Tabpanel value='unresolved'>{!showResolvedThreads && comments}</Tabs.Tabpanel>
+        </div>
       </Tabs.Root>
     </StackItem.Content>
   );

package/src/components/ThreadSettings.tsx

@@ -4,14 +4,13 @@
 
 import React from 'react';
 
-// import { useTranslation } from '@dxos/react-ui';
-import { DeprecatedFormContainer } from '@dxos/react-ui-form';
+import { useTranslation } from '@dxos/react-ui';
+import { ControlPage } from '@dxos/react-ui-form';
 
-// import { meta } from '../meta';
+import { meta } from '../meta';
 import type { ThreadSettingsProps } from '../types';
 
-export const ThreadSettings = ({ settings }: { settings: ThreadSettingsProps }) => {
-  // const { t } = useTranslation(meta.id);
-
-  return <DeprecatedFormContainer></DeprecatedFormContainer>;
+export const ThreadSettings = ({ settings: _settings }: { settings: ThreadSettingsProps }) => {
+  const { t: _t } = useTranslation(meta.id);
+  return <ControlPage></ControlPage>;
 };

package/src/components/command-extension.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { StreamLanguage, HighlightStyle, syntaxHighlighting } from '@codemirror/language';
+import { HighlightStyle, StreamLanguage, syntaxHighlighting } from '@codemirror/language';
 import { type Extension } from '@codemirror/state';
 
 import { tags } from '@dxos/react-ui-editor';
@@ -27,7 +27,10 @@ const parser = StreamLanguage.define<{ count: number }>({
 });
 
 const styles = HighlightStyle.define([
-  { tag: tags.tagName, class: mx('dx-tag dx-tag--indigo text-baseText font-medium') },
+  {
+    tag: tags.tagName,
+    class: mx('dx-tag dx-tag--indigo text-baseText font-medium'),
+  },
 ]);
 
 export const command: Extension = [parser, syntaxHighlighting(styles)];

package/src/components/testing.ts

@@ -6,16 +6,17 @@ import { Obj, Ref } from '@dxos/echo';
 import { IdentityDid } from '@dxos/keys';
 import { faker } from '@dxos/random';
 import { type Identity } from '@dxos/react-client/halo';
-import { DataType } from '@dxos/schema';
+import { Message } from '@dxos/types';
 
-import { ThreadType } from '../types';
+import { Thread } from '../types';
 
-export const createCommentThread = (identity: Identity): ThreadType => {
-  return Obj.make(ThreadType, {
+export const createCommentThread = (identity: Identity): Thread.Thread => {
+  return Thread.make({
+    name: 'Comment',
     messages: faker.helpers.multiple(
       () =>
         Ref.make(
-          Obj.make(DataType.Message, {
+          Obj.make(Message.Message, {
             created: new Date().toISOString(),
             sender: {
               identityDid: faker.datatype.boolean() ? identity.did : IdentityDid.random(),
@@ -25,5 +26,26 @@ export const createCommentThread = (identity: Identity): ThreadType => {
         ),
       { count: { min: 2, max: 3 } },
     ),
+    status: 'active',
+  });
+};
+
+export const createProposalThread = (identity: Identity): Thread.Thread => {
+  return Thread.make({
+    name: 'Proposal',
+    messages: faker.helpers.multiple(
+      () =>
+        Ref.make(
+          Obj.make(Message.Message, {
+            created: new Date().toISOString(),
+            sender: {
+              identityDid: faker.datatype.boolean() ? identity.did : IdentityDid.random(),
+            },
+            blocks: [{ _tag: 'proposal', text: faker.lorem.sentences(3) }],
+          }),
+        ),
+      { count: { min: 1, max: 1 } },
+    ),
+    status: 'active',
   });
 };

package/src/extensions/threads.ts

@@ -6,17 +6,17 @@ import { type Extension } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
 import { computed, effect } from '@preact/signals-core';
 
-import { createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
+import { type PromiseIntentDispatcher, createIntent } from '@dxos/app-framework';
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
-import { type DocumentType } from '@dxos/plugin-markdown/types';
-import { getSpace, getTextInRange, createDocAccessor, fullyQualifiedId, getSource } from '@dxos/react-client/echo';
+import { type Markdown } from '@dxos/plugin-markdown/types';
+import { createDocAccessor, getSource, getSpace, getTextInRange } from '@dxos/react-client/echo';
 import { comments, createExternalCommentSync } from '@dxos/react-ui-editor';
-import { AnchoredTo } from '@dxos/schema';
+import { AnchoredTo } from '@dxos/types';
 
-import { ThreadAction, ThreadType, type ThreadState } from '../types';
+import { Thread, ThreadAction, type ThreadState } from '../types';
 
 // TODO(burdon): Factor out.
-const getName = (doc: DocumentType, anchor: string): string | undefined => {
+const getName = (doc: Markdown.Document, anchor: string): string | undefined => {
   if (doc.content) {
     const [start, end] = anchor.split(':');
     return getTextInRange(createDocAccessor(doc.content.target!, ['content']), start, end);
@@ -26,7 +26,7 @@ const getName = (doc: DocumentType, anchor: string): string | undefined => {
 /**
  * Construct plugins.
  */
-export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: PromiseIntentDispatcher): Extension => {
+export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?: PromiseIntentDispatcher): Extension => {
   const space = doc && getSpace(doc);
   if (!doc || !space || !dispatch) {
     // Include no-op comments extension here to ensure that the facets are always present when they are expected.
@@ -34,16 +34,16 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Promi
     return [comments()];
   }
 
-  const query = space.db.query(Query.select(Filter.ids(doc.id)).targetOf(AnchoredTo));
+  const query = space.db.query(Query.select(Filter.ids(doc.id)).targetOf(AnchoredTo.AnchoredTo));
   const unsubscribe = query.subscribe();
 
   const anchors = computed(() =>
     query.objects
       .filter((anchor) => {
         const thread = Relation.getSource(anchor);
-        return Obj.instanceOf(ThreadType, thread) && thread.status !== 'resolved';
+        return Obj.instanceOf(Thread.Thread, thread) && thread.status !== 'resolved';
       })
-      .concat(state.drafts[fullyQualifiedId(doc)] ?? []),
+      .concat(state.drafts[Obj.getDXN(doc).toString()] ?? []),
   );
 
   return [
@@ -60,7 +60,7 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Promi
             // Only update if the name has changed, otherwise this will cause an infinite loop.
             // Skip if the name is empty; this means comment text was deleted, but thread name should remain.
             const name = getName(doc, anchor.anchor);
-            const thread = Relation.getSource(anchor) as ThreadType;
+            const thread = Relation.getSource(anchor) as Thread.Thread;
             if (name && name !== thread.name) {
               thread.name = name;
             }
@@ -70,24 +70,33 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Promi
     }),
 
     createExternalCommentSync(
-      fullyQualifiedId(doc),
+      Obj.getDXN(doc).toString(),
       (sink) => effect(() => sink()),
       () =>
         anchors.value
           .filter((anchor) => anchor.anchor)
-          .map((anchor) => ({ id: fullyQualifiedId(Relation.getSource(anchor)), cursor: anchor.anchor })),
+          .map((anchor) => ({
+            id: Obj.getDXN(Relation.getSource(anchor)).toString(),
+            cursor: anchor.anchor,
+          })),
     ),
 
     comments({
-      id: fullyQualifiedId(doc),
+      id: Obj.getDXN(doc).toString(),
       onCreate: ({ cursor }) => {
         const name = getName(doc, cursor);
-        void dispatch(createIntent(ThreadAction.Create, { anchor: cursor, name, subject: doc }));
+        void dispatch(
+          createIntent(ThreadAction.Create, {
+            anchor: cursor,
+            name,
+            subject: doc,
+          }),
+        );
       },
       onDelete: ({ id }) => {
-        const draft = state.drafts[fullyQualifiedId(doc)];
+        const draft = state.drafts[Obj.getDXN(doc).toString()];
         if (draft) {
-          const index = draft.findIndex((thread) => fullyQualifiedId(thread) === id);
+          const index = draft.findIndex((thread) => Obj.getDXN(thread).toString() === id);
           if (index !== -1) {
             draft.splice(index, 1);
           }
@@ -99,9 +108,9 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Promi
         }
       },
       onUpdate: ({ id, cursor }) => {
-        const draft = state.drafts[fullyQualifiedId(doc)]?.find((thread) => fullyQualifiedId(thread) === id);
+        const draft = state.drafts[Obj.getDXN(doc).toString()]?.find((thread) => Obj.getDXN(thread).toString() === id);
         if (draft) {
-          const thread = Relation.getSource(draft) as ThreadType;
+          const thread = Relation.getSource(draft) as Thread.Thread;
           thread.name = getName(doc, cursor);
           draft.anchor = cursor;
         }
@@ -109,7 +118,7 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Promi
         const relation = query.objects.find((object) => getSource(object).id === id);
         if (relation) {
           const thread = getSource(relation);
-          if (Obj.instanceOf(ThreadType, thread)) {
+          if (Obj.instanceOf(Thread.Thread, thread)) {
             thread.name = getName(doc, cursor);
             relation.anchor = cursor;
           }

package/src/functions/create-proposals.ts

@@ -0,0 +1,58 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Array from 'effect/Array';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import * as Schema from 'effect/Schema';
+
+import { ArtifactId, computeDiffsWithCursors } from '@dxos/assistant';
+import { Obj, Ref, Relation } from '@dxos/echo';
+import { createDocAccessor } from '@dxos/echo-db';
+import { DatabaseService, defineFunction } from '@dxos/functions';
+import { DXN } from '@dxos/keys';
+import { Markdown } from '@dxos/plugin-markdown/types';
+import { AnchoredTo, Message } from '@dxos/types';
+
+import { Thread } from '../types';
+
+export default defineFunction({
+  key: 'dxos.org/function/thread/create-proposals',
+  name: 'Create Proposals',
+  description: 'Proposes a set of changes to a document.',
+  inputSchema: Schema.Struct({
+    id: ArtifactId,
+    diffs: Schema.Array(Schema.String).annotations({
+      description: 'The diffs to propose for the document.',
+    }),
+  }),
+  outputSchema: Schema.Void,
+  handler: Effect.fn(function* ({ data: { id, diffs: _diffs } }) {
+    const object = yield* DatabaseService.resolve(DXN.parse(id), Markdown.Document);
+    const content = yield* Effect.promise(() => object.content.load());
+    const accessor = createDocAccessor(content, ['content']);
+
+    yield* Function.pipe(
+      computeDiffsWithCursors(accessor, _diffs),
+      Array.map(
+        Effect.fnUntraced(function* ({ cursor, text }) {
+          const proposal = Obj.make(Message.Message, {
+            created: new Date().toISOString(),
+            sender: { role: 'assistant' },
+            blocks: [{ _tag: 'proposal', text }],
+          });
+          const thread = Thread.make({ name: 'Proposal', messages: [Ref.make(proposal)], status: 'active' });
+          const relation = Relation.make(AnchoredTo.AnchoredTo, {
+            [Relation.Source]: thread,
+            [Relation.Target]: object,
+            anchor: cursor,
+          });
+          yield* DatabaseService.add(thread);
+          yield* DatabaseService.add(relation);
+        }),
+      ),
+      Effect.allWith({ concurrency: 'unbounded' }),
+    );
+  }),
+});

package/src/functions/index.ts

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

package/src/hooks/analytics.ts

@@ -4,18 +4,15 @@
 
 import { useCallback } from 'react';
 
-import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { createIntent } from '@dxos/app-framework';
+import { useIntentDispatcher } from '@dxos/app-framework/react';
 import { type Live } from '@dxos/live-object';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { getSpace } from '@dxos/react-client/echo';
 import { useOnTransition } from '@dxos/react-ui';
-import { type DataType } from '@dxos/schema';
+import { type ContentBlock } from '@dxos/types';
 
-export const useOnEditAnalytics = (
-  message: Live<any>,
-  textBlock: DataType.MessageBlock.Text | undefined,
-  editing: boolean,
-) => {
+export const useOnEditAnalytics = (message: Live<any>, textBlock: ContentBlock.Text | undefined, editing: boolean) => {
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const onEdit = useCallback(() => {

package/src/hooks/index.ts

@@ -3,7 +3,9 @@
 //
 
 export * from './analytics';
+
+export * from './useBlackCanvasStreamTrack';
 export * from './useDebugMode';
+export * from './useInaudibleAudioStreamTrack';
 export * from './useStatus';
 export * from './useVideoStreamTrack';
-export * from './useInaudibleAudioStreamTrack';

package/src/hooks/useBlackCanvasStreamTrack.tsx

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useEffect, useState } from 'react';
+
+import { scheduleTask } from '@dxos/async';
+import { Context } from '@dxos/context';
+
+import { createBlackCanvasStreamTrack } from '../calls/util/stub-media-streams';
+
+export const useBlackCanvasStreamTrack = () => {
+  const [blackCanvasStreamTrack, setBlackCanvasStreamTrack] = useState<MediaStreamTrack | undefined>(undefined);
+  useEffect(() => {
+    const ctx = new Context();
+    scheduleTask(ctx, async () => {
+      const blackCanvasStreamTrack = await createBlackCanvasStreamTrack({ ctx, width: 720, height: 480 });
+      setBlackCanvasStreamTrack(blackCanvasStreamTrack);
+    });
+
+    return () => {
+      void ctx.dispose();
+    };
+  }, []);
+
+  return blackCanvasStreamTrack;
+};

package/src/hooks/useDebugMode.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 // TODO(burdon): Standardize across plugins/composer.
 export const useDebugMode = () => {

package/src/hooks/useVideoStreamTrack.tsx

@@ -4,7 +4,7 @@
 
 import { type RefObject, useEffect, useRef, useState } from 'react';
 
-export const useVideoStreamTrack = (videoElement: RefObject<HTMLVideoElement>, videoSrc: string) => {
+export const useVideoStreamTrack = (videoElement: RefObject<HTMLVideoElement | null>, videoSrc: string) => {
   // Get video stream track.
   const [videoStreamTrack, setVideoStreamTrack] = useState<MediaStreamTrack | undefined>(undefined);
   const hadRun = useRef(false);
@@ -15,13 +15,16 @@ export const useVideoStreamTrack = (videoElement: RefObject<HTMLVideoElement>, v
     }
     hadRun.current = true;
     videoElement.current.addEventListener('playing', () => {
+      if (videoStreamTrack) {
+        return;
+      }
       const stream = (videoElement.current as any).captureStream();
       const track = stream.getTracks()[0];
-      if (track) {
+      if (track && !videoStreamTrack) {
         setVideoStreamTrack(track);
       }
       stream.onaddtrack = (event: MediaStreamTrackEvent) => {
-        if (event.track.kind === 'video') {
+        if (event.track.kind === 'video' && !videoStreamTrack) {
           setVideoStreamTrack(event.track);
         }
       };