@dxos/react-ui-thread 0.8.4-main.c1de068 → 0.8.4-main.e098934

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-thread",
-  "version": "0.8.4-main.c1de068",
+  "version": "0.8.4-main.e098934",
   "description": "A set of components to use with threads, including comments and messages.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,6 +10,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
     }
@@ -26,30 +27,30 @@
     "@preact-signals/safe-react": "^0.9.0",
     "@radix-ui/react-primitive": "2.0.2",
     "date-fns": "^3.3.1",
-    "@dxos/react-ui-editor": "0.8.4-main.c1de068",
-    "@dxos/util": "0.8.4-main.c1de068"
+    "@dxos/react-ui-editor": "0.8.4-main.e098934",
+    "@dxos/util": "0.8.4-main.e098934"
   },
   "devDependencies": {
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/echo-schema": "0.8.4-main.c1de068",
-    "@dxos/echo-db": "0.8.4-main.c1de068",
-    "@dxos/keys": "0.8.4-main.c1de068",
-    "@dxos/live-object": "0.8.4-main.c1de068",
-    "@dxos/random": "0.8.4-main.c1de068",
-    "@dxos/log": "0.8.4-main.c1de068",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
-    "@dxos/storybook-utils": "0.8.4-main.c1de068"
+    "vite": "7.1.1",
+    "@dxos/echo-db": "0.8.4-main.e098934",
+    "@dxos/echo-schema": "0.8.4-main.e098934",
+    "@dxos/keys": "0.8.4-main.e098934",
+    "@dxos/log": "0.8.4-main.e098934",
+    "@dxos/random": "0.8.4-main.e098934",
+    "@dxos/live-object": "0.8.4-main.e098934",
+    "@dxos/react-ui": "0.8.4-main.e098934",
+    "@dxos/react-ui-theme": "0.8.4-main.e098934",
+    "@dxos/storybook-utils": "0.8.4-main.e098934"
   },
   "peerDependencies": {
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068"
+    "@dxos/react-ui": "0.8.4-main.e098934",
+    "@dxos/react-ui-theme": "0.8.4-main.e098934"
   },
   "publishConfig": {
     "access": "public"

package/src/Message/Message.stories.tsx

@@ -4,17 +4,19 @@
 
 import '@dxos-theme';
 
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { PublicKey } from '@dxos/keys';
 import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/react-ui-theme';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { MessageRoot } from './Message';
+import { type MessageEntity, MessageStoryText } from '../testing';
 import { Thread } from '../Thread';
-import { MessageStoryText, type MessageEntity } from '../testing';
 import { translations } from '../translations';
 
+import { MessageRoot } from './Message';
+
 const DefaultStory = () => {
   const [identityKey] = useState(PublicKey.random());
   const [message] = useState<MessageEntity>({
@@ -35,12 +37,16 @@ const DefaultStory = () => {
   );
 };
 
-export default {
+const meta = {
   title: 'ui/react-ui-thread/Message',
-  component: MessageRoot,
+  component: MessageRoot as any,
   render: DefaultStory,
   decorators: [withTheme, withLayout({ fullscreen: true })],
   parameters: { translations },
-};
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
 
-export const Default = {};
+export const Default: Story = {};

package/src/Message/Message.tsx

@@ -3,7 +3,7 @@
 //
 
 import { formatDistanceToNow } from 'date-fns/formatDistanceToNow';
-import React, { type ComponentPropsWithRef, forwardRef, type ComponentPropsWithoutRef } from 'react';
+import React, { type ComponentPropsWithRef, type ComponentPropsWithoutRef, forwardRef } from 'react';
 
 // TODO(burdon): Remove dep.
 import { Avatar, type ThemedClassName, useTranslation } from '@dxos/react-ui';
@@ -20,6 +20,7 @@ export type MessageRootProps = ThemedClassName<ComponentPropsWithRef<'div'>> &
   MessageMetadata &
   Partial<{ continues: boolean }>;
 
+// TODO(burdon): Show authorName on tooltip.
 export const MessageRoot = forwardRef<HTMLDivElement, MessageRootProps>(
   (
     { authorImgSrc, authorId, authorName, authorAvatarProps, continues = true, children, classNames, ...rootProps },
@@ -35,7 +36,7 @@ export const MessageRoot = forwardRef<HTMLDivElement, MessageRootProps>(
           className={mx('grid grid-cols-subgrid col-span-2', classNames)}
           ref={forwardedRef}
         >
-          <div role='none' className='flex flex-col items-center gap-2 pbs-2'>
+          <div role='none' className='flex flex-col items-center gap-2 pbs-1'>
             <Avatar.Content
               size={avatarSize}
               hue={authorAvatarProps?.hue || hexToHue(authorId ?? '0')}

package/src/Thread/Comments.stories.tsx

@@ -4,6 +4,7 @@
 
 import '@dxos-theme';
 
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { type FC, useEffect, useMemo, useRef, useState } from 'react';
 
 import { createDocAccessor, createObject } from '@dxos/echo-db';
@@ -29,11 +30,12 @@ import {
 import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/react-ui-theme';
 import { withTheme } from '@dxos/storybook-utils';
 
-import { Thread } from './Thread';
 import { MessageBody, MessageHeading, MessageRoot, MessageTextbox } from '../Message';
 import { type MessageEntity } from '../testing';
 import { translations } from '../translations';
 
+import { Thread } from './Thread';
+
 faker.seed(101);
 
 const authorId = PublicKey.random().toHex();
@@ -231,7 +233,7 @@ type StoryProps = {
   autoCreate?: boolean;
 };
 
-const Story = ({ text, autoCreate }: StoryProps) => {
+const DefaultStory = ({ text, autoCreate }: StoryProps) => {
   const [item] = useState(createObject(live(Expando, { content: text ?? '' })));
   const [threads, setThreads] = useState<StoryCommentThread[]>([]);
   const [selected, setSelected] = useState<string>();
@@ -348,17 +350,21 @@ const Story = ({ text, autoCreate }: StoryProps) => {
   );
 };
 
-export default {
+const meta = {
   title: 'ui/react-ui-thread/Comments',
-  component: StoryThread,
+  component: StoryThread as any,
+  render: DefaultStory,
   decorators: [withTheme],
-  render: (args: StoryProps) => <Story {...args} />,
   parameters: { translations, layout: 'fullscreen' },
-};
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
 
 const str = (...lines: string[]) => lines.join('\n');
 
-export const Default = {
+export const Default: Story = {
   args: {
     text: str(
       '# Comments',

package/src/Thread/Thread.stories.tsx

@@ -4,19 +4,21 @@
 
 import '@dxos-theme';
 
+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 { createBasicExtensions, createThemeExtensions } from '@dxos/react-ui-editor';
 import { hoverableControls, hoverableFocusedWithinControls } from '@dxos/react-ui-theme';
-import { type Meta, withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { Thread } from './Thread';
 import { MessageRoot, MessageTextbox } from '../Message';
-import { MessageStoryText, type MessageEntity } from '../testing';
+import { type MessageEntity, MessageStoryText } from '../testing';
 import { translations } from '../translations';
 
+import { Thread } from './Thread';
+
 faker.seed(1);
 
 const DefaultStory = () => {
@@ -81,14 +83,16 @@ const DefaultStory = () => {
   );
 };
 
-const meta: Meta<typeof Thread.Root> = {
+const meta = {
   title: 'ui/react-ui-thread/Thread',
   component: Thread.Root,
   render: DefaultStory,
   decorators: [withTheme, withLayout({ fullscreen: true })],
   parameters: { translations },
-};
+} satisfies Meta<typeof Thread.Root>;
 
 export default meta;
 
-export const Default = {};
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/Thread/Thread.tsx

@@ -95,8 +95,8 @@ const ThreadStatus = forwardRef<HTMLDivElement, ThreadStatusProps>(
       >
         <Icon
           icon='ph--spinner--bold'
-          data-visible={activity ? 'show' : 'hide'}
           classNames='is-6 bs-4 invisible data-[visible=show]:visible animate-spin-slow'
+          data-visible={activity ? 'show' : 'hide'}
         />
         <span className='truncate min-is-0' aria-live='polite'>
           {activity ? children : null}