@dxos/react-ui-thread 0.8.4-main.84f28bd → 0.8.4-main.a4bbb77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-thread",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.a4bbb77",
   "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,32 +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.84f28bd",
-    "@dxos/util": "0.8.4-main.84f28bd"
+    "@dxos/util": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-editor": "0.8.4-main.a4bbb77"
   },
   "devDependencies": {
-    "@phosphor-icons/react": "^2.1.5",
-    "@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-db": "0.8.4-main.84f28bd",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd",
-    "@dxos/keys": "0.8.4-main.84f28bd",
-    "@dxos/live-object": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/random": "0.8.4-main.84f28bd",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd",
-    "@dxos/storybook-utils": "0.8.4-main.84f28bd"
+    "@types/react": "~19.2.0",
+    "@types/react-dom": "~19.2.0",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
+    "@dxos/live-object": "0.8.4-main.a4bbb77",
+    "@dxos/echo-db": "0.8.4-main.a4bbb77",
+    "@dxos/log": "0.8.4-main.a4bbb77",
+    "@dxos/keys": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/random": "0.8.4-main.a4bbb77",
+    "@dxos/storybook-utils": "0.8.4-main.a4bbb77"
   },
   "peerDependencies": {
-    "@phosphor-icons/react": "^2.1.5",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77"
   },
   "publishConfig": {
     "access": "public"

package/src/Message/Message.stories.tsx

@@ -2,19 +2,19 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { PublicKey } from '@dxos/keys';
+import { withTheme } from '@dxos/react-ui/testing';
 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 +35,19 @@ 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 },
-};
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+    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,13 +3,13 @@
 //
 
 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';
 import { type UseTextEditorProps, keymap, listener, useTextEditor } from '@dxos/react-ui-editor';
 import { focusRing, mx } from '@dxos/react-ui-theme';
-import { hexToEmoji, hexToHue, isNotFalsy } from '@dxos/util';
+import { hexToEmoji, hexToHue, isTruthy } from '@dxos/util';
 
 import { translationKey } from '../translations';
 import { type MessageMetadata } from '../types';
@@ -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')}
@@ -155,7 +156,7 @@ export const MessageTextbox = ({
           },
         }),
         extensions,
-      ].filter(isNotFalsy),
+      ].filter(isTruthy),
       ...editorProps,
     }),
     [id, extensions],

package/src/Thread/Comments.stories.tsx

@@ -2,9 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { Check, Trash } from '@phosphor-icons/react';
+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';
@@ -13,7 +11,8 @@ import { PublicKey } from '@dxos/keys';
 import { live } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { faker } from '@dxos/random';
