@dxos/react-ui 0.8.4-main.3c1ae3b → 0.8.4-main.3eb6e50203

package/src/components/ScrollContainer/ScrollContainer.tsx

@@ -2,7 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useState } from '@preact-signals/safe-react/react';
 import { createContext } from '@radix-ui/react-context';
 import React, {
   type HTMLAttributes,
@@ -13,16 +12,18 @@ import React, {
   useImperativeHandle,
   useMemo,
   useRef,
+  useState,
 } from 'react';
 
 // TODO(burdon): Move these deps to @dxos/dom-util.
 import { addEventListener, combine } from '@dxos/async';
 import { invariant } from '@dxos/invariant';
 import { useForwardedRef } from '@dxos/react-hooks';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 import { type ThemedClassName } from '../../util';
 import { IconButton } from '../Button';
+import { ScrollArea } from '../ScrollArea';
 
 const isBottom = (el: HTMLElement | null) => {
   return !!(el && el.scrollHeight - el.scrollTop === el.clientHeight);
@@ -138,9 +139,9 @@ const Root = forwardRef<ScrollController, RootProps>(
               )}
             />
           )}
-          <div className={mx('flex flex-col min-bs-0 overflow-y-auto scrollbar-thin', classNames)} ref={scrollerRef}>
-            {children}
-          </div>
+          <ScrollArea.Root classNames={mx('min-bs-0', classNames)} ref={scrollerRef} thin>
+            <ScrollArea.Viewport>{children}</ScrollArea.Viewport>
+          </ScrollArea.Root>
         </div>
       </ScrollContainerProvider>
     );
@@ -153,11 +154,13 @@ Root.displayName = 'ScrollContainer.Root';
 // Viewport
 //
 
