@dxos/react-ui 0.8.3 → 0.8.4-main.1da679c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui",
-  "version": "0.8.3",
+  "version": "0.8.4-main.1da679c",
   "description": "Low-level React components for DXOS, applying a theme to a core group of primitives",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,11 +10,13 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": "./dist/lib/node-esm/testing/index.mjs"
@@ -35,6 +37,7 @@
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
     "@fluentui/react-tabster": "^9.24.2",
+    "@phosphor-icons/react": "^2.1.5",
     "@preact-signals/safe-react": "^0.9.0",
     "@radix-ui/primitive": "1.1.1",
     "@radix-ui/react-alert-dialog": "1.1.6",
@@ -72,34 +75,33 @@
     "keyborg": "^2.5.0",
     "react-i18next": "^11.18.6",
     "react-remove-scroll": "^2.6.0",
-    "@dxos/debug": "0.8.3",
-    "@dxos/lit-ui": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/react-input": "0.8.3",
-    "@dxos/react-hooks": "0.8.3",
-    "@dxos/react-ui-types": "0.8.3",
-    "@dxos/react-list": "0.8.3",
-    "@dxos/util": "0.8.3"
+    "@dxos/debug": "0.8.4-main.1da679c",
+    "@dxos/lit-ui": "0.8.4-main.1da679c",
+    "@dxos/log": "0.8.4-main.1da679c",
+    "@dxos/react-input": "0.8.4-main.1da679c",
+    "@dxos/react-list": "0.8.4-main.1da679c",
+    "@dxos/react-hooks": "0.8.4-main.1da679c",
+    "@dxos/react-ui-types": "0.8.4-main.1da679c",
+    "@dxos/util": "0.8.4-main.1da679c"
   },
   "devDependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
     "@dnd-kit/utilities": "^3.2.0",
-    "@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/random": "0.8.3",
-    "@dxos/util": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "vite": "7.1.1",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c",
+    "@dxos/util": "0.8.4-main.1da679c",
+    "@dxos/random": "0.8.4-main.1da679c"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.8.3"
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Avatars/Avatar.stories.tsx

@@ -3,16 +3,18 @@
 //
 
 import '@dxos-theme';
+import { type Meta } from '@storybook/react-vite';
 import React, { type PropsWithChildren } from 'react';
 
 import { type HuePalette } from '@dxos/react-ui-theme';
 import { type Size } from '@dxos/react-ui-types';
 import { hexToFallback } from '@dxos/util';
 
-import { Avatar, type AvatarVariant, type AvatarStatus, type AvatarAnimation } from './Avatar';
 import { withTheme } from '../../testing';
 
