@dxos/react-ui-stack 0.7.5-main.ff8607b → 0.7.5-staging.b81e783

package/dist/types/src/hooks/useStackDropForElements.d.ts

@@ -0,0 +1,15 @@
+import { type Orientation } from '../components/Stack';
+import { type StackItemRearrangeHandler } from '../components/StackContext';
+/**
+ * Hook to handle drag and drop functionality for Stack components.
+ */
+export declare const useStackDropForElements: ({ element, selfDroppable, orientation, id, onRearrange, }: {
+    element: HTMLDivElement | null;
+    selfDroppable: boolean;
+    orientation: Orientation;
+    id?: string;
+    onRearrange?: StackItemRearrangeHandler;
+}) => {
+    dropping: boolean;
+};
+//# sourceMappingURL=useStackDropForElements.d.ts.map

package/dist/types/src/hooks/useStackDropForElements.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useStackDropForElements.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useStackDropForElements.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,KAAK,yBAAyB,EAAsB,MAAM,4BAA4B,CAAC;AAEhG;;GAEG;AACH,eAAO,MAAM,uBAAuB,8DAMjC;IACD,OAAO,EAAE,cAAc,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,yBAAyB,CAAC;CACzC;;CA4CA,CAAC"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@dxos/react-ui-stack",
-  "version": "0.7.5-main.ff8607b",
+  "version": "0.7.5-staging.b81e783",
   "description": "A stack component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/types/src/index.d.ts",
@@ -47,12 +48,12 @@
     "@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.7.5-main.ff8607b",
-    "@dxos/live-object": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-attention": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-mosaic": "0.7.5-main.ff8607b",
-    "@dxos/util": "0.7.5-main.ff8607b",
-    "@dxos/keyboard": "0.7.5-main.ff8607b"
+    "@dxos/echo-schema": "0.7.5-staging.b81e783",
+    "@dxos/react-ui-attention": "0.7.5-staging.b81e783",
+    "@dxos/live-object": "0.7.5-staging.b81e783",
+    "@dxos/keyboard": "0.7.5-staging.b81e783",
+    "@dxos/react-ui-dnd": "0.7.5-staging.b81e783",
+    "@dxos/util": "0.7.5-staging.b81e783"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -61,24 +62,24 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/app-graph": "0.7.5-main.ff8607b",
-    "@dxos/client": "0.7.5-main.ff8607b",
-    "@dxos/echo-schema": "0.7.5-main.ff8607b",
-    "@dxos/random": "0.7.5-main.ff8607b",
-    "@dxos/react-ui": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-editor": "0.7.5-main.ff8607b",
-    "@dxos/storybook-utils": "0.7.5-main.ff8607b",
-    "@dxos/test-utils": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-theme": "0.7.5-main.ff8607b"
+    "@dxos/app-graph": "0.7.5-staging.b81e783",
+    "@dxos/client": "0.7.5-staging.b81e783",
+    "@dxos/echo-schema": "0.7.5-staging.b81e783",
+    "@dxos/random": "0.7.5-staging.b81e783",
+    "@dxos/react-ui": "0.7.5-staging.b81e783",
+    "@dxos/react-ui-editor": "0.7.5-staging.b81e783",
+    "@dxos/storybook-utils": "0.7.5-staging.b81e783",
+    "@dxos/react-ui-theme": "0.7.5-staging.b81e783",
+    "@dxos/test-utils": "0.7.5-staging.b81e783"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/random": "0.7.5-main.ff8607b",
-    "@dxos/client": "0.7.5-main.ff8607b",
-    "@dxos/react-ui": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-theme": "0.7.5-main.ff8607b"
+    "@dxos/client": "0.7.5-staging.b81e783",
+    "@dxos/random": "0.7.5-staging.b81e783",
+    "@dxos/react-ui-theme": "0.7.5-staging.b81e783",
+    "@dxos/react-ui": "0.7.5-staging.b81e783"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Stack.stories.tsx

