@dxos/react-ui 0.8.4-main.fffef41 → 0.8.4-staging.60fe92afc8

package/src/components/Status/Status.tsx

@@ -5,13 +5,15 @@
 import React, { type ComponentPropsWithRef, forwardRef } from 'react';
 
 import { useThemeContext } from '../../hooks';
+import { type StatusStyleProps } from '../../theme';
 import { type ThemedClassName } from '../../util';
 
-type StatusProps = ThemedClassName<ComponentPropsWithRef<'span'>> & {
-  indeterminate?: boolean;
-  variant?: 'default' | 'main-bottom';
-  progress?: number;
-};
+type StatusProps = ThemedClassName<
+  ComponentPropsWithRef<'span'> &
+    StatusStyleProps & {
+      progress?: number;
+    }
+>;
 
 const Status = forwardRef<HTMLSpanElement, StatusProps>(
   ({ classNames, children, progress = 0, indeterminate, variant, ...props }, forwardedRef) => {
@@ -20,12 +22,12 @@ const Status = forwardRef<HTMLSpanElement, StatusProps>(
       <span
         role='status'
         {...props}
-        className={tx('status.root', 'status', { indeterminate, variant }, classNames)}
+        className={tx('status.root', { indeterminate, variant }, classNames)}
         ref={forwardedRef}
       >
         <span
           role='none'
-          className={tx('status.bar', 'status__bar', { indeterminate, variant }, classNames)}
+          className={tx('status.bar', { indeterminate, variant }, classNames)}
           {...(!indeterminate && { style: { width: `${Math.round(progress * 100)}%` } })}
         />
         {children}

package/src/components/Tag/Tag.stories.tsx

@@ -5,20 +5,19 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { hues } from '@dxos/react-ui-theme';
-import { type ChromaticPalette, type MessageValence } from '@dxos/react-ui-types';
-
-import { withTheme } from '../../testing';
+import { hues } from '@dxos/ui-theme';
+import { type ChromaticPalette, type MessageValence } from '@dxos/ui-types';
 
+import { withLayout, withTheme } from '../../testing';
 import { Tag } from './Tag';
 
 const palettes = ['neutral', 'success', 'info', 'warning', 'error', ...hues] as (ChromaticPalette | MessageValence)[];
 
 const meta = {
-  title: 'ui/react-ui-core/Tag',
+  title: 'ui/react-ui-core/components/Tag',
   component: Tag,
   render: () => (
-    <div role='grid' className='grid grid-cols-5 gap-2 max-is-screen-md'>
+    <div>
       {palettes.map((palette) => (
         <Tag key={palette} palette={palette}>
           {palette}
@@ -26,12 +25,7 @@ const meta = {
       ))}
     </div>
   ),
-  decorators: [withTheme],
-  parameters: {
-    chromatic: {
-      disableSnapshot: false,
-    },
-  },
+  decorators: [withTheme(), withLayout({ layout: 'default' })],
 } satisfies Meta<typeof Tag>;
 
 export default meta;

package/src/components/Tag/Tag.theme.ts

@@ -0,0 +1,22 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { mx } from '@dxos/ui-theme';
+import {
+  type ChromaticPalette,
+  type ComponentFunction,
+  type MessageValence,
+  type NeutralPalette,
+  type Theme,
+} from '@dxos/ui-types';
+
+export type TagStyleProps = {
+  palette?: ChromaticPalette | NeutralPalette | MessageValence;
+};
+
+const root: ComponentFunction<TagStyleProps> = (_, ...etc) => mx('dx-tag', ...etc);
+
+export const tagTheme: Theme<TagStyleProps> = {
+  root,
+};

package/src/components/Tag/Tag.tsx

@@ -6,7 +6,7 @@ import { Primitive } from '@radix-ui/react-primitive';
 import { Slot } from '@radix-ui/react-slot';
 import React, { type ComponentPropsWithRef, forwardRef } from 'react';
 
-import { type ChromaticPalette, type MessageValence, type NeutralPalette } from '@dxos/react-ui-types';
+import { type ChromaticPalette, type MessageValence, type NeutralPalette } from '@dxos/ui-types';
 
 import { useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
@@ -19,14 +19,9 @@ export type TagProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.sp
 export const Tag = forwardRef<HTMLSpanElement, TagProps>(
   ({ asChild, palette = 'neutral', classNames, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
-    const Root = asChild ? Slot : Primitive.span;
+    const Comp = asChild ? Slot : Primitive.span;
     return (
-      <Root
-        {...props}
-        className={tx('tag.root', 'dx-tag', { palette }, classNames)}
-        data-hue={palette}
-        ref={forwardedRef}
-      />
+      <Comp {...props} className={tx('tag.root', { palette }, classNames)} data-hue={palette} ref={forwardedRef} />
     );
   },
 );

package/src/components/Toast/Toast.stories.tsx

@@ -7,48 +7,58 @@ import React, { type ReactNode, useState } from 'react';
 
 import { withTheme } from '../../testing';
 import { Button } from '../Button';
-
 import { Toast } from './Toast';
 
 type ActionTriggerProps = { altText: string; trigger: ReactNode };
 
 type StorybookToastProps = Partial<{
+  icon: string;
   title: string;
   description: string;
+  duration: number;
   actionTriggers: ActionTriggerProps[];
   openTrigger: string;
-  closeTrigger: ReactNode;
+  defaultOpen: boolean;
 }>;
 
-const DefaultStory = ({ title, description, actionTriggers, openTrigger, closeTrigger }: StorybookToastProps) => {
-  const [open, setOpen] = useState(true);
+const DefaultStory = ({
+  icon,
+  title,
+  description,
+  duration,
+  actionTriggers,
+  openTrigger,
+  defaultOpen = true,
+}: StorybookToastProps) => {
+  const [open, setOpen] = useState(defaultOpen);
   return (
     <Toast.Provider>
       <Button onClick={() => setOpen(true)}>{openTrigger}</Button>
       <Toast.Viewport />
-      <Toast.Root open={open} onOpenChange={setOpen}>
-        <Toast.Body>
-          <Toast.Title>{title}</Toast.Title>
-          <Toast.Description>{description}</Toast.Description>
-        </Toast.Body>
-        <Toast.Actions>
-          <Toast.Close asChild={typeof closeTrigger !== 'string'}>{closeTrigger}</Toast.Close>
-          {(actionTriggers || []).map(({ altText, trigger }: ActionTriggerProps, index: number) => (
-            <Toast.Action key={index} altText={altText} asChild={typeof trigger !== 'string'}>
-              {trigger}
-            </Toast.Action>
-          ))}
-        </Toast.Actions>
+      <Toast.Root open={open} onOpenChange={setOpen} defaultOpen={defaultOpen} duration={duration}>
+        <Toast.Title icon={icon} onClose={() => setOpen(false)}>
+          {title}
+        </Toast.Title>
+        <Toast.Description>{description}</Toast.Description>
+        {actionTriggers && actionTriggers.length > 0 && (
+          <Toast.Actions>
+            {actionTriggers.map(({ altText, trigger }: ActionTriggerProps, index: number) => (
+              <Toast.Action key={index} altText={altText} asChild={typeof trigger !== 'string'}>
+                {trigger}
+              </Toast.Action>
+            ))}
+          </Toast.Actions>
+        )}
       </Toast.Root>
     </Toast.Provider>
   );
 };
 
 const meta = {
-  title: 'ui/react-ui-core/Toast',
+  title: 'ui/react-ui-core/components/Toast',
   component: Toast as any,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme()],
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;
@@ -57,18 +67,28 @@ type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
+    defaultOpen: true,
     openTrigger: 'Open toast',
+    icon: 'ph--sparkle--regular',
     title: 'This is a toast',
     description: 'This goes away on its own with a timer.',
+    duration: 100_000,
+  },
+};
+
+export const WithAction: Story = {
+  args: {
+    defaultOpen: true,
+    openTrigger: 'Open toast',
+    icon: 'ph--sparkle--regular',
+    title: 'This is a toast',
+    description: 'This goes away on its own with a timer.',
+    duration: 100_000,
     actionTriggers: [
       {
         altText: 'Press F5 to reload the page',
         trigger: <Button variant='primary'>Reload</Button>,
       },
     ],
-    closeTrigger: <Button>Close</Button>,
-  },
-  parameters: {
-    chromatic: { delay: 800 },
   },
 };

package/src/components/Toast/Toast.theme.ts

@@ -0,0 +1,56 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { mx, surfaceShadow } from '@dxos/ui-theme';
+import { type ComponentFunction, type Theme } from '@dxos/ui-types';
+
+export type ToastStyleProps = {};
+
+const viewport: ComponentFunction<ToastStyleProps> = (_props, ...etc) =>
+  mx(
+    // TODO(burdon): block-end should take into account status bar.
+    'z-40 fixed bottom-[calc(env(safe-area-inset-bottom)+1rem)] inset-start-[calc(env(safe-area-inset-left)+1rem)] inset-end-[calc(env(safe-area-inset-right)+1rem)] w-auto md:end-[calc(env(safe-area-inset-right)+1rem)] md:left-auto md:w-full md:max-w-sm',
+    'rounded-md flex flex-col gap-2',
+    ...etc,
+  );
+
+const root: ComponentFunction<ToastStyleProps> = (_props, ...etc) =>
+  mx(
+    'dx-popover-surface rounded-md p-1',
+    surfaceShadow({ elevation: 'toast' }),
+    'radix-state-open:animate-toast-slide-in-bottom md:radix-state-open:animate-toast-slide-in-right',
+    'radix-state-closed:animate-toast-hide',
+    'radix-swipe-end:animate-toast-swipe-out',
+    'translate-x-radix-toast-swipe-move-x',
+    'radix-swipe-cancel:translate-x-0 radix-swipe-cancel:duration-200 radix-swipe-cancel:ease-[ease]',
+    'dx-focus-ring',
+    ...etc,
+  );
+
+const grid: ComponentFunction<ToastStyleProps> = (_props, ...etc) => mx('gap-y-1 pbe-1', ...etc);
+
+const header: ComponentFunction<ToastStyleProps> = (_props, ...etc) => mx('items-center', ...etc);
+
+const icon: ComponentFunction<ToastStyleProps> = (_props, ...etc) => mx('col-start-1 grid place-items-center', ...etc);
+
+const title: ComponentFunction<ToastStyleProps> = (_props, ...etc) => mx('col-start-2 truncate font-medium', ...etc);
+
+const close: ComponentFunction<ToastStyleProps> = (_props, ...etc) => mx('col-start-3', ...etc);
+
+const description: ComponentFunction<ToastStyleProps> = (_props, ...etc) =>
+  mx('col-start-2 overflow-hidden text-description', ...etc);
+
+const actions: ComponentFunction<ToastStyleProps> = (_props, ...etc) => mx('flex gap-2 mbs-1', ...etc);
+
+export const toastTheme: Theme<ToastStyleProps> = {
+  viewport,
+  root,
+  grid,
+  header,
+  icon,
+  title,
+  close,
+  description,
+  actions,
+};

package/src/components/Toast/Toast.tsx

@@ -2,107 +2,157 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Primitive } from '@radix-ui/react-primitive';
-import { Slot } from '@radix-ui/react-slot';
-import {
-  ToastAction as ToastActionPrimitive,
-  type ToastActionProps as ToastActionPrimitiveProps,
-  ToastClose as ToastClosePrimitive,
-  type ToastCloseProps as ToastClosePrimitiveProps,
-  ToastDescription as ToastDescriptionPrimitive,
-  type ToastDescriptionProps as ToastDescriptionPrimitiveProps,
-  ToastProvider as ToastProviderPrimitive,
-  type ToastProviderProps as ToastProviderPrimitiveProps,
-  Root as ToastRootPrimitive,
-  type ToastProps as ToastRootPrimitiveProps,
-  ToastTitle as ToastTitlePrimitive,
-  type ToastTitleProps as ToastTitlePrimitiveProps,
-  ToastViewport as ToastViewportPrimitive,
-  type ToastViewportProps as ToastViewportPrimitiveProps,
-} from '@radix-ui/react-toast';
-import React, { type ComponentPropsWithRef, type FunctionComponent, forwardRef } from 'react';
+import * as ToastPrimitive from '@radix-ui/react-toast';
+import React, { type ComponentPropsWithRef, forwardRef } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { translationKey } from '#translations';
 
 import { useThemeContext } from '../../hooks';
+import { DensityProvider, ElevationProvider } from '../../primitives';
 import { type ThemedClassName } from '../../util';
-import { ElevationProvider } from '../ElevationProvider';
+import { IconButton } from '../Button';
+import { Column } from '../Column';
+import { Icon } from '../Icon';
+
+//
+// Provider
+//
+
+type ToastProviderProps = ToastPrimitive.ToastProviderProps;
 
-type ToastProviderProps = ToastProviderPrimitiveProps;
+const ToastProvider = ToastPrimitive.Provider;
 
-const ToastProvider: FunctionComponent<ToastProviderProps> = ToastProviderPrimitive;
+//
+// Viewport
+//
 
-type ToastViewportProps = ThemedClassName<ToastViewportPrimitiveProps>;
+type ToastViewportProps = ThemedClassName<ToastPrimitive.ToastViewportProps>;
 
 const ToastViewport = forwardRef<HTMLOListElement, ToastViewportProps>(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return (
-    <ToastViewportPrimitive className={tx('toast.viewport', 'toast-viewport', {}, classNames)} ref={forwardedRef} />
-  );
+  return <ToastPrimitive.Viewport {...props} className={tx('toast.viewport', {}, classNames)} ref={forwardedRef} />;
 });
 
-type ToastRootProps = ThemedClassName<ToastRootPrimitiveProps>;
+ToastViewport.displayName = 'Toast.Viewport';
+
+//
+// Root
+//
+
+type ToastRootProps = ThemedClassName<ToastPrimitive.ToastProps>;
 
 const ToastRoot = forwardRef<HTMLLIElement, ToastRootProps>(({ classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   return (
-    <ToastRootPrimitive {...props} className={tx('toast.root', 'toast', {}, classNames)} ref={forwardedRef}>
-      <ElevationProvider elevation='toast'>{children}</ElevationProvider>
-    </ToastRootPrimitive>
+    <ToastPrimitive.Root {...props} className={tx('toast.root', {}, classNames)} ref={forwardedRef}>
+      <ElevationProvider elevation='toast'>
+        <Column.Root classNames={tx('toast.grid', {})}>{children}</Column.Root>
+      </ElevationProvider>
+    </ToastPrimitive.Root>
   );
 });
 
-type ToastBodyProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.div>>;
+ToastRoot.displayName = 'Toast.Root';
 
-const ToastBody = forwardRef<HTMLDivElement, ToastBodyProps>(({ asChild, classNames, ...props }, forwardedRef) => {
-  const { tx } = useThemeContext();
-  const Root = asChild ? Slot : Primitive.div;
-  return <Root {...props} className={tx('toast.body', 'toast__body', {}, classNames)} ref={forwardedRef} />;
-});
+//
+// Title
+//
 
-type ToastTitleProps = ThemedClassName<ToastTitlePrimitiveProps>;
+type ToastTitleProps = ThemedClassName<ToastPrimitive.ToastTitleProps> & {
+  icon?: string;
+  onClose?: () => void;
+};
 
 const ToastTitle = forwardRef<HTMLHeadingElement, ToastTitleProps>(
-  ({ asChild, classNames, ...props }, forwardedRef) => {
+  ({ classNames, children, icon, onClose, ...props }, forwardedRef) => {
+    const { t } = useTranslation(translationKey);
     const { tx } = useThemeContext();
-    const Root = asChild ? Slot : ToastTitlePrimitive;
-    return <Root {...props} className={tx('toast.title', 'toast__title', {}, classNames)} ref={forwardedRef} />;
+    return (
+      <Column.Row classNames={tx('toast.header', {})}>
+        {icon && (
+          <div className={tx('toast.icon', {})}>
+            <Icon icon={icon} size={5} />
+          </div>
+        )}
+        <ToastPrimitive.Title {...props} className={tx('toast.title', {}, classNames)} ref={forwardedRef}>
+          {children}
+        </ToastPrimitive.Title>
+        {onClose && (
+          <IconButton
+            variant='ghost'
+            icon='ph--x--regular'
+            iconOnly
+            label={t('toolbar-close.label')}
+            classNames={tx('toast.close', {})}
+            onClick={onClose}
+          />
+        )}
+      </Column.Row>
+    );
   },
 );
 
-type ToastDescriptionProps = ThemedClassName<ToastDescriptionPrimitiveProps>;
+ToastTitle.displayName = 'Toast.Title';
+
+//
+// Description
+//
+
+type ToastDescriptionProps = ThemedClassName<ToastPrimitive.ToastDescriptionProps>;
 
 const ToastDescription = forwardRef<HTMLParagraphElement, ToastDescriptionProps>(
-  ({ asChild, classNames, ...props }, forwardedRef) => {
+  ({ classNames, children, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
-    const Root = asChild ? Slot : ToastDescriptionPrimitive;
     return (
-      <Root {...props} className={tx('toast.description', 'toast__description', {}, classNames)} ref={forwardedRef} />
+      <ToastPrimitive.Description {...props} className={tx('toast.description', {}, classNames)} ref={forwardedRef}>
+        {children}
+      </ToastPrimitive.Description>
     );
   },
 );
 
-type ToastActionsProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.div>>;
+ToastDescription.displayName = 'Toast.Description';
+
+//
+// Actions
+//
+
+type ToastActionsProps = ThemedClassName<ComponentPropsWithRef<'div'>>;
 
 const ToastActions = forwardRef<HTMLDivElement, ToastActionsProps>(
-  ({ asChild, classNames, ...props }, forwardedRef) => {
+  ({ classNames, children, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
-    const Root = asChild ? Slot : Primitive.div;
-    return <Root {...props} className={tx('toast.actions', 'toast__actions', {}, classNames)} ref={forwardedRef} />;
+    return (
+      <Column.Center classNames={tx('toast.actions', {}, classNames)} ref={forwardedRef} {...props}>
+        <DensityProvider density='sm'>{children}</DensityProvider>
+      </Column.Center>
+    );
   },
 );
 
-type ToastActionProps = ToastActionPrimitiveProps;
+ToastActions.displayName = 'Toast.Actions';
+
+//
+// Action / Close
+//
 
-const ToastAction: FunctionComponent<ToastActionProps> = ToastActionPrimitive;
+type ToastActionProps = ToastPrimitive.ToastActionProps;
 
-type ToastCloseProps = ToastClosePrimitiveProps;
+const ToastAction = ToastPrimitive.Action;
 
-const ToastClose: FunctionComponent<ToastCloseProps> = ToastClosePrimitive;
+type ToastCloseProps = ToastPrimitive.ToastCloseProps;
+
+const ToastClose = ToastPrimitive.Close;
+
+//
+// Toast
+//
 
 export const Toast = {
   Provider: ToastProvider,
   Viewport: ToastViewport,
   Root: ToastRoot,
-  Body: ToastBody,
   Title: ToastTitle,
   Description: ToastDescription,
   Actions: ToastActions,
@@ -114,7 +164,6 @@ export type {
   ToastProviderProps,
   ToastViewportProps,
   ToastRootProps,
-  ToastBodyProps,
   ToastTitleProps,
   ToastDescriptionProps,
   ToastActionsProps,

package/src/components/Toolbar/Toolbar.stories.tsx

@@ -9,7 +9,6 @@ import { withTheme } from '../../testing';
 import { Toggle } from '../Button';
 import { Icon } from '../Icon';
 import { Select } from '../Select';
-
 import { Toolbar } from './Toolbar';
 
 type StorybookToolbarProps = {};
@@ -69,10 +68,10 @@ const DefaultStory = (props: StorybookToolbarProps) => {
 };
 
 const meta = {
-  title: 'ui/react-ui-core/Toolbar',
+  title: 'ui/react-ui-core/components/Toolbar',
   component: Toolbar as any,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme()],
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;

package/src/components/Toolbar/Toolbar.theme.ts

@@ -0,0 +1,36 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import { mx } from '@dxos/ui-theme';
+import { type ComponentFunction, type Density, type Theme } from '@dxos/ui-types';
+
+export type ToolbarStyleProps = Partial<{
+  density: Density;
+  disabled: boolean;
+  layoutManaged: boolean;
+}>;
+
+const layout =
+  'w-full shrink-0 flex flex-nowrap p-1 gap-1 items-center overflow-x-auto scrollbar-none dx-contain-layout';
+
+const root: ComponentFunction<ToolbarStyleProps> = ({ density, disabled, layoutManaged }, ...etc) => {
+  return mx(
+    'bg-toolbar-surface dx-toolbar shadow-sm',
+    density === 'lg' && 'h-(--dx-rail-size) px-3!',
+    density === 'sm' && 'h-7 px-2!',
+    density === 'xs' && 'h-6 px-1!',
+    disabled && '*:opacity-20',
+    !layoutManaged && layout,
+    ...etc,
+  );
+};
+
+const text: ComponentFunction<ToolbarStyleProps> = (_, ...etc) => {
+  return mx('px-2 grow truncate items-center', ...etc);
+};
+
+export const toolbarTheme: Theme<ToolbarStyleProps> = {
+  root,
+  text,
+};