@dxos/react-ui 0.8.4-main.c85a9c8dae → 0.8.4-main.d05539e30a

package/src/components/Splitter/Splitter.tsx

@@ -5,21 +5,21 @@
 import { createContextScope } from '@radix-ui/react-context';
 import { Primitive } from '@radix-ui/react-primitive';
 import { Slot } from '@radix-ui/react-slot';
-import React, { forwardRef } from 'react';
+import React from 'react';
 
-import { type SlottableProps } from '@dxos/ui-types';
+import { composableProps, slottable } from '@dxos/ui-theme';
 
 import { useThemeContext } from '../../hooks';
+import { ThemedClassName } from '../../util';
 
 type ScopedProps<P> = P & { __scopeSplitter?: any };
 
-// TODO(burdon): Enable resize.
 // TODO(burdon): Generalize horizontal/vertical and change to start/end.
-type Mode = 'upper' | 'lower' | 'both';
+type Mode = 'top' | 'bottom' | 'split';
 
 type SplitterContextValue = {
   mode: Mode;
-  ratio: number;
+  ratio?: number;
   transition: number;
 };
 
@@ -35,33 +35,20 @@ const [SplitterProvider, useSplitterContext] = createSplitterContext<SplitterCon
 
 const ROOT_NAME = 'Splitter.Root';
 
