@dxos/react-ui 0.8.4-main.406dc2a → 0.8.4-main.422d1c7879

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

@@ -0,0 +1,83 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { type ComponentPropsWithoutRef, forwardRef, useState } from 'react';
+
+import { Panel } from '../../primitives';
+import { withLayout, withTheme } from '../../testing';
+import { ScrollArea } from '../ScrollArea';
+import { Toolbar } from '../Toolbar';
+import { Splitter, type SplitterRootProps } from './Splitter';
+
+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 ?? 'split');
+  const [ratio, setRatio] = useState(props.ratio ?? 0.5);
+
+  return (
+    <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>
+  );
+};
+
+const meta: Meta<SplitterRootProps> = {
+  title: 'ui/react-ui-core/components/Splitter',
+  component: Splitter.Root,
+  render: DefaultStory,
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
+  parameters: {
+    layout: 'fullscreen',
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<SplitterRootProps>;
+
+export const Default: Story = {
+  args: {
+    mode: 'split',
+    ratio: 0.4,
+  },
+};

package/src/components/Splitter/Splitter.tsx

@@ -0,0 +1,127 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { createContextScope } from '@radix-ui/react-context';
+import { Primitive } from '@radix-ui/react-primitive';
+import { Slot } from '@radix-ui/react-slot';
+import React from 'react';
+
+import { composableProps, slottable } from '@dxos/ui-theme';
+
+import { useThemeContext } from '../../hooks';
+import { ThemedClassName } from '../../util';
+
+type ScopedProps<P> = P & { __scopeSplitter?: any };
+
+// TODO(burdon): Generalize horizontal/vertical and change to start/end.
+type Mode = 'top' | 'bottom' | 'split';
+
+type SplitterContextValue = {
+  mode: Mode;
+  ratio?: number;
+  transition: number;
+};
+
+const SPLITTER_NAME = 'Splitter';
+
+const [createSplitterContext, createSplitterScope] = createContextScope(SPLITTER_NAME);
+
+const [SplitterProvider, useSplitterContext] = createSplitterContext<SplitterContextValue>(SPLITTER_NAME);
+
+//
+// Root
+//
+
+const ROOT_NAME = 'Splitter.Root';
+
+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 {...restProps} ref={forwardedRef} className={tx('splitter.root', {}, className)}>
+          {children}
+        </Comp>
+      </SplitterProvider>
+    );
+  },
+);
+
+Root.displayName = ROOT_NAME;
+
+//
+// Panel
+//
+
+const PANEL_NAME = 'Splitter.Panel';
+
+type PanelOwnProps = ThemedClassName<{
+  position: 'top' | 'bottom';
+}>;
+
+type PanelProps = PanelOwnProps;
+
+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 isTopPanel = position === 'top';
+    const topOffset = isTopPanel ? '0%' : mode === 'top' ? '100%' : mode === 'bottom' ? '0%' : `${ratio * 100}%`;
+    const height = isTopPanel
+      ? mode === 'top'
+        ? '100%'
+        : mode === 'bottom'
+          ? '0%'
+          : `${ratio * 100}%`
+      : mode === 'bottom'
+        ? '100%'
+        : mode === 'top'
+          ? '0%'
+          : `${(1 - ratio) * 100}%`;
+
+    return (
+      <Comp
+        {...restProps}
+        ref={forwardedRef}
+        className={tx('splitter.panel', {}, className)}
+        style={{
+          top: topOffset,
+          height,
+          transition: `top ${transition}ms, height ${transition}ms ease-out`,
+          ...style,
+        }}
+      >
+        {children}
+      </Comp>
+    );
+  },
+);
+
+Panel.displayName = PANEL_NAME;
+
+//
+// Splitter
+//
+
+const Splitter = {
+  Root,
+  Panel,
+};
+
+export { Splitter, createSplitterScope };
+
+export type { Mode as SplitterMode, RootProps as SplitterRootProps, PanelProps as SplitterPanelProps };

package/src/components/Splitter/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export * from './Splitter';

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

@@ -6,34 +6,37 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { withTheme } from '../../testing';
-
 import { Status } from './Status';
 
 const meta = {
-  title: 'ui/react-ui-core/Status',
+  title: 'ui/react-ui-core/components/Status',
   component: Status,
-  decorators: [withTheme],
+  decorators: [withTheme()],
 } satisfies Meta<typeof Status>;
 
 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

@@ -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.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/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

@@ -5,23 +5,21 @@
 import { createKeyborg } from 'keyborg';
 import React, { type PropsWithChildren, createContext, useEffect, useMemo } from 'react';
 
