@dxos/react-ui-stack 0.8.4-main.f5c0578 → 0.8.4-main.fcc0d83b33

package/package.json

@@ -1,13 +1,20 @@
 {
   "name": "@dxos/react-ui-stack",
-  "version": "0.8.4-main.f5c0578",
+  "version": "0.8.4-main.fcc0d83b33",
   "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",
+  "imports": {
+    "#translations": "./src/translations.ts"
+  },
   "exports": {
     ".": {
       "types": "./dist/types/src/index.d.ts",
@@ -19,33 +26,24 @@
       "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"
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "playwright": [
-        "dist/types/src/playwright/index.d.ts"
-      ],
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "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 +52,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.f5c0578",
-    "@dxos/keyboard": "0.8.4-main.f5c0578",
-    "@dxos/live-object": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-dnd": "0.8.4-main.f5c0578",
-    "@dxos/util": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-attention": "0.8.4-main.f5c0578",
-    "@dxos/storybook-utils": "0.8.4-main.f5c0578"
+    "@dxos/keyboard": "0.8.4-main.fcc0d83b33",
+    "@dxos/echo": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-dnd": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-attention": "0.8.4-main.fcc0d83b33",
+    "@dxos/util": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui-mosaic": "0.8.4-main.fcc0d83b33"
   },
   "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.f5c0578",
-    "@dxos/client": "0.8.4-main.f5c0578",
-    "@dxos/random": "0.8.4-main.f5c0578",
-    "@dxos/echo-schema": "0.8.4-main.f5c0578",
-    "@dxos/react-ui": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-theme": "0.8.4-main.f5c0578",
-    "@dxos/storybook-utils": "0.8.4-main.f5c0578",
-    "@dxos/test-utils": "0.8.4-main.f5c0578"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.10",
+    "@dxos/app-framework": "0.8.4-main.fcc0d83b33",
+    "@dxos/app-graph": "0.8.4-main.fcc0d83b33",
+    "@dxos/client": "0.8.4-main.fcc0d83b33",
+    "@dxos/echo-db": "0.8.4-main.fcc0d83b33",
+    "@dxos/random": "0.8.4-main.fcc0d83b33",
+    "@dxos/echo": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-client": "0.8.4-main.fcc0d83b33",
+    "@dxos/schema": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui": "0.8.4-main.fcc0d83b33",
+    "@dxos/storybook-utils": "0.8.4-main.fcc0d83b33",
+    "@dxos/test-utils": "0.8.4-main.fcc0d83b33",
+    "@dxos/ui-theme": "0.8.4-main.fcc0d83b33",
+    "@dxos/types": "0.8.4-main.fcc0d83b33"
   },
   "peerDependencies": {
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/client": "0.8.4-main.f5c0578",
-    "@dxos/random": "0.8.4-main.f5c0578",
-    "@dxos/react-ui": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-theme": "0.8.4-main.f5c0578"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/client": "0.8.4-main.fcc0d83b33",
+    "@dxos/random": "0.8.4-main.fcc0d83b33",
+    "@dxos/ui-theme": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui": "0.8.4-main.fcc0d83b33"
   },
   "publishConfig": {
     "access": "public"

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

@@ -2,18 +2,15 @@
 // 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, { useCallback, useState } from 'react';
 
-import { faker } from '@dxos/random';
-import { withTheme } from '@dxos/storybook-utils';
+import { random } from '@dxos/random';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { type StackItemData } from '../defs';
 import { StackItem } from '../StackItem';
-
+import { type StackItemData } from '../types';
 import { Stack } from './Stack';
 
 type StoryStackItem = {
@@ -24,7 +21,7 @@ type StoryStackItem = {
 
 const KanbanBlock = ({ item }: { item: StoryStackItem }) => {
   return (
-    <div className='overflow-hidden'>
+    <div role='none' className='overflow-hidden'>
       <p className='place-content-center p-4'>{item.title}</p>
     </div>
   );
@@ -32,16 +29,16 @@ const KanbanBlock = ({ item }: { item: StoryStackItem }) => {
 
 const DefaultStory = () => {
   const [columns, setColumns] = useState<StoryStackItem[]>(
-    faker.helpers.multiple(
+    random.helpers.multiple(
       () =>
         ({
-          id: faker.string.uuid(),
-          title: faker.lorem.paragraph(),
-          items: faker.helpers.multiple(
+          id: random.string.uuid(),
+          title: random.lorem.paragraph(),
+          items: random.helpers.multiple(
             () =>
               ({
-                id: faker.string.uuid(),
-                title: faker.lorem.paragraph(),
+                id: random.string.uuid(),
+                title: random.lorem.paragraph(),
               }) satisfies StoryStackItem,
             { count: { min: 32, max: 64 } },
           ),
@@ -79,7 +76,6 @@ const DefaultStory = () => {
             targetColumn.items
           ) {
             const [movedCard] = sourceColumn.items.splice(sourceCardIndex, 1);
-
             let insertIndex;
             if (sourceColumn === targetColumn && sourceCardIndex < targetCardIndex) {
               insertIndex = closestEdge === 'bottom' ? targetCardIndex : targetCardIndex - 1;
@@ -130,12 +126,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;
 

package/src/components/Stack/Stack.tsx

@@ -2,78 +2,86 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useArrowNavigationGroup } from '@fluentui/react-tabster';
 import { composeRefs } from '@radix-ui/react-compose-refs';
 import React, {
-  type CSSProperties,
   Children,
   type ComponentPropsWithRef,
+  type FocusEvent,
+  type KeyboardEvent,
   forwardRef,
   useCallback,
   useEffect,
-  useMemo,
   useState,
 } from 'react';
 
-import { ListItem, type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { ListItem, type ThemedClassName, useId } from '@dxos/react-ui';
+import { mx } from '@dxos/ui-theme';
 
 import { useStackDropForElements } from '../../hooks';
-import { type StackContextValue } from '../defs';
 import { StackContext } from '../StackContext';
+import { type StackContextValue } from '../types';
 
 export type Orientation = 'horizontal' | 'vertical';
-export type Size = 'intrinsic' | 'contain' | 'contain-fit-content';
+
+/**
+ * Size is how Stack and its StackItems coordinate the dimensions of the items with the available space.
+ * - `intrinsic` signals to Stack and its StackItems to occupy their intrinsic size
+ * - Any other size will extrinsically fill the available space along the axis of its orientation and handle overflow:
+ *   - `contain` causes StackItems to occupy their intrinsic size
+ *   - `split` divides the Stack’s available space among the StackItems
+ */
+export type Size = 'intrinsic' | 'contain' | 'split';
+
+export const railGridHorizontal = 'grid-rows-[[rail-start]_var(--dx-rail-size)_[content-start]_1fr_[content-end]]';
+export const railGridVertical = 'grid-cols-[[rail-start]_var(--dx-rail-size)_[content-start]_1fr_[content-end]]';
+
+const PERPENDICULAR_FOCUS_THRESHHOLD = 128;
+
+const scrollIntoViewAndFocus = (el: HTMLElement, orientation: StackProps['orientation']) => {
+  el.scrollIntoView({
+    behavior: 'instant',
+    [orientation === 'vertical' ? 'block' : 'inline']: 'center',
+  });
+  return el.focus();
+};
 
 export type StackProps = Omit<ThemedClassName<ComponentPropsWithRef<'div'>>, 'aria-orientation'> &
   Partial<StackContextValue> & {
     itemsCount?: number;
-    getDropElement?: (stackElement: HTMLDivElement) => HTMLDivElement;
+    circularFocus?: boolean;
     separatorOnScroll?: number;
+    getDropElement?: (stackElement: HTMLDivElement) => HTMLDivElement;
   };
 
-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>(
   (
     {
       children,
       classNames,
+      id,
       style,
       orientation = 'vertical',
       rail = true,
       size = 'intrinsic',
-      onRearrange,
       itemsCount = Children.count(children),
-      getDropElement,
+      circularFocus,
       separatorOnScroll,
+      getDropElement,
+      onBlur,
+      onKeyDown,
+      onRearrange,
       ...props
     },
     forwardedRef,
   ) => {
+    const stackId = useId('stack', id);
     const [stackElement, stackRef] = useState<HTMLDivElement | null>(null);
+    const [lastFocusedItem, setLastFocusedItem] = useState<string>();
     const composedItemRef = composeRefs<HTMLDivElement>(stackRef, forwardedRef);
-    const arrowNavigationAttrs = useArrowNavigationGroup({ axis: orientation });
-
-    const styles: CSSProperties = {
-      [orientation === 'horizontal' ? 'gridTemplateColumns' : 'gridTemplateRows']:
-        `repeat(${itemsCount}, min-content) [tabster-dummies] 0`,
-      ...style,
-    };
-
-    const selfDroppable = !!(itemsCount < 1 && onRearrange && props.id);
 
+    const selfDroppable = !!(itemsCount < 1 && onRearrange && id);
     const { dropping } = useStackDropForElements({
-      id: props.id,
+      id,
       element: getDropElement && stackElement ? getDropElement(stackElement) : stackElement,
       scrollElement: stackElement,
       selfDroppable,
@@ -81,6 +89,7 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
       onRearrange,
     });
 
+    /** Updates scroll separator data attributes based on current scroll position. */
     const handleScroll = useCallback(() => {
       if (stackElement && Number.isFinite(separatorOnScroll)) {
         const scrollPosition = orientation === 'horizontal' ? stackElement.scrollLeft : stackElement.scrollTop;
@@ -97,17 +106,25 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
       }
     }, [stackElement, separatorOnScroll, orientation]);
 
-    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;
-      }
-    }, [rail, orientation, size]);
+    /** Handles blur events to track the last focused item within this stack. */
+    const handleBlur = useCallback(
+      (event: FocusEvent<HTMLDivElement>) => {
+        if (event.target) {
+          const target = event.target as HTMLElement;
+          const closestStackItem = target.closest(`[data-dx-item-id]`) as HTMLElement | null;
+          if (closestStackItem?.closest(`[data-dx-stack="${stackId}"]`)) {
+            setLastFocusedItem(closestStackItem?.getAttribute('data-dx-item-id') ?? undefined);
+          }
+        }
+        onBlur?.(event);
+      },
+      [stackId, onBlur],
+    );
+
+    /** Handles keyboard navigation within the stack. */
+    const handleKeyDown = useKeyDown(stackId, circularFocus, onKeyDown);
 
+    /** Observes DOM mutations to keep scroll separator state in sync. */
     useEffect(() => {
       if (!(stackElement && Number.isFinite(separatorOnScroll))) {
         return;
@@ -118,31 +135,46 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
       });
 
       observer.observe(stackElement, { childList: true, subtree: true });
-
       return () => {
         observer.disconnect();
       };
     }, [stackElement, handleScroll]);
 
     return (
-      <StackContext.Provider value={{ orientation, rail, size, onRearrange }}>
+      <StackContext.Provider value={{ stackId, orientation, rail, size, onRearrange }}>
         <div
           {...props}
-          {...arrowNavigationAttrs}
+          {...(Number.isFinite(separatorOnScroll) && { onScroll: handleScroll })}
           className={mx(
-            'grid relative',
-            gridClasses,
-            (size === 'contain' || size === 'contain-fit-content') &&
+            'relative grid [--stack-gap:var(--spacing-trim-xs)]',
+            size === 'contain' &&
               (orientation === 'horizontal'
-                ? 'overflow-x-auto min-bs-0 max-bs-full bs-full'
-                : 'overflow-y-auto min-is-0 max-is-full is-full'),
+                ? 'overflow-x-auto overscroll-x-contain min-h-0 max-h-full h-full'
+                : 'overflow-y-auto min-w-0 max-w-full w-full'),
+            rail
+              ? orientation === 'horizontal'
+                ? railGridHorizontal
+                : railGridVertical
+              : orientation === 'horizontal'
+                ? 'grid-rows-1 px-(--stack-gap)'
+                : 'grid-cols-1 py-(--stack-gap)',
             classNames,
           )}
-          data-rail={rail}
+          style={{
+            [orientation === 'horizontal' ? 'gridTemplateColumns' : 'gridTemplateRows']:
+              size === 'split'
+                ? `repeat(${itemsCount}, 1fr)`
+                : `repeat(${itemsCount}, min-content) [tabster-dummies] 0`,
+            ...style,
+          }}
           aria-orientation={orientation}
-          style={styles}
+          data-dx-stack={stackId}
+          data-dx-stack-circular-focus={circularFocus}
+          data-dx-last-focused-item={lastFocusedItem}
+          data-rail={rail}
+          onBlur={handleBlur}
+          onKeyDown={handleKeyDown}
           ref={composedItemRef}
-          {...(Number.isFinite(separatorOnScroll) && { onScroll: handleScroll })}
         >
           {children}
           {selfDroppable && dropping && (
@@ -162,3 +194,157 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
 export { StackContext };
 
 export type { StackContextValue };
+
+/**
+ * Handles moving focus using the arrow keys. Focus is only handled by the nearest stack.
+ * If the arrow key matches the orientation, focus cycles between items, otherwise focus is passed to an adjacent stack item;
+ * Or if there is no such stack item, focus is passed to the adjacent empty stack if one can be found.
+ */
+// TODO(burdon): Replace with Mosaic.Stack which handles this automatically.
+const useKeyDown = (stackId: string, circularFocus?: boolean, onKeyDown?: StackProps['onKeyDown']) =>
+  useCallback(
+    (event: KeyboardEvent<HTMLDivElement>) => {
+      const target = event.target as HTMLElement;
+      if (
+        event.key.startsWith('Arrow') &&
+        !target.closest(
+          `input, textarea, [role="textbox"], [data-tabster*="mover"], [data-arrow-keys="all"], [data-arrow-keys~="${event.key.toLowerCase().slice(5)}"]`,
+        )
+      ) {
+        const closestOwnedItem = target.closest(`[data-dx-stack-item="${stackId}"]`);
+        const closestStack = target.closest('[data-dx-stack]') as HTMLElement | null;
+        const closestStackItems = Array.from(closestStack?.querySelectorAll(`[data-dx-stack-item="${stackId}"]`) ?? []);
+        const closestStackOrientation = closestStack?.getAttribute('aria-orientation') as Orientation;
+        const ancestorStack = closestStack?.parentElement?.closest('[data-dx-stack]') as HTMLElement | null;
+        if (closestOwnedItem && closestStack) {
+          const ancestorOrientation = ancestorStack?.getAttribute('aria-orientation') as Orientation | undefined;
+          const parallelDelta = (
+            closestStackOrientation === 'vertical' ? event.key === 'ArrowUp' : event.key === 'ArrowLeft'
+          )
+            ? -1
+            : (closestStackOrientation === 'vertical' ? event.key === 'ArrowDown' : event.key === 'ArrowRight')
+              ? 1
+              : 0;
+          const perpendicularDelta = (
+            closestStackOrientation === 'vertical' ? event.key === 'ArrowLeft' : event.key === 'ArrowUp'
+          )
+            ? -1
+            : (closestStackOrientation === 'vertical' ? event.key === 'ArrowRight' : event.key === 'ArrowDown')
+              ? 1
+              : 0;
+          if (parallelDelta !== 0) {
+            const currentIndex = closestStackItems.indexOf(closestOwnedItem);
+            const nextIndex = currentIndex + parallelDelta;
+            let adjacentItem: HTMLElement | undefined;
+            if (circularFocus) {
+              // Circular navigation: wrap around using modulo.
+              adjacentItem = closestStackItems[(nextIndex + closestStackItems.length) % closestStackItems.length] as
+                | HTMLElement
+                | undefined;
+            } else {
+              // Non-circular navigation: only move if within bounds.
+              if (nextIndex >= 0 && nextIndex < closestStackItems.length) {
+                adjacentItem = closestStackItems[nextIndex] as HTMLElement | undefined;
+              }
+            }
+
+            if (adjacentItem) {
+              event.preventDefault();
+              scrollIntoViewAndFocus(adjacentItem, closestStackOrientation);
+            }
+          }
+
+          if (perpendicularDelta !== 0) {
+            if (ancestorStack && ancestorOrientation !== closestStackOrientation) {
+              const siblingStacks = Array.from(
+                ancestorStack.querySelectorAll(
+                  `[data-dx-stack-item="${ancestorStack.getAttribute('data-dx-stack')}"] [data-dx-stack]`,
+                ),
+              ) as HTMLElement[];
+              const currentStackIndex = siblingStacks.indexOf(closestStack);
+              const nextStackIndex = currentStackIndex + perpendicularDelta;
+              let adjacentStack: HTMLElement | undefined;
+
+              if (ancestorStack.getAttribute('data-dx-stack-circular-focus') === 'true') {
+                // Circular navigation: wrap around using modulo.
+                adjacentStack = siblingStacks[(nextStackIndex + siblingStacks.length) % siblingStacks.length] as
+                  | HTMLElement
+                  | undefined;
+              } else {
+                // Non-circular navigation: only move if within bounds.
+                if (nextStackIndex >= 0 && nextStackIndex < siblingStacks.length) {
+                  adjacentStack = siblingStacks[nextStackIndex] as HTMLElement | undefined;
+                }
+              }
+              const adjacentStackSelfItem = adjacentStack?.closest(
+                `[data-dx-stack-item=${ancestorStack.getAttribute('data-dx-stack')}]`,
+              ) as HTMLElement | undefined;
+              const adjacentStackItems = adjacentStack
+                ? (Array.from(
+                    adjacentStack.querySelectorAll(
+                      `[data-dx-stack-item="${adjacentStack.getAttribute('data-dx-stack')}"]`,
+                    ),
+                  ) as HTMLElement[])
+                : [];
+              if (adjacentStack && adjacentStackItems.length > 0) {
+                // Check if the adjacent stack has a last focused item recorded, otherwise find the closest item by position.
+                let closestItem = adjacentStackItems[0];
+                // Try to find an item with matching data-dx-stack-item value.
+                const lastFocusedItem = adjacentStack.querySelector(
+                  `[data-dx-item-id="${adjacentStack.getAttribute('data-dx-last-focused-item') ?? 'never'}"]`,
+                );
+                if (lastFocusedItem) {
+                  closestItem = lastFocusedItem as HTMLElement;
+                } else {
+                  // Fall back to positional calculation
+                  const ownedItemRect = closestOwnedItem.getBoundingClientRect();
+                  const targetPosition =
+                    closestStackOrientation === 'vertical' ? ownedItemRect.top : ownedItemRect.left;
+
+                  let closestDistance = Infinity;
+                  for (const item of adjacentStackItems) {
+                    const itemRect = item.getBoundingClientRect();
+                    const itemPosition = closestStackOrientation === 'vertical' ? itemRect.top : itemRect.left;
+                    const distance = Math.abs(itemPosition - targetPosition);
+                    if (distance < closestDistance) {
+                      closestDistance = distance;
+                      closestItem = item;
+                    }
+                    if (closestDistance <= PERPENDICULAR_FOCUS_THRESHHOLD) {
+                      break;
+                    }
+                  }
+                }
+
+                event.preventDefault();
+                scrollIntoViewAndFocus(closestItem, closestStackOrientation);
+              } else if (adjacentStackSelfItem) {
+                event.preventDefault();
+                scrollIntoViewAndFocus(adjacentStackSelfItem, ancestorOrientation);
+              }
+            } else if (closestOwnedItem) {
+              const closestOwnedItemStack = closestOwnedItem.querySelector('[data-dx-stack]');
+              const closestOwnedItemStackItems = closestOwnedItemStack
+                ? (Array.from(
+                    closestOwnedItemStack.querySelectorAll(
+                      `[data-dx-stack-item="${closestOwnedItemStack.getAttribute('data-dx-stack')}"]`,
+                    ),
+                  ) as HTMLElement[])
+                : [];
+              if (closestOwnedItemStackItems.length > 0) {
+                event.preventDefault();
+                scrollIntoViewAndFocus(
+                  closestOwnedItemStackItems[
+                    ['ArrowUp', 'ArrowLeft'].includes(event.key) ? closestOwnedItemStackItems.length - 1 : 0
+                  ],
+                  closestOwnedItemStack?.getAttribute('aria-orientation') as Orientation,
+                );
+              }
+            }
+          }
+        }
+      }
+      onKeyDown?.(event);
+    },
+    [onKeyDown, stackId, circularFocus],
+  );

package/src/components/StackContext.tsx

@@ -4,14 +4,15 @@
 
 import { createContext, useContext } from 'react';
 
-import { type StackItemRearrangeHandler, type StackItemSize } from './defs';
 import { type Orientation, type Size } from './Stack';
+import { type StackItemRearrangeHandler, type StackItemSize } from './types';
 
 export type StackContextValue = {
   orientation: Orientation;
   rail: boolean;
   size: Size;
   onRearrange?: StackItemRearrangeHandler;
+  stackId?: string;
 };
 
 export const StackContext = createContext<StackContextValue>({

package/src/components/StackItem/MenuSignifier.tsx

@@ -5,14 +5,7 @@
 import React from 'react';
 
 export const MenuSignifierHorizontal = () => (
-  <svg
-    className='absolute block-end-[7px]'
-    width={20}
-    height={2}
-    viewBox='0 0 20 2'
-    stroke='currentColor'
-    opacity={0.5}
-  >
+  <svg className='absolute bottom-[7px]' width={20} height={2} viewBox='0 0 20 2' stroke='currentColor' opacity={0.5}>
     <line
       x1={0.5}
       y1={0.75}
@@ -27,7 +20,7 @@ export const MenuSignifierHorizontal = () => (
 );
 
 export const MenuSignifierVertical = () => (
-  <svg className='absolute inline-start-1' width={2} height={18} viewBox='0 0 2 18' stroke='currentColor'>
+  <svg className='absolute left-1' width={2} height={18} viewBox='0 0 2 18' stroke='currentColor'>
     <line x1={1} y1={3} x2={1} y2={18} strokeWidth={1.5} strokeLinecap='round' strokeDasharray='0 6' />
   </svg>
 );