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

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@dxos/react-ui-stack",
-  "version": "0.8.4-main.3a94e84",
+  "version": "0.8.4-main.3eb6e50203",
   "description": "A stack component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
@@ -18,11 +22,6 @@
       "types": "./dist/types/src/playwright/index.d.ts",
       "browser": "./dist/lib/browser/playwright/index.mjs",
       "node": "./dist/lib/node-esm/playwright/index.mjs"
-    },
-    "./testing": {
-      "types": "./dist/types/src/testing/index.d.ts",
-      "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -41,11 +40,11 @@
     "src"
   ],
   "dependencies": {
-    "@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
-    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
-    "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
-    "@fluentui/react-tabster": "^9.24.2",
-    "@preact-signals/safe-react": "^0.9.0",
+    "@atlaskit/pragmatic-drag-and-drop": "1.7.7",
+    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.2",
+    "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
+    "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "3.2.10",
+    "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/primitive": "1.1.1",
     "@radix-ui/react-compose-refs": "1.1.1",
     "@radix-ui/react-context": "1.1.1",
@@ -54,36 +53,40 @@
     "@radix-ui/react-slot": "1.1.2",
     "@radix-ui/react-use-controllable-state": "1.1.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/echo-schema": "0.8.4-main.3a94e84",
-    "@dxos/keyboard": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-attention": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-dnd": "0.8.4-main.3a94e84",
-    "@dxos/storybook-utils": "0.8.4-main.3a94e84",
-    "@dxos/live-object": "0.8.4-main.3a94e84",
-    "@dxos/util": "0.8.4-main.3a94e84"
+    "@dxos/echo": "0.8.4-main.3eb6e50203",
+    "@dxos/keyboard": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-attention": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-dnd": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-mosaic": "0.8.4-main.3eb6e50203",
+    "@dxos/util": "0.8.4-main.3eb6e50203"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/app-graph": "0.8.4-main.3a94e84",
-    "@dxos/echo-schema": "0.8.4-main.3a94e84",
-    "@dxos/random": "0.8.4-main.3a94e84",
-    "@dxos/client": "0.8.4-main.3a94e84",
-    "@dxos/react-ui": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-theme": "0.8.4-main.3a94e84",
-    "@dxos/storybook-utils": "0.8.4-main.3a94e84",
-    "@dxos/test-utils": "0.8.4-main.3a94e84"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "7.1.9",
+    "@dxos/app-framework": "0.8.4-main.3eb6e50203",
+    "@dxos/app-graph": "0.8.4-main.3eb6e50203",
+    "@dxos/echo-db": "0.8.4-main.3eb6e50203",
+    "@dxos/echo": "0.8.4-main.3eb6e50203",
+    "@dxos/client": "0.8.4-main.3eb6e50203",
+    "@dxos/react-client": "0.8.4-main.3eb6e50203",
+    "@dxos/random": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
+    "@dxos/storybook-utils": "0.8.4-main.3eb6e50203",
+    "@dxos/test-utils": "0.8.4-main.3eb6e50203",
+    "@dxos/schema": "0.8.4-main.3eb6e50203",
+    "@dxos/types": "0.8.4-main.3eb6e50203",
+    "@dxos/ui-theme": "0.8.4-main.3eb6e50203"
   },
   "peerDependencies": {
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/client": "0.8.4-main.3a94e84",
-    "@dxos/react-ui": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-theme": "0.8.4-main.3a94e84",
-    "@dxos/random": "0.8.4-main.3a94e84"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/client": "0.8.4-main.3eb6e50203",
+    "@dxos/ui-theme": "0.8.4-main.3eb6e50203",
+    "@dxos/random": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui": "0.8.4-main.3eb6e50203"
   },
   "publishConfig": {
     "access": "public"

package/src/{exemplars → components}/CardStack/CardStack.stories.tsx

@@ -2,21 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Edge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React, { useState, useCallback } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { faker } from '@dxos/random';
 import { IconButton } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
+import { Card, CardDragPreview } from '@dxos/react-ui-mosaic';
+
+import { StackItem } from '../StackItem';
 
 import { CardStack } from './CardStack';
-import { StackItem } from '../../components';
-import { Card, CardDragPreview } from '../Card';
 
-// Set a seed for reproducible random values
 faker.seed(0);
 
 type CardItem = {
@@ -96,7 +94,7 @@ const CardStackStory = () => {
 
   return (
     <CardStack.Root classNames='is-96'>
-      <CardStack.Content>
+      <CardStack.Content footer>
         <CardStack.Stack id='story column' onRearrange={handleRearrange} itemsCount={column.length}>
           {column.map((card, cardIndex, cardsArray) => {
             const cardItem = { id: card.id, type: 'card' as const };
@@ -111,10 +109,10 @@ const CardStackStory = () => {
                   prevSiblingId={prevCardId}
                   nextSiblingId={nextCardId}
                 >
-                  <Card.StaticRoot>
+                  <Card.Root>
                     <Card.Toolbar>
                       <StackItem.DragHandle asChild>
-                        <Card.DragHandle toolbarItem />
+                        <Card.DragHandle />
                       </StackItem.DragHandle>
                       <Card.ToolbarSeparator variant='gap' />
                       <Card.ToolbarIconButton
@@ -127,18 +125,18 @@ const CardStackStory = () => {
                     </Card.Toolbar>
                     <Card.Poster alt={card.title} image={card.image} />
                     <Card.Heading>{card.title}</Card.Heading>
-                    <Card.Text classNames='line-clamp-2'>{card.description}</Card.Text>
-                  </Card.StaticRoot>
+                    <Card.Text variant='description'>{card.description}</Card.Text>
+                  </Card.Root>
                   <StackItem.DragPreview>
-                    {({ item }) => (
+                    {() => (
                       <CardDragPreview.Root>
                         <CardDragPreview.Content>
                           <Card.Toolbar>
-                            <Card.DragHandle toolbarItem />
+                            <Card.DragHandle />
                           </Card.Toolbar>
                           <Card.Poster alt={card.title} image={card.image} />
                           <Card.Heading>{card.title}</Card.Heading>
-                          <Card.Text classNames='line-clamp-2'>{card.description}</Card.Text>
+                          <Card.Text variant='description'>{card.description}</Card.Text>
                         </CardDragPreview.Content>
                       </CardDragPreview.Root>
                     )}
@@ -159,11 +157,14 @@ const CardStackStory = () => {
   );
 };
 
-const meta: Meta<typeof CardStackStory> = {
+const meta = {
   title: 'ui/react-ui-stack/CardStack',
   component: CardStackStory,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
-};
+  decorators: [withTheme()],
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof CardStackStory>;
 
 export default meta;
 

package/src/{exemplars → components}/CardStack/CardStack.tsx

@@ -6,17 +6,78 @@ import { Slot } from '@radix-ui/react-slot';
 import React, { type ComponentPropsWithoutRef, forwardRef } from 'react';
 
 import type { ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { Card } from '@dxos/react-ui-mosaic';
+import { cardDefaultInlineSize, mx } from '@dxos/ui-theme';
 
-import { railGridHorizontalContainFitContent, Stack, type StackProps } from '../../components';
-import { Card } from '../Card';
+import { Stack, type StackProps, railGridHorizontalContainFitContent } from '../Stack';
 
-type SharedCardStackProps = ThemedClassName<ComponentPropsWithoutRef<'div'>> & { asChild?: boolean };
+/**
+ * This is `cardDefaultInlineSize` plus 2 times the sum of the inner and outer spacing applied by CardStack on the inline axis.
+ */
+const cardStackDefaultInlineSizeRem = cardDefaultInlineSize + 2.125;
+
+//
+// Root
+//
+
+const cardStackRoot = 'flex flex-col';
+
+const CardStackRoot = forwardRef<HTMLDivElement, SharedCardStackProps>(
+  ({ children, classNames, asChild, role = 'none', ...props }, forwardedRef) => {
+    const Root = asChild ? Slot : 'div';
+    const rootProps = asChild
+      ? { classNames: [cardStackRoot, classNames] }
+      : { className: mx(cardStackRoot, classNames), role };
+
+    return (
+      <Root {...props} {...rootProps} ref={forwardedRef}>
+        {children}
+      </Root>
+    );
+  },
+);
+
+//
+// Content
+// TODO(burdon): Rename Viewport (should be the component that scrolls).
+//
+
+const cardStackContent = 'shrink min-bs-0 grid dx-focus-ring-group-x-indicator bg-baseSurface';
+
+type CardStackContentProps = SharedCardStackProps & {
+  footer?: boolean;
+};
+
+const CardStackContent = forwardRef<HTMLDivElement, CardStackContentProps>(
+  ({ children, classNames, asChild, role = 'none', footer, ...props }, forwardedRef) => {
+    const Root = asChild ? Slot : 'div';
+    const baseClassNames = footer ? [cardStackContent, railGridHorizontalContainFitContent] : [cardStackContent];
+    const rootProps = asChild
+      ? { classNames: [...baseClassNames, classNames] }
+      : { className: mx(...baseClassNames, classNames), role };
+
+    return (
+      <Root {...props} {...rootProps} data-scroll-separator='false' ref={forwardedRef}>
+        {children}
+      </Root>
+    );
+  },
+);
+
+//
+// Stack
+// TODO(burdon): Rename Content.
+//
+
+type SharedCardStackProps = ThemedClassName<ComponentPropsWithoutRef<'div'>> & {
+  asChild?: boolean;
+};
 
 const CardStackStack = forwardRef<
   HTMLDivElement,
   Omit<StackProps, 'orientation' | 'size' | 'rail' | 'separatorOnScroll'>
 >(({ children, classNames, itemsCount = 0, ...props }, forwardedRef) => {
+  // NOTE: Should not have horizontal padding since separatorOnScroll should be full width.
   return (
     <Stack
       orientation='vertical'
@@ -24,7 +85,7 @@ const CardStackStack = forwardRef<
       rail={false}
       classNames={
         /* NOTE(thure): Do not let this element have zero intrinsic size, otherwise the drop indicator will not display. See #9035. */
-        ['plb-1', itemsCount > 0 && 'plb-2', classNames]
+        ['plb-2', classNames]
       }
       itemsCount={itemsCount}
       separatorOnScroll={9}
@@ -37,16 +98,19 @@ const CardStackStack = forwardRef<
   );
 });
 
-const CardStackDragHandle = Card.DragHandle;
+//
+// Item
+//
 
-const cardStackHeading = 'mli-2 order-first bg-transparent rounded-bs-md flex items-center';
+const cardStackItem = 'contain-layout pli-2 plb-1 first-of-type:pbs-0 last-of-type:pbe-0';
 
-const CardStackHeading = forwardRef<HTMLDivElement, SharedCardStackProps>(
-  ({ children, classNames, asChild, role = 'heading', ...props }, forwardedRef) => {
+const CardStackItem = forwardRef<HTMLDivElement, SharedCardStackProps>(
+  ({ children, classNames, asChild, role = 'none', ...props }, forwardedRef) => {
     const Root = asChild ? Slot : 'div';
     const rootProps = asChild
-      ? { classNames: [cardStackHeading, classNames] }
-      : { className: mx(cardStackHeading, classNames), role };
+      ? { classNames: [cardStackItem, classNames] }
+      : { className: mx(cardStackItem, classNames), role };
+
     return (
       <Root {...props} {...rootProps} ref={forwardedRef}>
         {children}
@@ -55,15 +119,19 @@ const CardStackHeading = forwardRef<HTMLDivElement, SharedCardStackProps>(
   },
 );
 
-const cardStackFooter =
-  'plb-2 mli-2 border-bs border-transparent [[data-scroll-separator-end="true"]_&]:border-subduedSeparator';
+//
+// Heading
+//
 
-const CardStackFooter = forwardRef<HTMLDivElement, SharedCardStackProps>(
-  ({ children, classNames, asChild, role = 'none', ...props }, forwardedRef) => {
+const cardStackHeading = 'mli-2 order-first bg-transparent rounded-bs-md flex items-center';
+
+const CardStackHeading = forwardRef<HTMLDivElement, SharedCardStackProps>(
+  ({ children, classNames, asChild, role = 'heading', ...props }, forwardedRef) => {
     const Root = asChild ? Slot : 'div';
     const rootProps = asChild
-      ? { classNames: [cardStackFooter, classNames] }
-      : { className: mx(cardStackFooter, classNames), role };
+      ? { classNames: [cardStackHeading, classNames] }
+      : { className: mx(cardStackHeading, classNames), role };
+
     return (
       <Root {...props} {...rootProps} ref={forwardedRef}>
         {children}
@@ -72,33 +140,20 @@ const CardStackFooter = forwardRef<HTMLDivElement, SharedCardStackProps>(
   },
 );
 
-const cardStackContent = [
-  'shrink min-bs-0 bg-baseSurface border border-separator rounded-md grid dx-focus-ring-group-x-indicator kanban-drop',
-  railGridHorizontalContainFitContent,
-];
-
-const CardStackContent = forwardRef<HTMLDivElement, SharedCardStackProps>(
-  ({ children, classNames, asChild, role = 'none', ...props }, forwardedRef) => {
-    const Root = asChild ? Slot : 'div';
-    const rootProps = asChild
-      ? { classNames: [...cardStackContent, classNames] }
-      : { className: mx(...cardStackContent, classNames), role };
-    return (
-      <Root {...props} {...rootProps} data-scroll-separator='false' ref={forwardedRef}>
-        {children}
-      </Root>
-    );
-  },
-);
+//
+// Footer
+//
 
-const cardStackRoot = 'flex flex-col pli-2 plb-2';
+const cardStackFooter =
+  'plb-2 mli-2 border-bs border-transparent [[data-scroll-separator-end="true"]_&]:border-subduedSeparator';
 
-const CardStackRoot = forwardRef<HTMLDivElement, SharedCardStackProps>(
+const CardStackFooter = forwardRef<HTMLDivElement, SharedCardStackProps>(
   ({ children, classNames, asChild, role = 'none', ...props }, forwardedRef) => {
     const Root = asChild ? Slot : 'div';
     const rootProps = asChild
-      ? { classNames: [cardStackRoot, classNames] }
-      : { className: mx(cardStackRoot, classNames), role };
+      ? { classNames: [cardStackFooter, classNames] }
+      : { className: mx(cardStackFooter, classNames), role };
+
     return (
       <Root {...props} {...rootProps} ref={forwardedRef}>
         {children}
@@ -107,22 +162,19 @@ const CardStackRoot = forwardRef<HTMLDivElement, SharedCardStackProps>(
   },
 );
 
-const cardStackItem = 'contain-layout pli-2 plb-1 first-of-type:pbs-0 last-of-type:pbe-0';
+//
+// DragHandle
+//
 
-const CardStackItem = forwardRef<HTMLDivElement, SharedCardStackProps>(
-  ({ children, classNames, asChild, role = 'none', ...props }, forwardedRef) => {
-    const Root = asChild ? Slot : 'div';
-    const rootProps = asChild
-      ? { classNames: [cardStackItem, classNames] }
-      : { className: mx(cardStackItem, classNames), role };
-    return (
-      <Root {...props} {...rootProps} ref={forwardedRef}>
-        {children}
-      </Root>
-    );
-  },
-);
+const CardStackDragHandle = Card.DragHandle;
 
+//
+// CardStack
+//
+
+/**
+ * @deprecated Replace with Mosaic.Stack.
+ */
 export const CardStack = {
   Root: CardStackRoot,
   Content: CardStackContent,
@@ -133,4 +185,11 @@ export const CardStack = {
   Item: CardStackItem,
 };
 
-export { cardStackRoot, cardStackFooter, cardStackHeading, cardStackContent, cardStackItem };
+export {
+  cardStackRoot,
+  cardStackFooter,
+  cardStackHeading,
+  cardStackContent,
+  cardStackItem,
+  cardStackDefaultInlineSizeRem,
+};

package/src/{exemplars → components}/CardStack/CardStackDragPreview.tsx

@@ -4,11 +4,11 @@
 
 import React, { type PropsWithChildren } from 'react';
 
-import { IconButton, useTranslation } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { IconButton, ScrollArea, useTranslation } from '@dxos/react-ui';
+import { mx } from '@dxos/ui-theme';
 
-import { type StackProps } from '../../components';
 import { translationKey } from '../../translations';
+import { type StackProps } from '../Stack';
 
 const CardStackDragPreviewRoot = ({ children }: PropsWithChildren<{}>) => {
   return (
@@ -41,18 +41,21 @@ const CardStackDragPreviewContent = ({
   itemsCount = 0,
 }: PropsWithChildren<Pick<StackProps, 'itemsCount'>>) => {
   return (
-    <div
-      className={mx('overflow-y-auto flex-1 pli-2 flex flex-col gap-2', 'plb-1', itemsCount > 0 ? 'plb-2' : 'plb-1')}
-    >
-      {children}
-    </div>
+    <ScrollArea.Root orientation='vertical'>
+      <ScrollArea.Viewport classNames={mx('pli-2 plb-1 gap-2', itemsCount > 0 ? 'plb-2' : 'plb-1')}>
+        {children}
+      </ScrollArea.Viewport>
+    </ScrollArea.Root>
   );
 };
 
 const CardStackDragPreviewFooter = ({ children }: PropsWithChildren<{}>) => {
-  return <div className='p-2 border-t border-separator'>{children}</div>;
+  return <div className='p-2 border-bs border-separator'>{children}</div>;
 };
 
+/**
+ * @deprecated
+ */
 export const CardStackDragPreview = {
   Root: CardStackDragPreviewRoot,
   Heading: CardStackDragPreviewHeading,

package/src/components/Stack/Stack.stories.tsx

@@ -2,18 +2,17 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Edge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React, { useState, useCallback } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { faker } from '@dxos/random';
-import { withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { Stack } from './Stack';
 import { StackItem } from '../StackItem';
-import { type StackItemData } from '../defs';
+import { type StackItemData } from '../types';
+
+import { Stack } from './Stack';
 
 type StoryStackItem = {
   id: string;
@@ -129,12 +128,12 @@ const DefaultStory = () => {
   );
 };
 
-const meta: Meta<typeof DefaultStory> = {
+const meta = {
   title: 'ui/react-ui-stack/Stack',
   component: DefaultStory,
-  decorators: [withTheme],
   argTypes: { orientation: { control: 'radio', options: ['horizontal', 'vertical'] } },
-};
+  decorators: [withTheme()],
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;