-import { Button, useThemeContext } from '@dxos/react-ui';
+import { Button, Icon, useThemeContext } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
 import {
   type Comment,
   type CommentsOptions,
@@ -28,13 +27,13 @@ import {
   useTextEditor,
 } from '@dxos/react-ui-editor';
 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();
@@ -162,7 +161,7 @@ const StoryThread: FC<{
         <span>id:{thread.id.slice(0, 4)}</span>
         <span>y:{thread.yPos}</span>
         <span className='grow' />
-        {!thread.cursor && <Trash />}
+        {!thread.cursor && <Icon icon='ph--trash--regular' />}
       </div>
 
       <Thread.Header>
@@ -187,7 +186,7 @@ const StoryThread: FC<{
         />
         <Thread.Status />
         <Button variant='ghost' classNames='px-1' title='Resolve' onClick={onResolve}>
-          <Check />
+          <Icon icon='ph--check--regular' />
         </Button>
       </div>
     </Thread.Root>
@@ -232,7 +231,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>();
@@ -349,17 +348,24 @@ 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' },
-};
+  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

@@ -2,21 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-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 { withTheme } from '@dxos/react-ui/testing';
 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 { 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 +81,19 @@ 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 },
-};
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+    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

@@ -2,10 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { CaretDoubleRight, Spinner } from '@phosphor-icons/react';
 import React, { type ComponentPropsWithRef, forwardRef } from 'react';
 
-import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { Icon, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { hoverableControlItem, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
 
 import { translationKey } from '../translations';
@@ -53,7 +52,7 @@ const ThreadHeader = forwardRef<HTMLParagraphElement, ThreadHeaderProps>(
     return (
       <>
         <div role='none' className='flex items-center justify-center text-description'>
-          <CaretDoubleRight />
+          <Icon icon='ph--caret-double-right--regular' />
         </div>
         <div role='none' className='flex items-center overflow-hidden'>
           <p
@@ -94,10 +93,10 @@ const ThreadStatus = forwardRef<HTMLDivElement, ThreadStatusProps>(
         )}
         ref={forwardedRef}
       >
-        <Spinner
-          weight='bold'
+        <Icon
+          icon='ph--spinner--bold'
+          classNames='is-6 bs-4 invisible data-[visible=show]:visible animate-spin-slow'
           data-visible={activity ? 'show' : 'hide'}
-          className='is-6 bs-4 invisible data-[visible=show]:visible animate-spin-slow'
         />
         <span className='truncate min-is-0' aria-live='polite'>
           {activity ? children : null}

package/src/index.ts

@@ -6,5 +6,5 @@ import { translations } from './translations';
 
 export * from './Thread';
 export * from './Message';
-export * from './types';
+export type * from './types';
 export { translations };

package/src/testing.tsx

@@ -2,10 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { X } from '@phosphor-icons/react';
 import React from 'react';
 
-import { Button } from '@dxos/react-ui';
+import { Button, Icon } from '@dxos/react-ui';
 import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
 
 import { MessageBody, MessageHeading } from './Message';
@@ -31,7 +30,7 @@ export const MessageStoryText = ({ text, onDelete, authorName, timestamp }: Mess
             classNames={['p-1.5 min-bs-0 mie-1 items-start transition-opacity', hoverableControlItem]}
             onClick={() => onDelete()}
           >
-            <X />
+            <Icon icon='ph--x--regular' />
           </Button>
         )}
       </MessageHeading>

package/dist/lib/node-esm/index.mjs

@@ -1,268 +0,0 @@
-import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
-
-// src/translations.ts
-var translationKey = "react-ui-thread";
-var 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 \u23CE"
-      }
-    }
-  }
-];
-
-// src/Thread/Thread.tsx
-import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
-import { CaretDoubleRight, Spinner } from "@phosphor-icons/react";
-import React, { forwardRef } from "react";
-import { useTranslation } from "@dxos/react-ui";
-import { hoverableControlItem, hoverableFocusedWithinControls, mx } from "@dxos/react-ui-theme";
-var threadLayout = "is-full place-self-start grid grid-cols-[var(--rail-size)_1fr]";
-var ThreadRoot = /* @__PURE__ */ forwardRef(({ current, children, classNames, ...props }, forwardedRef) => {
-  var _effect = _useSignals();
-  try {
-    return /* @__PURE__ */ React.createElement("div", {
-      role: "group",
-      "data-testid": "thread",
-      ...current && {
-        "aria-current": typeof current === "string" ? current : "location"
-      },
-      ...props,
-      className: mx(threadLayout, hoverableFocusedWithinControls, "bg-[var(--surface-bg)] current-related attention-surface [--controls-opacity:0]", classNames),
-      ref: forwardedRef
-    }, children);
-  } finally {
-    _effect.f();
-  }
-});
-var ThreadHeader = /* @__PURE__ */ forwardRef(({ classNames, children, detached, ...props }, forwardedRef) => {
-  var _effect = _useSignals();
-  try {
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", {
-      role: "none",
-      className: "flex items-center justify-center text-description"
-    }, /* @__PURE__ */ React.createElement(CaretDoubleRight, null)), /* @__PURE__ */ React.createElement("div", {
-      role: "none",
-      className: "flex items-center overflow-hidden"
-    }, /* @__PURE__ */ React.createElement("p", {
-      role: "heading",
-      "data-testid": "thread.heading",
-      ...props,
-      className: mx("mie-2 text-description font-medium truncate italic", detached && "line-through decoration-1"),
-      ref: forwardedRef
-    }, children)));
-  } finally {
-    _effect.f();
-  }
-});
-var ThreadStatus = /* @__PURE__ */ forwardRef(({ activity, classNames, children, ...props }, forwardedRef) => {
-  var _effect = _useSignals();
-  try {
-    const { t } = useTranslation(translationKey);
-    return /* @__PURE__ */ React.createElement("div", {
-      ...props,
-      className: mx("col-start-2 grid grid-cols-[min-content_1fr_max-content] pb-2 pie-2 text-xs text-description", classNames),
-      ref: forwardedRef
-    }, /* @__PURE__ */ React.createElement(Spinner, {
-      weight: "bold",
-      "data-visible": activity ? "show" : "hide",
-      className: "is-6 bs-4 invisible data-[visible=show]:visible animate-spin-slow"
-    }), /* @__PURE__ */ React.createElement("span", {
-      className: "truncate min-is-0",
-      "aria-live": "polite"
-    }, activity ? children : null), /* @__PURE__ */ React.createElement("span", {
-      className: mx("text-end", hoverableControlItem)
-    }, t("enter to send message")));
-  } finally {
-    _effect.f();
-  }
-});
-var Thread = {
-  Root: ThreadRoot,
-  Header: ThreadHeader,
-  Status: ThreadStatus
-};
-
-// src/Message/Message.tsx
-import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
-import { formatDistanceToNow } from "date-fns/formatDistanceToNow";
-import React2, { forwardRef as forwardRef2 } from "react";
-import { Avatar, useTranslation as useTranslation2 } from "@dxos/react-ui";
-import { keymap, listener, useTextEditor } from "@dxos/react-ui-editor";
-import { focusRing, mx as mx2 } from "@dxos/react-ui-theme";
-import { hexToEmoji, hexToHue, isNotFalsy } from "@dxos/util";
-var avatarSize = 7;
-var MessageRoot = /* @__PURE__ */ forwardRef2(({ authorImgSrc, authorId, authorName, authorAvatarProps, continues = true, children, classNames, ...rootProps }, forwardedRef) => {
-  var _effect = _useSignals2();
-  try {
-    return (
-      // Must wrap the message since Avatar.Label may be used in the content.
-      /* @__PURE__ */ React2.createElement(Avatar.Root, null, /* @__PURE__ */ React2.createElement("div", {
-        role: "none",
-        "data-testid": "thread.message",
-        ...rootProps,
-        className: mx2("grid grid-cols-subgrid col-span-2", classNames),
-        ref: forwardedRef
-      }, /* @__PURE__ */ React2.createElement("div", {
-        role: "none",
-        className: "flex flex-col items-center gap-2 pbs-2"
-      }, /* @__PURE__ */ React2.createElement(Avatar.Content, {
-        size: avatarSize,
-        hue: authorAvatarProps?.hue || hexToHue(authorId ?? "0"),
-        fallback: authorAvatarProps?.emoji || hexToEmoji(authorId ?? "0"),
-        ...authorImgSrc && {
-          imgSrc: authorImgSrc
-        }
-      }), continues && /* @__PURE__ */ React2.createElement("div", {
-        role: "none",
-        className: "is-px grow bg-separator"
-      })), /* @__PURE__ */ React2.createElement("div", {
-        role: "none",
-        className: "plb-1 min-is-0"
-      }, children)))
-    );
-  } finally {
-    _effect.f();
-  }
-});
-var MessageHeading = ({ children, classNames, timestamp, authorName, ...props }) => {
-  var _effect = _useSignals2();
-  try {
-    return /* @__PURE__ */ React2.createElement("div", {
-      role: "none",
-      ...props,
-      className: mx2("flex gap-2 items-start", classNames)
-    }, /* @__PURE__ */ React2.createElement("p", {
-      className: "grow"
-    }, /* @__PURE__ */ React2.createElement(MessageAuthorName, {
-      authorName
-    }), timestamp && /* @__PURE__ */ React2.createElement(MessageTime, {
-      timestamp
-    })), children);
-  } finally {
-    _effect.f();
-  }
-};
-var MessageAuthorName = ({ authorName }) => {
-  var _effect = _useSignals2();
-  try {
-    const { t } = useTranslation2(translationKey);
-    return /* @__PURE__ */ React2.createElement(Avatar.Label, {
-      classNames: "block truncate text-sm text-subdued"
-    }, authorName ?? t("anonymous label"));
-  } finally {
-    _effect.f();
-  }
-};
-var MessageTime = ({ timestamp }) => {
-  var _effect = _useSignals2();
-  try {
-    const { dtLocale } = useTranslation2(translationKey);
-    const dt = timestamp ? new Date(timestamp) : void 0;
-    return /* @__PURE__ */ React2.createElement("time", {
-      className: "block text-subdued text-xs pbe-0.5",
-      dateTime: dt?.toISOString()
-    }, dt ? formatDistanceToNow(dt, {
-      locale: dtLocale,
-      addSuffix: true
-    }) : "");
-  } finally {
-    _effect.f();
-  }
-};
-var MessageBody = ({ children, ...props }) => {
-  var _effect = _useSignals2();
-  try {
-    return /* @__PURE__ */ React2.createElement("p", props, children);
-  } finally {
-    _effect.f();
-  }
-};
-var keyBindings = ({ onSend, onClear }) => [
-  {
-    key: "Enter",
-    run: () => {
-      if (onSend) {
-        onSend();
-        return true;
-      } else {
-        return false;
-      }
-    }
-  },
-  {
-    // TODO(burdon): Other key bindings.
-    key: "Meta+Backspace",
-    run: () => {
-      if (onClear) {
-        onClear();
-        return true;
-      } else {
-        return false;
-      }
-    }
-  }
-];
-var MessageTextbox = ({ id, authorId, authorName, authorImgSrc, authorAvatarProps, disabled, extensions, onSend, onClear, onEditorFocus, ...editorProps }) => {
-  var _effect = _useSignals2();
-  try {
-    const { parentRef, focusAttributes } = useTextEditor(() => ({
-      id,
-      extensions: [
-        keymap.of(keyBindings({
-          onSend,
-          onClear
-        })),
-        listener({
-          onFocus: (focusing) => {
-            if (focusing) {
-              onEditorFocus?.();
-            }
-          }
-        }),
-        extensions
-      ].filter(isNotFalsy),
-      ...editorProps
-    }), [
-      id,
-      extensions
-    ]);
-    return /* @__PURE__ */ React2.createElement(MessageRoot, {
-      id,
-      authorId,
-      authorName,
-      authorImgSrc,
-      authorAvatarProps,
-      continues: false
-    }, /* @__PURE__ */ React2.createElement("div", {
-      role: "none",
-      ref: parentRef,
-      className: mx2("plb-0.5 mie-1 rounded-sm", focusRing, disabled && "opacity-50"),
-      ...focusAttributes
-    }));
-  } finally {
-    _effect.f();
-  }
-};
-export {
-  MessageAuthorName,
-  MessageBody,
-  MessageHeading,
-  MessageRoot,
-  MessageTextbox,
-  MessageTime,
-  Thread,
-  threadLayout,
-  translations
-};
-//# sourceMappingURL=index.mjs.map