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

package/src/components/Select/Select.tsx

@@ -5,8 +5,7 @@
 import * as SelectPrimitive from '@radix-ui/react-select';
 import React, { forwardRef } from 'react';
 
-import { useElevationContext, useThemeContext } from '../../hooks';
-import { useSafeCollisionPadding } from '../../hooks/useSafeCollisionPadding';
+import { useSafeCollisionPadding, useElevationContext, useThemeContext } from '../../hooks';
 import { type ThemedClassName } from '../../util';
 import { Button, type ButtonProps } from '../Button';
 import { Icon } from '../Icon';
@@ -34,12 +33,12 @@ const SelectPortal = SelectPrimitive.Portal;
 type SelectTriggerButtonProps = Omit<ButtonProps, 'children'> & Pick<SelectValueProps, 'placeholder' | 'children'>;
 
 const SelectTriggerButton = forwardRef<HTMLButtonElement, SelectTriggerButtonProps>(
-  ({ children, placeholder, ...props }, forwardedRef) => {
+  ({ children, placeholder, classNames, ...props }, forwardedRef) => {
+    const { tx } = useThemeContext();
     return (
       <SelectPrimitive.Trigger asChild ref={forwardedRef}>
-        <Button {...props}>
+        <Button {...props} classNames={tx('select.triggerButton', {}, classNames)}>
           <SelectPrimitive.Value placeholder={placeholder}>{children}</SelectPrimitive.Value>
-          <span className='is-1 flex-1' />
           <SelectPrimitive.Icon asChild>
             <Icon size={3} icon='ph--caret-down--bold' />
           </SelectPrimitive.Icon>
@@ -49,6 +48,8 @@ const SelectTriggerButton = forwardRef<HTMLButtonElement, SelectTriggerButtonPro
   },
 );
 
+SelectTriggerButton.displayName = 'Select.TriggerButton';
+
 type SelectContentProps = ThemedClassName<SelectPrimitive.SelectContentProps>;
 
 const SelectContent = forwardRef<HTMLDivElement, SelectContentProps>(
@@ -61,7 +62,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}
       >
@@ -71,6 +72,8 @@ const SelectContent = forwardRef<HTMLDivElement, SelectContentProps>(
   },
 );
 
+SelectContent.displayName = 'Select.Content';
+
 type SelectScrollUpButtonProps = ThemedClassName<SelectPrimitive.SelectScrollUpButtonProps>;
 
 const SelectScrollUpButton = forwardRef<HTMLDivElement, SelectScrollUpButtonProps>(
@@ -79,7 +82,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' />}
@@ -88,6 +91,8 @@ const SelectScrollUpButton = forwardRef<HTMLDivElement, SelectScrollUpButtonProp
   },
 );
 
+SelectScrollUpButton.displayName = 'Select.ScrollUpButton';
+
 type SelectScrollDownButtonProps = ThemedClassName<SelectPrimitive.SelectScrollDownButtonProps>;
 
 const SelectScrollDownButton = forwardRef<HTMLDivElement, SelectScrollDownButtonProps>(
@@ -96,7 +101,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' />}
@@ -105,30 +110,32 @@ const SelectScrollDownButton = forwardRef<HTMLDivElement, SelectScrollDownButton
   },
 );
 
+SelectScrollDownButton.displayName = 'Select.ScrollDownButton';
+
 type SelectViewportProps = ThemedClassName<SelectPrimitive.SelectViewportProps>;
 
 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>
     );
   },
 );
 
+SelectViewport.displayName = 'Select.Viewport';
+
 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} />;
 });
 
+SelectItem.displayName = 'Select.Item';
+
 type SelectItemTextProps = SelectPrimitive.SelectItemTextProps;
 
 const SelectItemText = SelectPrimitive.ItemText;
@@ -141,7 +148,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}
@@ -150,22 +157,23 @@ const SelectItemIndicator = forwardRef<HTMLDivElement, SelectItemIndicatorProps>
   },
 );
 
+SelectItemIndicator.displayName = 'Select.ItemIndicator';
+
 type SelectOptionProps = SelectItemProps;
 
-// TODO(burdon): Option to show icon on left/right.
 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', {})}> */}
-      <Icon icon='ph--check--regular' />
-      {/* </SelectPrimitive.ItemIndicator> */}
+      <span className='grow' />
+      <Icon size={3} icon='ph--check--regular' />
     </SelectPrimitive.Item>
   );
 });
 
+SelectOption.displayName = 'Select.Option';
+
 type SelectGroupProps = SelectPrimitive.SelectGroupProps;
 
 const SelectGroup = SelectPrimitive.Group;
@@ -178,28 +186,20 @@ 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} />;
 });
 