-type StoryProps = {
+import { Avatar, type AvatarAnimation, type AvatarStatus, type AvatarVariant } from './Avatar';
+
+type StoryProps = PropsWithChildren<{
   id?: string;
   imgSrc?: string;
   fallbackText?: string;
@@ -23,9 +25,9 @@ type StoryProps = {
   animation?: AvatarAnimation;
   size?: Size;
   hue?: HuePalette;
-};
+}>;
 
-const DefaultStory = (props: PropsWithChildren<StoryProps>) => {
+const DefaultStory = (props: StoryProps) => {
   const {
     id = '20970b563fc49b5bb194a6ffdff376031a3a11f9481360c071c3fed87874106b',
     status,
@@ -55,17 +57,20 @@ const DefaultStory = (props: PropsWithChildren<StoryProps>) => {
   );
 };
 
-export default {
+const meta = {
   title: 'ui/react-ui-core/Avatar',
-  component: Avatar,
-  render: DefaultStory,
+  component: Avatar.Root,
   decorators: [withTheme],
   parameters: { chromatic: { disableSnapshot: false } },
-};
+} satisfies Meta<typeof Avatar.Root>;
+
+export default meta;
 
 const sampleImage =
   'https://png.pngtree.com/thumb_back/fh260/background/20230614/pngtree-the-photo-of-a-woman-with-red-sunglasses-is-surrounded-by-image_2931163.jpg';
 
+const brokenImage = 'https://png.pngtree.com/potato_squirrel.png';
+
 const row = (size: Size) => (
   <>
     <DefaultStory size={size} status='inactive' description='Offline' />
@@ -97,6 +102,12 @@ export const Image = () => (
   </div>
 );
 
+export const BrokenImage = () => (
+  <div>
+    <DefaultStory variant='circle' imgSrc={brokenImage} />
+  </div>
+);
+
 export const Square = () => (
   <div className='flex flex-row gap-4'>
     <DefaultStory variant='square' status='inactive' description='Offline' />

package/src/components/Avatars/Avatar.tsx

@@ -7,12 +7,12 @@ import '@dxos/lit-ui/dx-avatar.pcss';
 import { createContext } from '@radix-ui/react-context';
 import { Primitive } from '@radix-ui/react-primitive';
 import { Slot } from '@radix-ui/react-slot';
-import React, { type ComponentProps, type ComponentPropsWithRef, forwardRef, type PropsWithChildren } from 'react';
+import React, { type ComponentProps, type ComponentPropsWithRef, type PropsWithChildren, forwardRef } from 'react';
 
 import {
-  type AvatarVariant,
-  type AvatarStatus,
   type AvatarAnimation,
+  type AvatarStatus,
+  type AvatarVariant,
   type DxAvatar as NaturalDxAvatar,
 } from '@dxos/lit-ui';
 import { DxAvatar } from '@dxos/lit-ui/react';

package/src/components/Avatars/AvatarGroup.stories.tsx

@@ -3,14 +3,17 @@
 //
 
 import '@dxos-theme';
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { useId } from '@dxos/react-hooks';
 import { toEmoji } from '@dxos/util';
 
-import { Avatar } from './Avatar';
 import { withTheme } from '../../testing';
 
+import { Avatar } from './Avatar';
+
 const hues = ['lime', 'teal', 'purple', 'pink'];
 
 const AvatarItem = ({ n }: { n: number }) => {
@@ -36,13 +39,17 @@ const DefaultStory = () => {
   );
 };
 
-export default {
+const meta = {
   title: 'ui/react-ui-core/AvatarGroup',
   render: DefaultStory,
   decorators: [withTheme],
   parameters: { chromatic: { disableSnapshot: false } },
-};
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
 
-export const Default = {
+export const Default: Story = {
   args: {},
 };

package/src/components/Breadcrumb/Breadcrumb.stories.tsx

@@ -4,15 +4,17 @@
 
 import '@dxos-theme';
 
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { Breadcrumb } from './Breadcrumb';
 import { withTheme } from '../../testing';
 import { Button } from '../Buttons';
 
-const DefaultStory = () => {
+import { Breadcrumb, type BreadcrumbRootProps } from './Breadcrumb';
+
+const DefaultStory = (props: BreadcrumbRootProps) => {
   return (
-    <Breadcrumb.Root aria-label='Breadcrumb'>
+    <Breadcrumb.Root {...props}>
       <Breadcrumb.List>
         <Breadcrumb.ListItem>
           <Breadcrumb.Link asChild>
@@ -38,14 +40,20 @@ const DefaultStory = () => {
   );
 };
 
-export default {
+const meta = {
   title: 'ui/react-ui-core/Breadcrumb',
-  component: Breadcrumb,
+  component: Breadcrumb.Root as any,
   render: DefaultStory,
   decorators: [withTheme],
   parameters: { chromatic: { disableSnapshot: false } },
-};
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
 
-export const Default = {
-  args: {},
+export const Default: Story = {
+  args: {
+    'aria-label': 'Breadcrumb',
+  },
 };

package/src/components/Breadcrumb/Breadcrumb.tsx

@@ -2,13 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Dot } from '@phosphor-icons/react';
 import { Primitive } from '@radix-ui/react-primitive';
 import { Slot } from '@radix-ui/react-slot';
-import React, { type ComponentPropsWithoutRef, type ComponentPropsWithRef, forwardRef } from 'react';
+import React, { type ComponentPropsWithRef, type ComponentPropsWithoutRef, forwardRef } from 'react';
 
 import { useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
+import { Icon } from '../Icon';
 import { Link, type LinkProps } from '../Link';
 
 type BreadcrumbRootProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.div>> & {
@@ -100,7 +100,7 @@ const BreadcrumbSeparator = ({ children, classNames, ...props }: BreadcrumbSepar
       {...props}
       className={tx('breadcrumb.separator', 'breadcrumb__separator', {}, classNames)}
     >
-      {children ?? <Dot weight='bold' />}
+      {children ?? <Icon icon='ph--dot--bold' />}
     </Primitive.span>
   );
 };

package/src/components/Buttons/Button.stories.tsx

@@ -4,12 +4,13 @@
 
 import '@dxos-theme';
 
-import { CaretLeft, CaretRight } from '@phosphor-icons/react';
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { Button, ButtonGroup, type ButtonProps } from './Button';
 import { withSurfaceVariantsLayout, withTheme } from '../../testing';
+import { Icon } from '../Icon';
+
+import { Button, ButtonGroup, type ButtonProps } from './Button';
 
 const DefaultStory = ({ children, ...args }: Omit<ButtonProps, 'ref'>) => {
   return (
@@ -21,10 +22,10 @@ const DefaultStory = ({ children, ...args }: Omit<ButtonProps, 'ref'>) => {
       {(args.variant === 'default' || args.variant === 'primary') && (
         <ButtonGroup>
           <Button {...args}>
-            <CaretLeft />
+            <Icon icon='ph--caret-left--regular' />
           </Button>
           <Button {...args}>
-            <CaretRight />
+            <Icon icon='ph--caret-right--regular' />
           </Button>
         </ButtonGroup>
       )}
@@ -32,13 +33,13 @@ const DefaultStory = ({ children, ...args }: Omit<ButtonProps, 'ref'>) => {
   );
 };
 
-const meta: Meta<typeof Button> = {
+const meta = {
   title: 'ui/react-ui-core/Button',
   component: Button,
   render: DefaultStory,
   decorators: [withSurfaceVariantsLayout(), withTheme],
   parameters: { chromatic: { disableSnapshot: false } },
-};
+} satisfies Meta<typeof Button>;
 
 export default meta;
 

package/src/components/Buttons/Button.tsx

@@ -23,6 +23,7 @@ type ButtonGroupContextValue = { inGroup?: boolean };
 
 const BUTTON_GROUP_NAME = 'ButtonGroup';
 const BUTTON_NAME = 'Button';
+
 const [ButtonGroupProvider, useButtonGroupContext] = createContext<ButtonGroupContextValue>(BUTTON_GROUP_NAME, {
   inGroup: false,
 });

package/src/components/Buttons/IconButton.stories.tsx

@@ -4,12 +4,14 @@
 
 import '@dxos-theme';
 
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { IconButton, type IconButtonProps } from './IconButton';
 import { withTheme } from '../../testing';
 import { Tooltip } from '../Tooltip';
 
+import { IconButton, type IconButtonProps } from './IconButton';
+
 const DefaultStory = (props: IconButtonProps) => {
   return (
     <Tooltip.Provider>
@@ -23,15 +25,19 @@ const DefaultStory = (props: IconButtonProps) => {
   );
 };
 
-export default {
+const meta = {
   title: 'ui/react-ui-core/IconButton',
   component: IconButton,
-  render: DefaultStory,
+  render: DefaultStory as any,
   decorators: [withTheme],
   parameters: { chromatic: { disableSnapshot: false } },
-};
+} satisfies Meta<typeof IconButton>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
 
-export const Default = {
+export const Default: Story = {
   args: {
     label: 'Bold',
     icon: 'ph--text-b--regular',

package/src/components/Buttons/IconButton.tsx

@@ -4,14 +4,15 @@
 
 import React, { forwardRef } from 'react';
 
-import { Button, type ButtonProps } from './Button';
 import { useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
 import { Icon, type IconProps } from '../Icon';
 import { Tooltip, type TooltipSide } from '../Tooltip';
 
+import { Button, type ButtonProps } from './Button';
+
 type IconButtonProps = Omit<ButtonProps, 'children'> &
-  Pick<IconProps, 'icon' | 'size'> & {
+  Partial<Pick<IconProps, 'icon' | 'size'>> & {
     label: string;
     iconOnly?: boolean;
     noTooltip?: boolean;
@@ -38,8 +39,8 @@ const LabelledIconButton = forwardRef<HTMLButtonElement, IconButtonProps>(
   ({ icon, size, iconOnly, label, classNames, iconClassNames, caretDown, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
     return (
-      <Button {...props} classNames={tx('iconButton.root', 'iconButton', {}, classNames)} ref={forwardedRef}>
-        <Icon icon={icon} size={size} classNames={iconClassNames} />
+      <Button {...props} classNames={tx('iconButton.root', 'iconButton', { iconOnly }, classNames)} ref={forwardedRef}>
+        {icon && <Icon icon={icon} size={size} classNames={iconClassNames} />}
         <span className={iconOnly ? 'sr-only' : undefined}>{label}</span>
         {caretDown && <Icon size={3} icon='ph--caret-down--bold' />}
       </Button>

package/src/components/Buttons/Toggle.stories.tsx

@@ -4,30 +4,36 @@
 
 import '@dxos-theme';
 
-import { TextB } from '@phosphor-icons/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { Toggle } from './Toggle';
 import { withTheme } from '../../testing';
+import { Icon } from '../Icon';
+
+import { Toggle } from './Toggle';
 
 type StorybookToggleProps = {};
 
 const DefaultStory = (props: StorybookToggleProps) => {
   return (
     <Toggle {...props}>
-      <TextB />
+      <Icon icon='ph--text-b--regular' />
     </Toggle>
   );
 };
 
-export default {
+const meta = {
   title: 'ui/react-ui-core/Toggle',
   component: Toggle,
   render: DefaultStory,
   decorators: [withTheme],
   parameters: { chromatic: { disableSnapshot: false } },
-};
+} satisfies Meta<typeof Toggle>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
 
-export const Default = {
+export const Default: Story = {
   args: {},
 };

package/src/components/Buttons/ToggleGroup.stories.tsx

@@ -4,35 +4,41 @@
 
 import '@dxos-theme';
 
-import { TextB, TextItalic } from '@phosphor-icons/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { ToggleGroup, ToggleGroupItem, type ToggleGroupProps } from './ToggleGroup';
 import { withTheme } from '../../testing';
+import { Icon } from '../Icon';
+
+import { ToggleGroup, ToggleGroupItem, type ToggleGroupProps } from './ToggleGroup';
 
 // TODO(burdon): Create Radix-style Root, Item, etc?
 const DefaultStory = (props: ToggleGroupProps) => {
   return (
     <ToggleGroup {...props}>
       <ToggleGroupItem value='textb'>
-        <TextB />
+        <Icon icon='ph--text-b--regular' />
       </ToggleGroupItem>
       <ToggleGroupItem value='texti'>
-        <TextItalic />
+        <Icon icon='ph--text-italic--regular' />
       </ToggleGroupItem>
     </ToggleGroup>
   );
 };
 
-export default {
+const meta = {
   title: 'ui/react-ui-core/ToggleGroup',
   component: ToggleGroup,
   render: DefaultStory,
   decorators: [withTheme],
   parameters: { chromatic: { disableSnapshot: false } },
-};
+} satisfies Meta<typeof ToggleGroup>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
 
-export const Default = {
+export const Default: Story = {
   args: {
     type: 'single',
   },

package/src/components/Buttons/ToggleGroup.tsx

@@ -3,15 +3,16 @@
 //
 
 import {
+  ToggleGroupItem as ToggleGroupItemPrimitive,
+  type ToggleGroupItemProps as ToggleGroupItemPrimitiveProps,
+  type ToggleGroupMultipleProps,
   ToggleGroup as ToggleGroupPrimitive,
   type ToggleGroupSingleProps,
-  type ToggleGroupMultipleProps,
-  type ToggleGroupItemProps as ToggleGroupItemPrimitiveProps,
-  ToggleGroupItem as ToggleGroupItemPrimitive,
 } from '@radix-ui/react-toggle-group';
 import React, { forwardRef } from 'react';
 
 import { Button, ButtonGroup, type ButtonGroupProps, type ButtonProps } from './Button';
+import { IconButton, type IconButtonProps } from './IconButton';
 
 type ToggleGroupProps = Omit<ToggleGroupSingleProps, 'className'> | Omit<ToggleGroupMultipleProps, 'className'>;
 
@@ -37,5 +38,17 @@ const ToggleGroupItem = forwardRef<HTMLButtonElement, ToggleGroupItemProps>(
   },
 );
 
-export { ToggleGroup, ToggleGroupItem };
+type ToggleGroupIconItemProps = Omit<ToggleGroupItemPrimitiveProps, 'className'> & IconButtonProps;
+
+const ToggleGroupIconItem = forwardRef<HTMLButtonElement, ToggleGroupIconItemProps>(
+  ({ variant, label, icon, size, elevation, density, classNames, ...props }, forwardedRef) => {
+    return (
+      <ToggleGroupItemPrimitive {...props} asChild>
+        <IconButton {...{ variant, elevation, density, classNames, label, icon, size }} ref={forwardedRef} />
+      </ToggleGroupItemPrimitive>
+    );
+  },
+);
+
+export { ToggleGroup, ToggleGroupItem, ToggleGroupIconItem };
 export type { ToggleGroupProps, ToggleGroupItemProps };

package/src/components/Clipboard/ClipboardProvider.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { createContext, type PropsWithChildren, useCallback, useContext, useState } from 'react';
+import React, { type PropsWithChildren, createContext, useCallback, useContext, useState } from 'react';
 
 export type ClipboardContextValue = {
   textValue: string;

package/src/components/Clipboard/CopyButton.tsx

@@ -2,25 +2,25 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type IconProps } from '@phosphor-icons/react';
 import React from 'react';
 
 import { mx } from '@dxos/react-ui-theme';
 
-import { useClipboard } from './ClipboardProvider';
 import { Button, type ButtonProps, IconButton } from '../Buttons';
-import { Icon } from '../Icon';
+import { Icon, type IconProps } from '../Icon';
 import { useTranslation } from '../ThemeProvider';
 import { type TooltipScopedProps, useTooltipContext } from '../Tooltip';
 
-export type CopyButtonProps = ButtonProps & {
-  value: string;
-  iconProps?: IconProps;
-};
+import { useClipboard } from './ClipboardProvider';
+
+export type CopyButtonProps = ButtonProps &
+  Pick<IconProps, 'size'> & {
+    value: string;
+  };
 
 const inactiveLabelStyles = 'invisible bs-px -mbe-px overflow-hidden';
 
-export const CopyButton = ({ value, classNames, iconProps, ...props }: CopyButtonProps) => {
+export const CopyButton = ({ classNames, value, size = 5, ...props }: CopyButtonProps) => {
   const { t } = useTranslation('os');
   const { textValue, setTextValue } = useClipboard();
   const isCopied = textValue === value;
@@ -33,12 +33,11 @@ export const CopyButton = ({ value, classNames, iconProps, ...props }: CopyButto
     >
       <div role='none' className={mx('flex gap-1 items-center', isCopied && inactiveLabelStyles)}>
         <span className='pli-1'>{t('copy label')}</span>
-        {/* TODO(wittjosiah): Why do these need as any? */}
-        <Icon icon='ph--copy--regular' size={5 as any} {...iconProps} />
+        <Icon icon='ph--copy--regular' size={size} />
       </div>
       <div role='none' className={mx('flex gap-1 items-center', !isCopied && inactiveLabelStyles)}>
         <span className='pli-1'>{t('copy success label')}</span>
-        <Icon icon='ph--check--regular' size={5 as any} {...iconProps} />
+        <Icon icon='ph--check--regular' size={size} />
       </div>
     </Button>
   );
@@ -52,21 +51,21 @@ export const CopyButtonIconOnly = ({
   __scopeTooltip,
   value,
   classNames,
-  iconProps,
+  size,
   variant,
   ...props
 }: TooltipScopedProps<CopyButtonIconOnlyProps>) => {
   const { t } = useTranslation('os');
   const { textValue, setTextValue } = useClipboard();
   const isCopied = textValue === value;
-  const label = isCopied ? t('copy success label') : props.label ?? t('copy label');
+  const label = isCopied ? t('copy success label') : (props.label ?? t('copy label'));
   const { onOpen } = useTooltipContext('CopyButton', __scopeTooltip);
   return (
     <IconButton
       iconOnly
       label={label!}
       icon='ph--copy--regular'
-      size={5}
+      size={size}
       variant={variant}
       classNames={['inline-flex flex-col justify-center', classNames]}
       onClick={() => setTextValue(value).then(onOpen)}

package/src/components/DensityProvider/DensityProvider.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { createContext, type PropsWithChildren } from 'react';
+import React, { type PropsWithChildren, createContext } from 'react';
 
 import { type Density } from '@dxos/react-ui-types';