-import { type Density, type Elevation, type ThemeFunction } from '@dxos/react-ui-types';
+import { type Density, type Elevation, type ThemeFunction, type ThemeMode } from '@dxos/ui-types';
 
 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 ThemeMode = 'dark' | 'light';
-
 export type ThemeContextValue = {
   tx: ThemeFunction<any>;
   themeMode: ThemeMode;
   hasIosKeyboard: boolean;
   safeAreaPadding?: SafeAreaPadding;
   noCache?: boolean;
+  platform?: 'mobile' | 'desktop';
 };
 
 /**
@@ -41,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) {
@@ -55,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 (
@@ -79,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/TranslationsProvider.tsx

@@ -3,7 +3,7 @@
 //
 
 import { type Locale, enUS as dtLocaleEnUs } from 'date-fns/locale';
-import i18Next, { type Resource, type TFunction } from 'i18next';
+import i18Next, { type Resource } from 'i18next';
 import React, { type ReactNode, Suspense, createContext, useContext, useEffect, useState } from 'react';
 import { initReactI18next, useTranslation as useI18NextTranslation } from 'react-i18next';
 
@@ -11,21 +11,6 @@ const initialLng = 'en-US';
 const initialNs = 'dxos-common';
 const initialDtLocale = dtLocaleEnUs;
 
-// TODO(thure): `Parameters<TFunction>` causes typechecking issues because `TFunction` has so many signatures.
-export type Label = string | [string, { ns: string; count?: number; defaultValue?: string }];
-
-export const isLabel = (o: any): o is Label =>
-  typeof o === 'string' ||
-  (Array.isArray(o) &&
-    o.length === 2 &&
-    typeof o[0] === 'string' &&
-    !!o[1] &&
-    typeof o[1] === 'object' &&
-    'ns' in o[1] &&
-    typeof o[1].ns === 'string');
-
-export const toLocalizedString = (label: Label, t: TFunction) => (Array.isArray(label) ? t(...label) : label);
-
 export const resources = {
   [initialLng]: {
     [initialNs]: {

package/src/components/ThemeProvider/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-export * from './ThemeProvider';
-export { type Label, isLabel, toLocalizedString, useTranslation } from './TranslationsProvider';
+export { type Label, isLabel, toLocalizedString } from '@dxos/ui-types';
 
-// TODO(burdon): Use `@internal` with barrel exports (rather than picking individual exports?)
+export * from './ThemeProvider';
+export { useTranslation } from './TranslationsProvider';

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

@@ -6,8 +6,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { type ReactNode, useState } from 'react';
 
 import { withTheme } from '../../testing';
-import { Button } from '../Buttons';
-
+import { Button } from '../Button';
 import { Toast } from './Toast';
 
 type ActionTriggerProps = { altText: string; trigger: ReactNode };
@@ -45,10 +44,10 @@ const DefaultStory = ({ title, description, actionTriggers, openTrigger, closeTr
 };
 
 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;

package/src/components/Toast/Toast.tsx

@@ -4,49 +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', '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', 'toast', {}, classNames)} ref={forwardedRef}>
+    <ToastPrimitive.Root {...props} className={tx('toast.root', {}, classNames)} ref={forwardedRef}>
       <ElevationProvider elevation='toast'>{children}</ElevationProvider>
-    </ToastRootPrimitive>
+    </ToastPrimitive.Root>
   );
 });
 
@@ -54,29 +37,27 @@ type ToastBodyProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.div
 
 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} />;
+  const Comp = asChild ? Slot : Primitive.div;
+  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 Root = asChild ? Slot : ToastTitlePrimitive;
-    return <Root {...props} className={tx('toast.title', 'toast__title', {}, classNames)} ref={forwardedRef} />;
+    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 Root = asChild ? Slot : ToastDescriptionPrimitive;
-    return (
-      <Root {...props} className={tx('toast.description', 'toast__description', {}, classNames)} ref={forwardedRef} />
-    );
+    const Comp = asChild ? Slot : ToastPrimitive.Description;
+    return <Comp {...props} className={tx('toast.description', {}, classNames)} ref={forwardedRef} />;
   },
 );
 
@@ -85,18 +66,18 @@ type ToastActionsProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.
 const ToastActions = forwardRef<HTMLDivElement, ToastActionsProps>(
   ({ asChild, classNames, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
-    const Root = asChild ? Slot : Primitive.div;
-    return <Root {...props} className={tx('toast.actions', 'toast__actions', {}, classNames)} ref={forwardedRef} />;
+    const Comp = asChild ? Slot : Primitive.div;
+    return <Comp {...props} className={tx('toast.actions', {}, classNames)} ref={forwardedRef} />;
   },
 );
 
-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,