+SelectSeparator.displayName = 'Select.Separator';
+
 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} />;
 });
 
+SelectArrow.displayName = 'Select.Arrow';
+
 export const Select = {
   Root: SelectRoot,
   Trigger: SelectTrigger,

package/src/components/Separator/Separator.theme.ts

@@ -0,0 +1,23 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { mx } from '@dxos/ui-theme';
+import { type ComponentFunction, type Theme } from '@dxos/ui-types';
+
+export type SeparatorStyleProps = {
+  orientation?: 'horizontal' | 'vertical';
+  subdued?: boolean;
+};
+
+const root: ComponentFunction<SeparatorStyleProps> = ({ orientation, subdued }, ...etc) =>
+  mx(
+    'self-stretch',
+    orientation === 'vertical' ? 'border-e mx-1' : 'border-b my-1',
+    subdued ? 'border-subdued-separator' : 'border-separator',
+    ...etc,
+  );
+
+export const separatorTheme: Theme<SeparatorStyleProps> = {
+  root,
+};

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.theme.ts

@@ -0,0 +1,22 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { mx } from '@dxos/ui-theme';
+import type { ComponentFunction, Theme } from '@dxos/ui-types';
+
+export type SkeletonStyleProps = {
+  variant?: 'default' | 'circle' | 'text';
+};
+
+const root: ComponentFunction<SkeletonStyleProps> = ({ variant = 'default' }, ...etc) =>
+  mx(
+    'animate-pulse bg-neutral-300 dark:bg-neutral-700 rounded-md',
+    variant === 'circle' && 'rounded-full',
+    variant === 'text' && 'rounded-sm',
+    ...etc,
+  );
+
+export const skeletonTheme: Theme<SkeletonStyleProps> = {
+  root,
+};

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 { withLayout, withTheme } from '../../testing';
+import { Panel } from '../Panel';
 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.theme.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { mx } from '@dxos/ui-theme';
+import { type ComponentFunction, type Theme } from '@dxos/ui-types';
+
+export type SplitterStyleProps = {};
+
+const root: ComponentFunction<SplitterStyleProps> = (_props, ...etc) => mx('relative h-full overflow-hidden', ...etc);
+
+const panel: ComponentFunction<SplitterStyleProps> = (_props, ...etc) =>
+  mx('absolute inset-x-0 flex flex-col overflow-hidden', ...etc);
+
+export const splitterTheme: Theme<SplitterStyleProps> = {
+  root,
+  panel,
+};

package/src/components/Splitter/Splitter.tsx

@@ -3,22 +3,22 @@
 //
 
 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 { type ThemedClassName } from '../../util';
+import { useThemeContext } from '../../hooks';
+import { composableProps, slottable } from '../../util';
+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,29 +34,26 @@ const [SplitterProvider, useSplitterContext] = createSplitterContext<SplitterCon
 
 const ROOT_NAME = 'Splitter.Root';
 
-type RootProps = ThemedClassName<ComponentPropsWithoutRef<'div'>> & Partial<SplitterContextValue>;
+type SplitterRootProps = Partial<SplitterContextValue>;
+
+const SplitterRoot = slottable<HTMLDivElement, SplitterRootProps>(
+  ({ 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>
     );
   },
 );
 
-Root.displayName = ROOT_NAME;
+SplitterRoot.displayName = ROOT_NAME;
 
 //
 // Panel
@@ -64,60 +61,62 @@ Root.displayName = ROOT_NAME;
 
 const PANEL_NAME = 'Splitter.Panel';
 
-interface PanelProps extends ThemedClassName<ComponentPropsWithoutRef<'div'>> {
-  position: 'upper' | 'lower';
-}
+type SplitterPanelProps = 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;
+const SplitterPanel = slottable<HTMLDivElement, SplitterPanelProps>(
+  ({ 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 isUpper = position === 'upper';
-    const top = isUpper ? '0%' : mode === 'upper' ? '100%' : mode === 'lower' ? '0%' : `${ratio * 100}%`;
-
-    const height = isUpper
-      ? mode === 'upper'
+    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>
     );
   },
 );
 
-Panel.displayName = PANEL_NAME;
+SplitterPanel.displayName = PANEL_NAME;
 
 //
 // Splitter
 //
 
 const Splitter = {
-  Root,
-  Panel,
+  Root: SplitterRoot,
+  Panel: SplitterPanel,
 };
 
 export { Splitter, createSplitterScope };
 
-export type { Mode as SplitterMode, RootProps as SplitterRootProps, PanelProps as SplitterPanelProps };
+export type { Mode as SplitterMode, SplitterRootProps, SplitterPanelProps };