@dxos/react-ui-thread 0.8.4-main.c85a9c8dae → 0.8.4-main.cb12b3f963

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-thread",
-  "version": "0.8.4-main.c85a9c8dae",
+  "version": "0.8.4-main.cb12b3f963",
   "description": "A set of components to use with threads, including comments and messages.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,48 +12,54 @@
   "author": "DXOS.org",
   "sideEffects": false,
   "type": "module",
+  "imports": {
+    "#translations": "./src/translations.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
     "@radix-ui/react-primitive": "2.0.2",
-    "date-fns": "^3.3.1",
-    "@dxos/react-ui-editor": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-editor": "0.8.4-main.c85a9c8dae",
-    "@dxos/util": "0.8.4-main.c85a9c8dae"
+    "date-fns": "^3.6.0",
+    "@dxos/react-ui-editor": "0.8.4-main.cb12b3f963",
+    "@dxos/util": "0.8.4-main.cb12b3f963",
+    "@dxos/ui-editor": "0.8.4-main.cb12b3f963"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/echo": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo-db": "0.8.4-main.c85a9c8dae",
-    "@dxos/random": "0.8.4-main.c85a9c8dae",
-    "@dxos/log": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae",
-    "@dxos/keys": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
+    "vite": "^8.0.10",
+    "@dxos/keys": "0.8.4-main.cb12b3f963",
+    "@dxos/log": "0.8.4-main.cb12b3f963",
+    "@dxos/echo": "0.8.4-main.cb12b3f963",
+    "@dxos/echo-db": "0.8.4-main.cb12b3f963",
+    "@dxos/react-ui": "0.8.4-main.cb12b3f963",
+    "@dxos/ui-theme": "0.8.4-main.cb12b3f963",
+    "@dxos/storybook-utils": "0.8.4-main.cb12b3f963",
+    "@dxos/random": "0.8.4-main.cb12b3f963"
   },
   "peerDependencies": {
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
+    "@dxos/react-ui": "0.8.4-main.cb12b3f963",
+    "@dxos/ui-theme": "0.8.4-main.cb12b3f963"
   },
   "publishConfig": {
     "access": "public"

package/src/Message/Message.stories.tsx

@@ -9,10 +9,10 @@ import { PublicKey } from '@dxos/keys';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/ui-theme';
 
+import { translations } from '#translations';
+
 import { type MessageEntity, MessageStoryText } from '../testing';
 import { Thread } from '../Thread';
-import { translations } from '../translations';
-
 import { MessageRoot } from './Message';
 
 const DefaultStory = () => {

package/src/Message/Message.tsx

@@ -8,10 +8,11 @@ import React, { type ComponentPropsWithRef, type ComponentPropsWithoutRef, forwa
 import { Avatar, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { type UseTextEditorProps, useTextEditor } from '@dxos/react-ui-editor';
 import { keymap, listener } from '@dxos/ui-editor';
-import { focusRing, mx } from '@dxos/ui-theme';
+import { mx } from '@dxos/ui-theme';
 import { hexToEmoji, hexToHue, isTruthy } from '@dxos/util';
 
-import { translationKey } from '../translations';
+import { translationKey } from '#translations';
+
 import { type MessageMetadata } from '../types';
 
 const avatarSize = 7;
@@ -26,8 +27,8 @@ export const MessageRoot = forwardRef<HTMLDivElement, MessageRootProps>(
     { authorImgSrc, authorId, authorName, authorAvatarProps, continues = true, children, classNames, ...rootProps },
     forwardedRef,
   ) => {
+    // Must wrap the message since Avatar.Label may be used in the content.
     return (
-      // Must wrap the message since Avatar.Label may be used in the content.
       <Avatar.Root>
         <div
           role='none'
@@ -74,7 +75,7 @@ export type MessageAuthorNameProps = Pick<MessageMetadata, 'authorName'>;
 export const MessageAuthorName = ({ authorName }: MessageAuthorNameProps) => {
   const { t } = useTranslation(translationKey);
   return (
-    <Avatar.Label classNames='block truncate text-sm text-subdued'>{authorName ?? t('anonymous label')}</Avatar.Label>
+    <Avatar.Label classNames='block truncate text-sm text-subdued'>{authorName ?? t('anonymous.label')}</Avatar.Label>
   );
 };
 
@@ -167,7 +168,7 @@ export const MessageTextbox = ({
       <div
         role='none'
         ref={parentRef}
-        className={mx('py-0.5 me-1 rounded-xs', focusRing, disabled && 'opacity-50')}
+        className={mx('py-0.5 me-1 rounded-xs dx-focus-ring', disabled && 'opacity-50')}
         {...focusAttributes}
       />
     </MessageRoot>

package/src/Thread/Comments.stories.tsx

@@ -9,15 +9,13 @@ import { Obj } from '@dxos/echo';
 import { TestSchema } from '@dxos/echo/testing';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { Icon, IconButton, useThemeContext } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { useTextEditor } from '@dxos/react-ui-editor';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import {
-  type Comment,
   type CommentsOptions,
   type EditorView,
-  type Range,
   comments,
   createBasicExtensions,
   createThemeExtensions,
@@ -26,15 +24,16 @@ import {
   scrollThreadIntoView,
   setComments,
 } from '@dxos/ui-editor';
+import { type Comment, type Range } from '@dxos/ui-editor/types';
 import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/ui-theme';
 
+import { translations } from '#translations';
+
 import { MessageBody, MessageHeading, MessageRoot, MessageTextbox } from '../Message';
 import { type MessageEntity } from '../testing';
-import { translations } from '../translations';
-
 import { Thread } from './Thread';
 
-faker.seed(101);
+random.seed(101);
 
 const authorId = PublicKey.random().toHex();
 
@@ -252,12 +251,12 @@ const Sidebar = ({ threads, selected, onSelect, onResolve }: SidebarProps) => {
 // Story container.
 //
 
-type StoryProps = {
+type DefaultStoryProps = {
   text?: string;
   autoCreate?: boolean;
 };
 
-const DefaultStory = ({ text, autoCreate }: StoryProps) => {
+const DefaultStory = ({ text, autoCreate }: DefaultStoryProps) => {
   const [item] = useState(() => Obj.make(TestSchema.Expando, { content: text ?? '' }));
   const [threads, setThreads] = useState<StoryCommentThread[]>([]);
   const [selected, setSelected] = useState<string>();
@@ -277,12 +276,12 @@ const DefaultStory = ({ text, autoCreate }: StoryProps) => {
         cursor,
         yPos: location ? Math.floor(location.top) : undefined,
         messages: autoCreate
-          ? faker.helpers.multiple(
+          ? random.helpers.multiple(
               () => ({
                 id: PublicKey.random().toHex(),
                 timestamp: new Date().toISOString(),
                 authorId: PublicKey.random().toHex(),
-                text: faker.lorem.sentence(),
+                text: random.lorem.sentence(),
               }),
               { count: { min: 1, max: 3 } },
             )
@@ -396,7 +395,7 @@ export const Default: Story = {
     text: str(
       '# Comments',
       '',
-      str(...faker.helpers.multiple(() => [faker.lorem.paragraph({ min: 5, max: 10 }), ''], { count: 20 }).flat()),
+      str(...random.helpers.multiple(() => [random.lorem.paragraph({ min: 5, max: 10 }), ''], { count: 20 }).flat()),
       '',
     ),
   },

package/src/Thread/Thread.stories.tsx

@@ -6,18 +6,18 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useMemo, useRef, useState } from 'react';
 
 import { PublicKey } from '@dxos/keys';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { createBasicExtensions, createThemeExtensions } from '@dxos/ui-editor';
 import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/ui-theme';
 
+import { translations } from '#translations';
+
 import { MessageRoot, MessageTextbox } from '../Message';
 import { type MessageEntity, MessageStoryText } from '../testing';
-import { translations } from '../translations';
-
 import { Thread } from './Thread';
 
-faker.seed(1);
+random.seed(1);
 
 const DefaultStory = () => {
   const [pending, setPending] = useState(false);
@@ -28,7 +28,7 @@ const DefaultStory = () => {
       id: `m${i + 1}`,
       timestamp: new Date().toISOString(),
       authorId: [identityKey1.toHex(), identityKey2.toHex()][i % 2],
-      text: faker.lorem.paragraph(),
+      text: random.lorem.paragraph(),
     })),
   );
 

package/src/Thread/Thread.tsx

@@ -2,12 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { type ComponentPropsWithRef, forwardRef } from 'react';
+import React, { ComponentPropsWithRef, forwardRef, PropsWithChildren } from 'react';
 
 import { Icon, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { hoverableControlItem, hoverableFocusedWithinControls, mx } from '@dxos/ui-theme';
 
-import { translationKey } from '../translations';
+import { translationKey } from '#translations';
+
 import type { ThreadEntity } from '../types';
 
 // TODO(burdon): Avoid exporting fragments.
@@ -17,7 +18,11 @@ export const threadLayout = 'w-full place-self-start grid grid-cols-[var(--dx-ra
 // Root
 //
 
-type ThreadRootProps = ThemedClassName<ComponentPropsWithRef<'div'>> & ThreadEntity & { current?: boolean };
+type ThreadRootProps = ThemedClassName<
+  PropsWithChildren<
+    ThreadEntity & { current?: boolean } & Pick<ComponentPropsWithRef<'div'>, 'onClickCapture' | 'onFocusCapture'>
+  >
+>;
 
 const ThreadRoot = forwardRef<HTMLDivElement, ThreadRootProps>(
   ({ current, children, classNames, ...props }, forwardedRef) => {
@@ -45,7 +50,7 @@ const ThreadRoot = forwardRef<HTMLDivElement, ThreadRootProps>(
 // Heading
 //
 
-type ThreadHeaderProps = ComponentPropsWithRef<'div'> & { detached?: boolean };
+type ThreadHeaderProps = PropsWithChildren<{ detached?: boolean }>;
 
 const ThreadHeader = forwardRef<HTMLParagraphElement, ThreadHeaderProps>(
   ({ children, detached, ...props }, forwardedRef) => {
@@ -74,7 +79,7 @@ const ThreadHeader = forwardRef<HTMLParagraphElement, ThreadHeaderProps>(
 // Status
 //
 
-type ThreadStatusProps = ThemedClassName<ComponentPropsWithRef<'div'>> & {
+type ThreadStatusProps = ThemedClassName<PropsWithChildren> & {
   activity?: boolean;
 };
 
@@ -98,7 +103,7 @@ const ThreadStatus = forwardRef<HTMLDivElement, ThreadStatusProps>(
         <span className='truncate min-w-0' aria-live='polite'>
           {activity ? children : null}
         </span>
-        <span className={mx('text-end', hoverableControlItem)}>{t('enter to send message')}</span>
+        <span className={mx('text-end', hoverableControlItem)}>{t('enter-to-send.message')}</span>
       </div>
     );
   },

package/src/index.ts

@@ -2,9 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import { translations } from './translations';
-
 export * from './Thread';
 export * from './Message';
 export type * from './types';
-export { translations };

package/src/translations.ts

@@ -10,16 +10,16 @@ export const translations = [
   {
     'en-US': {
       [translationKey]: {
-        'plugin name': 'Threads',
-        'thread title placeholder': 'New thread',
-        'thread title label': 'Title',
-        'delete thread label': 'Delete',
-        'create thread label': 'Create thread',
-        'message placeholder': 'Enter message...',
-        'comment placeholder': 'Enter comment...',
-        'settings standalone label': 'Enable standalone thread creation',
-        'anonymous label': 'Anonymous',
-        'enter to send message': 'Enter to add ⏎',
+        'plugin.name': 'Threads',
+        'thread-title.placeholder': 'New thread',
+        'thread-title.label': 'Title',
+        'delete-thread.label': 'Delete',
+        'create-thread.label': 'Create thread',
+        'message.placeholder': 'Enter message...',
+        'comment.placeholder': 'Enter comment...',
+        'settings-standalone.label': 'Enable standalone thread creation',
+        'anonymous.label': 'Anonymous',
+        'enter-to-send.message': 'Enter to add ⏎',
       },
     },
   },

package/src/types.ts

@@ -16,6 +16,7 @@ export type MessageMetadata = {
 };
 
 export type ThreadEntity = {
+  id?: string;
   topicId?: string;
   topicTitle?: string;
 };