@dxos/react-ui-stack 0.7.4 → 0.7.5-main.499c70c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-stack",
-  "version": "0.7.4",
+  "version": "0.7.5-main.499c70c",
   "description": "A stack component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -43,14 +43,15 @@
     "@radix-ui/react-compose-refs": "^1.0.0",
     "@radix-ui/react-context": "^1.0.0",
     "@radix-ui/react-menu": "^2.0.6",
+    "@radix-ui/react-slot": "^1.0.1",
     "@radix-ui/react-use-controllable-state": "^1.0.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/echo-schema": "0.7.4",
-    "@dxos/react-ui-attention": "0.7.4",
-    "@dxos/live-object": "0.7.4",
-    "@dxos/react-ui-mosaic": "0.7.4",
-    "@dxos/util": "0.7.4",
-    "@dxos/keyboard": "0.7.4"
+    "@dxos/echo-schema": "0.7.5-main.499c70c",
+    "@dxos/keyboard": "0.7.5-main.499c70c",
+    "@dxos/react-ui-attention": "0.7.5-main.499c70c",
+    "@dxos/util": "0.7.5-main.499c70c",
+    "@dxos/react-ui-mosaic": "0.7.5-main.499c70c",
+    "@dxos/live-object": "0.7.5-main.499c70c"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -59,24 +60,24 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/app-graph": "0.7.4",
-    "@dxos/client": "0.7.4",
-    "@dxos/echo-schema": "0.7.4",
-    "@dxos/react-ui": "0.7.4",
-    "@dxos/random": "0.7.4",
-    "@dxos/react-ui-theme": "0.7.4",
-    "@dxos/react-ui-editor": "0.7.4",
-    "@dxos/storybook-utils": "0.7.4",
-    "@dxos/test-utils": "0.7.4"
+    "@dxos/app-graph": "0.7.5-main.499c70c",
+    "@dxos/client": "0.7.5-main.499c70c",
+    "@dxos/echo-schema": "0.7.5-main.499c70c",
+    "@dxos/random": "0.7.5-main.499c70c",
+    "@dxos/react-ui": "0.7.5-main.499c70c",
+    "@dxos/react-ui-theme": "0.7.5-main.499c70c",
+    "@dxos/react-ui-editor": "0.7.5-main.499c70c",
+    "@dxos/storybook-utils": "0.7.5-main.499c70c",
+    "@dxos/test-utils": "0.7.5-main.499c70c"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/client": "0.7.4",
-    "@dxos/random": "0.7.4",
-    "@dxos/react-ui": "0.7.4",
-    "@dxos/react-ui-theme": "0.7.4"
+    "@dxos/client": "0.7.5-main.499c70c",
+    "@dxos/react-ui": "0.7.5-main.499c70c",
+    "@dxos/random": "0.7.5-main.499c70c",
+    "@dxos/react-ui-theme": "0.7.5-main.499c70c"
   },
   "publishConfig": {
     "access": "public"

package/src/components/LayoutControls.tsx

@@ -44,9 +44,7 @@ const LayoutControl = ({ icon, label, ...props }: Omit<ButtonProps, 'children'>
         </Button>
       </Tooltip.Trigger>
       <Tooltip.Portal>
-        <Tooltip.Content side='bottom' classNames='z-[70]'>
-          {label}
-        </Tooltip.Content>
+        <Tooltip.Content side='bottom'>{label}</Tooltip.Content>
       </Tooltip.Portal>
     </Tooltip.Root>
   );

package/src/components/Stack.stories.tsx

@@ -10,7 +10,8 @@ import { faker } from '@dxos/random';
 import { withTheme } from '@dxos/storybook-utils';
 
 import { Stack } from './Stack';
-import { StackItem, type StackItemData } from './StackItem';
+import { type StackItemData } from './StackContext';
+import { StackItem } from './StackItem';
 
 type StoryStackItem = {
   id: string;
@@ -93,15 +94,15 @@ const StorybookStack = () => {
 
   return (
     <main className='fixed inset-0'>
-      <Stack orientation='horizontal' size='contain'>
+      <Stack orientation='horizontal' size='contain' onRearrange={reorderItem}>
         {columns.map((column) => (
-          <StackItem.Root key={column.id} item={column} onRearrange={reorderItem}>
+          <StackItem.Root key={column.id} item={column}>
             <StackItem.Heading>
               <StackItem.ResizeHandle />
             </StackItem.Heading>
             <Stack orientation='vertical' size='contain'>
               {column.items?.map((card) => (
-                <StackItem.Root key={card.id} item={card} onRearrange={reorderItem}>
+                <StackItem.Root key={card.id} item={card}>
                   <StackItem.Heading>
                     <StackItem.ResizeHandle />
                   </StackItem.Heading>

package/src/components/Stack.tsx

@@ -1,14 +1,23 @@
 //
 // Copyright 2024 DXOS.org
 //
-
+import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
+import { attachClosestEdge, extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
 import { useArrowNavigationGroup } from '@fluentui/react-tabster';
-import React, { Children, type CSSProperties, type ComponentPropsWithRef, forwardRef } from 'react';
+import { composeRefs } from '@radix-ui/react-compose-refs';
+import React, {
+  Children,
+  type CSSProperties,
+  type ComponentPropsWithRef,
+  forwardRef,
+  useLayoutEffect,
+  useState,
+} from 'react';
 
-import { type ThemedClassName } from '@dxos/react-ui';
+import { type ThemedClassName, ListItem } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
-import { type StackContextValue, StackContext } from './StackContext';
+import { type StackContextValue, StackContext, type StackItemData } from './StackContext';
 
 export type Orientation = 'horizontal' | 'vertical';
 export type Size = 'intrinsic' | 'contain';
@@ -28,13 +37,17 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
       style,
       orientation = 'vertical',
       rail = true,
-      separators = true,
       size = 'intrinsic',
+      onRearrange,
       itemsCount = Children.count(children),
       ...props
     },
     forwardedRef,
   ) => {
+    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 = {
@@ -42,8 +55,43 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
       ...style,
     };
 
+    const selfDroppable = !!(itemsCount < 1 && onRearrange && props.id);
+
+    useLayoutEffect(() => {
+      if (!stackElement || !selfDroppable) {
+        return;
+      }
+      const acceptSourceType = orientation === 'horizontal' ? 'column' : 'card';
+      return 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));
+          }
+        },
+      });
+    }, [stackElement, selfDroppable]);
+
     return (
-      <StackContext.Provider value={{ orientation, rail, size, separators }}>
+      <StackContext.Provider value={{ orientation, rail, size, onRearrange }}>
         <div
           {...props}
           {...arrowNavigationGroup}
@@ -60,14 +108,14 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
               (orientation === 'horizontal'
                 ? 'overflow-x-auto min-bs-0 bs-full max-bs-full'
                 : 'overflow-y-auto min-is-0 is-full max-is-full'),
-            separators && (orientation === 'horizontal' ? 'divide-separator divide-x' : 'divide-separator divide-y'),
             classNames,
           )}
           aria-orientation={orientation}
           style={styles}
-          ref={forwardedRef}
+          ref={composedItemRef}
         >
           {children}
+          {selfDroppable && dropping && <ListItem.DropIndicator edge={orientation === 'horizontal' ? 'left' : 'top'} />}
         </div>
       </StackContext.Provider>
     );

package/src/components/StackContext.tsx

@@ -2,28 +2,37 @@
 // Copyright 2024 DXOS.org
 //
 
+import type { Edge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
 import { createContext, useContext } from 'react';
 
 import { type Orientation, type Size } from './Stack';
-import { type StackItemSize } from './StackItem';
+
+export type StackItemSize = number | 'min-content';
+
+export type StackItemData = { id: string; type: 'column' | 'card' };
+
+export type StackItemRearrangeHandler = (
+  source: StackItemData,
+  target: StackItemData,
+  closestEdge: Edge | null,
+) => void;
 
 export type StackContextValue = {
   orientation: Orientation;
-  separators: boolean;
   rail: boolean;
   size: Size;
+  onRearrange?: StackItemRearrangeHandler;
 };
 
 export const StackContext = createContext<StackContextValue>({
   orientation: 'vertical',
   rail: true,
   size: 'intrinsic',
-  separators: true,
 });
 
 export const useStack = () => useContext(StackContext);
 
-type StackItemContextValue = {
+export type StackItemContextValue = {
   selfDragHandleRef: (element: HTMLDivElement | null) => void;
   size: StackItemSize;
   setSize: (nextSize: StackItemSize, commit?: boolean) => void;

package/src/components/StackItem.tsx

@@ -4,29 +4,30 @@
 
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { draggable, dropTargetForElements } 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 {
   attachClosestEdge,
   extractClosestEdge,
   type Edge,
 } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
-// TODO(wittjosiah): Drop indicator that doesn't depend on emotion. See react-ui-list DropIndicator.
-// import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { useFocusableGroup } from '@fluentui/react-tabster';
 import { composeRefs } from '@radix-ui/react-compose-refs';
 import React, { forwardRef, useLayoutEffect, useState, type ComponentPropsWithRef, useCallback } from 'react';
 
-import { type ThemedClassName } from '@dxos/react-ui';
+import { type ThemedClassName, ListItem } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
-import { useStack, StackItemContext } from './StackContext';
+import { useStack, StackItemContext, type StackItemSize, type StackItemData } from './StackContext';
 import { StackItemContent, type StackItemContentProps } from './StackItemContent';
+import { StackItemDragHandle, type StackItemDragHandleProps } from './StackItemDragHandle';
 import {
   StackItemHeading,
   StackItemHeadingLabel,
   type StackItemHeadingProps,
   type StackItemHeadingLabelProps,
 } from './StackItemHeading';
-import { StackItemResizeHandle } from './StackItemResizeHandle';
+import { StackItemResizeHandle, type StackItemResizeHandleProps } from './StackItemResizeHandle';
 import {
   StackItemSigil,
   type StackItemSigilProps,
@@ -35,31 +36,24 @@ import {
   StackItemSigilButton,
 } from './StackItemSigil';
 
-export type StackItemSize = number | 'min-content';
 export const DEFAULT_HORIZONTAL_SIZE = 44 satisfies StackItemSize;
 export const DEFAULT_VERTICAL_SIZE = 'min-content' satisfies StackItemSize;
 export const DEFAULT_EXTRINSIC_SIZE = DEFAULT_HORIZONTAL_SIZE satisfies StackItemSize;
 
-export type StackItemData = { id: string; type: 'column' | 'card' };
-
 export type StackItemRootProps = ThemedClassName<ComponentPropsWithRef<'div'>> & {
   item: Omit<StackItemData, 'type'>;
   order?: number;
-  onRearrange?: (source: StackItemData, target: StackItemData, closestEdge: Edge | null) => void;
   size?: StackItemSize;
   onSizeChange?: (nextSize: StackItemSize) => void;
   role?: 'article' | 'section';
 };
 
 const StackItemRoot = forwardRef<HTMLDivElement, StackItemRootProps>(
-  (
-    { item, children, classNames, onRearrange, size: propsSize, onSizeChange, role, order, style, ...props },
-    forwardedRef,
-  ) => {
+  ({ item, children, classNames, size: propsSize, onSizeChange, role, order, style, ...props }, forwardedRef) => {
     const [itemElement, itemRef] = useState<HTMLDivElement | null>(null);
     const [selfDragHandleElement, selfDragHandleRef] = useState<HTMLDivElement | null>(null);
-    const [_closestEdge, setEdge] = useState<Edge | null>(null);
-    const { orientation, rail, separators } = useStack();
+    const [closestEdge, setEdge] = useState<Edge | null>(null);
+    const { orientation, rail, onRearrange } = useStack();
     const [size = orientation === 'horizontal' ? DEFAULT_HORIZONTAL_SIZE : DEFAULT_VERTICAL_SIZE, setInternalSize] =
       useState(propsSize);
 
@@ -88,6 +82,11 @@ const StackItemRoot = forwardRef<HTMLDivElement, StackItemRootProps>(
           element: itemElement,
           ...(selfDragHandleElement && { dragHandle: selfDragHandleElement }),
           getInitialData: () => ({ id: item.id, type }),
+          // TODO(thure): tabster focus honeypots are causing the preview to render with the wrong dimensions; what do?
+          onGenerateDragPreview: ({ nativeSetDragImage }) => {
+            disableNativeDragPreview({ nativeSetDragImage });
+            preventUnhandled.start();
+          },
         }),
         dropTargetForElements({
           element: itemElement,
@@ -131,7 +130,6 @@ const StackItemRoot = forwardRef<HTMLDivElement, StackItemRootProps>(
             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'),
-            separators && (orientation === 'horizontal' ? 'divide-separator divide-y' : 'divide-separator divide-x'),
             classNames,
           )}
           data-dx-stack-item
@@ -147,7 +145,7 @@ const StackItemRoot = forwardRef<HTMLDivElement, StackItemRootProps>(
           ref={composedItemRef}
         >
           {children}
-          {/* {closestEdge && <DropIndicator edge={closestEdge} />} */}
+          {closestEdge && <ListItem.DropIndicator edge={closestEdge} />}
         </Root>
       </StackItemContext.Provider>
     );
@@ -160,6 +158,7 @@ export const StackItem = {
   Heading: StackItemHeading,
   HeadingLabel: StackItemHeadingLabel,
   ResizeHandle: StackItemResizeHandle,
+  DragHandle: StackItemDragHandle,
   Sigil: StackItemSigil,
   SigilButton: StackItemSigilButton,
 };
@@ -168,6 +167,8 @@ export type {
   StackItemContentProps,
   StackItemHeadingProps,
   StackItemHeadingLabelProps,
+  StackItemResizeHandleProps,
+  StackItemDragHandleProps,
   StackItemSigilProps,
   StackItemSigilButtonProps,
   StackItemSigilAction,

package/src/components/StackItemContent.tsx

@@ -21,18 +21,13 @@ export const StackItemContent = ({
   classNames,
   ...props
 }: StackItemContentProps) => {
-  const { size, separators } = useStack();
+  const { size } = useStack();
 
   return (
     <div
       role='none'
       {...props}
-      className={mx(
-        'group grid grid-cols-[100%]',
-        size === 'contain' && 'min-bs-0 overflow-hidden',
-        separators && 'divide-separator divide-y',
-        classNames,
-      )}
+      className={mx('group grid grid-cols-[100%]', size === 'contain' && 'min-bs-0 overflow-hidden', classNames)}
       style={{
         gridTemplateRows: [
           ...(toolbar ? ['var(--rail-action)'] : []),

package/src/components/StackItemDragHandle.tsx

@@ -0,0 +1,22 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Slot } from '@radix-ui/react-slot';
+import React, { type ComponentPropsWithoutRef } from 'react';
+
+import { useStackItem } from './StackContext';
+
+export type StackItemDragHandleProps = ComponentPropsWithoutRef<'button'> & { asChild: boolean };
+
+export const StackItemDragHandle = ({ asChild, children }: StackItemDragHandleProps) => {
+  const { selfDragHandleRef } = useStackItem();
+
+  const Root = asChild ? Slot : 'div';
+
+  return (
+    <Root ref={selfDragHandleRef} role='button'>
+      {children}
+    </Root>
+  );
+};

package/src/components/StackItemHeading.tsx

@@ -9,13 +9,12 @@ import { type ThemedClassName } from '@dxos/react-ui';
 import { useAttention, type AttendableId, type Related } from '@dxos/react-ui-attention';
 import { mx } from '@dxos/react-ui-theme';
 
-import { useStack, useStackItem } from './StackContext';
+import { useStack } from './StackContext';
 
 export type StackItemHeadingProps = ThemedClassName<ComponentPropsWithoutRef<'div'>>;
 
 export const StackItemHeading = ({ children, classNames, ...props }: StackItemHeadingProps) => {
   const { orientation } = useStack();
-  const { selfDragHandleRef } = useStackItem();
   const focusableGroupAttrs = useFocusableGroup({ tabBehavior: 'limited' });
   return (
     <div
@@ -28,7 +27,6 @@ export const StackItemHeading = ({ children, classNames, ...props }: StackItemHe
         orientation === 'horizontal' ? 'bs-[--rail-size]' : 'is-[--rail-size] flex-col',
         classNames,
       )}
-      ref={selfDragHandleRef}
     >
       {children}
     </div>

package/src/components/StackItemResizeHandle.tsx

@@ -10,8 +10,8 @@ import React, { useLayoutEffect, useRef } from 'react';
 
 import { mx } from '@dxos/react-ui-theme';
 
-import { useStack, useStackItem } from './StackContext';
-import { DEFAULT_EXTRINSIC_SIZE, type StackItemSize } from './StackItem';
+import { useStack, useStackItem, type StackItemSize } from './StackContext';
+import { DEFAULT_EXTRINSIC_SIZE } from './StackItem';
 
 const REM = parseFloat(getComputedStyle(document.documentElement).fontSize);
 
@@ -26,6 +26,8 @@ const getNextSize = (startSize: number, location: DragLocationHistory, client: '
   return Math.max(MIN_SIZE, startSize + (location.current.input[client] - location.initial.input[client]) / REM);
 };
 
+export type StackItemResizeHandleProps = {};
+
 export const StackItemResizeHandle = () => {
   const { orientation } = useStack();
   const { setSize, size } = useStackItem();
@@ -42,11 +44,10 @@ export const StackItemResizeHandle = () => {
       draggable({
         element: buttonRef.current,
         onGenerateDragPreview: ({ nativeSetDragImage }) => {
-          // we will be moving the line to indicate a drag
-          // we can disable the native drag preview
+          // 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
+          // 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: () => {

package/src/components/StackItemSigil.tsx

@@ -159,7 +159,7 @@ export const StackItemSigil = forwardRef<HTMLButtonElement, StackItemSigilProps>
           </DropdownMenu.Portal>
         </DropdownMenu.Root>
         <Tooltip.Portal>
-          <Tooltip.Content style={{ zIndex: 70 }} side='bottom'>
+          <Tooltip.Content side='bottom'>
             {triggerLabel}
             <Tooltip.Arrow />
           </Tooltip.Content>

package/src/components/index.ts

@@ -5,3 +5,4 @@
 export * from './Stack';
 export * from './StackItem';
 export * from './LayoutControls';
+export * from './StackContext';