@dxos/react-ui 0.8.4-main.ef1bc66f44 → 0.8.4-main.f466a3d56e

package/src/components/Separator/Separator.tsx

@@ -1,25 +1,22 @@
 //
 // Copyright 2023 DXOS.org
 //
-import {
-  Separator as SeparatorPrimitive,
-  type SeparatorProps as SeparatorPrimitiveProps,
-} from '@radix-ui/react-separator';
+import * as SeparatorPrimitive from '@radix-ui/react-separator';
 import React, { forwardRef } from 'react';
 
 import { useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
 
-type SeparatorProps = ThemedClassName<SeparatorPrimitiveProps> & { subdued?: boolean };
+type SeparatorProps = ThemedClassName<SeparatorPrimitive.SeparatorProps> & { subdued?: boolean };
 
 const Separator = forwardRef<HTMLDivElement, SeparatorProps>(
   ({ classNames, orientation = 'horizontal', subdued, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
     return (
-      <SeparatorPrimitive
-        orientation={orientation}
+      <SeparatorPrimitive.Root
         {...props}
-        className={tx('separator.root', 'separator', { orientation, subdued }, classNames)}
+        orientation={orientation}
+        className={tx('separator.root', { orientation, subdued }, classNames)}
         ref={forwardedRef}
       />
     );

package/src/components/Skeleton/Skeleton.stories.tsx

@@ -5,7 +5,6 @@
 import React from 'react';
 
 import { withTheme } from '../../testing';
-
 import { Skeleton } from './Skeleton';
 
 export default {
@@ -19,12 +18,12 @@ export default {
 
 export const Default = {
   render: () => (
-    <div className='flex flex-col gap-4 p-4 border border-separator rounded-sm'>
-      <div className='flex is-fit items-center gap-4'>
+    <div className='flex flex-col gap-4 p-4 border border-separator rounded-xs'>
+      <div className='flex w-fit items-center gap-4'>
         <Skeleton classNames='size-10 shrink-0 rounded-full' />
         <div className='grid gap-2'>
-          <Skeleton classNames='bs-4 is-[150px]' />
-          <Skeleton classNames='bs-4 is-[100px]' />
+          <Skeleton classNames='h-4 w-[150px]' />
+          <Skeleton classNames='h-4 w-[100px]' />
         </div>
       </div>
     </div>
@@ -33,19 +32,19 @@ export const Default = {
 
 export const Card = {
   render: () => (
-    <div className='flex flex-col gap-3 is-96 p-4 border border-separator rounded-sm'>
+    <div className='flex flex-col gap-3 w-96 p-4 border border-separator rounded-xs'>
       <div className='flex items-center gap-3'>
-        <Skeleton variant='circle' classNames='bs-12 is-12 rounded-full' />
+        <Skeleton variant='circle' classNames='h-12 w-12 rounded-full' />
         <div className='flex flex-col gap-2 flex-1'>
-          <Skeleton classNames='bs-4 is-24' />
-          <Skeleton classNames='bs-3 is-32' />
+          <Skeleton classNames='h-4 w-24' />
+          <Skeleton classNames='h-3 w-32' />
         </div>
       </div>
-      <Skeleton classNames='bs-32 is-full rounded' />
+      <Skeleton classNames='h-32 w-full rounded-sm' />
       <div className='flex flex-col gap-2'>
-        <Skeleton classNames='bs-3 is-full' />
-        <Skeleton classNames='bs-3 is-5/6' />
-        <Skeleton classNames='bs-3 is-4/6' />
+        <Skeleton classNames='h-3 w-full' />
+        <Skeleton classNames='h-3 w-5/6' />
+        <Skeleton classNames='h-3 w-4/6' />
       </div>
     </div>
   ),

package/src/components/Skeleton/Skeleton.tsx

@@ -17,7 +17,7 @@ type SkeletonProps = ThemedClassName<ComponentPropsWithRef<'div'>> & {
 const Skeleton = forwardRef<HTMLDivElement, SkeletonProps>(
   ({ classNames, variant = 'default', ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
-    return <div {...props} className={tx('skeleton.root', 'skeleton', { variant }, classNames)} ref={forwardedRef} />;
+    return <div {...props} className={tx('skeleton.root', { variant }, classNames)} ref={forwardedRef} />;
   },
 );
 

package/src/components/Splitter/Splitter.stories.tsx

@@ -3,51 +3,61 @@
 //
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React, { useState } from 'react';
+import React, { type ComponentPropsWithoutRef, forwardRef, useState } from 'react';
 
-import { Layout } from '../../primitives';
+import { Panel } from '../../primitives';
 import { withLayout, withTheme } from '../../testing';
 import { ScrollArea } from '../ScrollArea';
 import { Toolbar } from '../Toolbar';
-
 import { Splitter, type SplitterRootProps } from './Splitter';
 
-const Panel = ({ label }: { label: string }) => {
-  return (
-    <Layout.Main toolbar>
-      <Toolbar.Root>{label}</Toolbar.Root>
-      <ScrollArea.Root orientation='vertical'>
-        <ScrollArea.Viewport>
-          {Array.from({ length: 100 }).map((_, i) => (
-            <div key={i} className='p-1'>
-              {label}-{i}
-            </div>
-          ))}
-        </ScrollArea.Viewport>
-      </ScrollArea.Root>
-    </Layout.Main>
-  );
-};
+const PanelContent = forwardRef<HTMLDivElement, ComponentPropsWithoutRef<'div'> & { label: string }>(
+  ({ label, ...props }, forwardedRef) => (
+    <Panel.Root {...props} ref={forwardedRef}>
+      <Panel.Toolbar asChild>
+        <Toolbar.Root>{label}</Toolbar.Root>
+      </Panel.Toolbar>
+      <Panel.Content asChild>
+        <ScrollArea.Root orientation='vertical'>
+          <ScrollArea.Viewport>
+            {Array.from({ length: 100 }).map((_, i) => (
+              <div key={i} className='p-1'>
+                {label}-{i}
+              </div>
+            ))}
+          </ScrollArea.Viewport>
+        </ScrollArea.Root>
+      </Panel.Content>
+    </Panel.Root>
+  ),
+);
 
 const DefaultStory = (props: SplitterRootProps) => {
-  const [mode, setMode] = useState(props.mode ?? 'both');
+  const [mode, setMode] = useState(props.mode ?? 'split');
+  const [ratio, setRatio] = useState(props.ratio ?? 0.5);
 
   return (
-    <div className='grid grid-rows-[min-content_1fr] bs-full overflow-hidden'>
-      <Toolbar.Root>
-        <Toolbar.Button onClick={() => setMode('upper')}>A</Toolbar.Button>
-        <Toolbar.Button onClick={() => setMode('both')}>A + B</Toolbar.Button>
-        <Toolbar.Button onClick={() => setMode('lower')}>B</Toolbar.Button>
-      </Toolbar.Root>
-      <Splitter.Root mode={mode} ratio={props.ratio} classNames='divide-y divide-subduedSeparator'>
-        <Splitter.Panel position='upper'>
-          <Panel label='A' />
-        </Splitter.Panel>
-        <Splitter.Panel position='lower'>
-          <Panel label='B' />
-        </Splitter.Panel>
-      </Splitter.Root>
-    </div>
+    <Panel.Root>
+      <Panel.Toolbar asChild>
+        <Toolbar.Root>
+          <Toolbar.Button onClick={() => setMode('top')}>A</Toolbar.Button>
+          <Toolbar.Button onClick={() => setMode('split')}>A+B</Toolbar.Button>
+          <Toolbar.Button onClick={() => setMode('bottom')}>B</Toolbar.Button>
+          <Toolbar.Separator />
+          <Toolbar.Button onClick={() => setRatio((r) => 1 - r)}>Toggle</Toolbar.Button>
+        </Toolbar.Root>
+      </Panel.Toolbar>
+      <Panel.Content asChild>
+        <Splitter.Root mode={mode} ratio={ratio}>
+          <Splitter.Panel asChild position='top'>
+            <PanelContent label='A' />
+          </Splitter.Panel>
+          <Splitter.Panel asChild position='bottom'>
+            <PanelContent label='B' />
+          </Splitter.Panel>
+        </Splitter.Root>
+      </Panel.Content>
+    </Panel.Root>
   );
 };
 
@@ -67,7 +77,7 @@ type Story = StoryObj<SplitterRootProps>;
 
 export const Default: Story = {
   args: {
-    mode: 'both',
-    ratio: 0.5,
+    mode: 'split',
+    ratio: 0.4,
   },
 };

package/src/components/Splitter/Splitter.tsx

@@ -3,22 +3,23 @@
 //
 
 import { createContextScope } from '@radix-ui/react-context';
-import React, { type ComponentPropsWithoutRef, forwardRef } from 'react';
+import { Primitive } from '@radix-ui/react-primitive';
+import { Slot } from '@radix-ui/react-slot';
+import React from 'react';
 
-import { mx } from '@dxos/ui-theme';
+import { composableProps, slottable } from '@dxos/ui-theme';
 
-import { type ThemedClassName } from '../../util';
+import { useThemeContext } from '../../hooks';
+import { ThemedClassName } from '../../util';
 
 type ScopedProps<P> = P & { __scopeSplitter?: any };
 
-// TODO(burdon): Generalize styles.
-// TODO(burdon): Enalbe 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;
 };
 
@@ -34,23 +35,22 @@ const [SplitterProvider, useSplitterContext] = createSplitterContext<SplitterCon
 
 const ROOT_NAME = 'Splitter.Root';
 
-type RootProps = ThemedClassName<ComponentPropsWithoutRef<'div'>> & Partial<SplitterContextValue>;
+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;
 
-const Root = forwardRef<HTMLDivElement, ScopedProps<RootProps>>(
-  (
-    { __scopeSplitter, classNames, mode = 'upper', ratio = 0.5, transition = 250, children, ...rootProps },
-    forwardedRef,
-  ) => {
     return (
       <SplitterProvider scope={__scopeSplitter} mode={mode} ratio={ratio} transition={transition}>
-        <div
-          role='none'
-          {...rootProps}
-          ref={forwardedRef}
-          className={mx('relative bs-full overflow-hidden', classNames)}
-        >
+        <Comp {...restProps} ref={forwardedRef} className={tx('splitter.root', {}, className)}>
           {children}
-        </div>
+        </Comp>
       </SplitterProvider>
     );
   },
@@ -64,45 +64,49 @@ Root.displayName = ROOT_NAME;
 
 const PANEL_NAME = 'Splitter.Panel';
 
-interface PanelProps extends ThemedClassName<ComponentPropsWithoutRef<'div'>> {
-  position: 'upper' | 'lower';
-}
+type PanelOwnProps = ThemedClassName<{
+  position: 'top' | 'bottom';
+}>;
 
-const Panel = forwardRef<HTMLDivElement, ScopedProps<PanelProps>>(
-  ({ __scopeSplitter, classNames, children, position, style, ...panelProps }, forwardedRef) => {
-    const context = useSplitterContext(PANEL_NAME, __scopeSplitter);
-    const { mode, ratio, transition } = context;
+type PanelProps = PanelOwnProps;
 
-    // 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 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);
 
-    const height = isUpper
-      ? mode === 'upper'
+    // Calculate position and height based on mode and ratio.
+    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 (
-      <div
-        {...panelProps}
+      <Comp
+        {...restProps}
         ref={forwardedRef}
-        className={mx('absolute inset-inline-0 flex flex-col overflow-hidden', classNames)}
+        className={tx('splitter.panel', {}, className)}
         style={{
-          top,
+          top: topOffset,
           height,
           transition: `top ${transition}ms, height ${transition}ms ease-out`,
           ...style,
         }}
       >
         {children}
-      </div>
+      </Comp>
     );
   },
 );

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 = {
@@ -19,21 +18,25 @@ export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const Normal = (props: any) => {
-  return (
-    <div className='m-5 space-b-5'>
-      <Status classNames='block' progress={0} {...props} />
-      <Status classNames='block' progress={0.3} {...props} />
-      <Status classNames='block' progress={0.7} {...props} />
-      <Status classNames='block' progress={1} {...props} />
-    </div>
-  );
+export const Normal: Story = {
+  render: (props) => {
+    return (
+      <div className='m-5 space-b-5'>
+        <Status classNames='block' progress={0} {...props} />
+        <Status classNames='block' progress={0.3} {...props} />
+        <Status classNames='block' progress={0.7} {...props} />
+        <Status classNames='block' progress={1} {...props} />
+      </div>
+    );
+  },
 };
 
-export const Indeterminate = (props: any) => {
-  return (
-    <div className='m-5'>
-      <Status classNames='block' indeterminate {...props} />
-    </div>
-  );
+export const Indeterminate: Story = {
+  render: (props) => {
+    return (
+      <div className='m-5'>
+        <Status classNames='block' indeterminate {...props} />
+      </div>
+    );
+  },
 };

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) => {
@@ -20,12 +23,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

@@ -8,8 +8,7 @@ import React from 'react';
 import { hues } from '@dxos/ui-theme';
 import { type ChromaticPalette, type MessageValence } from '@dxos/ui-types';
 
-import { withTheme } from '../../testing';
-
+import { withLayout, withTheme } from '../../testing';
 import { Tag } from './Tag';
 
 const palettes = ['neutral', 'success', 'info', 'warning', 'error', ...hues] as (ChromaticPalette | MessageValence)[];
@@ -18,7 +17,7 @@ const meta = {
   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.tsx

@@ -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/ThemeProvider/ThemeProvider.stories.tsx

@@ -0,0 +1,31 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { useThemeContext } from '../../hooks';
+import { withLayout, withTheme } from '../../testing';
+import { ThemeProvider } from './ThemeProvider';
+
+const meta = {
+  title: 'ui/react-ui-core/components/ThemeProvider',
+  component: ThemeProvider,
+  render: () => {
+    const { themeMode, platform } = useThemeContext();
+    return (
+      <div className='p-4 flex flex-col gap-4'>
+        <h1>ThemeProvider</h1>
+        <pre className='text-sm text-description'>{JSON.stringify({ themeMode, platform }, null, 2)}</pre>
+      </div>
+    );
+  },
+  decorators: [withTheme(), withLayout()],
+} satisfies Meta<typeof ThemeProvider>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

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 = {
@@ -40,10 +39,11 @@ export const ThemeProvider = ({
   fallback = null,
   resourceExtensions,
   appNs,
-  tx = (_path, defaultClassName, _styleProps, ..._options) => defaultClassName,
+  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 (
@@ -78,8 +79,8 @@ export const ThemeProvider = ({
 
 const handleInputModalityChange = (isUsingKeyboard: boolean) => {
   if (isUsingKeyboard) {
-    document.body.setAttribute('data-is-keyboard', 'true');
+    document.body.setAttribute('data-w-keyboard', 'true');
   } else {
-    document.body.removeAttribute('data-is-keyboard');
+    document.body.removeAttribute('data-w-keyboard');
   }
 };

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