@dxos/react-ui 0.8.4-main.d05673bc65 → 0.8.4-main.d9fc60f731

package/src/primitives/Container/Container.stories.tsx

@@ -6,7 +6,6 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { withLayout, withTheme } from '../../testing';
-
 import { Container } from './Container';
 
 const DefaultStory = () => (

package/src/primitives/Container/Container.tsx

@@ -2,17 +2,16 @@
 // Copyright 2026 DXOS.org
 //
 
-import React, { forwardRef } from 'react';
-
-import { composableProps, mx } from '@dxos/ui-theme';
-import { Slot } from '@radix-ui/react-slot';
-import { SlottableProps } from '@dxos/ui-types';
 import { Primitive } from '@radix-ui/react-primitive';
+import { Slot } from '@radix-ui/react-slot';
+import React from 'react';
+
+import { mx } from '@dxos/ui-theme';
 
-export type ContainerProps = SlottableProps<HTMLDivElement>;
+import { composableProps, slottable } from '../../util';
 
-export const Container = forwardRef<HTMLDivElement, ContainerProps>(({ children, asChild, ...props }, forwardedRef) => {
-  const { className, ...rest } = composableProps<HTMLDivElement>(props, { role: 'none' });
+export const Container = slottable<HTMLDivElement>(({ children, asChild, ...props }, forwardedRef) => {
+  const { className, ...rest } = composableProps<HTMLDivElement>(props);
   const Comp = asChild ? Slot : Primitive.div;
   return (
     <Comp {...rest} className={mx('dx-container', className)} ref={forwardedRef}>

package/src/{components → primitives}/DensityProvider/DensityProvider.tsx

@@ -14,7 +14,7 @@ export type DensityProviderProps = PropsWithChildren<{
   density?: Density;
 }>;
 
-export const DensityContext = createContext<DensityContextValue>({ density: 'fine' });
+export const DensityContext = createContext<DensityContextValue>({ density: 'md' });
 
 export const DensityProvider = ({ density, children }: DensityProviderProps) => (
   <DensityContext.Provider value={{ density }}>{children}</DensityContext.Provider>

package/src/primitives/Flex/Flex.stories.tsx

@@ -8,7 +8,6 @@ import React from 'react';
 import { type ChromaticPalette } from '@dxos/ui-types';
 
 import { withLayout, withTheme } from '../../testing';
-
 import { Flex } from './Flex';
 
 const Cell = ({ label, hue }: { label: string; hue: ChromaticPalette }) => (

package/src/primitives/Flex/Flex.tsx

@@ -2,28 +2,28 @@
 // Copyright 2026 DXOS.org
 //
 
-import React, { forwardRef } from 'react';
+import { Primitive } from '@radix-ui/react-primitive';
+import { Slot } from '@radix-ui/react-slot';
+import React from 'react';
 
-import { composableProps, mx } from '@dxos/ui-theme';
-import { type ComposableProps } from '@dxos/ui-types';
+import { mx } from '@dxos/ui-theme';
 
-export type FlexProps = ComposableProps<HTMLDivElement> & {
-  column?: boolean;
-  grow?: boolean;
-};
+import { composableProps, slottable } from '../../util';
 
-export const Flex = forwardRef<HTMLDivElement, FlexProps>(
-  ({ children, role, column, grow, ...props }, forwardedRef) => {
+export type FlexProps = { column?: boolean; grow?: boolean };
+
+export const Flex = slottable<HTMLDivElement, FlexProps>(
+  ({ children, asChild, column, grow, ...props }, forwardedRef) => {
     const { className, ...rest } = composableProps(props);
+    const Comp = asChild ? Slot : Primitive.div;
     return (
-      <div
+      <Comp
         ref={forwardedRef}
         {...rest}
-        role={role ?? 'none'}
         className={mx('flex', column && 'flex-col', grow && 'flex-1 overflow-hidden', className)}
       >
         {children}
-      </div>
+      </Comp>
     );
   },
 );

package/src/primitives/Grid/Grid.stories.tsx

@@ -8,7 +8,6 @@ import React from 'react';
 import { type ChromaticPalette } from '@dxos/ui-types';
 
 import { withLayout, withTheme } from '../../testing';
-
 import { Grid } from './Grid';
 
 const Cell = ({ label, hue }: { label: string; hue: ChromaticPalette }) => (

package/src/primitives/Grid/Grid.tsx

@@ -2,18 +2,15 @@
 // Copyright 2026 DXOS.org
 //
 
-import React, { forwardRef } from 'react';
+import React from 'react';
 
-import { composableProps, mx } from '@dxos/ui-theme';
-import { type ComposableProps } from '@dxos/ui-types';
+import { mx } from '@dxos/ui-theme';
 
-export type GridProps = ComposableProps<HTMLDivElement> & {
-  cols?: number;
-  rows?: number;
-  grow?: boolean;
-};
+import { composable, composableProps } from '../../util';
 
-export const Grid = forwardRef<HTMLDivElement, GridProps>(
+export type GridProps = { cols?: number; rows?: number; grow?: boolean };
+
+export const Grid = composable<HTMLDivElement, GridProps>(
   ({ children, style, role, cols, rows, grow = true, ...props }, forwardedRef) => {
     const { className, ...rest } = composableProps(props);
     return (

package/src/{components → primitives}/ThemeProvider/ThemeProvider.stories.tsx

@@ -7,11 +7,10 @@ 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',
+  title: 'ui/react-ui-core/primitives/ThemeProvider',
   component: ThemeProvider,
   render: () => {
     const { themeMode, platform } = useThemeContext();

package/src/{components → primitives}/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 = {
@@ -42,8 +41,9 @@ export const ThemeProvider = ({
   appNs,
   tx = (_path, _styleProps, ..._options) => undefined,
   themeMode = 'dark',
-  rootDensity = 'fine',
-  ...rest
+  rootDensity = 'md',
+  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 → primitives}/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';
+export { TranslationsContext, useTranslation } from './TranslationsProvider';

package/src/primitives/index.ts

@@ -2,8 +2,10 @@
 // Copyright 2026 DXOS.org
 //
 
-export * from './Column';
+export * from './DensityProvider';
+export * from './ElevationProvider';
+export * from './ThemeProvider';
+
 export * from './Container';
 export * from './Flex';
 export * from './Grid';
-export * from './Panel';

package/src/testing/Loading.tsx

@@ -2,9 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
+import React, { captureOwnerStack, useEffect, useState } from 'react';
+
 import { mx } from '@dxos/ui-theme';
 import { safeStringify } from '@dxos/util';
-import React, { useEffect, useState } from 'react';
+
+import { ErrorStack, parseCaptureOwnerStack } from '../components';
 
 export type LoadingProps = { data?: any };
 
@@ -13,14 +16,32 @@ export type LoadingProps = { data?: any };
  */
 export const Loading = ({ data }: LoadingProps) => {
   const [visible, setVisible] = useState(false);
+  const ownerFrames = parseCaptureOwnerStack(captureOwnerStack());
+
   useEffect(() => {
     const t = setTimeout(() => setVisible(true), 500);
     return () => clearTimeout(t);
   }, []);
+
   return (
-    <div className={mx('flex flex-col opacity-0 transition delay-1000 duration-1000', visible && 'opacity-100')}>
-      <h2 className='uppercase'>Loading</h2>
-      <pre>{safeStringify(data, undefined, 2)}</pre>
+    <div className='w-full p-2'>
+      <div
+        className={mx(
+          'flex flex-col w-full p-2 border-2 border-teal-500 rounded-md',
+          'opacity-0 transition delay-1000 duration-1000',
+          visible && 'opacity-100',
+        )}
+      >
+        <h2 className='uppercase capitalize text-xs'>Loading State</h2>
+        <pre className='text-sm text-description'>{safeStringify(data, undefined, 2)}</pre>
+
+        <h3 className='uppercase capitalize text-xs mt-2'>Owner stack</h3>
+        {ownerFrames && ownerFrames.length > 0 ? (
+          <ErrorStack frames={ownerFrames} />
+        ) : (
+          <p className='text-xs text-subdued'>No owner stack (production build or unsupported context).</p>
+        )}
+      </div>
     </div>
   );
 };

package/src/testing/decorators/withLayout.tsx

@@ -39,7 +39,7 @@ export const withLayout =
       const { layout = 'default', classNames, scroll } = props;
       const Container = layouts[layout] ?? layouts.fullscreen;
       return (
-        <Container classNames={mx(classNames, scroll ? 'overflow-y-auto' : 'overflow-hidden')}>
+        <Container classNames={mx(scroll ? 'overflow-y-auto' : 'overflow-hidden', classNames)}>
           <MemoizedStory />
         </Container>
       );
@@ -47,31 +47,21 @@ export const withLayout =
   };
 
 const layouts: Record<ContainerType, FC<ContainerProps>> = {
-  default: ({ classNames, children }: ContainerProps) => (
-    <div role='none' className={mx('p-4', classNames)}>
-      {children}
-    </div>
-  ),
+  default: ({ classNames, children }: ContainerProps) => <div className={mx('p-4', classNames)}>{children}</div>,
 
   fullscreen: ({ classNames, children }: ContainerProps) => (
-    <div role='none' className={mx('fixed inset-0 flex overflow-hidden bg-base-surface', classNames)}>
-      {children}
-    </div>
+    <div className={mx('fixed inset-0 flex overflow-hidden bg-black', classNames)}>{children}</div>
   ),
 
   centered: ({ classNames, children }: ContainerProps) => (
-    <div role='none' className={mx('fixed inset-0 grid overflow-hidden place-items-center bg-base-surface')}>
-      <div role='none' className={mx('flex flex-col w-[40rem] bg-group-surface', classNames)}>
-        {children}
-      </div>
+    <div className={mx('fixed inset-0 grid overflow-hidden place-items-center bg-black')}>
+      <div className={mx('flex flex-col bg-base-surface', classNames)}>{children}</div>
     </div>
   ),
 
   column: ({ classNames, children }: ContainerProps) => (
-    <div role='none' className='fixed inset-0 flex overflow-hidden justify-center bg-base-surface'>
-      <div role='none' className={mx('flex flex-col w-[40rem] bg-group-surface', classNames)}>
-        {children}
-      </div>
+    <div className='fixed inset-0 flex overflow-hidden justify-center bg-black'>
+      <div className={mx('flex flex-col w-[40rem] bg-base-surface', classNames)}>{children}</div>
     </div>
   ),
 };

package/src/testing/decorators/withLayoutVariants.tsx

@@ -42,7 +42,7 @@ export const withLayoutVariants = ({
     { elevation: 'positioned', surface: 'bg-card-surface' },
     { elevation: 'base', surface: 'bg-base-surface' },
   ],
-  densities = ['coarse'],
+  densities = ['md'],
 }: Config = {}): Decorator => {
   return (Story) => <Panel Story={Story} elevations={elevations} densities={densities} />;
 };

package/src/testing/decorators/withTheme.tsx

@@ -3,32 +3,43 @@
 //
 
 import { type Decorator } from '@storybook/react';
-import React, { memo } from 'react';
+import React from 'react';
+import { I18nProvider } from 'react-aria-components';
 
-import { defaultTx } from '@dxos/ui-theme';
 import { type ThemeMode } from '@dxos/ui-types';
 
-import { type ThemeContextValue, ThemeProvider, Tooltip } from '../../components';
+import { Tooltip } from '../../components';
+import { type ThemeContextValue, ThemeProvider } from '../../primitives';
+import { defaultTx } from '../../theme';
 
 /**
  * Adds theme decorator.
+ *
+ * `I18nProvider` is included so react-aria-components-backed widgets (DateField, Calendar, …)
+ * have a guaranteed locale in headless test environments where `navigator.language` may be
+ * empty.
  */
 export const withTheme =
-  ({ tx = defaultTx, ...props }: Partial<ThemeContextValue> = {}): Decorator =>
+  ({ tx = defaultTx, noCache, platform }: Partial<ThemeContextValue> = {}): Decorator =>
   (Story, context) => {
     const {
       globals: { theme },
       parameters: { translations },
     } = context;
 
-    // Prevent re-rendering of the story.
-    const MemoizedStory = memo(Story);
-
     return (
-      <ThemeProvider {...props} tx={tx} themeMode={theme as ThemeMode} resourceExtensions={translations} noCache>
-        <Tooltip.Provider>
-          <MemoizedStory />
-        </Tooltip.Provider>
-      </ThemeProvider>
+      <I18nProvider locale='en-US'>
+        <ThemeProvider
+          tx={tx}
+          themeMode={(theme as ThemeMode) || 'dark'}
+          resourceExtensions={translations}
+          noCache={noCache}
+          platform={platform}
+        >
+          <Tooltip.Provider>
+            <Story />
+          </Tooltip.Provider>
+        </ThemeProvider>
+      </I18nProvider>
     );
   };

package/src/theme/bindTheme.ts

@@ -0,0 +1,13 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type ClassNameArray, type ComponentFunction, type Theme, type ThemeFunction } from '@dxos/ui-types';
+import { getDeep } from '@dxos/util';
+
+export const bindTheme = <P extends Record<string, any>>(theme: Theme<Record<string, any>>): ThemeFunction<P> => {
+  return (path: string, styleProps?: P, ...etc: ClassNameArray) => {
+    const result = getDeep<Theme<P> | ComponentFunction<P>>(theme, path.split('.'));
+    return typeof result === 'function' ? result(styleProps ?? ({} as P), ...etc) : undefined;
+  };
+};

package/src/theme/defaultTheme.ts

@@ -0,0 +1,83 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type Theme } from '@dxos/ui-types';
+
+import { avatarTheme } from '../components/Avatars/Avatar.theme';
+import { breadcrumbTheme } from '../components/Breadcrumb/Breadcrumb.theme';
+import { buttonTheme } from '../components/Button/Button.theme';
+import { iconButtonTheme } from '../components/Button/IconButton.theme';
+import { calendarTheme } from '../components/Calendar/Calendar.theme';
+import { cardTheme } from '../components/Card/Card.theme';
+import { columnTheme } from '../components/Column/Column.theme';
+import { datePickerTheme } from '../components/DatePicker/DatePicker.theme';
+import { dialogTheme } from '../components/Dialog/Dialog.theme';
+import { focusTheme } from '../components/Focus/Focus.theme';
+import { iconTheme } from '../components/Icon/Icon.theme';
+import { inputTheme } from '../components/Input/Input.theme';
+import { linkTheme } from '../components/Link/Link.theme';
+import { listTheme } from '../components/List/List.theme';
+import { treegridTheme } from '../components/List/Treegrid.theme';
+import { mainTheme } from '../components/Main/Main.theme';
+import { menuTheme } from '../components/Menu/Menu.theme';
+import { messageTheme } from '../components/Message/Message.theme';
+import { panelTheme } from '../components/Panel/Panel.theme';
+import { popoverTheme } from '../components/Popover/Popover.theme';
+import { scrollAreaTheme } from '../components/ScrollArea/ScrollArea.theme';
+import { selectTheme } from '../components/Select/Select.theme';
+import { separatorTheme } from '../components/Separator/Separator.theme';
+import { skeletonTheme } from '../components/Skeleton/Skeleton.theme';
+import { splitterTheme } from '../components/Splitter/Splitter.theme';
+import { statusTheme } from '../components/Status/Status.theme';
+import { tagTheme } from '../components/Tag/Tag.theme';
+import { toastTheme } from '../components/Toast/Toast.theme';
+import { toolbarTheme } from '../components/Toolbar/Toolbar.theme';
+import { tooltipTheme } from '../components/Tooltip/Tooltip.theme';
+import { bindTheme } from './bindTheme';
+
+export const defaultTheme: Theme<Record<string, any>> = {
+  themeName: () => 'default',
+
+  //
+  // Primitives
+  //
+
+  column: columnTheme,
+  panel: panelTheme,
+
+  //
+  // Components
+  //
+
+  avatar: avatarTheme,
+  breadcrumb: breadcrumbTheme,
+  button: buttonTheme,
+  calendar: calendarTheme,
+  card: cardTheme,
+  datePicker: datePickerTheme,
+  dialog: dialogTheme,
+  focus: focusTheme,
+  icon: iconTheme,
+  iconButton: iconButtonTheme,
+  input: inputTheme,
+  link: linkTheme,
+  list: listTheme,
+  main: mainTheme,
+  message: messageTheme,
+  menu: menuTheme,
+  popover: popoverTheme,
+  scrollArea: scrollAreaTheme,
+  select: selectTheme,
+  separator: separatorTheme,
+  skeleton: skeletonTheme,
+  splitter: splitterTheme,
+  status: statusTheme,
+  tag: tagTheme,
+  toast: toastTheme,
+  toolbar: toolbarTheme,
+  tooltip: tooltipTheme,
+  treegrid: treegridTheme,
+};
+
+export const defaultTx = bindTheme(defaultTheme);

package/src/theme/index.ts

@@ -0,0 +1,37 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export * from './bindTheme';
+export * from './defaultTheme';
+
+// Re-export every co-located theme file so consumers can pull style-prop types,
+// theme tables, and constants from a single peer (@dxos/react-ui).
+export * from '../components/Avatars/Avatar.theme';
+export * from '../components/Breadcrumb/Breadcrumb.theme';
+export * from '../components/Button/Button.theme';
+export * from '../components/Button/IconButton.theme';
+export * from '../components/Card/Card.theme';
+export * from '../components/Dialog/Dialog.theme';
+export * from '../components/Focus/Focus.theme';
+export * from '../components/Icon/Icon.theme';
+export * from '../components/Input/Input.theme';
+export * from '../components/Link/Link.theme';
+export * from '../components/List/List.theme';
+export * from '../components/List/Treegrid.theme';
+export * from '../components/Main/Main.theme';
+export * from '../components/Menu/Menu.theme';
+export * from '../components/Message/Message.theme';
+export * from '../components/Popover/Popover.theme';
+export * from '../components/ScrollArea/ScrollArea.theme';
+export * from '../components/Select/Select.theme';
+export * from '../components/Separator/Separator.theme';
+export * from '../components/Skeleton/Skeleton.theme';
+export * from '../components/Splitter/Splitter.theme';
+export * from '../components/Status/Status.theme';
+export * from '../components/Tag/Tag.theme';
+export * from '../components/Toast/Toast.theme';
+export * from '../components/Toolbar/Toolbar.theme';
+export * from '../components/Tooltip/Tooltip.theme';
+export * from '../components/Column/Column.theme';
+export * from '../components/Panel/Panel.theme';

package/src/translations.ts

@@ -10,9 +10,23 @@ export const translations = [
   {
     'en-US': {
       [translationKey]: {
-        'toolbar menu label': 'Action menu',
-        'toolbar drag handle label': 'Drag to rearrange',
-        'toolbar close label': 'Close',
+        'toolbar-menu.label': 'Action menu',
+        'toolbar-drag-handle.label': 'Drag to rearrange',
+        'toolbar-close.label': 'Close',
+        'toolbar-delete.label': 'Delete',
+        'carousel-viewport.label': 'Carousel',
+        'carousel-prev.label': 'Previous slide',
+        'carousel-next.label': 'Next slide',
+        'carousel-indicators.label': 'Carousel slides',
+        'carousel-go-to.label': 'Go to slide {{index}}',
+        'date-picker.placeholder.single.label': 'Pick a date',
+        'date-picker.placeholder.range.label': 'Pick a date range',
+        'date-picker.placeholder.multiple.label': 'Pick dates',
+        'date-picker.clear.label': 'Clear',
+        'calendar.nav.previous.label': 'Previous month',
+        'calendar.nav.next.label': 'Next month',
+        'calendar.footer.today.label': 'Today',
+        'trigger-button.label': 'Open',
       },
     },
   },

package/src/util/index.ts

@@ -4,5 +4,6 @@
 
 export type { ThemedClassName } from '@dxos/ui-types';
 
-export * from './hasIosKeyboard';
+export * from './mobile';
+export * from './slots';
 export * from './usePx';

package/src/util/mobile.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+/**
+ * Determines whether the on-screen keyboard will appear on `focus` outside of a click handler.
+ */
+export const hasIosKeyboard = () => {
+  // TODO(burdon): Better way to detect iOS keyboard?
+  return !!navigator.userAgent.match(/iP(ad|od|hone).+Safari/);
+};