+const VIEWPORT_NAME = 'ScrollContainer.Viewport';
+
 type ViewportProps = ThemedClassName<PropsWithChildren<Omit<HTMLAttributes<HTMLDivElement>, 'className'>>>;
 
 const Viewport = forwardRef<HTMLDivElement, ViewportProps>(({ classNames, children, ...props }, forwardedRef) => {
   const contentRef = useForwardedRef(forwardedRef);
-  const { pinned, scrollToBottom } = useScrollContainerContext(Viewport.displayName!);
+  const { pinned, scrollToBottom } = useScrollContainerContext(VIEWPORT_NAME);
 
   useEffect(() => {
     if (!pinned || !contentRef.current) {
@@ -180,16 +183,18 @@ const Viewport = forwardRef<HTMLDivElement, ViewportProps>(({ classNames, childr
   );
 });
 
-Viewport.displayName = 'ScrollContainer.Viewport';
+Viewport.displayName = VIEWPORT_NAME;
 
 //
 // ScrollDownButton
 //
 
+const SCROLL_DOWN_BUTTON_NAME = 'ScrollContainer.ScrollDownButton';
+
 type ScrollDownButtonProps = ThemedClassName;
 
 const ScrollDownButton = ({ classNames }: ScrollDownButtonProps) => {
-  const { pinned, scrollToBottom } = useScrollContainerContext(ScrollDownButton.displayName!);
+  const { pinned, scrollToBottom } = useScrollContainerContext(SCROLL_DOWN_BUTTON_NAME);
 
   return (
     <div
@@ -212,7 +217,7 @@ const ScrollDownButton = ({ classNames }: ScrollDownButtonProps) => {
   );
 };
 
-ScrollDownButton.displayName = 'ScrollContainer.ScrollDownButton';
+ScrollDownButton.displayName = SCROLL_DOWN_BUTTON_NAME;
 
 //
 // ScrollContainer

package/src/components/Select/Select.stories.tsx

@@ -42,9 +42,9 @@ const DefaultStory = ({ items = [] }: StoryProps) => {
 };
 
 const meta = {
-  title: 'ui/react-ui-core/Select',
+  title: 'ui/react-ui-core/components/Select',
   render: DefaultStory,
-  decorators: [withTheme, withLayoutVariants()],
+  decorators: [withTheme(), withLayoutVariants()],
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;

package/src/components/Select/Select.tsx

@@ -61,7 +61,7 @@ const SelectContent = forwardRef<HTMLDivElement, SelectContentProps>(
         {...props}
         data-arrow-keys='up down'
         collisionPadding={safeCollisionPadding}
-        className={tx('select.content', 'select__content', { elevation }, classNames)}
+        className={tx('select.content', { elevation }, classNames)}
         position='popper'
         ref={forwardedRef}
       >
@@ -79,7 +79,7 @@ const SelectScrollUpButton = forwardRef<HTMLDivElement, SelectScrollUpButtonProp
     return (
       <SelectPrimitive.SelectScrollUpButton
         {...props}
-        className={tx('select.scrollButton', 'select__scroll-button--up', {}, classNames)}
+        className={tx('select.scrollButton', {}, classNames)}
         ref={forwardedRef}
       >
         {children ?? <Icon size={3} icon='ph--caret-up--bold' />}
@@ -96,7 +96,7 @@ const SelectScrollDownButton = forwardRef<HTMLDivElement, SelectScrollDownButton
     return (
       <SelectPrimitive.SelectScrollDownButton
         {...props}
-        className={tx('select.scrollButton', 'select__scroll-button--down', {}, classNames)}
+        className={tx('select.scrollButton', {}, classNames)}
         ref={forwardedRef}
       >
         {children ?? <Icon size={3} icon='ph--caret-down--bold' />}
@@ -111,11 +111,7 @@ const SelectViewport = forwardRef<HTMLDivElement, SelectViewportProps>(
   ({ classNames, children, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
     return (
-      <SelectPrimitive.SelectViewport
-        {...props}
-        className={tx('select.viewport', 'select__viewport', {}, classNames)}
-        ref={forwardedRef}
-      >
+      <SelectPrimitive.SelectViewport {...props} className={tx('select.viewport', {}, classNames)} ref={forwardedRef}>
         {children}
       </SelectPrimitive.SelectViewport>
     );
@@ -126,7 +122,7 @@ type SelectItemProps = ThemedClassName<SelectPrimitive.SelectItemProps>;
 
 const SelectItem = forwardRef<HTMLDivElement, SelectItemProps>(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return <SelectPrimitive.Item {...props} className={tx('select.item', 'option', {}, classNames)} ref={forwardedRef} />;
+  return <SelectPrimitive.Item {...props} className={tx('select.item', {}, classNames)} ref={forwardedRef} />;
 });
 
 type SelectItemTextProps = SelectPrimitive.SelectItemTextProps;
@@ -141,7 +137,7 @@ const SelectItemIndicator = forwardRef<HTMLDivElement, SelectItemIndicatorProps>
     return (
       <SelectPrimitive.ItemIndicator
         {...props}
-        className={tx('select.itemIndicator', 'option__indicator', {}, classNames)}
+        className={tx('select.itemIndicator', {}, classNames)}
         ref={forwardedRef}
       >
         {children}
@@ -156,7 +152,7 @@ type SelectOptionProps = SelectItemProps;
 const SelectOption = forwardRef<HTMLDivElement, SelectItemProps>(({ children, classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
   return (
-    <SelectPrimitive.Item {...props} className={tx('select.item', 'option', {}, classNames)} ref={forwardedRef}>
+    <SelectPrimitive.Item {...props} className={tx('select.item', {}, classNames)} ref={forwardedRef}>
       <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
       <span className='grow is-1' />
       {/* <SelectPrimitive.ItemIndicator className={tx('select.itemIndicator', 'option__indicator', {})}> */}
@@ -178,26 +174,14 @@ type SelectSeparatorProps = ThemedClassName<SelectPrimitive.SelectSeparatorProps
 
 const SelectSeparator = forwardRef<HTMLDivElement, SelectSeparatorProps>(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return (
-    <SelectPrimitive.Separator
-      {...props}
-      className={tx('select.separator', 'select__separator', {}, classNames)}
-      ref={forwardedRef}
-    />
-  );
+  return <SelectPrimitive.Separator {...props} className={tx('select.separator', {}, classNames)} ref={forwardedRef} />;
 });
 
 type SelectArrowProps = ThemedClassName<SelectPrimitive.SelectArrowProps>;
 
 const SelectArrow = forwardRef<SVGSVGElement, SelectArrowProps>(({ classNames, ...props }, forwardedRef) => {
   const { tx } = useThemeContext();
-  return (
-    <SelectPrimitive.Arrow
-      {...props}
-      className={tx('select.arrow', 'select__arrow', {}, classNames)}
-      ref={forwardedRef}
-    />
-  );
+  return <SelectPrimitive.Arrow {...props} className={tx('select.arrow', {}, classNames)} ref={forwardedRef} />;
 });
 
 export const Select = {

package/src/components/Separator/Separator.tsx

@@ -19,7 +19,7 @@ const Separator = forwardRef<HTMLDivElement, SeparatorProps>(
       <SeparatorPrimitive
         orientation={orientation}
         {...props}
-        className={tx('separator.root', 'separator', { orientation, subdued }, classNames)}
+        className={tx('separator.root', { orientation, subdued }, classNames)}
         ref={forwardedRef}
       />
     );

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

@@ -0,0 +1,52 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React from 'react';
+
+import { withTheme } from '../../testing';
+
+import { Skeleton } from './Skeleton';
+
+export default {
+  title: 'ui/react-ui-core/components/Skeleton',
+  component: Skeleton,
+  decorators: [withTheme()],
+  parameters: {
+    layout: 'centered',
+  },
+};
+
+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'>
+        <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]' />
+        </div>
+      </div>
+    </div>
+  ),
+};
+
+export const Card = {
+  render: () => (
+    <div className='flex flex-col gap-3 is-96 p-4 border border-separator rounded-sm'>
+      <div className='flex items-center gap-3'>
+        <Skeleton variant='circle' classNames='bs-12 is-12 rounded-full' />
+        <div className='flex flex-col gap-2 flex-1'>
+          <Skeleton classNames='bs-4 is-24' />
+          <Skeleton classNames='bs-3 is-32' />
+        </div>
+      </div>
+      <Skeleton classNames='bs-32 is-full rounded' />
+      <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' />
+      </div>
+    </div>
+  ),
+};

package/src/components/Skeleton/Skeleton.tsx

@@ -0,0 +1,26 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React, { type ComponentPropsWithRef, forwardRef } from 'react';
+
+import { useThemeContext } from '../../hooks';
+import { type ThemedClassName } from '../../util';
+
+type SkeletonProps = ThemedClassName<ComponentPropsWithRef<'div'>> & {
+  variant?: 'default' | 'circle' | 'text';
+};
+
+/**
+ * A skeleton loading component that displays a placeholder while content is loading.
+ */
+const Skeleton = forwardRef<HTMLDivElement, SkeletonProps>(
+  ({ classNames, variant = 'default', ...props }, forwardedRef) => {
+    const { tx } = useThemeContext();
+    return <div {...props} className={tx('skeleton.root', { variant }, classNames)} ref={forwardedRef} />;
+  },
+);
+
+export { Skeleton };
+
+export type { SkeletonProps };

package/src/components/Skeleton/index.ts

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

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

@@ -0,0 +1,73 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useState } from 'react';
+
+import { Layout } 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 DefaultStory = (props: SplitterRootProps) => {
+  const [mode, setMode] = useState(props.mode ?? 'both');
+
+  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>
+  );
+};
+
+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: 'both',
+    ratio: 0.5,
+  },
+};

package/src/components/Splitter/Splitter.tsx

@@ -0,0 +1,123 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { createContextScope } from '@radix-ui/react-context';
+import React, { type ComponentPropsWithoutRef, forwardRef } from 'react';
+
+import { mx } from '@dxos/ui-theme';
+
+import { type 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 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 RootProps = ThemedClassName<ComponentPropsWithoutRef<'div'>> & Partial<SplitterContextValue>;
+
+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)}
+        >
+          {children}
+        </div>
+      </SplitterProvider>
+    );
+  },
+);
+
+Root.displayName = ROOT_NAME;
+
+//
+// Panel
+//
+
+const PANEL_NAME = 'Splitter.Panel';
+
+interface PanelProps extends ThemedClassName<ComponentPropsWithoutRef<'div'>> {
+  position: 'upper' | 'lower';
+}
+
+const Panel = forwardRef<HTMLDivElement, ScopedProps<PanelProps>>(
+  ({ __scopeSplitter, classNames, children, position, style, ...panelProps }, forwardedRef) => {
+    const context = useSplitterContext(PANEL_NAME, __scopeSplitter);
+    const { mode, ratio, transition } = context;
+
+    // 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'
+        ? '100%'
+        : mode === 'lower'
+          ? '0%'
+          : `${ratio * 100}%`
+      : mode === 'lower'
+        ? '100%'
+        : mode === 'upper'
+          ? '0%'
+          : `${(1 - ratio) * 100}%`;
+
+    return (
+      <div
+        {...panelProps}
+        ref={forwardedRef}
+        className={mx('absolute inset-inline-0 flex flex-col overflow-hidden', classNames)}
+        style={{
+          top,
+          height,
+          transition: `top ${transition}ms, height ${transition}ms ease-out`,
+          ...style,
+        }}
+      >
+        {children}
+      </div>
+    );
+  },
+);
+
+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

@@ -10,9 +10,9 @@ 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;

package/src/components/Status/Status.tsx

@@ -20,12 +20,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,8 +5,8 @@
 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 { hues } from '@dxos/ui-theme';
+import { type ChromaticPalette, type MessageValence } from '@dxos/ui-types';
 
 import { withTheme } from '../../testing';
 
@@ -15,7 +15,7 @@ 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'>
@@ -26,7 +26,7 @@ const meta = {
       ))}
     </div>
   ),
-  decorators: [withTheme],
+  decorators: [withTheme()],
   parameters: {
     chromatic: {
       disableSnapshot: false,

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';
@@ -21,12 +21,7 @@ export const Tag = forwardRef<HTMLSpanElement, TagProps>(
     const { tx } = useThemeContext();
     const Root = asChild ? Slot : Primitive.span;
     return (
-      <Root
-        {...props}
-        className={tx('tag.root', 'dx-tag', { palette }, classNames)}
-        data-hue={palette}
-        ref={forwardedRef}
-      />
+      <Root {...props} className={tx('tag.root', { palette }, classNames)} data-hue={palette} ref={forwardedRef} />
     );
   },
 );

package/src/components/ThemeProvider/ThemeProvider.tsx

@@ -5,7 +5,7 @@
 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';
@@ -14,14 +14,13 @@ 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,7 +40,7 @@ export const ThemeProvider = ({
   fallback = null,
   resourceExtensions,
   appNs,
-  tx = (_path, defaultClassName, _styleProps, ..._options) => defaultClassName,
+  tx = (_path, _styleProps, ..._options) => undefined,
   themeMode = 'dark',
   rootDensity = 'fine',
   ...rest

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

@@ -45,10 +45,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;