@dxos/react-ui-stack 0.8.3 → 0.8.4-main.f9ba587

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-stack",
-  "version": "0.8.3",
+  "version": "0.8.4-main.f9ba587",
   "description": "A stack component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -49,37 +49,35 @@
     "@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.3",
-    "@dxos/keyboard": "0.8.3",
-    "@dxos/react-ui-attention": "0.8.3",
-    "@dxos/live-object": "0.8.3",
-    "@dxos/react-ui-dnd": "0.8.3",
-    "@dxos/util": "0.8.3"
+    "@dxos/echo-schema": "0.8.4-main.f9ba587",
+    "@dxos/keyboard": "0.8.4-main.f9ba587",
+    "@dxos/live-object": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-attention": "0.8.4-main.f9ba587",
+    "@dxos/util": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-dnd": "0.8.4-main.f9ba587"
   },
   "devDependencies": {
-    "@phosphor-icons/react": "^2.1.5",
     "@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.3",
-    "@dxos/client": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/random": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3",
-    "@dxos/test-utils": "0.8.3",
-    "@dxos/storybook-utils": "0.8.3"
+    "@dxos/app-graph": "0.8.4-main.f9ba587",
+    "@dxos/echo-schema": "0.8.4-main.f9ba587",
+    "@dxos/random": "0.8.4-main.f9ba587",
+    "@dxos/client": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
+    "@dxos/react-ui": "0.8.4-main.f9ba587",
+    "@dxos/storybook-utils": "0.8.4-main.f9ba587",
+    "@dxos/test-utils": "0.8.4-main.f9ba587"
   },
   "peerDependencies": {
-    "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/client": "0.8.3",
-    "@dxos/random": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3",
-    "@dxos/react-ui": "0.8.3"
+    "@dxos/client": "0.8.4-main.f9ba587",
+    "@dxos/random": "0.8.4-main.f9ba587",
+    "@dxos/react-ui": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
   },
   "publishConfig": {
     "access": "public"

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

@@ -5,7 +5,7 @@
 import '@dxos-theme';
 
 import { type Edge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
-import { type Meta, type StoryObj } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState, useCallback } from 'react';
 
 import { faker } from '@dxos/random';

package/src/components/StackItem/StackItem.stories.tsx

@@ -4,7 +4,7 @@
 
 import '@dxos-theme';
 
-import { type Meta, type StoryObj } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { Icon, DropdownMenu } from '@dxos/react-ui';

package/src/exemplars/Card/Card.stories.tsx

@@ -0,0 +1,78 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import '@dxos-theme';
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { faker } from '@dxos/random';
+import { withTheme } from '@dxos/storybook-utils';
+
+import { Card } from './Card';
+
+// Set a seed for reproducible random values
+faker.seed(0);
+
+type CardStoryProps = {
+  title: string;
+  description: string;
+  image: string;
+  showImage: boolean;
+  showIcon: boolean;
+};
+
+const meta: Meta<CardStoryProps> = {
+  title: 'ui/react-ui-stack/Card',
+  decorators: [withTheme],
+  argTypes: {
+    title: {
+      control: 'text',
+      description: 'Card title',
+    },
+    description: {
+      control: 'text',
+      description: 'Card description',
+    },
+    image: {
+      control: 'text',
+      description: 'URL for the poster image',
+    },
+    showImage: {
+      control: 'boolean',
+      description: 'Whether to show the image',
+    },
+    showIcon: {
+      control: 'boolean',
+      description: 'Whether to show an icon (when image is not shown)',
+    },
+  },
+  args: {
+    title: faker.commerce.productName(),
+    description: faker.lorem.paragraph(),
+    image: faker.image.url(),
+    showImage: true,
+    showIcon: true,
+  },
+};
+
+export default meta;
+
+export const Default: StoryObj<CardStoryProps> = {
+  render: ({ title, description, image, showImage, showIcon }: CardStoryProps) => (
+    <div className='max-is-md'>
+      <Card.StaticRoot>
+        <Card.Toolbar>
+          <Card.DragHandle toolbarItem />
+          <Card.ToolbarSeparator variant='gap' />
+          <Card.ToolbarIconButton iconOnly variant='ghost' icon='ph--x--regular' label={'remove card label'} />
+        </Card.Toolbar>
+        {showImage && <Card.Poster alt={title} image={image} />}
+        {!showImage && showIcon && <Card.Poster alt={title} icon='ph--building-office--regular' />}
+        <Card.Heading>{title}</Card.Heading>
+        {description && <Card.Text classNames='line-clamp-2'>{description}</Card.Text>}
+      </Card.StaticRoot>
+    </div>
+  ),
+};

package/src/exemplars/Card/Card.tsx

@@ -15,30 +15,16 @@ import React, {
 import { Icon, IconButton, type ThemedClassName, Toolbar, type ToolbarRootProps, useTranslation } from '@dxos/react-ui';
 import { hoverableControls, mx } from '@dxos/react-ui-theme';
 
-import { cardChrome, cardContent, cardHeading, cardRoot, cardText, cardSpacing } from './fragments';
+import { cardChrome, cardRoot, cardHeading, cardText, cardSpacing } from './fragments';
 import { StackItem } from '../../components';
 import { translationKey } from '../../translations';
 
 type SharedCardProps = ThemedClassName<ComponentPropsWithoutRef<'div'>> & { asChild?: boolean };
 
-const CardRoot = forwardRef<HTMLDivElement, SharedCardProps>(
-  ({ children, classNames, asChild, role = 'none', ...props }, forwardedRef) => {
-    const Root = asChild ? Slot : 'div';
-    const rootProps = asChild ? { classNames: [cardRoot, classNames] } : { className: mx(cardRoot, classNames), role };
-    return (
-      <Root {...props} {...rootProps} ref={forwardedRef}>
-        {children}
-      </Root>
-    );
-  },
-);
-
-const CardContent = forwardRef<HTMLDivElement, SharedCardProps>(
+const CardStaticRoot = forwardRef<HTMLDivElement, SharedCardProps>(
   ({ children, classNames, asChild, role = 'group', ...props }, forwardedRef) => {
     const Root = asChild ? Slot : 'div';
-    const rootProps = asChild
-      ? { classNames: [cardContent, classNames] }
-      : { className: mx(cardContent, classNames), role };
+    const rootProps = asChild ? { classNames: [cardRoot, classNames] } : { className: mx(cardRoot, classNames), role };
     return (
       <Root {...props} {...rootProps} ref={forwardedRef}>
         {children}
@@ -49,11 +35,11 @@ const CardContent = forwardRef<HTMLDivElement, SharedCardProps>(
 
 /**
  * This should be used by Surface fulfillments in cases where the content may or may not already be encapsulated (e.g.
- * in a Popover) and knows this based on the `role` it receives. This will render a `Card.Content` by default, otherwise
+ * in a Popover) and knows this based on the `role` it receives. This will render a `Card.StaticRoot` by default, otherwise
  * it will render a `div` primitive with the appropriate styling for specific handled situations.
  */
-const CardConditionalContent = ({ role, children }: PropsWithChildren<{ role?: string }>) => {
-  if (['popover', 'card--kanban'].includes(role ?? 'never')) {
+const CardSurfaceRoot = ({ role = 'never', children }: PropsWithChildren<{ role?: string }>) => {
+  if (['popover', 'card--kanban'].includes(role)) {
     return (
       <div className={role === 'popover' ? 'popover-card-width' : role === 'card--kanban' ? 'contents' : ''}>
         {children}
@@ -61,9 +47,9 @@ const CardConditionalContent = ({ role, children }: PropsWithChildren<{ role?: s
     );
   } else {
     return (
-      <CardContent {...(role === 'card--document' && { classNames: ['mlb-[1em]', hoverableControls] })}>
+      <CardStaticRoot {...(role === 'card--document' && { classNames: ['mlb-[1em]', hoverableControls] })}>
         {children}
-      </CardContent>
+      </CardStaticRoot>
     );
   }
 };
@@ -84,7 +70,7 @@ const CardHeading = forwardRef<HTMLDivElement, SharedCardProps>(
 
 const CardToolbar = forwardRef<HTMLDivElement, ToolbarRootProps>(({ children, classNames, ...props }, forwardedRef) => {
   return (
-    <Toolbar.Root {...props} classNames={['bg-transparent', classNames]} ref={forwardedRef}>
+    <Toolbar.Root {...props} classNames={['bg-transparent density-coarse', classNames]} ref={forwardedRef}>
       {children}
     </Toolbar.Root>
   );
@@ -101,7 +87,7 @@ const CardDragHandle = forwardRef<HTMLButtonElement, { toolbarItem?: boolean }>(
       iconOnly
       icon='ph--dots-six-vertical--regular'
       variant='ghost'
-      label={t('card drag handle label')}
+      label={t('drag handle label')}
       classNames='pli-2'
       ref={forwardedRef}
     />
@@ -164,9 +150,8 @@ const CardText = forwardRef<HTMLParagraphElement, SharedCardProps>(
 );
 
 export const Card = {
-  Root: CardRoot,
-  Content: CardContent,
-  Container: CardConditionalContent,
+  StaticRoot: CardStaticRoot,
+  SurfaceRoot: CardSurfaceRoot,
   Heading: CardHeading,
   Toolbar: CardToolbar,
   ToolbarIconButton: CardToolbarIconButton,
@@ -179,4 +164,4 @@ export const Card = {
   Text: CardText,
 };
 
-export { cardRoot, cardContent, cardHeading, cardText, cardChrome, cardSpacing };
+export { cardRoot, cardHeading, cardText, cardChrome, cardSpacing };

package/src/exemplars/Card/CardDragPreview.tsx

@@ -6,14 +6,14 @@ import React, { type PropsWithChildren } from 'react';
 
 import { mx } from '@dxos/react-ui-theme';
 
-import { cardContent } from './fragments';
+import { cardRoot } from './fragments';
 
 const CardDragPreviewRoot = ({ children }: PropsWithChildren<{}>) => {
   return <div className='p-2'>{children}</div>;
 };
 
 const CardDragPreviewContent = ({ children }: PropsWithChildren<{}>) => {
-  return <div className={mx(cardContent, 'ring-focusLine ring-neutralFocusIndicator')}>{children}</div>;
+  return <div className={mx(cardRoot, 'ring-focusLine ring-neutralFocusIndicator')}>{children}</div>;
 };
 
 export const CardDragPreview = {

package/src/exemplars/Card/fragments.ts

@@ -2,9 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-export const cardRoot = 'contain-layout pli-2 plb-1 first-of-type:pbs-0 last-of-type:pbe-0';
-
-export const cardContent =
+export const cardRoot =
   'rounded overflow-hidden bg-cardSurface border border-separator dark:border-subduedSeparator dx-focus-ring-group-y-indicator relative min-bs-[--rail-item] group/card';
 
 export const cardSpacing = 'pli-cardSpacingInline mlb-cardSpacingBlock';

package/src/exemplars/CardStack/CardStack.stories.tsx

@@ -0,0 +1,172 @@
+//
+// 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 { faker } from '@dxos/random';
+import { IconButton } from '@dxos/react-ui';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+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 = {
+  id: string;
+  title: string;
+  description: string;
+  image: string;
+};
+
+type StackItemData = {
+  id: string;
+  type?: 'column' | 'card';
+};
+
+const CardStackStory = () => {
+  const [column, setColumn] = useState<CardItem[]>(
+    faker.helpers.multiple(
+      () => ({
+        id: faker.string.uuid(),
+        title: faker.commerce.productName(),
+        description: faker.lorem.paragraph(),
+        image: faker.image.url(),
+      }),
+      { count: 12 },
+    ),
+  );
+
+  const handleRearrange = useCallback((source: StackItemData, target: StackItemData, closestEdge: Edge | null) => {
+    setColumn((prevColumn) => {
+      const newColumns = [...prevColumn];
+      // Reordering cards within a column
+      const sourceCardIndex = prevColumn.findIndex((card) => card.id === source.id);
+      const targetCardIndex = prevColumn.findIndex((card) => card.id === target.id);
+
+      if (typeof sourceCardIndex === 'number' && typeof targetCardIndex === 'number') {
+        const [movedCard] = newColumns.splice(sourceCardIndex, 1);
+
+        let insertIndex;
+        if (sourceCardIndex < targetCardIndex) {
+          insertIndex = closestEdge === 'bottom' ? targetCardIndex : targetCardIndex - 1;
+        } else {
+          insertIndex = closestEdge === 'bottom' ? targetCardIndex + 1 : targetCardIndex;
+        }
+        newColumns.splice(insertIndex, 0, movedCard);
+      }
+      return newColumns;
+    });
+  }, []);
+
+  const handleAddCard = useCallback(() => {
+    setColumn((prevColumn) => {
+      const newColumn = [...prevColumn];
+      const newCard = {
+        id: faker.string.uuid(),
+        title: faker.commerce.productName(),
+        description: faker.lorem.paragraph(),
+        image: faker.image.url(),
+      } satisfies CardItem;
+      newColumn.push(newCard);
+      console.log('[add card]', prevColumn.length, newColumn.length);
+      return newColumn;
+    });
+  }, []);
+
+  const handleRemoveCard = useCallback((cardId: string) => {
+    setColumn((prevColumn) => {
+      const newColumn = [...prevColumn];
+
+      const cardIndex = prevColumn.findIndex((card) => card.id === cardId);
+      if (cardIndex !== -1) {
+        newColumn.splice(cardIndex, 1);
+      }
+
+      return newColumn;
+    });
+  }, []);
+
+  return (
+    <CardStack.Root classNames='is-96'>
+      <CardStack.Content>
+        <CardStack.Stack id='story column' onRearrange={handleRearrange} itemsCount={column.length}>
+          {column.map((card, cardIndex, cardsArray) => {
+            const cardItem = { id: card.id, type: 'card' as const };
+            const prevCardId = cardIndex > 0 ? cardsArray[cardIndex - 1].id : undefined;
+            const nextCardId = cardIndex < cardsArray.length - 1 ? cardsArray[cardIndex + 1].id : undefined;
+
+            return (
+              <CardStack.Item asChild key={card.id}>
+                <StackItem.Root
+                  item={cardItem}
+                  focusIndicatorVariant='group'
+                  prevSiblingId={prevCardId}
+                  nextSiblingId={nextCardId}
+                >
+                  <Card.StaticRoot>
+                    <Card.Toolbar>
+                      <StackItem.DragHandle asChild>
+                        <Card.DragHandle toolbarItem />
+                      </StackItem.DragHandle>
+                      <Card.ToolbarSeparator variant='gap' />
+                      <Card.ToolbarIconButton
+                        iconOnly
+                        variant='ghost'
+                        icon='ph--x--regular'
+                        label='Remove card'
+                        onClick={() => handleRemoveCard(card.id)}
+                      />
+                    </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>
+                  <StackItem.DragPreview>
+                    {({ item }) => (
+                      <CardDragPreview.Root>
+                        <CardDragPreview.Content>
+                          <Card.Toolbar>
+                            <Card.DragHandle toolbarItem />
+                          </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>
+                        </CardDragPreview.Content>
+                      </CardDragPreview.Root>
+                    )}
+                  </StackItem.DragPreview>
+                </StackItem.Root>
+              </CardStack.Item>
+            );
+          })}
+        </CardStack.Stack>
+
+        <CardStack.Footer>
+          <IconButton icon='ph--plus--regular' label='Add card' onClick={handleAddCard} classNames='is-full' />
+        </CardStack.Footer>
+
+        <CardStack.Heading>{faker.company.name()}</CardStack.Heading>
+      </CardStack.Content>
+    </CardStack.Root>
+  );
+};
+
+const meta: Meta<typeof CardStackStory> = {
+  title: 'ui/react-ui-stack/CardStack',
+  component: CardStackStory,
+  decorators: [withTheme, withLayout({ fullscreen: true })],
+};
+
+export default meta;
+
+type Story = StoryObj<typeof CardStackStory>;
+
+export const Default: Story = {};

package/src/exemplars/CardStack/CardStack.tsx

@@ -107,6 +107,22 @@ const CardStackRoot = forwardRef<HTMLDivElement, SharedCardStackProps>(
   },
 );
 
+const cardStackItem = 'contain-layout pli-2 plb-1 first-of-type:pbs-0 last-of-type:pbe-0';
+
+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>
+    );
+  },
+);
+
 export const CardStack = {
   Root: CardStackRoot,
   Content: CardStackContent,
@@ -114,6 +130,7 @@ export const CardStack = {
   Heading: CardStackHeading,
   Footer: CardStackFooter,
   DragHandle: CardStackDragHandle,
+  Item: CardStackItem,
 };
 
-export { cardStackRoot, cardStackFooter, cardStackHeading, cardStackContent };
+export { cardStackRoot, cardStackFooter, cardStackHeading, cardStackContent, cardStackItem };

package/src/hooks/useStackDropForElements.ts

@@ -66,7 +66,10 @@ export const useStackDropForElements = ({
           }
         },
       }),
-      autoScrollForElements({ element: scrollElement as Element, getAllowedAxis: () => orientation }),
+      autoScrollForElements({
+        element: scrollElement as Element,
+        getAllowedAxis: () => orientation,
+      }),
     );
   }, [element, scrollElement, selfDroppable, orientation, id, onRearrange]);
 

package/src/index.ts

@@ -2,9 +2,8 @@
 // Copyright 2022 DXOS.org
 //
 
-export * from './components';
-
 // TODO(thure): Consider exporting exemplars from separate endpoints.
-export * from './exemplars';
 
-export { default as translations } from './translations';
+export * from './components';
+export * from './exemplars';
+export * from './translations';

package/src/playwright/playwright.config.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { defineConfig } from '@playwright/test';
+
+import { e2ePreset } from '@dxos/test-utils/playwright';
+
+export default defineConfig({
+  ...e2ePreset(import.meta.dirname),
+  // TODO(wittjosiah): Avoid hard-coding ports.
+  webServer: {
+    command: 'moon run storybook:serve-e2e -- --port=9003',
+    port: 9003,
+    reuseExistingServer: false,
+  },
+});

package/src/playwright/smoke.spec.ts

@@ -8,10 +8,12 @@ import { setupPage, storybookUrl } from '@dxos/test-utils/playwright';
 
 import { StackManager } from '../testing';
 
+const PORT = 9003;
+
 // TODO(wittjosiah): Update for new stack.
 test.describe.skip('Stack', () => {
   test('remove', async ({ browser }) => {
-    const { page } = await setupPage(browser, { url: storybookUrl('ui-react-ui-stack-stack--transfer') });
+    const { page } = await setupPage(browser, { url: storybookUrl('ui-react-ui-stack-stack--transfer', PORT) });
     await page.getByTestId('stack-transfer').waitFor({ state: 'visible' });
 
     const stack = new StackManager(page.getByTestId('stack-1'));
@@ -24,7 +26,7 @@ test.describe.skip('Stack', () => {
   });
 
   test('rearrange', async ({ browser }) => {
-    const { page } = await setupPage(browser, { url: storybookUrl('ui-react-ui-stack-stack--transfer') });
+    const { page } = await setupPage(browser, { url: storybookUrl('ui-react-ui-stack-stack--transfer', PORT) });
     await page.getByTestId('stack-transfer').waitFor({ state: 'visible' });
 
     const stack = new StackManager(page.getByTestId('stack-1'));
@@ -41,7 +43,7 @@ test.describe.skip('Stack', () => {
       test.skip();
     }
 
-    const { page } = await setupPage(browser, { url: storybookUrl('ui-react-ui-stack-stack--transfer') });
+    const { page } = await setupPage(browser, { url: storybookUrl('ui-react-ui-stack-stack--transfer', PORT) });
     await page.getByTestId('stack-transfer').waitFor({ state: 'visible' });
 
     const stack1 = new StackManager(page.getByTestId('stack-1'));
@@ -61,7 +63,7 @@ test.describe.skip('Stack', () => {
   });
 
   test('copy', async ({ browser }) => {
-    const { page } = await setupPage(browser, { url: storybookUrl('ui-react-ui-stack-stack--copy') });
+    const { page } = await setupPage(browser, { url: storybookUrl('ui-react-ui-stack-stack--copy', PORT) });
     await page.getByTestId('stack-copy').waitFor({ state: 'visible' });
 
     const stack1 = new StackManager(page.getByTestId('stack-1'));

package/src/translations.ts

@@ -2,9 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-export const translationKey = 'stack';
+import { type Resource } from '@dxos/react-ui';
 
-export default [
+export const translationKey = 'react-ui-stack';
+
+export const translations = [
   {
     'en-US': {
       [translationKey]: {
@@ -19,4 +21,4 @@ export default [
       },
     },
   },
-];
+] as const satisfies Resource[];