@dxos/plugin-thread 0.8.2-main.5885341 → 0.8.2-main.600d381

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.3"}
+{"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.2-main.5885341",
+  "version": "0.8.2-main.600d381",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -38,33 +38,34 @@
     "@codemirror/view": "^6.34.1",
     "@preact/signals-core": "^1.6.0",
     "date-fns": "^3.3.1",
+    "effect": "3.14.21",
     "lodash.get": "^4.4.2",
-    "@dxos/app-framework": "0.8.2-main.5885341",
-    "@dxos/echo-schema": "0.8.2-main.5885341",
-    "@dxos/invariant": "0.8.2-main.5885341",
-    "@dxos/async": "0.8.2-main.5885341",
-    "@dxos/display-name": "0.8.2-main.5885341",
-    "@dxos/keys": "0.8.2-main.5885341",
-    "@dxos/live-object": "0.8.2-main.5885341",
-    "@dxos/local-storage": "0.8.2-main.5885341",
-    "@dxos/log": "0.8.2-main.5885341",
-    "@dxos/plugin-client": "0.8.2-main.5885341",
-    "@dxos/plugin-graph": "0.8.2-main.5885341",
-    "@dxos/plugin-attention": "0.8.2-main.5885341",
-    "@dxos/plugin-deck": "0.8.2-main.5885341",
-    "@dxos/plugin-markdown": "0.8.2-main.5885341",
-    "@dxos/plugin-space": "0.8.2-main.5885341",
-    "@dxos/plugin-observability": "0.8.2-main.5885341",
-    "@dxos/react-client": "0.8.2-main.5885341",
-    "@dxos/react-ui-attention": "0.8.2-main.5885341",
-    "@dxos/react-ui-editor": "0.8.2-main.5885341",
-    "@dxos/react-ui-menu": "0.8.2-main.5885341",
-    "@dxos/react-ui-form": "0.8.2-main.5885341",
-    "@dxos/react-ui-stack": "0.8.2-main.5885341",
-    "@dxos/react-ui-thread": "0.8.2-main.5885341",
-    "@dxos/react-ui-tabs": "0.8.2-main.5885341",
-    "@dxos/schema": "0.8.2-main.5885341",
-    "@dxos/util": "0.8.2-main.5885341"
+    "@dxos/app-framework": "0.8.2-main.600d381",
+    "@dxos/async": "0.8.2-main.600d381",
+    "@dxos/display-name": "0.8.2-main.600d381",
+    "@dxos/echo-schema": "0.8.2-main.600d381",
+    "@dxos/keys": "0.8.2-main.600d381",
+    "@dxos/invariant": "0.8.2-main.600d381",
+    "@dxos/live-object": "0.8.2-main.600d381",
+    "@dxos/local-storage": "0.8.2-main.600d381",
+    "@dxos/log": "0.8.2-main.600d381",
+    "@dxos/plugin-attention": "0.8.2-main.600d381",
+    "@dxos/plugin-graph": "0.8.2-main.600d381",
+    "@dxos/plugin-observability": "0.8.2-main.600d381",
+    "@dxos/plugin-deck": "0.8.2-main.600d381",
+    "@dxos/plugin-markdown": "0.8.2-main.600d381",
+    "@dxos/react-client": "0.8.2-main.600d381",
+    "@dxos/plugin-space": "0.8.2-main.600d381",
+    "@dxos/react-ui-attention": "0.8.2-main.600d381",
+    "@dxos/plugin-client": "0.8.2-main.600d381",
+    "@dxos/react-ui-editor": "0.8.2-main.600d381",
+    "@dxos/react-ui-menu": "0.8.2-main.600d381",
+    "@dxos/react-ui-stack": "0.8.2-main.600d381",
+    "@dxos/react-ui-form": "0.8.2-main.600d381",
+    "@dxos/react-ui-tabs": "0.8.2-main.600d381",
+    "@dxos/schema": "0.8.2-main.600d381",
+    "@dxos/react-ui-thread": "0.8.2-main.600d381",
+    "@dxos/util": "0.8.2-main.600d381"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -74,17 +75,18 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.2-main.5885341",
-    "@dxos/react-ui": "0.8.2-main.5885341",
-    "@dxos/react-ui-theme": "0.8.2-main.5885341",
-    "@dxos/storybook-utils": "0.8.2-main.5885341"
+    "@dxos/react-ui": "0.8.2-main.600d381",
+    "@dxos/random": "0.8.2-main.600d381",
+    "@dxos/react-ui-theme": "0.8.2-main.600d381",
+    "@dxos/storybook-utils": "0.8.2-main.600d381"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.5885341",
-    "@dxos/react-ui-theme": "0.8.2-main.5885341"
+    "@dxos/react-ui": "0.8.2-main.600d381",
+    "@dxos/react-ui-theme": "0.8.2-main.600d381"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -7,9 +7,9 @@ import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { SpaceCapabilities, ThreadEvents } from '@dxos/plugin-space';
 import { ChannelType, defineObjectForm, ThreadType } from '@dxos/plugin-space/types';
-import { type ReactiveEchoObject, RefArray } from '@dxos/react-client/echo';
+import { type AnyLiveObject, RefArray } from '@dxos/react-client/echo';
 import { translations as threadTranslations } from '@dxos/react-ui-thread';
-import { MessageType, MessageTypeV1, MessageTypeV1ToV2 } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 import { AppGraphBuilder, IntentResolver, Markdown, ReactSurface, ThreadState } from './capabilities';
 import { ThreadEvents as LocalThreadEvents } from './events';
@@ -58,16 +58,16 @@ export const ThreadPlugin = () =>
           },
         }),
         contributes(Capabilities.Metadata, {
-          id: MessageType.typename,
+          id: DataType.Message.typename,
           metadata: {
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (message: MessageType) => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
+            loadReferences: (message: DataType.Message) => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
           },
         }),
         contributes(Capabilities.Metadata, {
           id: THREAD_ITEM,
           metadata: {
-            parse: (item: ReactiveEchoObject<any>, type: string) => {
+            parse: (item: AnyLiveObject<any>, type: string) => {
               switch (type) {
                 case 'node':
                   return { id: item.id, label: item.title, data: item };
@@ -96,12 +96,12 @@ export const ThreadPlugin = () =>
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ThreadType, MessageType, MessageTypeV1]),
+      activate: () => contributes(ClientCapabilities.Schema, [ThreadType, DataType.Message, DataType.MessageV1]),
     }),
     defineModule({
       id: `${meta.id}/module/migration`,
       activatesOn: ClientEvents.SetupMigration,
-      activate: () => contributes(ClientCapabilities.Migration, [MessageTypeV1ToV2]),
+      activate: () => contributes(ClientCapabilities.Migration, [DataType.MessageV1ToV2]),
     }),
     defineModule({
       id: `${meta.id}/module/markdown`,

package/src/capabilities/app-graph-builder.ts

@@ -3,7 +3,7 @@
 //
 
 import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
-import { type ReactiveEchoObject } from '@dxos/client/echo';
+import { type AnyLiveObject } from '@dxos/client/echo';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { createExtension, type Node } from '@dxos/plugin-graph';
 
@@ -14,8 +14,8 @@ export default (context: PluginsContext) =>
     createExtension({
       id: `${meta.id}/comments`,
       // TODO(wittjosiah): Support comments on any object.
-      // filter: (node): node is Node<ReactiveEchoObject<any>> => isEchoObject(node.data),
-      filter: (node): node is Node<ReactiveEchoObject<any>> =>
+      // filter: (node): node is Node<AnyLiveObject<any>> => isEchoObject(node.data),
+      filter: (node): node is Node<AnyLiveObject<any>> =>
         !!node.data && typeof node.data === 'object' && 'threads' in node.data && Array.isArray(node.data.threads),
       connector: ({ node }) => [
         {

package/src/capabilities/intent-resolver.ts

@@ -12,7 +12,7 @@ import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { ChannelType, ThreadType } from '@dxos/plugin-space/types';
 import { live, fullyQualifiedId, getSpace, makeRef } from '@dxos/react-client/echo';
-import { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 import { ThreadCapabilities } from './capabilities';
 import { THREAD_PLUGIN } from '../meta';
@@ -172,7 +172,7 @@ export default (context: PluginsContext) =>
         invariant(space, 'Space not found');
         const intents = [];
 
-        const message = live(MessageType, {
+        const message = live(DataType.Message, {
           sender,
           created: new Date().toISOString(),
           blocks: [{ type: 'text', text }],

package/src/components/Chat.stories.tsx

@@ -19,7 +19,7 @@ import { live, type Space } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Thread } from '@dxos/react-ui-thread';
-import { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { ChatContainer } from './ChatContainer';
@@ -80,8 +80,8 @@ const meta: Meta = {
       ],
     }),
     withTheme,
-    withLayout({ fullscreen: true, tooltips: true }),
-    withClientProvider({ createSpace: true, types: [ThreadType, MessageType] }),
+    withLayout({ fullscreen: true }),
+    withClientProvider({ createSpace: true, types: [ThreadType, DataType.Message] }),
   ],
   parameters: { translations },
 };

package/src/components/ChatContainer.tsx

@@ -14,7 +14,7 @@ import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/re
 import { StackItem } from '@dxos/react-ui-stack';
 import { mx } from '@dxos/react-ui-theme';
 import { MessageTextbox, type MessageTextboxProps, Thread, ThreadFooter, threadLayout } from '@dxos/react-ui-thread';
-import { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 import { MessageContainer } from './MessageContainer';
 import { command } from './command-extension';
@@ -44,7 +44,7 @@ export const ChatContainer = ({ space, dxn, context, current, autoFocusTextbox }
   const id = dxn.toString();
   const identity = useIdentity()!;
   const members = useMembers(space?.key);
-  const queue = useQueue<MessageType>(dxn, { pollInterval: 1_000 });
+  const queue = useQueue<DataType.Message>(dxn, { pollInterval: 1_000 });
   const activity = useStatus(space, id);
   const { t } = useTranslation(THREAD_PLUGIN);
   // TODO(wittjosiah): This is a hack to reset the editor after a message is sent.
@@ -84,7 +84,7 @@ export const ChatContainer = ({ space, dxn, context, current, autoFocusTextbox }
     }
 
     queue.append([
-      create(MessageType, {
+      create(DataType.Message, {
         sender: { identityDid: identity.did },
         created: new Date().toISOString(),
         blocks: [{ type: 'text', text: messageRef.current }],

package/src/components/CommentContainer.tsx

@@ -42,25 +42,17 @@ const ToggleResolvedButton = ({
   const { t } = useTranslation(THREAD_PLUGIN);
   const label = t(isResolved ? 'mark as unresolved label' : 'mark as resolved label');
   return (
-    <Tooltip.Root>
-      <Tooltip.Trigger asChild>
-        <Button
-          variant='ghost'
-          data-testid='thread.toggle-resolved'
-          onClick={onResolve}
-          classNames={[commentControlClassNames, !isResolved && hoverableControlItem]}
-        >
-          <span className='sr-only'>{label}</span>
-          {isResolved ? <CheckCircle className={sizeClass} weight='fill' /> : <CheckCircle className={sizeClass} />}
-        </Button>
-      </Tooltip.Trigger>
-      <Tooltip.Portal>
-        <Tooltip.Content>
-          {label}
-          <Tooltip.Arrow />
-        </Tooltip.Content>
-      </Tooltip.Portal>
-    </Tooltip.Root>
+    <Tooltip.Trigger asChild content={label}>
+      <Button
+        variant='ghost'
+        data-testid='thread.toggle-resolved'
+        onClick={onResolve}
+        classNames={[commentControlClassNames, !isResolved && hoverableControlItem]}
+      >
+        <span className='sr-only'>{label}</span>
+        {isResolved ? <CheckCircle className={sizeClass} weight='fill' /> : <CheckCircle className={sizeClass} />}
+      </Button>
+    </Tooltip.Trigger>
   );
 };
 
@@ -68,25 +60,17 @@ const DeleteThreadButton = ({ onDelete }: { onDelete: () => void }) => {
   const { t } = useTranslation(THREAD_PLUGIN);
   const label = t('delete thread label');
   return (
-    <Tooltip.Root>
-      <Tooltip.Trigger asChild>
-        <Button
-          variant='ghost'
-          data-testid='thread.delete'
-          onClick={onDelete}
-          classNames={[commentControlClassNames, hoverableControlItem]}
-        >
-          <span className='sr-only'>{label}</span>
-          <X className={sizeClass} />
-        </Button>
-      </Tooltip.Trigger>
-      <Tooltip.Portal>
-        <Tooltip.Content classNames='z-30'>
-          {label}
-          <Tooltip.Arrow />
-        </Tooltip.Content>
-      </Tooltip.Portal>
-    </Tooltip.Root>
+    <Tooltip.Trigger asChild content={label}>
+      <Button
+        variant='ghost'
+        data-testid='thread.delete'
+        onClick={onDelete}
+        classNames={[commentControlClassNames, hoverableControlItem]}
+      >
+        <span className='sr-only'>{label}</span>
+        <X className={sizeClass} />
+      </Button>
+    </Tooltip.Trigger>
   );
 };
 
@@ -156,17 +140,9 @@ export const CommentContainer = ({
         )}
       >
         {detached ? (
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <ThreadHeading detached>{thread.name}</ThreadHeading>
-            </Tooltip.Trigger>
-            <Tooltip.Portal>
-              <Tooltip.Content classNames='z-30' side='top'>
-                {t('detached thread label')}
-                <Tooltip.Arrow />
-              </Tooltip.Content>
-            </Tooltip.Portal>
-          </Tooltip.Root>
+          <Tooltip.Trigger asChild content={t('detached thread label')} side='top'>
+            <ThreadHeading detached>{thread.name}</ThreadHeading>
+          </Tooltip.Trigger>
         ) : (
           <ThreadHeading>{thread.name}</ThreadHeading>
         )}

package/src/components/Comments.stories.tsx

@@ -14,7 +14,7 @@ import { faker } from '@dxos/random';
 import { Filter, fullyQualifiedId, useQuery, useSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { type ClientRepeatedComponentProps, ClientRepeater } from '@dxos/react-client/testing';
-import { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { CommentsContainer } from './CommentsContainer';
@@ -59,12 +59,8 @@ export const Default = {};
 const meta: Meta = {
   title: 'plugins/plugin-thread/Comments',
   // TODO(wittjosiah): Use decorator.
-  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, MessageType]} />,
-  decorators: [
-    withTheme,
-    withLayout({ fullscreen: true, tooltips: true }),
-    withPluginManager({ plugins: [IntentPlugin()] }),
-  ],
+  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, DataType.Message]} />,
+  decorators: [withTheme, withLayout({ fullscreen: true }), withPluginManager({ plugins: [IntentPlugin()] })],
   parameters: { translations },
 };
 

package/src/components/MessageContainer.tsx

@@ -9,7 +9,7 @@ import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'rea
 import { Surface } from '@dxos/app-framework';
 import { RefArray } from '@dxos/live-object';
 import { PublicKey } from '@dxos/react-client';
-import { type ReactiveEchoObject, type Expando, type SpaceMember } from '@dxos/react-client/echo';
+import { type AnyLiveObject, type Expando, type SpaceMember } from '@dxos/react-client/echo';
 import { useIdentity, type Identity } from '@dxos/react-client/halo';
 import { Button, ButtonGroup, Tooltip, useOnTransition, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, useTextEditor } from '@dxos/react-ui-editor';
@@ -21,7 +21,7 @@ import {
   mx,
 } from '@dxos/react-ui-theme';
 import { MessageHeading, MessageRoot } from '@dxos/react-ui-thread';
-import { type TextContentBlock, type MessageType } from '@dxos/schema';
+import { type DataType } from '@dxos/schema';
 
 import { command } from './command-extension';
 import { useOnEditAnalytics } from '../hooks';
@@ -31,17 +31,14 @@ import { getMessageMetadata } from '../util';
 // TODO(thure): #8149
 const messageControlClassNames = ['!p-1 !min-bs-0 transition-opacity', hoverableControlItem];
 
-export const MessageContainer = ({
-  message,
-  members,
-  editable = false,
-  onDelete,
-}: {
-  message: MessageType;
+export type MessageContainerProps = {
+  message: DataType.Message;
   members: SpaceMember[];
   editable?: boolean;
   onDelete?: (id: string) => void;
-}) => {
+};
+
+export const MessageContainer = ({ message, members, editable = false, onDelete }: MessageContainerProps) => {
   const senderIdentity = members.find(
     (member) =>
       (message.sender.identityDid && member.identity.did === message.sender.identityDid) ||
@@ -64,46 +61,30 @@ export const MessageContainer = ({
       <MessageHeading authorName={messageMetadata.authorName} timestamp={messageMetadata.timestamp}>
         <ButtonGroup classNames='mie-1'>
           {userIsAuthor && editable && (
-            <Tooltip.Root>
-              <Tooltip.Trigger asChild>
-                <Button
-                  variant='ghost'
-                  data-testid={editing ? 'thread.message.save' : 'thread.message.edit'}
-                  classNames={messageControlClassNames}
-                  onClick={() => setEditing((editing) => !editing)}
-                >
-                  <span className='sr-only'>{editLabel}</span>
-                  {editing ? <Check className={getSize(4)} /> : <PencilSimple className={getSize(4)} />}
-                </Button>
-              </Tooltip.Trigger>
-              <Tooltip.Portal>
-                <Tooltip.Content>
-                  {editLabel}
-                  <Tooltip.Arrow />
-                </Tooltip.Content>
-              </Tooltip.Portal>
-            </Tooltip.Root>
+            <Tooltip.Trigger asChild content={editLabel}>
+              <Button
+                variant='ghost'
+                data-testid={editing ? 'thread.message.save' : 'thread.message.edit'}
+                classNames={messageControlClassNames}
+                onClick={() => setEditing((editing) => !editing)}
+              >
+                <span className='sr-only'>{editLabel}</span>
+                {editing ? <Check className={getSize(4)} /> : <PencilSimple className={getSize(4)} />}
+              </Button>
+            </Tooltip.Trigger>
           )}
           {onDelete && (
-            <Tooltip.Root>
-              <Tooltip.Trigger asChild>
-                <Button
-                  variant='ghost'
-                  data-testid='thread.message.delete'
-                  classNames={messageControlClassNames}
-                  onClick={() => handleDelete()}
-                >
-                  <span className='sr-only'>{deleteLabel}</span>
-                  <X className={getSize(4)} />
-                </Button>
-              </Tooltip.Trigger>
-              <Tooltip.Portal>
-                <Tooltip.Content>
-                  {deleteLabel}
-                  <Tooltip.Arrow />
-                </Tooltip.Content>
-              </Tooltip.Portal>
-            </Tooltip.Root>
+            <Tooltip.Trigger asChild content={deleteLabel}>
+              <Button
+                variant='ghost'
+                data-testid='thread.message.delete'
+                classNames={messageControlClassNames}
+                onClick={() => handleDelete()}
+              >
+                <span className='sr-only'>{deleteLabel}</span>
+                <X className={getSize(4)} />
+              </Button>
+            </Tooltip.Trigger>
           )}
         </ButtonGroup>
       </MessageHeading>
@@ -124,7 +105,7 @@ const TextboxBlock = ({
   isAuthor,
   editing,
 }: {
-  block: TextContentBlock;
+  block: DataType.MessageBlock.Text;
   editing?: boolean;
   isAuthor?: boolean;
   identity?: Identity;
@@ -166,7 +147,7 @@ const TextboxBlock = ({
   return <div role='none' ref={parentRef} className='mie-4' {...focusAttributes} />;
 };
 
-const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: ReactiveEchoObject<any> }>(
+const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: AnyLiveObject<any> }>(
   ({ subject }, forwardedRef) => {
     let title = subject.name ?? subject.title ?? subject.type ?? 'Object';
     if (typeof title !== 'string') {

package/src/components/testing.ts

@@ -7,14 +7,14 @@ import { live, makeRef } from '@dxos/live-object';
 import { ThreadType } from '@dxos/plugin-space/types';
 import { faker } from '@dxos/random';
 import { type Identity } from '@dxos/react-client/halo';
-import { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 export const createCommentThread = (identity: Identity) => {
   return live(ThreadType, {
     messages: faker.helpers.multiple(
       () =>
         makeRef(
-          live(MessageType, {
+          live(DataType.Message, {
             sender: {
               identityDid: faker.datatype.boolean() ? identity.did : IdentityDid.random(),
             },

package/src/components/types.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type ReactiveEchoObject } from '@dxos/client/echo';
+import { type AnyLiveObject } from '@dxos/client/echo';
 import { type ThreadType } from '@dxos/plugin-space/types';
 import { type ThreadProps } from '@dxos/react-ui-thread';
 
@@ -20,7 +20,7 @@ import { type ThreadProps } from '@dxos/react-ui-thread';
  */
 export type ThreadContainerProps = {
   thread: ThreadType;
-  context?: ReactiveEchoObject<any>;
+  context?: AnyLiveObject<any>;
   autoFocusTextbox?: boolean;
   onTextboxFocus?: () => void;
   detached?: boolean;

package/src/hooks/analytics.ts

@@ -9,9 +9,13 @@ 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 TextContentBlock } from '@dxos/schema';
+import { type DataType } from '@dxos/schema';
 
-export const useOnEditAnalytics = (message: Live<any>, textBlock: TextContentBlock | undefined, editing: boolean) => {
+export const useOnEditAnalytics = (
+  message: Live<any>,
+  textBlock: DataType.MessageBlock.Text | undefined,
+  editing: boolean,
+) => {
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const onEdit = useCallback(() => {

package/src/translations.ts

@@ -27,9 +27,9 @@ export default [
         'comments heading': 'Comments',
         'chat heading': 'Chat',
         'draft button': 'DRAFT',
-        'no comments title': 'No comments (yet)',
+        'no comments title': 'Comments',
         'no comments message':
-          'To start a comment thread, select a range of text in a document and click the <commentIcon></commentIcon> Create comment button in the toolbar.',
+          'Click on the <commentIcon></commentIcon> button in the document toolbar to create a comment thread on the selected text.',
         'toggle show resolved': 'Show resolved',
         'unnamed object threads label': 'Threads',
         'mark as resolved label': 'Mark as resolved',