@@ -126,7 +126,7 @@ export const Default: Story = {
 };
 
 const meta: Meta<typeof StorybookStack> = {
-  title: 'ui/react-ui-stack-next/Stack',
+  title: 'ui/react-ui-stack/Stack',
   component: StorybookStack,
   decorators: [withTheme],
   argTypes: { orientation: { control: 'radio', options: ['horizontal', 'vertical'] } },

package/src/components/Stack.tsx

@@ -1,36 +1,32 @@
 //
-// Copyright 2024 DXOS.org
+// Copyright 2025 DXOS.org
 //
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
-import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
-import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
-import { attachClosestEdge, extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
+
 import { useArrowNavigationGroup } from '@fluentui/react-tabster';
 import { composeRefs } from '@radix-ui/react-compose-refs';
-import React, {
-  Children,
-  type CSSProperties,
-  type ComponentPropsWithRef,
-  forwardRef,
-  useLayoutEffect,
-  useState,
-} from 'react';
+import React, { Children, type CSSProperties, type ComponentPropsWithRef, forwardRef, useState, useMemo } from 'react';
 
 import { type ThemedClassName, ListItem } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
-import { type StackContextValue, StackContext, type StackItemData } from './StackContext';
+import { type StackContextValue, StackContext } from './StackContext';
+import { useStackDropForElements } from '../hooks';
 
 export type Orientation = 'horizontal' | 'vertical';
-export type Size = 'intrinsic' | 'contain';
+export type Size = 'intrinsic' | 'contain' | 'contain-fit-content';
 
 export type StackProps = Omit<ThemedClassName<ComponentPropsWithRef<'div'>>, 'aria-orientation'> &
   Partial<StackContextValue> & { itemsCount?: number };
 
 export const railGridHorizontal = 'grid-rows-[[rail-start]_var(--rail-size)_[content-start]_1fr_[content-end]]';
-
 export const railGridVertical = 'grid-cols-[[rail-start]_var(--rail-size)_[content-start]_1fr_[content-end]]';
 
+// TODO(ZaymonFC): Magic 2px to stop overflow (tabster dummies... ask @thure).
+export const railGridHorizontalContainFitContent =
+  'grid-rows-[[rail-start]_var(--rail-size)_[content-start]_fit-content(calc(100%-var(--rail-size)*2+2px))_[content-end]]';
+export const railGridVerticalContainFitContent =
+  'grid-cols-[[rail-start]_var(--rail-size)_[content-start]_fit-content(calc(100%-var(--rail-size)*2+2px))_[content-end]]';
+
 export const autoScrollRootAttributes = { 'data-drag-autoscroll': 'idle' };
 
 export const Stack = forwardRef<HTMLDivElement, StackProps>(
@@ -50,52 +46,34 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
   ) => {
     const [stackElement, stackRef] = useState<HTMLDivElement | null>(null);
     const composedItemRef = composeRefs<HTMLDivElement>(stackRef, forwardedRef);
-    const [dropping, setDropping] = useState(false);
-
     const arrowNavigationGroup = useArrowNavigationGroup({ axis: orientation });
 
     const styles: CSSProperties = {
-      [orientation === 'horizontal' ? 'gridTemplateColumns' : 'gridTemplateRows']: `repeat(${itemsCount}, min-content)`,
+      [orientation === 'horizontal' ? 'gridTemplateColumns' : 'gridTemplateRows']:
+        `repeat(${itemsCount}, min-content) [tabster-dummies] 0`,
       ...style,
     };
 
     const selfDroppable = !!(itemsCount < 1 && onRearrange && props.id);
 
-    useLayoutEffect(() => {
-      if (!stackElement || !selfDroppable) {
-        return;
+    const { dropping } = useStackDropForElements({
+      id: props.id,
+      element: stackElement,
+      selfDroppable,
+      orientation,
+      onRearrange,
+    });
+
+    const gridClasses = useMemo(() => {
+      if (!rail) {
+        return orientation === 'horizontal' ? 'grid-rows-1 pli-1' : 'grid-cols-1 plb-1';
+      }
+      if (orientation === 'horizontal') {
+        return size === 'contain-fit-content' ? railGridHorizontalContainFitContent : railGridHorizontal;
+      } else {
+        return size === 'contain-fit-content' ? railGridVerticalContainFitContent : railGridVertical;
       }
-      const acceptSourceType = orientation === 'horizontal' ? 'column' : 'card';
-      return combine(
-        dropTargetForElements({
-          element: stackElement,
-          getData: ({ input, element }) => {
-            return attachClosestEdge(
-              { id: props.id, type: orientation === 'horizontal' ? 'card' : 'column' },
-              { input, element, allowedEdges: [orientation === 'horizontal' ? 'left' : 'top'] },
-            );
-          },
-          onDragEnter: ({ source }) => {
-            if (source.data.type === acceptSourceType) {
-              setDropping(true);
-            }
-          },
-          onDrag: ({ source }) => {
-            if (source.data.type === acceptSourceType) {
-              setDropping(true);
-            }
-          },
-          onDragLeave: () => setDropping(false),
-          onDrop: ({ self, source }) => {
-            setDropping(false);
-            if (source.data.type === acceptSourceType && selfDroppable) {
-              onRearrange(source.data as StackItemData, self.data as StackItemData, extractClosestEdge(self.data));
-            }
-          },
-        }),
-        autoScrollForElements({ element: stackElement, getAllowedAxis: () => orientation }),
-      );
-    }, [stackElement, selfDroppable, orientation]);
+    }, [rail, orientation, size]);
 
     return (
       <StackContext.Provider value={{ orientation, rail, size, onRearrange }}>
@@ -104,14 +82,8 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
           {...arrowNavigationGroup}
           className={mx(
             'grid relative',
-            rail
-              ? orientation === 'horizontal'
-                ? railGridHorizontal
-                : railGridVertical
-              : orientation === 'horizontal'
-                ? 'grid-rows-1 pli-1'
-                : 'grid-cols-1 plb-1',
-            size === 'contain' &&
+            gridClasses,
+            (size === 'contain' || size === 'contain-fit-content') &&
               (orientation === 'horizontal'
                 ? 'overflow-x-auto min-bs-0 bs-full max-bs-full'
                 : 'overflow-y-auto min-is-0 is-full max-is-full'),

package/src/components/StackContext.tsx

@@ -5,9 +5,11 @@
 import type { Edge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
 import { createContext, useContext } from 'react';
 
+import { type Size as DndSize } from '@dxos/react-ui-dnd';
+
 import { type Orientation, type Size } from './Stack';
 
-export type StackItemSize = number | 'min-content';
+export type StackItemSize = DndSize;
 
 export type StackItemData = { id: string; type: 'column' | 'card' };
 

package/src/components/StackItem.tsx

@@ -16,6 +16,7 @@ import { composeRefs } from '@radix-ui/react-compose-refs';
 import React, { forwardRef, useLayoutEffect, useState, type ComponentPropsWithRef, useCallback } from 'react';
 
 import { type ThemedClassName, ListItem } from '@dxos/react-ui';
+import { resizeAttributes, sizeStyle } from '@dxos/react-ui-dnd';
 import { mx } from '@dxos/react-ui-theme';
 
 import { useStack, StackItemContext, type StackItemSize, type StackItemData } from './StackContext';
@@ -159,16 +160,14 @@ const StackItemRoot = forwardRef<HTMLDivElement, StackItemRootProps>(
               : orientation === 'horizontal'
                 ? 'dx-focus-ring-group-x'
                 : 'dx-focus-ring-group-y',
-            size === 'min-content' && (orientation === 'horizontal' ? 'is-min' : 'bs-min'),
             orientation === 'horizontal' ? 'grid-rows-subgrid' : 'grid-cols-subgrid',
             rail && (orientation === 'horizontal' ? 'row-span-2' : 'col-span-2'),
             classNames,
           )}
           data-dx-stack-item
+          {...resizeAttributes}
           style={{
-            ...(size !== 'min-content' && {
-              [orientation === 'horizontal' ? 'inlineSize' : 'blockSize']: `${size}rem`,
-            }),
+            ...sizeStyle(size, orientation),
             ...(Number.isFinite(order) && {
               [orientation === 'horizontal' ? 'gridColumn' : 'gridRow']: `${order}`,
             }),

package/src/components/StackItemContent.tsx

@@ -15,10 +15,12 @@ export type StackItemContentProps = ThemedClassName<ComponentPropsWithoutRef<'di
    * (`row-span-2`) or was buggy. See the description of the StackItem.Content component itself for more information.
    */
   toolbar: boolean;
+
   /**
    * Whether to provide for the layout of a statusbar after the content.
    */
   statusbar?: boolean;
+
   /**
    * Whether to set a certain aspect ratio on the content, including the toolbar and statusbar. This is provided for
    * convenience and consistency; it can instead be specified by the `classNames` or `style` props as needed.

package/src/components/StackItemResizeHandle.tsx

@@ -2,126 +2,29 @@
 // Copyright 2024 DXOS.org
 //
 
-import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
-import { disableNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/disable-native-drag-preview';
-import { preventUnhandled } from '@atlaskit/pragmatic-drag-and-drop/prevent-unhandled';
-import { type DragLocationHistory } from '@atlaskit/pragmatic-drag-and-drop/types';
-import React, { useLayoutEffect, useRef } from 'react';
+import React from 'react';
 
-import { mx } from '@dxos/react-ui-theme';
+import { ResizeHandle } from '@dxos/react-ui-dnd';
 
-import { useStack, useStackItem, type StackItemSize } from './StackContext';
+import { useStack, useStackItem } from './StackContext';
 import { DEFAULT_EXTRINSIC_SIZE } from './StackItem';
 
-const REM = parseFloat(getComputedStyle(document.documentElement).fontSize);
-
 const MIN_WIDTH = 20;
 const MIN_HEIGHT = 3;
 
-const measureStackItem = (element: HTMLButtonElement): { width: number; height: number } => {
-  const stackItemElement = element.closest('[data-dx-stack-item]');
-  return stackItemElement?.getBoundingClientRect() ?? { width: DEFAULT_EXTRINSIC_SIZE, height: DEFAULT_EXTRINSIC_SIZE };
-};
-
-const getNextSize = (startSize: number, location: DragLocationHistory, client: 'clientX' | 'clientY') => {
-  return Math.max(
-    client === 'clientX' ? MIN_WIDTH : MIN_HEIGHT,
-    startSize + (location.current.input[client] - location.initial.input[client]) / REM,
-  );
-};
-
 export type StackItemResizeHandleProps = {};
 
 export const StackItemResizeHandle = () => {
   const { orientation } = useStack();
   const { setSize, size } = useStackItem();
-  const buttonRef = useRef<HTMLButtonElement>(null);
-  const dragStartSize = useRef<StackItemSize>(size);
-  const client = orientation === 'horizontal' ? 'clientX' : 'clientY';
-
-  useLayoutEffect(
-    () => {
-      if (!buttonRef.current || buttonRef.current.hasAttribute('draggable')) {
-        return;
-      }
-      // TODO(thure): This should handle StackItem state vs local state better.
-      draggable({
-        element: buttonRef.current,
-        onGenerateDragPreview: ({ nativeSetDragImage }) => {
-          // We will be moving the line to indicate a drag; we can disable the native drag preview.
-          disableNativeDragPreview({ nativeSetDragImage });
-          // We don't want any native drop animation for when the user does not drop on a drop target.
-          // We want the drag to finish immediately.
-          preventUnhandled.start();
-        },
-        onDragStart: () => {
-          dragStartSize.current =
-            dragStartSize.current === 'min-content'
-              ? measureStackItem(buttonRef.current!)[orientation === 'horizontal' ? 'width' : 'height'] / REM
-              : dragStartSize.current;
-        },
-        onDrag: ({ location }) => {
-          if (typeof dragStartSize.current !== 'number') {
-            return;
-          }
-          setSize(getNextSize(dragStartSize.current, location, client));
-        },
-        onDrop: ({ location }) => {
-          if (typeof dragStartSize.current !== 'number') {
-            return;
-          }
-          const nextSize = getNextSize(dragStartSize.current, location, client);
-          setSize(nextSize, true);
-          dragStartSize.current = nextSize;
-        },
-      });
-    },
-    [
-      // Note that `size` should not be a dependency here since dragging this adjusts the size.
-    ],
-  );
-
-  return (
-    <button
-      ref={buttonRef}
-      className={mx(
-        'group absolute',
-        orientation === 'horizontal'
-          ? 'cursor-col-resize is-3 bs-full inline-end-[-1px] !border-lb-0 before:inset-block-0 before:inline-end-0 before:is-1'
-          : 'cursor-row-resize bs-3 is-full block-end-[-1px] !border-li-0 before:inset-inline-0 before:block-end-0 before:bs-1',
-        'before:transition-opacity before:duration-100 before:ease-in-out before:opacity-0 hover:before:opacity-100 focus-visible:before:opacity-100 active:before:opacity-100',
-        'before:absolute before:block before:bg-accentFocusIndicator',
-      )}
-    >
-      <div
-        role='none'
-        className={mx(
-          'absolute flex items-center group-hover:opacity-0 group-focus-visible:opacity-0 group-active:opacity-0',
-          orientation === 'horizontal'
-            ? 'block-start-0 inline-end-px bs-[--rail-size]'
-            : 'inline-start-0 block-end-px is-[--rail-size] flex justify-center',
-        )}
-      >
-        <DragHandleSignifier orientation={orientation} />
-      </div>
-    </button>
-  );
-};
 
-const DragHandleSignifier = ({ orientation }: { orientation: 'horizontal' | 'vertical' }) => {
   return (
-    <svg
-      xmlns='http://www.w3.org/2000/svg'
-      viewBox='0 0 256 256'
-      fill='currentColor'
-      className={mx('shrink-0 bs-[1em] is-[1em] text-unAccent', orientation === 'vertical' && 'rotate-90')}
-    >
-      {/* two pips: <path d='M256,120c-8.8,0-16-7.2-16-16v-56c0-8.8,7.2-16,16-16v88Z' />
-      <path d='M256,232c-8.8,0-16-7.2-16-16v-56c0-8.8,7.2-16,16-16v88Z' /> */}
-      <path d='M256,64c-8.8,0-16-7.2-16-16s7.2-16,16-16v32Z' />
-      <path d='M256,120c-8.8,0-16-7.2-16-16s7.2-16,16-16v32Z' />
-      <path d='M256,176c-8.8,0-16-7.2-16-16s7.2-16,16-16v32Z' />
-      <path d='M256,232c-8.8,0-16-7.2-16-16s7.2-16,16-16v32Z' />
-    </svg>
+    <ResizeHandle
+      side={orientation === 'horizontal' ? 'inline-end' : 'block-end'}
+      fallbackSize={DEFAULT_EXTRINSIC_SIZE}
+      minSize={orientation === 'horizontal' ? MIN_WIDTH : MIN_HEIGHT}
+      size={size}
+      onSizeChange={setSize}
+    />
   );
 };

package/src/hooks/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { useStackDropForElements } from './useStackDropForElements';

package/src/hooks/useStackDropForElements.ts

@@ -0,0 +1,73 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
+import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
+import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
+import { attachClosestEdge, extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
+import { useLayoutEffect, useState } from 'react';
+
+import { type Orientation } from '../components/Stack';
+import { type StackItemRearrangeHandler, type StackItemData } from '../components/StackContext';
+
+/**
+ * Hook to handle drag and drop functionality for Stack components.
+ */
+export const useStackDropForElements = ({
+  element,
+  selfDroppable,
+  orientation,
+  id,
+  onRearrange,
+}: {
+  element: HTMLDivElement | null;
+  selfDroppable: boolean;
+  orientation: Orientation;
+  id?: string;
+  onRearrange?: StackItemRearrangeHandler;
+}) => {
+  const [dropping, setDropping] = useState(false);
+
+  useLayoutEffect(() => {
+    if (!element || !selfDroppable) {
+      return;
+    }
+
+    const acceptSourceType = orientation === 'horizontal' ? 'column' : 'card';
+
+    return combine(
+      dropTargetForElements({
+        element,
+        getData: ({ input, element }) => {
+          return attachClosestEdge(
+            { id, type: orientation === 'horizontal' ? 'card' : 'column' },
+            { input, element, allowedEdges: [orientation === 'horizontal' ? 'left' : 'top'] },
+          );
+        },
+        onDragEnter: ({ source }) => {
+          if (source.data.type === acceptSourceType) {
+            setDropping(true);
+          }
+        },
+        onDrag: ({ source }) => {
+          if (source.data.type === acceptSourceType) {
+            setDropping(true);
+          }
+        },
+        onDragLeave: () => {
+          return setDropping(false);
+        },
+        onDrop: ({ self, source }) => {
+          setDropping(false);
+          if (source.data.type === acceptSourceType && selfDroppable && onRearrange) {
+            onRearrange(source.data as StackItemData, self.data as StackItemData, extractClosestEdge(self.data));
+          }
+        },
+      }),
+      autoScrollForElements({ element, getAllowedAxis: () => orientation }),
+    );
+  }, [element, selfDroppable, orientation, id, onRearrange]);
+
+  return { dropping };
+};

package/dist/types/src/playwright/playwright.config.d.ts

@@ -1,3 +0,0 @@
-declare const _default: import("@playwright/test").PlaywrightTestConfig<{}, {}>;
-export default _default;
-//# sourceMappingURL=playwright.config.d.ts.map

package/dist/types/src/playwright/playwright.config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"playwright.config.d.ts","sourceRoot":"","sources":["../../../../src/playwright/playwright.config.ts"],"names":[],"mappings":";AASA,wBAQG"}