@dxos/react-ui 0.8.4-main.c85a9c8dae → 0.8.4-main.d05539e30a

package/src/components/ScrollArea/ScrollArea.stories.tsx

@@ -2,16 +2,18 @@
 // Copyright 2026 DXOS.org
 //
 
-import React, { useMemo } from 'react';
+import React, { PropsWithChildren, useMemo } from 'react';
 
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { mx } from '@dxos/ui-theme';
+import { ThemedClassName } from '@dxos/ui-types';
 
+import { Column } from '../../primitives';
 import { withLayout, withTheme } from '../../testing';
-
+import { Input } from '../Input';
 import { ScrollArea } from './ScrollArea';
 
-faker.seed(123);
+random.seed(123);
 
 export default {
   title: 'ui/react-ui-core/components/ScrollArea',
@@ -22,22 +24,22 @@ export default {
   },
 };
 
-const Column = () => (
+const List = ({ items = 50 }: { items?: number }) => (
   <div>
-    {Array.from({ length: 50 }).map((_, index) => (
-      <div key={index} className='px-1 text-sm cursor-pointer hover:bg-hover-surface'>
+    {Array.from({ length: items }).map((_, index) => (
+      <div key={index} className='px-1 cursor-pointer hover:bg-hover-surface'>
         Item {index + 1}
       </div>
     ))}
   </div>
 );
 
-const Row = () => (
+const Row = ({ items = 50 }: { items?: number }) => (
   <div className='flex gap-2 w-max'>
-    {Array.from({ length: 50 }).map((_, index) => (
+    {Array.from({ length: items }).map((_, index) => (
       <div
         key={index}
-        className='shrink-0 h-20 w-20 cursor-pointer border border-separator rounded-md flex items-center justify-center text-sm hover:bg-hover-surface'
+        className='shrink-0 h-20 w-20 cursor-pointer border border-separator rounded-md flex items-center justify-center hover:bg-hover-surface'
       >
         {index + 1}
       </div>
@@ -45,58 +47,91 @@ const Row = () => (
   </div>
 );
 
+const Container = ({ classNames, children }: ThemedClassName<PropsWithChildren>) => {
+  return <div className={mx('border border-separator rounded-md overflow-hidden', classNames)}>{children}</div>;
+};
+
 export const Vertical = {
   render: () => (
-    <div className='h-72 w-48 p-2 border border-separator rounded-md'>
-      <ScrollArea.Root orientation='vertical' padding>
+    <Container classNames='h-72 w-48'>
+      <ScrollArea.Root orientation='vertical'>
         <ScrollArea.Viewport>
-          <Column />
+          <List />
         </ScrollArea.Viewport>
       </ScrollArea.Root>
-    </div>
+    </Container>
   ),
 };
 
 export const VerticalThin = {
   render: () => (
-    <div className='h-72 w-48 p-2 border border-separator rounded-md'>
-      <ScrollArea.Root orientation='vertical' padding thin>
+    <Container classNames='h-72 w-48'>
+      <ScrollArea.Root orientation='vertical' thin>
         <ScrollArea.Viewport>
-          <Column />
+          <List />
         </ScrollArea.Viewport>
       </ScrollArea.Root>
-    </div>
+    </Container>
+  ),
+};
+
+export const VerticalPadded = {
+  render: () => (
+    <Container classNames='h-72 w-48'>
+      <ScrollArea.Root orientation='vertical' centered padding thin>
+        <ScrollArea.Viewport>
+          <List />
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    </Container>
+  ),
+};
+
+export const VerticalColumn = {
+  render: () => (
+    <Container classNames='h-72 w-48'>
+      <Column.Root gutter='sm' classNames='h-full overflow-hidden'>
+        <ScrollArea.Root orientation='vertical' padding thin>
+          <ScrollArea.Viewport classNames='py-2'>
+            <Input.Root>
+              <Input.TextInput classNames='p-1' />
+            </Input.Root>
+            <List />
+          </ScrollArea.Viewport>
+        </ScrollArea.Root>
+      </Column.Root>
+    </Container>
   ),
 };
 
 export const Horizontal = {
   render: () => (
-    <div className='w-96 p-2 border border-separator rounded-md'>
-      <ScrollArea.Root orientation='horizontal' padding>
+    <Container classNames='w-96'>
+      <ScrollArea.Root orientation='horizontal'>
         <ScrollArea.Viewport>
           <Row />
         </ScrollArea.Viewport>
       </ScrollArea.Root>
-    </div>
+    </Container>
   ),
 };
 
 export const HorizontalThin = {
   render: () => (
-    <div className='w-96 p-2 border border-separator rounded-md'>
-      <ScrollArea.Root orientation='horizontal' padding thin>
+    <Container classNames='w-96'>
+      <ScrollArea.Root orientation='horizontal' thin>
         <ScrollArea.Viewport>
           <Row />
         </ScrollArea.Viewport>
       </ScrollArea.Root>
-    </div>
+    </Container>
   ),
 };
 
 export const Both = {
   render: () => (
-    <div className='h-96 w-96 p-2 border border-separator rounded-md'>
-      <ScrollArea.Root orientation='all' padding>
+    <Container classNames='w-96 h-96'>
+      <ScrollArea.Root orientation='all'>
         <ScrollArea.Viewport>
           <div className='flex flex-col gap-2'>
             {Array.from({ length: 50 }).map((_, rowIndex) => (
@@ -114,7 +149,31 @@ export const Both = {
           </div>
         </ScrollArea.Viewport>
       </ScrollArea.Root>
-    </div>
+    </Container>
+  ),
+};
+
+export const Fullscreen = {
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
+  render: () => (
+    <ScrollArea.Root orientation='all' thin>
+      <ScrollArea.Viewport>
+        <div className='flex flex-col gap-2'>
+          {Array.from({ length: 50 }).map((_, rowIndex) => (
+            <div key={rowIndex} className='flex gap-2'>
+              {Array.from({ length: 50 }).map((_, colIndex) => (
+                <div
+                  key={colIndex}
+                  className='shrink-0 h-20 w-20 flex items-center justify-center text-sm border border-separator font-mono'
+                >
+                  [{colIndex}:{rowIndex}]
+                </div>
+              ))}
+            </div>
+          ))}
+        </div>
+      </ScrollArea.Viewport>
+    </ScrollArea.Root>
   ),
 };
 
@@ -125,13 +184,13 @@ export const NestedScrollAreas = {
       () =>
         Array.from({ length: 8 }).map((_, index) => ({
           id: String(index),
-          count: faker.number.int({ min: 5, max: 20 }),
+          count: random.number.int({ min: 5, max: 20 }),
         })),
       [],
     );
 
     return (
-      <ScrollArea.Root thin orientation='horizontal'>
+      <ScrollArea.Root orientation='horizontal' thin padding>
         <ScrollArea.Viewport classNames='gap-4'>
           {columns.map((column) => (
             <section
@@ -170,7 +229,7 @@ export const NativeScroll = {
           'group-hover:[&::-webkit-scrollbar-thumb]:bg-scrollbar-thumb',
         )}
       >
-        <Column />
+        <List />
       </div>
     </div>
   ),

package/src/components/ScrollArea/ScrollArea.tsx

@@ -5,9 +5,10 @@
 import { createContext } from '@radix-ui/react-context';
 import { Primitive } from '@radix-ui/react-primitive';
 import { Slot } from '@radix-ui/react-slot';
-import React, { type HTMLAttributes, forwardRef } from 'react';
+import React, { CSSProperties, useMemo } from 'react';
 
-import { type AllowedAxis, type SlottableProps, type ThemedClassName } from '@dxos/ui-types';
+import { composableProps, scrollbar, slottable } from '@dxos/ui-theme';
+import { type AllowedAxis, type SlottableProps } from '@dxos/ui-types';
 
 import { useThemeContext } from '../../hooks';
 
@@ -23,7 +24,7 @@ type ScrollAreaContextType = {
   /** Hide scrollbars when not scrolling. */
   autoHide: boolean;
   /** Apply padding to opposite side of scrollbar. */
-  margin?: boolean;
+  centered?: boolean;
   /** Apply padding. */
   padding: boolean;
   /** Use thin scrollbars. */
@@ -40,21 +41,19 @@ const [ScrollAreaProvider, useScrollAreaContext] = createContext<ScrollAreaConte
 
 const SCROLLAREA_ROOT_NAME = 'ScrollArea.Root';
 
-type ScrollAreaRootProps = SlottableProps<HTMLDivElement> & Partial<ScrollAreaContextType>;
+type ScrollAreaRootProps = Partial<ScrollAreaContextType>;
 
 /**
  * ScrollArea provides native scrollbars with custom styling.
  */
-const ScrollAreaRoot = forwardRef<HTMLDivElement, ScrollAreaRootProps>(
+const ScrollAreaRoot = slottable<HTMLDivElement, ScrollAreaRootProps>(
   (
     {
-      classNames,
-      className,
-      asChild,
       children,
+      asChild,
       orientation = 'vertical',
       autoHide = true,
-      margin = false,
+      centered = false,
       padding = false,
       thin = false,
       snap = false,
@@ -63,12 +62,16 @@ const ScrollAreaRoot = forwardRef<HTMLDivElement, ScrollAreaRootProps>(
     forwardedRef,
   ) => {
     const { tx } = useThemeContext();
+    const { className, ...rest } = composableProps(props);
     const Comp = asChild ? Slot : Primitive.div;
-    const options = { orientation, autoHide, margin, padding, thin, snap };
+    const options = useMemo(
+      () => ({ orientation, autoHide, centered, padding, thin, snap }),
+      [orientation, autoHide, centered, padding, thin, snap],
+    );
 
     return (
       <ScrollAreaProvider {...options}>
-        <Comp {...props} className={tx('scrollArea.root', options, [className, classNames])} ref={forwardedRef}>
+        <Comp {...rest} className={tx('scrollArea.root', options, className)} ref={forwardedRef}>
           {children}
         </Comp>
       </ScrollAreaProvider>
@@ -84,20 +87,33 @@ ScrollAreaRoot.displayName = SCROLLAREA_ROOT_NAME;
 
 const SCROLLAREA_VIEWPORT_NAME = 'ScrollArea.Viewport';
 
-type ScrollAreaViewportProps = ThemedClassName<HTMLAttributes<HTMLDivElement>>;
-
-const ScrollAreaViewport = forwardRef<HTMLDivElement, ScrollAreaViewportProps>(
-  ({ classNames, children, ...props }, forwardedRef) => {
-    const { tx } = useThemeContext();
-    const options = useScrollAreaContext(SCROLLAREA_VIEWPORT_NAME);
-
-    return (
-      <div {...props} className={tx('scrollArea.viewport', options, classNames)} ref={forwardedRef}>
-        {children}
-      </div>
-    );
-  },
-);
+type ScrollAreaViewportProps = SlottableProps;
+
+const ScrollAreaViewport = slottable<HTMLDivElement>(({ children, asChild, ...props }, forwardedRef) => {
+  const { tx } = useThemeContext();
+  const options = useScrollAreaContext(SCROLLAREA_VIEWPORT_NAME);
+  const density = options.thin ? scrollbar.thin : scrollbar.coarse;
+  const { className, ...rest } = composableProps(props);
+  const { style, ...restWithoutStyle } = rest as { style?: CSSProperties; [key: string]: any };
+  const Comp = asChild ? Slot : Primitive.div;
+
+  return (
+    <Comp
+      {...restWithoutStyle}
+      style={
+        {
+          '--scroll-width': `${density.size}px`,
+          '--scroll-padding': `${density.padding}px`,
+          ...style,
+        } as CSSProperties
+      }
+      className={tx('scrollArea.viewport', options, className)}
+      ref={forwardedRef}
+    >
+      {children}
+    </Comp>
+  );
+});
 
 ScrollAreaViewport.displayName = SCROLLAREA_VIEWPORT_NAME;
 

package/src/components/ScrollContainer/ScrollContainer.stories.tsx

@@ -5,23 +5,22 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useRef, useState } from 'react';
 
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 
 import { Panel } from '../../primitives';
 import { withLayout, withTheme } from '../../testing';
 import { Button } from '../Button';
 import { Toolbar } from '../Toolbar';
-
 import { ScrollContainer, type ScrollContainerRootProps, type ScrollController } from './ScrollContainer';
 
-type StoryProps = ScrollContainerRootProps & { running?: boolean; initialLines?: number };
+type DefaultStoryProps = ScrollContainerRootProps & { running?: boolean; initialLines?: number };
 
-const DefaultStory = ({ initialLines = 0, running: runningProp, ...props }: StoryProps) => {
+const DefaultStory = ({ initialLines = 0, running: runningProp, ...props }: DefaultStoryProps) => {
   const [lines, setLines] = useState<string[]>([]);
   const [running, setRunning] = useState(runningProp);
   const scroller = useRef<ScrollController>(null);
   useEffect(() => {
-    setLines(Array.from({ length: initialLines }, () => faker.lorem.paragraph()));
+    setLines(Array.from({ length: initialLines }, () => random.lorem.paragraph()));
   }, [initialLines]);
   useEffect(() => {
     if (!running) {
@@ -29,14 +28,14 @@ const DefaultStory = ({ initialLines = 0, running: runningProp, ...props }: Stor
     }
 
     const i = setInterval(() => {
-      setLines((lines) => [...lines, faker.lorem.paragraph()]);
+      setLines((lines) => [...lines, random.lorem.paragraph()]);
     }, 500);
 
     return () => clearInterval(i);
   }, [running]);
 
   return (
-    <Panel.Root className='dx-article'>
+    <Panel.Root className='dx-document'>
       <Panel.Toolbar asChild>
         <Toolbar.Root>
           <Button onClick={() => setRunning((running) => !running)}>{running ? 'Stop' : 'Start'}</Button>
@@ -45,16 +44,19 @@ const DefaultStory = ({ initialLines = 0, running: runningProp, ...props }: Stor
           <div className='px-1'>{lines.length}</div>
         </Toolbar.Root>
       </Panel.Toolbar>
-      <Panel.Content asChild>
+      <Panel.Content>
         <ScrollContainer.Root {...props} ref={scroller}>
-          <ScrollContainer.Viewport>
-            {lines.map((line, index) => (
-              <div key={index} className='p-2 text-description'>
-                {line}
-              </div>
-            ))}
-          </ScrollContainer.Viewport>
-          <ScrollContainer.ScrollDownButton />
+          <ScrollContainer.Content>
+            <ScrollContainer.Viewport>
+              {lines.map((line, index) => (
+                <div key={index} className='p-2 text-description'>
+                  {line}
+                </div>
+              ))}
+            </ScrollContainer.Viewport>
+            <ScrollContainer.ScrollDownButton />
+            <ScrollContainer.Fade />
+          </ScrollContainer.Content>
         </ScrollContainer.Root>
       </Panel.Content>
     </Panel.Root>
@@ -75,7 +77,7 @@ type Story = StoryObj<typeof meta>;
 export const Default: Story = {
   args: {
     pin: true,
-    fade: true,
+
     running: true,
   },
 };
@@ -83,7 +85,7 @@ export const Default: Story = {
 export const Large: Story = {
   args: {
     pin: true,
-    fade: true,
+
     initialLines: 100,
   },
 };