-type RootProps = SlottableProps<HTMLDivElement> & Partial<SplitterContextValue>;
-
-const Root = forwardRef<HTMLDivElement, ScopedProps<RootProps>>(
-  (
-    {
-      __scopeSplitter,
-      classNames,
-      className,
-      asChild,
-      mode = 'upper',
-      ratio = 0.5,
-      transition = 250,
-      children,
-      ...rootProps
-    },
-    forwardedRef,
-  ) => {
+type RootOwnProps = Partial<SplitterContextValue>;
+
+type RootProps = RootOwnProps;
+
+const Root = slottable<HTMLDivElement, RootOwnProps>(
+  ({ asChild, mode = 'top', ratio = 0.5, transition = 250, children, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
+    const { __scopeSplitter, ...rest } = props as ScopedProps<typeof props>;
+    const { className, ...restProps } = composableProps(rest);
     const Comp = asChild ? Slot : Primitive.div;
+
     return (
       <SplitterProvider scope={__scopeSplitter} mode={mode} ratio={ratio} transition={transition}>
-        <Comp
-          role='none'
-          {...rootProps}
-          ref={forwardedRef}
-          className={tx('splitter.root', {}, [className, classNames])}
-        >
+        <Comp {...restProps} ref={forwardedRef} className={tx('splitter.root', {}, className)}>
           {children}
         </Comp>
       </SplitterProvider>
@@ -77,40 +64,42 @@ Root.displayName = ROOT_NAME;
 
 const PANEL_NAME = 'Splitter.Panel';
 
-type PanelProps = SlottableProps<HTMLDivElement> & {
-  position: 'upper' | 'lower';
-};
+type PanelOwnProps = ThemedClassName<{
+  position: 'top' | 'bottom';
+}>;
+
+type PanelProps = PanelOwnProps;
 
-const Panel = forwardRef<HTMLDivElement, ScopedProps<PanelProps>>(
-  ({ __scopeSplitter, classNames, className, asChild, children, position, style, ...props }, forwardedRef) => {
-    const { mode, ratio, transition } = useSplitterContext(PANEL_NAME, __scopeSplitter);
+const Panel = slottable<HTMLDivElement, PanelOwnProps>(
+  ({ classNames, asChild, children, position, style, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
+    const { __scopeSplitter, ...rest } = props as ScopedProps<typeof props>;
     const Comp = asChild ? Slot : Primitive.div;
+    const { mode, ratio = 0.5, transition } = useSplitterContext(PANEL_NAME, __scopeSplitter);
+    const { className, ...restProps } = composableProps(rest);
 
     // Calculate position and height based on mode and ratio.
-    const isUpper = position === 'upper';
-    const top = isUpper ? '0%' : mode === 'upper' ? '100%' : mode === 'lower' ? '0%' : `${ratio * 100}%`;
-
-    const height = isUpper
-      ? mode === 'upper'
+    const isTopPanel = position === 'top';
+    const topOffset = isTopPanel ? '0%' : mode === 'top' ? '100%' : mode === 'bottom' ? '0%' : `${ratio * 100}%`;
+    const height = isTopPanel
+      ? mode === 'top'
         ? '100%'
-        : mode === 'lower'
+        : mode === 'bottom'
           ? '0%'
           : `${ratio * 100}%`
-      : mode === 'lower'
+      : mode === 'bottom'
         ? '100%'
-        : mode === 'upper'
+        : mode === 'top'
           ? '0%'
           : `${(1 - ratio) * 100}%`;
 
     return (
       <Comp
-        role='none'
-        {...props}
+        {...restProps}
         ref={forwardedRef}
-        className={tx('splitter.panel', {}, [className, classNames])}
+        className={tx('splitter.panel', {}, className)}
         style={{
-          top,
+          top: topOffset,
           height,
           transition: `top ${transition}ms, height ${transition}ms ease-out`,
           ...style,

package/src/components/Status/Status.stories.tsx

@@ -6,7 +6,6 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { withTheme } from '../../testing';
-
 import { Status } from './Status';
 
 const meta = {

package/src/components/Status/Status.tsx

@@ -4,14 +4,17 @@
 
 import React, { type ComponentPropsWithRef, forwardRef } from 'react';
 
+import { type StatusStyleProps } from '@dxos/ui-theme';
+
 import { useThemeContext } from '../../hooks';
 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) => {

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

@@ -9,7 +9,6 @@ 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)[];

package/src/components/ThemeProvider/ThemeProvider.stories.tsx

@@ -7,7 +7,6 @@ import React from 'react';
 
 import { useThemeContext } from '../../hooks';
 import { withLayout, withTheme } from '../../testing';
-
 import { ThemeProvider } from './ThemeProvider';
 
 const meta = {

package/src/components/ThemeProvider/ThemeProvider.tsx

@@ -11,7 +11,6 @@ import { type SafeAreaPadding, useSafeArea } from '../../hooks';
 import { hasIosKeyboard } from '../../util';
 import { DensityProvider } from '../DensityProvider';
 import { ElevationProvider } from '../ElevationProvider';
-
 import { TranslationsProvider, type TranslationsProviderProps } from './TranslationsProvider';
 
 export type ThemeContextValue = {
@@ -43,7 +42,8 @@ export const ThemeProvider = ({
   tx = (_path, _styleProps, ..._options) => undefined,
   themeMode = 'dark',
   rootDensity = 'fine',
-  ...rest
+  noCache,
+  platform,
 }: ThemeProviderProps) => {
   useEffect(() => {
     if (document.defaultView) {
@@ -54,9 +54,10 @@ export const ThemeProvider = ({
   }, []);
 
   const safeAreaPadding = useSafeArea();
+  // Destructure all props explicitly so useMemo deps are stable primitives, not a new `rest` object every render.
   const contextValue = useMemo(
-    () => ({ tx, themeMode, hasIosKeyboard: hasIosKeyboard(), safeAreaPadding, ...rest }),
-    [tx, themeMode, safeAreaPadding, rest],
+    () => ({ tx, themeMode, hasIosKeyboard: hasIosKeyboard(), safeAreaPadding, noCache, platform }),
+    [tx, themeMode, safeAreaPadding, noCache, platform],
   );
 
   return (

package/src/components/ThemeProvider/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-export { type Label, isLabel, toLocalizedString } from '@dxos/ui-types';
+export { type Label, isLabel, toLocalizedString } from '@dxos/ui-types/translations';
 
 export * from './ThemeProvider';
 export { useTranslation } from './TranslationsProvider';

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

@@ -7,7 +7,6 @@ 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 };

package/src/components/Toast/Toast.tsx

@@ -4,47 +4,32 @@
 
 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 * as ToastPrimitive from '@radix-ui/react-toast';
 import React, { type ComponentPropsWithRef, type FunctionComponent, forwardRef } from 'react';
 
 import { useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
 import { ElevationProvider } from '../ElevationProvider';
 
-type ToastProviderProps = ToastProviderPrimitiveProps;
+type ToastProviderProps = ToastPrimitive.ToastProviderProps;
 
-const ToastProvider: FunctionComponent<ToastProviderProps> = ToastProviderPrimitive;
+const ToastProvider: FunctionComponent<ToastProviderProps> = ToastPrimitive.Provider;
 
-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', {}, classNames)} ref={forwardedRef} />;
+  return <ToastPrimitive.Viewport {...props} className={tx('toast.viewport', {}, classNames)} ref={forwardedRef} />;
 });
 
-type ToastRootProps = ThemedClassName<ToastRootPrimitiveProps>;
+type ToastRootProps = ThemedClassName<ToastPrimitive.ToastProps>;
 
 const ToastRoot = forwardRef<HTMLLIElement, ToastRootProps>(({ classNames, children, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   return (
-    <ToastRootPrimitive {...props} className={tx('toast.root', {}, classNames)} ref={forwardedRef}>
+    <ToastPrimitive.Root {...props} className={tx('toast.root', {}, classNames)} ref={forwardedRef}>
       <ElevationProvider elevation='toast'>{children}</ElevationProvider>
-    </ToastRootPrimitive>
+    </ToastPrimitive.Root>
   );
 });
 
@@ -56,22 +41,22 @@ const ToastBody = forwardRef<HTMLDivElement, ToastBodyProps>(({ asChild, classNa
   return <Comp {...props} className={tx('toast.body', {}, classNames)} ref={forwardedRef} />;
 });
 
-type ToastTitleProps = ThemedClassName<ToastTitlePrimitiveProps>;
+type ToastTitleProps = ThemedClassName<ToastPrimitive.ToastTitleProps>;
 
 const ToastTitle = forwardRef<HTMLHeadingElement, ToastTitleProps>(
   ({ asChild, classNames, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
-    const Comp = asChild ? Slot : ToastTitlePrimitive;
+    const Comp = asChild ? Slot : ToastPrimitive.Title;
     return <Comp {...props} className={tx('toast.title', {}, classNames)} ref={forwardedRef} />;
   },
 );
 
-type ToastDescriptionProps = ThemedClassName<ToastDescriptionPrimitiveProps>;
+type ToastDescriptionProps = ThemedClassName<ToastPrimitive.ToastDescriptionProps>;
 
 const ToastDescription = forwardRef<HTMLParagraphElement, ToastDescriptionProps>(
   ({ asChild, classNames, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
-    const Comp = asChild ? Slot : ToastDescriptionPrimitive;
+    const Comp = asChild ? Slot : ToastPrimitive.Description;
     return <Comp {...props} className={tx('toast.description', {}, classNames)} ref={forwardedRef} />;
   },
 );
@@ -86,13 +71,13 @@ const ToastActions = forwardRef<HTMLDivElement, ToastActionsProps>(
   },
 );
 
-type ToastActionProps = ToastActionPrimitiveProps;
+type ToastActionProps = ToastPrimitive.ToastActionProps;
 
-const ToastAction: FunctionComponent<ToastActionProps> = ToastActionPrimitive;
+const ToastAction: FunctionComponent<ToastActionProps> = ToastPrimitive.Action;
 
-type ToastCloseProps = ToastClosePrimitiveProps;
+type ToastCloseProps = ToastPrimitive.ToastCloseProps;
 
-const ToastClose: FunctionComponent<ToastCloseProps> = ToastClosePrimitive;
+const ToastClose: FunctionComponent<ToastCloseProps> = ToastPrimitive.Close;
 
 export const Toast = {
   Provider: ToastProvider,

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 = {};

package/src/components/Toolbar/Toolbar.tsx

@@ -6,15 +6,15 @@ import { Primitive } from '@radix-ui/react-primitive';
 import { Slot } from '@radix-ui/react-slot';
 import type { ToggleGroupItemProps as ToggleGroupItemPrimitiveProps } from '@radix-ui/react-toggle-group';
 import * as ToolbarPrimitive from '@radix-ui/react-toolbar';
-import React, { Fragment, forwardRef } from 'react';
+import React, { forwardRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { type ToolbarStyleProps } from '@dxos/ui-theme';
+import { composable, composableProps, slottable, type ToolbarStyleProps } from '@dxos/ui-theme';
 import { type SlottableProps } from '@dxos/ui-types';
 
+import { translationKey } from '#translations';
+
 import { useThemeContext } from '../../hooks';
-import { translationKey } from '../../translations';
-import { type ThemedClassName } from '../../util';
 import {
   Button,
   ButtonGroup,
@@ -34,36 +34,24 @@ import { Separator, type SeparatorProps } from '../Separator';
 // Root
 //
 
-type ToolbarRootProps = ThemedClassName<
-  ToolbarPrimitive.ToolbarProps &
-    ToolbarStyleProps & {
-      textBlockWidth?: boolean;
-    }
->;
-
-// TODO(burdon): Implement asChild property.
-const ToolbarRoot = forwardRef<HTMLDivElement, ToolbarRootProps>(
-  (
-    { classNames, children, density, disabled, layoutManaged, textBlockWidth: textBlockWidthProp, ...props },
-    forwardedRef,
-  ) => {
+type ToolbarRootProps = ToolbarPrimitive.ToolbarProps & ToolbarStyleProps;
+
+const ToolbarRoot = composable<HTMLDivElement, ToolbarRootProps>(
+  ({ children, density, disabled, layoutManaged, orientation, ...props }, forwardedRef) => {
+    const { className, role, ...rest } = composableProps(props);
     const { tx } = useThemeContext();
-    const InnerRoot = textBlockWidthProp ? 'div' : Fragment;
-    const innerRootProps = textBlockWidthProp
-      ? {
-          role: 'none',
-          className: tx('toolbar.inner', { layoutManaged }, classNames),
-        }
-      : {};
 
     return (
       <ToolbarPrimitive.Root
-        {...props}
-        data-arrow-keys={props.orientation === 'vertical' ? 'up down' : 'left right'}
-        className={tx('toolbar.root', { density, disabled, layoutManaged }, classNames)}
+        {...rest}
+        // Only pass role when explicitly set; radix provides role="toolbar" by default.
+        {...(role !== 'none' && { role })}
+        orientation={orientation}
+        data-arrow-keys={orientation === 'vertical' ? 'up down' : 'left right'}
+        className={tx('toolbar.root', { density, disabled, layoutManaged }, className)}
         ref={forwardedRef}
       >
-        <InnerRoot {...innerRootProps}>{children}</InnerRoot>
+        {children}
       </ToolbarPrimitive.Root>
     );
   },
@@ -73,19 +61,18 @@ const ToolbarRoot = forwardRef<HTMLDivElement, ToolbarRootProps>(
 // Text
 //
 
-type ToolbarTextProps = SlottableProps<HTMLDivElement>;
+type ToolbarTextProps = SlottableProps;
 
-const ToolbarText = forwardRef<HTMLDivElement, ToolbarTextProps>(
-  ({ classNames, className, asChild, children, ...props }, forwardedRef) => {
-    const { tx } = useThemeContext();
-    const Comp = asChild ? Slot : Primitive.div;
-    return (
-      <Comp {...props} className={tx('toolbar.text', {}, [className, classNames])} ref={forwardedRef}>
-        {children}
-      </Comp>
-    );
-  },
-);
+const ToolbarText = slottable<HTMLDivElement>(({ children, asChild, ...props }, forwardedRef) => {
+  const { className, ...rest } = composableProps(props);
+  const Comp = asChild ? Slot : Primitive.div;
+  const { tx } = useThemeContext();
+  return (
+    <Comp {...rest} className={tx('toolbar.text', {}, className)} ref={forwardedRef}>
+      {children}
+    </Comp>
+  );
+});
 
 //
 // Button
@@ -174,7 +161,7 @@ const ToolbarToggleGroupItem = forwardRef<HTMLButtonElement, ToolbarToggleGroupI
 type ToolbarToggleGroupIconItemProps = Omit<ToggleGroupItemPrimitiveProps, 'className'> & IconButtonProps;
 
 const ToolbarToggleGroupIconItem = forwardRef<HTMLButtonElement, ToolbarToggleGroupIconItemProps>(
-  ({ variant, density, elevation, classNames, icon, label, iconOnly, ...props }, forwardedRef) => {
+  ({ variant, density, elevation, classNames, icon, label, iconOnly, iconClassNames, ...props }, forwardedRef) => {
     return (
       <ToolbarPrimitive.ToolbarToggleItem {...props} asChild>
         <IconButton
@@ -186,6 +173,7 @@ const ToolbarToggleGroupIconItem = forwardRef<HTMLButtonElement, ToolbarToggleGr
             icon,
             label,
             iconOnly,
+            iconClassNames,
           }}
           ref={forwardedRef}
         />
@@ -204,7 +192,7 @@ const ToolbarSeparator = forwardRef<HTMLDivElement, ToolbarSeparatorProps>(
   ({ variant = 'gap', ...props }, forwardedRef) => {
     return variant === 'line' ? (
       <ToolbarPrimitive.Separator asChild>
-        <Separator {...props} ref={forwardedRef} />
+        <Separator orientation='vertical' {...props} ref={forwardedRef} />
       </ToolbarPrimitive.Separator>
     ) : (
       <ToolbarPrimitive.Separator className='grow' ref={forwardedRef} />
@@ -224,13 +212,13 @@ const ToolbarDragHandle = forwardRef<HTMLButtonElement, ToolbarDragHandleProps>(
     return (
       <ToolbarIconButton
         data-testid={testId}
+        tabIndex={-1}
         noTooltip
         iconOnly
         icon='ph--dots-six-vertical--regular'
         variant='ghost'
-        label={label ?? t('toolbar drag handle label')}
-        classNames='cursor-pointer'
-        size={5}
+        label={label ?? t('toolbar-drag-handle.label')}
+        classNames='dx-focus-ring-none cursor-pointer'
         disabled={!forwardedRef}
         ref={forwardedRef}
       />
@@ -247,14 +235,14 @@ type ToolbarCloseIconButtonProps = { onClick?: () => void; label?: string };
 const ToolbarCloseIconButton = forwardRef<HTMLButtonElement, ToolbarCloseIconButtonProps>(
   ({ onClick, label }, forwardedRef) => {
     const { t } = useTranslation(translationKey);
+
     return (
       <ToolbarIconButton
         iconOnly
         icon='ph--x--regular'
         variant='ghost'
-        label={label ?? t('toolbar close label')}
+        label={label ?? t('toolbar-close.label')}
         classNames='cursor-pointer'
-        size={5}
         onClick={onClick}
         ref={forwardedRef}
       />
@@ -287,7 +275,7 @@ const ToolbarMenu = <T extends any | void = void>({ context, items }: ToolbarMen
           iconOnly
           variant='ghost'
           icon='ph--dots-three-vertical--regular'
-          label={t('toolbar menu label')}
+          label={t('toolbar-menu.label')}
         />
       </DropdownMenu.Trigger>
       {(items?.length ?? 0) > 0 && (

package/src/components/Tooltip/Tooltip.stories.tsx

@@ -5,22 +5,21 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 
 import { withTheme } from '../../testing';
 import { Button } from '../Button';
-
 import { Tooltip } from './Tooltip';
 
-type StoryProps = {
+type DefaultStoryProps = {
   tooltips: { label: string; content: string }[];
   defaultOpen?: boolean;
 };
 
-const DefaultStory = ({ tooltips, defaultOpen }: StoryProps) => {
+const DefaultStory = ({ tooltips, defaultOpen }: DefaultStoryProps) => {
   return (
     <Tooltip.Provider defaultOpen={defaultOpen}>
-      <div role='none' className='w-32'>
+      <div className='w-32'>
         {tooltips.map(({ label, content }, i) => (
           <Tooltip.Trigger asChild key={i} content={content} side='right'>
             <Button classNames='block w-full'>{label}</Button>
@@ -74,10 +73,10 @@ export const DefaultOpen: Story = {
 export const StressTest: Story = {
   args: {
     defaultOpen: true,
-    tooltips: faker.helpers.multiple(
+    tooltips: random.helpers.multiple(
       () => ({
-        label: faker.lorem.words(2),
-        content: faker.lorem.words(5),
+        label: random.lorem.words(2),
+        content: random.lorem.words(5),
       }),
       { count: 32 },
     ),