@dxos/react-ui 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/src/components/Popover/Popover.tsx

@@ -485,7 +485,7 @@ const PopoverContentImpl = forwardRef<PopoverContentImplElement, PopoverContentI
             {...contentProps}
             collisionPadding={safeCollisionPadding}
             collisionBoundary={computedCollisionBoundary}
-            className={tx('popover.content', 'popover', { elevation }, classNames)}
+            className={tx('popover.content', { elevation }, classNames)}
             ref={forwardedRef}
             style={{
               ...contentProps.style,
@@ -550,7 +550,7 @@ const PopoverArrow = forwardRef<PopoverArrowElement, PopoverArrowProps>(
       <PopperPrimitive.Arrow
         {...popperScope}
         {...arrowProps}
-        className={tx('popover.arrow', 'popover__arrow', {}, classNames)}
+        className={tx('popover.arrow', {}, classNames)}
         ref={forwardedRef}
       />
     );
@@ -576,7 +576,7 @@ const PopoverViewport = forwardRef<HTMLDivElement, PopoverViewportProps>(
     return (
       <Root
         {...props}
-        className={tx('popover.viewport', 'popover__viewport', { constrainInline, constrainBlock }, classNames)}
+        className={tx('popover.viewport', { constrainInline, constrainBlock }, classNames)}
         ref={forwardedRef}
       >
         {children}

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

@@ -1,101 +1,177 @@
 //
-// Copyright 2023 DXOS.org
+// Copyright 2026 DXOS.org
 //
 
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React, { type PropsWithChildren } from 'react';
+import React, { useMemo } from 'react';
 
 import { faker } from '@dxos/random';
-import { activeSurface, surfaceShadow } from '@dxos/ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 import { withLayout, withTheme } from '../../testing';
 
 import { ScrollArea } from './ScrollArea';
 
-faker.seed(1234);
-
-const DefaultStory = ({ children }: PropsWithChildren<{}>) => {
-  return (
-    <ScrollArea.Root
-      classNames={['is-[300px] bs-[400px] rounded', activeSurface, surfaceShadow({ elevation: 'positioned' })]}
-    >
-      <ScrollArea.Viewport classNames='rounded p-4'>
-        <p>{children}</p>
-      </ScrollArea.Viewport>
-      <ScrollArea.Scrollbar orientation='horizontal'>
-        <ScrollArea.Thumb />
-      </ScrollArea.Scrollbar>
-      <ScrollArea.Scrollbar orientation='vertical'>
-        <ScrollArea.Thumb />
-      </ScrollArea.Scrollbar>
-      <ScrollArea.Corner />
-    </ScrollArea.Root>
-  );
-};
+faker.seed(123);
 
-const meta = {
-  title: 'ui/react-ui-core/ScrollArea',
-  component: ScrollArea as any,
-  render: DefaultStory,
-  decorators: [withTheme, withLayout({ layout: 'fullscreen' })],
+export default {
+  title: 'ui/react-ui-core/components/ScrollArea',
+  component: ScrollArea,
+  decorators: [withTheme()],
   parameters: {
-    layout: 'fullscreen',
+    layout: 'centered',
   },
-} satisfies Meta<typeof DefaultStory>;
+};
 
-export default meta;
+const Column = () => (
+  <div>
+    {Array.from({ length: 50 }).map((_, index) => (
+      <div key={index} className='pli-1 text-sm cursor-pointer hover:bg-hoverSurface'>
+        Item {index + 1}
+      </div>
+    ))}
+  </div>
+);
 
-type Story = StoryObj<typeof meta>;
+const Row = () => (
+  <div className='flex gap-2 is-max'>
+    {Array.from({ length: 50 }).map((_, index) => (
+      <div
+        key={index}
+        className='shrink-0 bs-20 is-20 cursor-pointer border border-separator rounded-md flex items-center justify-center text-sm hover:bg-hoverSurface'
+      >
+        {index + 1}
+      </div>
+    ))}
+  </div>
+);
 
-export const Default: Story = {
-  args: {
-    children: faker.lorem.paragraphs(5),
-  },
+export const Vertical = {
+  render: () => (
+    <div className='bs-72 is-48 p-2 border border-separator rounded-md'>
+      <ScrollArea.Root orientation='vertical' padding>
+        <ScrollArea.Viewport>
+          <Column />
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    </div>
+  ),
 };
 
-export const NestedScrollAreas: Story = {
-  render: () => {
-    const columns = Array.from({ length: 3 }).map((_, index) => ({
-      id: String(index),
-      itemCount: 20,
-    }));
+export const VerticalThin = {
+  render: () => (
+    <div className='bs-72 is-48 p-2 border border-separator rounded-md'>
+      <ScrollArea.Root orientation='vertical' padding thin>
+        <ScrollArea.Viewport>
+          <Column />
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    </div>
+  ),
+};
 
-    return (
-      <div className='p-4 bs-full is-full overflow-hidden'>
-        <div className='flex bs-full is-full overflow-hidden border border-sky-500'>
-          <ScrollArea.Root>
-            <ScrollArea.Viewport>
-              <div className='flex gap-4 p-3 bs-full overflow-hidden'>
-                {columns.map((column) => (
-                  <div key={column.id} className='flex flex-col gap-1 bs-full overflow-hidden is-[300px]'>
-                    <div className='flex shrink-0 p-2 border border-separator'>Column {column.id}</div>
-                    <ScrollArea.Expander classNames='border border-rose-500'>
-                      <ScrollArea.Root>
-                        <ScrollArea.Viewport>
-                          <div className='flex flex-col p-3 space-y-2'>
-                            {Array.from({ length: column.itemCount }, (_, i) => (
-                              <div key={i} className={`p-3 border border-separator rounded-sm`}>
-                                Item {i + 1}
-                              </div>
-                            ))}
-                          </div>
-                        </ScrollArea.Viewport>
-                        <ScrollArea.Scrollbar orientation='vertical'>
-                          <ScrollArea.Thumb />
-                        </ScrollArea.Scrollbar>
-                      </ScrollArea.Root>
-                    </ScrollArea.Expander>
-                    <div className={`p-2 border border-separator`}>Footer</div>
+export const Horizontal = {
+  render: () => (
+    <div className='is-96 p-2 border border-separator rounded-md'>
+      <ScrollArea.Root orientation='horizontal' padding>
+        <ScrollArea.Viewport>
+          <Row />
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    </div>
+  ),
+};
+
+export const HorizontalThin = {
+  render: () => (
+    <div className='is-96 p-2 border border-separator rounded-md'>
+      <ScrollArea.Root orientation='horizontal' padding thin>
+        <ScrollArea.Viewport>
+          <Row />
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    </div>
+  ),
+};
+
+export const Both = {
+  render: () => (
+    <div className='bs-96 is-96 p-2 border border-separator rounded-md'>
+      <ScrollArea.Root orientation='all' padding>
+        <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 bs-20 is-20 flex items-center justify-center text-sm border border-separator font-mono'
+                  >
+                    [{colIndex}:{rowIndex}]
                   </div>
                 ))}
               </div>
-            </ScrollArea.Viewport>
-            <ScrollArea.Scrollbar orientation='horizontal'>
-              <ScrollArea.Thumb />
-            </ScrollArea.Scrollbar>
-          </ScrollArea.Root>
-        </div>
-      </div>
+            ))}
+          </div>
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    </div>
+  ),
+};
+
+export const NestedScrollAreas = {
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
+  render: () => {
+    const columns = useMemo(
+      () =>
+        Array.from({ length: 8 }).map((_, index) => ({
+          id: String(index),
+          count: faker.number.int({ min: 5, max: 20 }),
+        })),
+      [],
+    );
+
+    return (
+      <ScrollArea.Root thin orientation='horizontal'>
+        <ScrollArea.Viewport classNames='gap-4'>
+          {columns.map((column) => (
+            <section
+              key={column.id}
+              className='shrink-0 bs-full is-[16rem] grid grid-rows-[min-content_1fr_min-content] border border-separator'
+            >
+              <header className='flex shrink-0 p-2 border-be border-separator'>Column {column.id}</header>
+              <ScrollArea.Root thin orientation='vertical'>
+                <ScrollArea.Viewport classNames='plb-2 pli-2 gap-2'>
+                  {Array.from({ length: column.count }, (_, i) => (
+                    <div key={i} role='listitem' className={`shrink-0 p-2 text-sm border border-separator rounded-sm`}>
+                      Item {i + 1}
+                    </div>
+                  ))}
+                </ScrollArea.Viewport>
+              </ScrollArea.Root>
+              <footer className={`p-2 text-subdued border-bs border-separator`}>{column.count}</footer>
+            </section>
+          ))}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
     );
   },
 };
+
+export const NativeScroll = {
+  render: () => (
+    <div className='group bs-48 is-48 border border-separator'>
+      <div
+        className={mx(
+          'group bs-full is-full overflow-y-scroll',
+          '[&::-webkit-scrollbar]:is-3',
+          '[&::-webkit-scrollbar-thumb]:rounded-none',
+          '[&::-webkit-scrollbar-track]:bg-scrollbarTrack',
+          '[&::-webkit-scrollbar-thumb]:bg-scrollbarThumbSubdued',
+          'group-hover:[&::-webkit-scrollbar-thumb]:bg-scrollbarThumb',
+        )}
+      >
+        <Column />
+      </div>
+    </div>
+  ),
+};

package/src/components/ScrollArea/ScrollArea.tsx

@@ -1,138 +1,101 @@
 //
-// Copyright 2023 DXOS.org
+// Copyright 2026 DXOS.org
 //
 
-import {
-  Corner as ScrollAreaPrimitiveCorner,
-  type ScrollAreaCornerProps as ScrollAreaPrimitiveCornerProps,
-  Root as ScrollAreaPrimitiveRoot,
-  type ScrollAreaProps as ScrollAreaPrimitiveRootProps,
-  Scrollbar as ScrollAreaPrimitiveScrollbar,
-  type ScrollAreaScrollbarProps as ScrollAreaPrimitiveScrollbarProps,
-  Thumb as ScrollAreaPrimitiveThumb,
-  type ScrollAreaThumbProps as ScrollAreaPrimitiveThumbProps,
-  Viewport as ScrollAreaPrimitiveViewport,
-  type ScrollAreaViewportProps as ScrollAreaPrimitiveViewportProps,
-} from '@radix-ui/react-scroll-area';
-import React, { type PropsWithChildren, forwardRef } from 'react';
-
-import { mx } from '@dxos/ui-theme';
+import { createContext } from '@radix-ui/react-context';
+import React, { type HTMLAttributes, forwardRef } from 'react';
 
-import { useThemeContext } from '../../hooks';
-import { type ThemedClassName } from '../../util';
+import { type AllowedAxis, type SlottableProps, type ThemedClassName } from '@dxos/ui-types';
 
-type ScrollAreaVariant = 'coarse' | 'fine';
+import { useThemeContext } from '../../hooks';
 
 //
-// Root
+// Context
 //
 
-type ScrollAreaRootProps = ThemedClassName<ScrollAreaPrimitiveRootProps>;
-
-const ScrollAreaRoot = forwardRef<HTMLDivElement, ScrollAreaRootProps>(({ classNames, ...props }, forwardedRef) => {
-  const { tx } = useThemeContext();
-  return (
-    <ScrollAreaPrimitiveRoot
-      {...props}
-      className={tx('scrollArea.root', 'scroll-area', {}, classNames)}
-      ref={forwardedRef}
-    />
-  );
-});
-
-//
-// Viewport
-//
+const SCROLLAREA_NAME = 'ScrollArea';
 
-type ScrollAreaViewportProps = ThemedClassName<ScrollAreaPrimitiveViewportProps>;
+type ScrollAreaContextType = {
+  /** Orientation of scrollbars. */
+  orientation: AllowedAxis;
+  /** Hide scrollbars when not scrolling. */
+  autoHide: boolean;
+  /** Apply padding to opposite side of scrollbar. */
+  margin?: boolean;
+  /** Apply padding. */
+  padding: boolean;
+  /** Use thin scrollbars. */
+  thin: boolean;
+  /** Enable snap scrolling. */
+  snap: boolean;
+};
 
-const ScrollAreaViewport = forwardRef<HTMLDivElement, ScrollAreaViewportProps>(
-  ({ classNames, ...props }, forwardedRef) => {
-    const { tx } = useThemeContext();
-    return (
-      <ScrollAreaPrimitiveViewport
-        {...props}
-        className={tx('scrollArea.viewport', 'scroll-area', {}, classNames)}
-        ref={forwardedRef}
-      />
-    );
-  },
-);
+const [ScrollAreaProvider, useScrollAreaContext] = createContext<ScrollAreaContextType>(SCROLLAREA_NAME);
 
 //
-// Scrollbar
+// Root
 //
 
-type ScrollAreaScrollbarProps = ThemedClassName<ScrollAreaPrimitiveScrollbarProps> & { variant?: ScrollAreaVariant };
+const SCROLLAREA_ROOT_NAME = 'ScrollArea.Root';
+
+type ScrollAreaRootProps = SlottableProps<HTMLDivElement> & Partial<ScrollAreaContextType>;
 
-const ScrollAreaScrollbar = forwardRef<HTMLDivElement, ScrollAreaScrollbarProps>(
-  ({ classNames, variant = 'fine', ...props }, forwardedRef) => {
+/**
+ * ScrollArea provides native scrollbars with custom styling.
+ */
+const ScrollAreaRoot = forwardRef<HTMLDivElement, ScrollAreaRootProps>(
+  (
+    {
+      classNames,
+      className,
+      children,
+      orientation = 'vertical',
+      autoHide = true,
+      margin = true, // TODO(burdon): Is this the right default?
+      padding = false,
+      thin = false,
+      snap = false,
+      ...props
+    },
+    forwardedRef,
+  ) => {
     const { tx } = useThemeContext();
+    const options = { orientation, autoHide, margin, padding, thin, snap };
+
     return (
-      <ScrollAreaPrimitiveScrollbar
-        data-variant={variant}
-        {...props}
-        className={tx('scrollArea.scrollbar', 'scroll-area__scrollbar', {}, classNames)}
-        ref={forwardedRef}
-      />
+      <ScrollAreaProvider {...options}>
+        <div {...props} className={tx('scrollArea.root', options, [className, classNames])} ref={forwardedRef}>
+          {children}
+        </div>
+      </ScrollAreaProvider>
     );
   },
 );
 
-//
-// Thumb
-//
-
-type ScrollAreaThumbProps = ThemedClassName<ScrollAreaPrimitiveThumbProps>;
-
-const ScrollAreaThumb = forwardRef<HTMLDivElement, ScrollAreaThumbProps>(({ classNames, ...props }, forwardedRef) => {
-  const { tx } = useThemeContext();
-  return (
-    <ScrollAreaPrimitiveThumb
-      {...props}
-      className={tx('scrollArea.thumb', 'scroll-area__thumb', {}, classNames)}
-      ref={forwardedRef}
-    />
-  );
-});
+ScrollAreaRoot.displayName = SCROLLAREA_ROOT_NAME;
 
 //
-// Corner
+// Viewport
 //
 
-type ScrollAreaCornerProps = ThemedClassName<ScrollAreaPrimitiveCornerProps>;
+const SCROLLAREA_VIEWPORT_NAME = 'ScrollArea.Viewport';
 
-const ScrollAreaCorner = forwardRef<HTMLDivElement, ScrollAreaCornerProps>(({ classNames, ...props }, forwardedRef) => {
-  const { tx } = useThemeContext();
-  return (
-    <ScrollAreaPrimitiveCorner
-      {...props}
-      className={tx('scrollArea.corner', 'scroll-area__corner', {}, classNames)}
-      ref={forwardedRef}
-    />
-  );
-});
+type ScrollAreaViewportProps = ThemedClassName<HTMLAttributes<HTMLDivElement>>;
 
-//
-// Expander
-//
-
-type ScrollAreaExpanderProps = ThemedClassName<PropsWithChildren>;
+const ScrollAreaViewport = forwardRef<HTMLDivElement, ScrollAreaViewportProps>(
+  ({ classNames, children, ...props }, forwardedRef) => {
+    const { tx } = useThemeContext();
+    const options = useScrollAreaContext(SCROLLAREA_VIEWPORT_NAME);
 
-/**
- * Size-locking wrapper required for inner ScrollArea to function correctly.
- * NOTE: Radix ScrollArea.Viewport applies `display: table` to its immediate child,
- * causing the content to participate in table layout and escape the intended fixed-size viewport.
- */
-const ScrollAreaExpander = ({ classNames, children }: ScrollAreaExpanderProps) => {
-  return (
-    <div role='none' className={mx('relative bs-full is-full overflow-hidden', classNames)}>
-      <div role='none' className='absolute inset-0 overflow-hidden'>
+    return (
+      <div {...props} className={tx('scrollArea.viewport', options, classNames)} ref={forwardedRef}>
         {children}
       </div>
-    </div>
-  );
-};
+    );
+  },
+);
+
+ScrollAreaViewport.displayName = SCROLLAREA_VIEWPORT_NAME;
 
 //
 // ScrollArea
@@ -141,17 +104,6 @@ const ScrollAreaExpander = ({ classNames, children }: ScrollAreaExpanderProps) =
 export const ScrollArea = {
   Root: ScrollAreaRoot,
   Viewport: ScrollAreaViewport,
-  Scrollbar: ScrollAreaScrollbar,
-  Thumb: ScrollAreaThumb,
-  Corner: ScrollAreaCorner,
-  Expander: ScrollAreaExpander,
 };
 
-export type {
-  ScrollAreaRootProps,
-  ScrollAreaViewportProps,
-  ScrollAreaScrollbarProps,
-  ScrollAreaThumbProps,
-  ScrollAreaCornerProps,
-  ScrollAreaExpanderProps,
-};
+export type { ScrollAreaRootProps, ScrollAreaViewportProps };

package/src/components/ScrollArea/index.ts

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

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

@@ -7,16 +7,22 @@ import React, { useEffect, useRef, useState } from 'react';
 
 import { faker } from '@dxos/random';
 
+import { Layout } from '../../primitives';
 import { withLayout, withTheme } from '../../testing';
 import { Button } from '../Button';
 import { Toolbar } from '../Toolbar';
 
 import { ScrollContainer, type ScrollContainerRootProps, type ScrollController } from './ScrollContainer';
 
-const DefaultStory = (props: ScrollContainerRootProps) => {
+type StoryProps = ScrollContainerRootProps & { running?: boolean; initialLines?: number };
+
+const DefaultStory = ({ initialLines = 0, running: runningProp, ...props }: StoryProps) => {
   const [lines, setLines] = useState<string[]>([]);
-  const [running, setRunning] = useState(true);
+  const [running, setRunning] = useState(runningProp);
   const scroller = useRef<ScrollController>(null);
+  useEffect(() => {
+    setLines(Array.from({ length: initialLines }, () => faker.lorem.paragraph()));
+  }, [initialLines]);
   useEffect(() => {
     if (!running) {
       return;
@@ -30,32 +36,32 @@ const DefaultStory = (props: ScrollContainerRootProps) => {
   }, [running]);
 
   return (
-    <div className='flex flex-col bs-full overflow-hidden'>
+    <Layout.Main toolbar>
       <Toolbar.Root>
         <Button onClick={() => setRunning((running) => !running)}>{running ? 'Stop' : 'Start'}</Button>
         <Button onClick={() => scroller.current?.scrollToBottom()}>Scroll to bottom</Button>
-        <div className='flex-1' />
-        <div>{lines.length}</div>
+        <Toolbar.Separator variant='gap' />
+        <div className='pli-1'>{lines.length}</div>
       </Toolbar.Root>
       <ScrollContainer.Root {...props} ref={scroller}>
         <ScrollContainer.Viewport>
           {lines.map((line, index) => (
-            <div key={index} className='p-2'>
+            <div key={index} className='p-2 text-description'>
               {line}
             </div>
           ))}
         </ScrollContainer.Viewport>
         <ScrollContainer.ScrollDownButton />
       </ScrollContainer.Root>
-    </div>
+    </Layout.Main>
   );
 };
 
 const meta = {
-  title: 'ui/react-ui-core/ScrollContainer',
+  title: 'ui/react-ui-core/components/ScrollContainer',
   component: ScrollContainer.Root,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ layout: 'column', classNames: 'is-[30rem]' })],
+  decorators: [withTheme(), withLayout({ layout: 'column', classNames: 'is-[30rem]' })],
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;
@@ -66,5 +72,14 @@ export const Default: Story = {
   args: {
     pin: true,
     fade: true,
+    running: true,
+  },
+};
+
+export const Large: Story = {
+  args: {
+    pin: true,
+    fade: true,
+    initialLines: 100,
   },
 };