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

package/src/playground/Custom.stories.tsx

@@ -30,7 +30,7 @@ const DefaultStory = ({ children, ...args }: Omit<ButtonProps, 'ref'>) => {
               iconOnly
               size={7}
               density='coarse'
-              classNames='px-1.5'
+              classNames='pli-1.5'
             />
           </div>
         </div>
@@ -43,7 +43,7 @@ const DefaultStory = ({ children, ...args }: Omit<ButtonProps, 'ref'>) => {
             </Button>
           </div>
           <div className='flex justify-center'>
-            <IconButton {...args} label='Test' icon='ph--atom--regular' size={5} density='fine' classNames='px-2' />
+            <IconButton {...args} label='Test' icon='ph--atom--regular' density='fine' classNames='pli-2' />
           </div>
           <div className='flex justify-center'>
             <IconButton
@@ -51,9 +51,8 @@ const DefaultStory = ({ children, ...args }: Omit<ButtonProps, 'ref'>) => {
               label='Test'
               icon='ph--atom--regular'
               iconOnly
-              size={5}
               density='fine'
-              classNames='py-1 px-1.5'
+              classNames='plb-1 pli-1.5'
             />
           </div>
         </div>
@@ -61,7 +60,7 @@ const DefaultStory = ({ children, ...args }: Omit<ButtonProps, 'ref'>) => {
         {/* Small */}
         <div className='grid grid-cols-3 gap-4'>
           <div className='flex justify-center'>
-            <Button {...args} density='fine' classNames={'!h-[24px] !text-[14px] p-0 px-1.5 min-bs-0'}>
+            <Button {...args} density='fine' classNames={'!h-[24px] !text-[14px] p-0 pli-1.5 min-bs-0'}>
               {children}
             </Button>
           </div>
@@ -90,18 +89,17 @@ const DefaultStory = ({ children, ...args }: Omit<ButtonProps, 'ref'>) => {
 
         {/* TODO(burdon): Full variant with max width. */}
         <div className='flex justify-center'>
-          <Button classNames='w-full max-w-[15rem] rounded' variant='default'>
+          <Button classNames='is-full max-is-[15rem] rounded' variant='default'>
             Test
           </Button>
         </div>
         <div className='flex justify-center'>
           {/* TODO(burdon): Option to have button on RHS. Default size for icon should be 5 for this (medium) density. */}
           <IconButton
-            classNames='w-full max-w-[15rem] rounded'
+            classNames='is-full max-is-[15rem] rounded'
             variant='primary'
             icon='ph--arrows-clockwise--regular'
             label='Test'
-            size={5}
           />
         </div>
       </div>
@@ -110,10 +108,10 @@ const DefaultStory = ({ children, ...args }: Omit<ButtonProps, 'ref'>) => {
 };
 
 const meta = {
-  title: 'ui/react-ui-core/Playground/Custom',
+  title: 'ui/react-ui-core/playground/Custom',
   component: Button,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme()],
   parameters: {
     layout: 'centered',
   },

package/src/playground/Typography.stories.tsx

@@ -43,9 +43,9 @@ const DefaultStory = () => {
 };
 
 const meta = {
-  title: 'ui/react-ui-core/Playground/Typography',
+  title: 'ui/react-ui-core/playground/Typography',
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme()],
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;

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

@@ -0,0 +1,67 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { Input } from '../../components';
+import { withTheme } from '../../testing';
+
+import { Container, type ContainerRootProps } from './Container';
+
+const DefaultStory = (props: ContainerRootProps) => {
+  return (
+    <div className='plb-2 is-[20rem] border border-separator rounded-sm'>
+      <Container.Root {...props}>
+        <Container.Column>
+          <Input.Root>
+            <Input.Label>Label</Input.Label>
+            <Input.TextInput />
+          </Input.Root>
+        </Container.Column>
+      </Container.Root>
+    </div>
+  );
+};
+
+const meta: Meta<typeof Container.Root> = {
+  title: 'ui/react-ui-core/primitives/Container',
+  component: Container.Root,
+  render: DefaultStory,
+  decorators: [withTheme()],
+  parameters: {
+    layout: 'centered',
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+// TODO(burdon): Requires container.
+export const Default = () => {
+  return (
+    <Container.Root>
+      <Container.Column>Column</Container.Column>
+    </Container.Root>
+  );
+};
+
+export const SM: Story = {
+  args: {
+    variant: 'sm',
+  },
+};
+
+export const MD: Story = {
+  args: {
+    variant: 'md',
+  },
+};
+
+export const LG: Story = {
+  args: {
+    variant: 'lg',
+  },
+};

package/src/primitives/Container/Container.tsx

@@ -0,0 +1,82 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { createContext } from '@radix-ui/react-context';
+import { Primitive } from '@radix-ui/react-primitive';
+import { Slot } from '@radix-ui/react-slot';
+import React, { type PropsWithChildren, type Ref, forwardRef } from 'react';
+
+import { type ColumnPadding } from '@dxos/ui-theme';
+import { type SlottableProps } from '@dxos/ui-types';
+
+import { useThemeContext } from '../../hooks';
+
+// TODO(burdon): Replace Form, Container, Card spacing.
+// TODO(burdon): Scrolling (reconcile with Mosaic Viewport).
+// TODO(burdon): Reconcile AnchoredOverflow.
+
+//
+// Context
+//
+
+type ContainerContext = {
+  variant?: ColumnPadding;
+};
+
+const [ContainerProvider, useContext] = createContext<ContainerContext>('Container');
+
+//
+// Root
+//
+
+type RootProps = PropsWithChildren<Partial<ContainerContext>>;
+
+const Root = ({ variant, children }: RootProps) => {
+  return <ContainerProvider {...{ variant }}>{children}</ContainerProvider>;
+};
+
+//
+// Column
+//
+
+const CONTAINER_COLUMN_NAME = 'Container.Column';
+
+type ColumnProps = SlottableProps<HTMLDivElement> & { variant?: ColumnPadding };
+
+const Column = forwardRef(
+  (
+    { classNames, className, asChild, role = 'none', children, variant, ...props }: ColumnProps,
+    ref: Ref<HTMLDivElement>,
+  ) => {
+    const { tx } = useThemeContext();
+    const Root = asChild ? Slot : Primitive.div;
+    const context = useContext(CONTAINER_COLUMN_NAME);
+    return (
+      <Root
+        {...props}
+        className={tx('container.column', 'container__column', { variant: variant ?? context.variant }, [
+          className,
+          classNames,
+        ])}
+        role={role}
+        ref={ref}
+      >
+        {children}
+      </Root>
+    );
+  },
+);
+
+Column.displayName = CONTAINER_COLUMN_NAME;
+
+//
+// Container
+//
+
+export const Container = {
+  Root,
+  Column,
+};
+
+export type { RootProps as ContainerRootProps, ColumnProps as ContainerColumnProps };

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

@@ -0,0 +1,57 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { Input, ScrollArea, Toolbar } from '../../components';
+import { withLayout, withTheme } from '../../testing';
+
+import { Layout } from './Layout';
+
+const DefaultStory = ({ count }: { count: number }) => {
+  return (
+    <Layout.Main toolbar statusbar>
+      <Toolbar.Root classNames='gap-2'>
+        <Toolbar.IconButton icon='ph--plus--regular' variant='primary' label='Add' />
+        <Input.Root>
+          <Input.TextInput placeholder='Search' />
+        </Input.Root>
+        <Toolbar.IconButton icon='ph--dots-three-vertical--regular' iconOnly label='Menu' />
+      </Toolbar.Root>
+      <ScrollArea.Root thin orientation='vertical'>
+        <ScrollArea.Viewport classNames='pli-2 plb-1 gap-1'>
+          {Array.from({ length: count }).map((_, index) => (
+            <div key={index} role='listitem' className='pli-2 plb-1 border border-separator'>
+              {index}
+            </div>
+          ))}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+      <Toolbar.Root classNames='justify-between'>
+        <Toolbar.IconButton variant='ghost' icon='ph--house--regular' iconOnly label='Add' size={4} />
+        <Toolbar.IconButton variant='ghost' icon='ph--alarm--regular' iconOnly label='Status' size={4} />
+      </Toolbar.Root>
+    </Layout.Main>
+  );
+};
+
+const meta: Meta<typeof DefaultStory> = {
+  title: 'ui/react-ui-core/primitives/Layout',
+  component: DefaultStory,
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
+  parameters: {
+    layout: 'fullscreen',
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    count: 100,
+  },
+};

package/src/primitives/Container/Layout.tsx

@@ -0,0 +1,61 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React, { type PropsWithChildren, forwardRef, useMemo } from 'react';
+
+import { mx } from '@dxos/ui-theme';
+import { type ThemedClassName } from '@dxos/ui-types';
+
+//
+// Main
+//
+
+type MainProps = ThemedClassName<
+  PropsWithChildren<{
+    role?: string;
+    toolbar?: boolean;
+    statusbar?: boolean;
+  }>
+>;
+
+const Main = forwardRef<HTMLDivElement, MainProps>(
+  ({ classNames, children, role, toolbar, statusbar }, forwardedRef) => {
+    const style = useMemo(
+      () => ({
+        gridTemplateRows: [toolbar && 'var(--toolbar-size)', '1fr', statusbar && 'var(--statusbar-size)']
+          .filter(Boolean)
+          .join(' '),
+      }),
+      [toolbar, statusbar],
+    );
+
+    return (
+      <div
+        ref={forwardedRef}
+        role={role ?? 'none'}
+        style={style}
+        className={mx(
+          'bs-full is-full grid grid-cols-[100%] overflow-hidden',
+          toolbar && [
+            '[.dx-main-mobile-layout_&>.dx-toolbar]:pli-3 [&>.dx-toolbar]:relative',
+            '[&>.dx-toolbar]:border-be [&>.dx-toolbar]:border-subduedSeparator',
+          ],
+          classNames,
+        )}
+      >
+        {children}
+      </div>
+    );
+  },
+);
+
+//
+// Layout
+//
+
+export const Layout = {
+  Main,
+};
+
+export type { MainProps as LayoutMainProps };

package/src/primitives/Container/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export * from './Container';
+export * from './Layout';

package/src/primitives/Flex/Flex.tsx

@@ -0,0 +1,26 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React, { type HTMLAttributes } from 'react';
+
+import { mx } from '@dxos/ui-theme';
+import { type ThemedClassName } from '@dxos/ui-types';
+
+export type FlexProps = ThemedClassName<
+  HTMLAttributes<HTMLDivElement> & {
+    column?: boolean;
+    grow?: boolean;
+  }
+>;
+
+export const Flex = ({ children, classNames, role, column, grow }: FlexProps) => {
+  return (
+    <div
+      role={role ?? 'none'}
+      className={mx('flex', column && 'flex-col', grow && 'flex-1 overflow-hidden', classNames)}
+    >
+      {children}
+    </div>
+  );
+};

package/src/primitives/Flex/index.ts

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

package/src/primitives/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export * from './Container';
+export * from './Flex';

package/src/testing/decorators/index.ts

@@ -3,5 +3,5 @@
 //
 
 export * from './withLayout';
-export * from './withSurfaceVariantsLayout';
+export * from './withLayoutVariants';
 export * from './withTheme';

package/src/testing/decorators/withLayout.tsx

@@ -3,45 +3,52 @@
 //
 
 import { type Decorator } from '@storybook/react';
-import React, { type FC, type PropsWithChildren } from 'react';
+import React, { type FC, type PropsWithChildren, memo } from 'react';
 
 import { type ClassNameValue, type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 export type ContainerProps = ThemedClassName<PropsWithChildren>;
 
-export type ContainerType = 'default' | 'column';
+export type ContainerType = 'fullscreen' | 'column';
 
 export type WithLayoutProps =
   | FC<ContainerProps>
-  | { classNames?: ClassNameValue; container?: ContainerType; scroll?: boolean };
+  | {
+      classNames?: ClassNameValue;
+      layout?: ContainerType;
+      scroll?: boolean;
+    };
 
 /**
  * Adds layout container.
  */
 export const withLayout =
-  (props: WithLayoutProps): Decorator =>
+  (props: WithLayoutProps = {}): Decorator =>
   (Story) => {
+    // Prevent re-rendering of the story.
+    const MemoizedStory = memo(Story);
     if (typeof props === 'function') {
       const Container = props;
       return (
         <Container>
-          <Story />
+          <MemoizedStory />
+        </Container>
+      );
+    } else {
+      const { layout = 'fullscreen', classNames, scroll } = props;
+      const Container = layouts[layout] ?? layouts.fullscreen;
+      return (
+        <Container classNames={mx(classNames, scroll ? 'overflow-y-auto' : 'overflow-hidden')}>
+          <MemoizedStory />
         </Container>
       );
     }
-
-    const Container = layouts[(props as any).container as ContainerType] ?? layouts.default;
-    return (
-      <Container classNames={mx(props.classNames, props.scroll ? 'overflow-y-auto' : 'overflow-hidden')}>
-        <Story />
-      </Container>
-    );
   };
 
 const layouts: Record<ContainerType, FC<ContainerProps>> = {
-  default: ({ children, classNames }: ContainerProps) => (
-    <div role='none' className={mx(classNames)}>
+  fullscreen: ({ children, classNames }: ContainerProps) => (
+    <div role='none' className={mx('fixed inset-0 flex overflow-hidden bg-deckSurface', classNames)}>
       {children}
     </div>
   ),

package/src/testing/decorators/{withSurfaceVariantsLayout.tsx → withLayoutVariants.tsx}

@@ -5,8 +5,8 @@
 import { type Decorator } from '@storybook/react';
 import React, { type ComponentType, type PropsWithChildren } from 'react';
 
-import { mx, surfaceShadow } from '@dxos/react-ui-theme';
-import { type Density, type Elevation } from '@dxos/react-ui-types';
+import { mx, surfaceShadow } from '@dxos/ui-theme';
+import { type Density, type Elevation } from '@dxos/ui-types';
 
 type Config = {
   elevations?: { elevation: Elevation; surface?: string }[];
@@ -14,7 +14,7 @@ type Config = {
 };
 
 const Container = ({ children, elevation, surface }: PropsWithChildren<{ elevation: Elevation; surface?: string }>) => (
-  <div className={mx('rounded-md border border-separator p-2', surface, surfaceShadow({ elevation }))}>{children}</div>
+  <div className={mx('rounded-md border border-separator', surface, surfaceShadow({ elevation }))}>{children}</div>
 );
 
 const Panel = ({
@@ -23,7 +23,7 @@ const Panel = ({
   densities,
   className,
 }: { Story: ComponentType } & Config & { className?: string }) => (
-  <div className={mx('flex flex-col h-full p-4 gap-4', className)}>
+  <div className={mx('flex flex-col bs-full p-4 gap-4', className)}>
     {elevations?.map(({ elevation, surface }) =>
       densities?.map((density) => (
         <Container key={`${elevation}--${density}`} surface={surface} elevation={elevation}>
@@ -34,7 +34,7 @@ const Panel = ({
   </div>
 );
 
-export const withSurfaceVariantsLayout = ({
+export const withLayoutVariants = ({
   elevations = [
     { elevation: 'base', surface: 'bg-baseSurface' },
     { elevation: 'positioned', surface: 'bg-cardSurface' },

package/src/testing/decorators/withTheme.tsx

@@ -5,27 +5,30 @@
 import { type Decorator } from '@storybook/react';
 import React, { memo } from 'react';
 
-import { defaultTx } from '@dxos/react-ui-theme';
+import { defaultTx } from '@dxos/ui-theme';
+import { type ThemeMode } from '@dxos/ui-types';
 
-import { type ThemeMode, ThemeProvider, Tooltip } from '../../components';
+import { type ThemeContextValue, ThemeProvider, Tooltip } from '../../components';
 
 /**
- * Adds theme decorator (add to preview.ts)
+ * Adds theme decorator.
  */
-export const withTheme: Decorator = (Story, context) => {
-  const {
-    globals: { theme },
-    parameters: { translations },
-  } = context;
+export const withTheme =
+  ({ tx = defaultTx, ...props }: Partial<ThemeContextValue> = {}): Decorator =>
+  (Story, context) => {
+    const {
+      globals: { theme },
+      parameters: { translations },
+    } = context;
 
-  // Prevent re-rendering of the story.
-  const MemoizedStory = memo(Story);
+    // Prevent re-rendering of the story.
+    const MemoizedStory = memo(Story);
 
-  return (
-    <ThemeProvider tx={defaultTx} themeMode={theme as ThemeMode} resourceExtensions={translations} noCache>
-      <Tooltip.Provider>
-        <MemoizedStory />
-      </Tooltip.Provider>
-    </ThemeProvider>
-  );
-};
+    return (
+      <ThemeProvider {...props} tx={tx} themeMode={theme as ThemeMode} resourceExtensions={translations} noCache>
+        <Tooltip.Provider>
+          <MemoizedStory />
+        </Tooltip.Provider>
+      </ThemeProvider>
+    );
+  };

package/src/util/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './domino';
+export type { ThemedClassName } from '@dxos/ui-types';
+
 export * from './hasIosKeyboard';
-export type * from './ThemedClassName';
 export * from './usePx';