@dxos/plugin-deck 0.8.2-main.f081794 → 0.8.2-main.fbd8ed0

package/dist/lib/browser/{chunk-VP6FCWFV.mjs → chunk-KIGMELV2.mjs}

@@ -1,25 +1,27 @@
 import {
-  parseEntryId
-} from "./chunk-FLOVGNYB.mjs";
+  getCompanionId,
+  useBreakpoints,
+  useCompanions,
+  useDeckCompanions,
+  useHoistStatusbar,
+  useMainSize,
+  useNodeActionExpander
+} from "./chunk-3O2UZVBA.mjs";
 import {
   calculateOverscroll,
   layoutAppliesTopbar,
-  useBreakpoints,
-  useCompanions,
-  useHoistStatusbar
-} from "./chunk-6HJZL3WT.mjs";
+  parseEntryId
+} from "./chunk-TRFYUEBA.mjs";
 import {
   DeckCapabilities
 } from "./chunk-XMCG42ID.mjs";
 import {
-  ATTENDABLE_PATH_SEPARATOR,
-  DECK_COMPANION_TYPE,
   DeckAction,
   NewPlankPositions,
   OverscrollOptions,
   PLANK_COMPANION_TYPE,
   getMode
-} from "./chunk-ZMJMCN7O.mjs";
+} from "./chunk-JAYQ5BTF.mjs";
 import {
   DECK_PLUGIN
 } from "./chunk-NSATFAEE.mjs";
@@ -31,15 +33,14 @@ import { useTranslation as useTranslation6 } from "@dxos/react-ui";
 import { mx as mx4 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-deck/src/components/Sidebar/ComplementarySidebar.tsx
-import React7, { Fragment as Fragment3, useCallback as useCallback4, useEffect as useEffect4, useMemo as useMemo3, useState as useState2 } from "react";
-import { LayoutAction as LayoutAction3, Surface as Surface3, createIntent as createIntent4, useAppGraph as useAppGraph3, useCapability as useCapability3, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
-import { Main, useTranslation as useTranslation5, toLocalizedString as toLocalizedString2, IconButton as IconButton3 } from "@dxos/react-ui";
+import React7, { Fragment as Fragment2, useCallback as useCallback5, useEffect as useEffect3, useMemo as useMemo3, useState as useState2 } from "react";
+import { LayoutAction as LayoutAction4, Surface as Surface3, createIntent as createIntent5, useCapability as useCapability3, useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework";
+import { Main, useTranslation as useTranslation5, toLocalizedString as toLocalizedString2, IconButton as IconButton4 } from "@dxos/react-ui";
 import { Tabs } from "@dxos/react-ui-tabs";
-import { byPosition } from "@dxos/util";
 
 // packages/plugins/plugin-deck/src/components/Sidebar/SidebarButton.tsx
-import React from "react";
-import { useCapability } from "@dxos/app-framework";
+import React, { useCallback } from "react";
+import { createIntent, LayoutAction, useCapability, useIntentDispatcher } from "@dxos/app-framework";
 import { IconButton, useTranslation } from "@dxos/react-ui";
 var ToggleSidebarButton = ({ classNames, variant = "ghost" }) => {
   const layoutContext = useCapability(DeckCapabilities.MutableDeckState);
@@ -67,12 +68,30 @@ var CloseSidebarButton = () => {
     classNames: "rounded-none pli-1 dx-focus-ring-inset pie-[max(.5rem,env(safe-area-inset-left))]"
   });
 };
-var ToggleComplementarySidebarButton = ({ inR0, classNames }) => {
+var ToggleComplementarySidebarButton = ({ inR0, classNames, current }) => {
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
   const layoutContext = useCapability(DeckCapabilities.MutableDeckState);
   const { t } = useTranslation(DECK_PLUGIN);
+  const companions = useDeckCompanions();
+  const handleClick = useCallback(async () => {
+    layoutContext.complementarySidebarState = layoutContext.complementarySidebarState === "expanded" ? "collapsed" : "expanded";
+    const firstCompanion = companions[0];
+    if (layoutContext.complementarySidebarState === "expanded" && !current && firstCompanion) {
+      await dispatch(createIntent(LayoutAction.UpdateComplementary, {
+        part: "complementary",
+        subject: getCompanionId(firstCompanion.id)
+      }));
+    }
+  }, [
+    layoutContext,
+    current,
+    companions,
+    dispatch
+  ]);
   return /* @__PURE__ */ React.createElement(IconButton, {
+    noTooltip: true,
     iconOnly: true,
-    onClick: () => layoutContext.complementarySidebarState = layoutContext.complementarySidebarState === "expanded" ? "collapsed" : "expanded",
+    onClick: handleClick,
     variant: "ghost",
     label: t("open complementary sidebar label"),
     classNames: [
@@ -86,62 +105,59 @@ var ToggleComplementarySidebarButton = ({ inR0, classNames }) => {
 };
 
 // packages/plugins/plugin-deck/src/components/Plank/Plank.tsx
-import React6, { Fragment as Fragment2, memo as memo2, useCallback as useCallback3, useLayoutEffect, useMemo as useMemo2, useRef } from "react";
-import { LayoutAction as LayoutAction2, Surface as Surface2, createIntent as createIntent3, useCapability as useCapability2, useAppGraph as useAppGraph2, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
+import React6, { memo as memo2, useCallback as useCallback4, useLayoutEffect, useMemo as useMemo2, useRef } from "react";
+import { LayoutAction as LayoutAction3, Surface as Surface2, createIntent as createIntent4, useCapability as useCapability2, useAppGraph as useAppGraph2, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
 import { debounce } from "@dxos/async";
 import { useNode } from "@dxos/plugin-graph";
-import { ATTENDABLE_PATH_SEPARATOR as ATTENDABLE_PATH_SEPARATOR2, useAttendableAttributes } from "@dxos/react-ui-attention";
+import { ATTENDABLE_PATH_SEPARATOR, useAttendableAttributes } from "@dxos/react-ui-attention";
 import { StackItem as StackItem2, railGridHorizontal } from "@dxos/react-ui-stack";
 import { mainIntrinsicSize, mx as mx3 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-deck/src/components/Plank/PlankError.tsx
 import React5, { useEffect as useEffect2, useState } from "react";
 import { useTranslation as useTranslation4 } from "@dxos/react-ui";
-import { descriptionText, mx as mx2 } from "@dxos/react-ui-theme";
+import { descriptionMessage, mx as mx2 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-deck/src/components/Plank/PlankHeading.tsx
-import React3, { Fragment, memo, useCallback as useCallback2, useEffect, useMemo } from "react";
-import { createIntent as createIntent2, LayoutAction, Surface, useAppGraph, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
-import { Icon as Icon2, IconButton as IconButton2, Popover, toLocalizedString, useTranslation as useTranslation3 } from "@dxos/react-ui";
+import React3, { Fragment, memo, useCallback as useCallback3, useEffect, useMemo } from "react";
+import { createIntent as createIntent3, LayoutAction as LayoutAction2, Surface, useAppGraph, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
+import { Icon, IconButton as IconButton3, Popover, toLocalizedString, useTranslation as useTranslation3 } from "@dxos/react-ui";
 import { StackItem } from "@dxos/react-ui-stack";
 import { TextTooltip } from "@dxos/react-ui-text-tooltip";
+import { hoverableControls, hoverableFocusedWithinControls } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-deck/src/components/Plank/PlankControls.tsx
-import React2, { forwardRef, useCallback } from "react";
-import { createIntent, useIntentDispatcher } from "@dxos/app-framework";
+import React2, { forwardRef, useCallback as useCallback2 } from "react";
+import { createIntent as createIntent2, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
 import { invariant } from "@dxos/invariant";
-import { Button, ButtonGroup, Icon, Tooltip, useTranslation as useTranslation2 } from "@dxos/react-ui";
+import { ButtonGroup, IconButton as IconButton2, useTranslation as useTranslation2 } from "@dxos/react-ui";
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-deck/src/components/Plank/PlankControls.tsx";
 var PlankControl = ({ icon, label: label3, ...props }) => {
-  return /* @__PURE__ */ React2.createElement(Tooltip.Root, null, /* @__PURE__ */ React2.createElement(Tooltip.Trigger, {
-    asChild: true
-  }, /* @__PURE__ */ React2.createElement(Button, {
+  return /* @__PURE__ */ React2.createElement(IconButton2, {
+    iconOnly: true,
+    label: label3,
+    icon,
+    size: 5,
     variant: "ghost",
+    tooltipSide: "bottom",
     ...props
-  }, /* @__PURE__ */ React2.createElement("span", {
-    className: "sr-only"
-  }, label3), /* @__PURE__ */ React2.createElement(Icon, {
-    icon,
-    size: 5
-  }))), /* @__PURE__ */ React2.createElement(Tooltip.Portal, null, /* @__PURE__ */ React2.createElement(Tooltip.Content, {
-    side: "bottom"
-  }, label3)));
+  });
 };
-var plankControlSpacing = "pli-2 plb-3";
+var plankControlSpacing = "pli-2";
 var PlankCompanionControls = /* @__PURE__ */ forwardRef(({ primary }, forwardedRef) => {
   const { t } = useTranslation2(DECK_PLUGIN);
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const handleCloseCompanion = useCallback(() => {
+  const { dispatchPromise: dispatch } = useIntentDispatcher2();
+  const handleCloseCompanion = useCallback2(() => {
     invariant(primary, void 0, {
       F: __dxlog_file,
-      L: 68,
+      L: 49,
       S: void 0,
       A: [
         "primary",
         ""
       ]
     });
-    return dispatch(createIntent(DeckAction.ChangeCompanion, {
+    return dispatch(createIntent2(DeckAction.ChangeCompanion, {
       primary,
       companion: null
     }));
@@ -152,7 +168,7 @@ var PlankCompanionControls = /* @__PURE__ */ forwardRef(({ primary }, forwardedR
   }, /* @__PURE__ */ React2.createElement(PlankControl, {
     label: t("close companion label"),
     variant: "ghost",
-    icon: "ph--caret-left--regular",
+    icon: "ph--x--regular",
     onClick: handleCloseCompanion,
     classNames: plankControlSpacing
   }));
@@ -164,19 +180,19 @@ var PlankControls = /* @__PURE__ */ forwardRef(({ children, classNames, variant
   return /* @__PURE__ */ React2.createElement(ButtonGroup, {
     ...props,
     classNames: [
-      "app-no-drag",
+      "app-no-drag !opacity-100",
       classNames
     ],
     ref: forwardedRef
-  }, capabilities.deck && /* @__PURE__ */ React2.createElement(React2.Fragment, null, capabilities.solo && /* @__PURE__ */ React2.createElement(React2.Fragment, null, layoutMode === "solo" && /* @__PURE__ */ React2.createElement(PlankControl, {
+  }, capabilities.deck ? /* @__PURE__ */ React2.createElement(React2.Fragment, null, capabilities.solo && /* @__PURE__ */ React2.createElement(React2.Fragment, null, layoutMode === "solo" && /* @__PURE__ */ React2.createElement(PlankControl, {
     label: t("show fullscreen plank label"),
     classNames: buttonClassNames,
     icon: "ph--corners-out--regular",
     onClick: () => onClick?.("solo--fullscreen")
   }), /* @__PURE__ */ React2.createElement(PlankControl, {
-    label: t(layoutMode === "solo--fullscreen" ? "exit fullscreen label" : !layoutIsAnySolo ? "show solo plank label" : "show deck plank label"),
+    label: t(layoutMode === "solo--fullscreen" ? "exit fullscreen label" : layoutIsAnySolo ? "show deck plank label" : "show solo plank label"),
     classNames: buttonClassNames,
-    icon: layoutIsAnySolo ? "ph--corners-in--regular" : "ph--corners-out--regular",
+    icon: layoutMode === "solo--fullscreen" ? "ph--corners-in--regular" : layoutIsAnySolo ? "ph--arrows-in-line-horizontal--regular" : "ph--arrows-out-line-horizontal--regular",
     onClick: () => onClick?.(layoutMode === "solo--fullscreen" ? "solo--fullscreen" : "solo")
   })), !layoutIsAnySolo && /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(PlankControl, {
     label: t("increment start label"),
@@ -190,7 +206,12 @@ var PlankControls = /* @__PURE__ */ forwardRef(({ children, classNames, variant
     classNames: buttonClassNames,
     icon: "ph--caret-right--regular",
     onClick: () => onClick?.("increment-end")
-  }))), close && !layoutIsAnySolo && /* @__PURE__ */ React2.createElement(PlankControl, {
+  }))) : capabilities.fullscreen && /* @__PURE__ */ React2.createElement(PlankControl, {
+    label: t(layoutMode === "solo--fullscreen" ? "exit fullscreen label" : "show fullscreen plank label"),
+    classNames: buttonClassNames,
+    icon: layoutMode === "solo--fullscreen" ? "ph--corners-in--regular" : "ph--corners-out--regular",
+    onClick: () => onClick?.("solo--fullscreen")
+  }), close && !layoutIsAnySolo && /* @__PURE__ */ React2.createElement(PlankControl, {
     label: t(`${typeof close === "string" ? "minify" : "close"} label`),
     classNames: buttonClassNames,
     "data-testid": "plankHeading.close",
@@ -208,14 +229,15 @@ var PlankControls = /* @__PURE__ */ forwardRef(({ children, classNames, variant
 // packages/plugins/plugin-deck/src/components/fragments.ts
 import { mx } from "@dxos/react-ui-theme";
 var soloInlinePadding = "pis-[calc(env(safe-area-inset-left)+.25rem)] pie-[calc(env(safe-area-inset-left)+.25rem)]";
-var sidebarToggleStyles = "bs-[--rail-item] is-[--rail-item] absolute block-end-2 z-[1] !bg-deck lg:hidden";
+var sidebarToggleStyles = "bs-[--rail-item] is-[--rail-item] absolute block-end-2 z-[1] !bg-deckSurface lg:hidden";
 var fixedSidebarToggleStyles = mx(sidebarToggleStyles, "inline-start-2");
 var fixedComplementarySidebarToggleStyles = mx(sidebarToggleStyles, "inline-end-2");
 
 // packages/plugins/plugin-deck/src/components/Plank/PlankHeading.tsx
+var MAX_COMPANIONS = 5;
 var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncrementStart, canIncrementEnd, popoverAnchorId, primaryId, pending, companioned, companions, layoutMode, actions = [] }) => {
   const { t } = useTranslation3(DECK_PLUGIN);
-  const { dispatchPromise: dispatch } = useIntentDispatcher2();
+  const { dispatchPromise: dispatch } = useIntentDispatcher3();
   const { graph } = useAppGraph();
   const breakpoint = useBreakpoints();
   const icon = node?.properties?.icon ?? "ph--placeholder--regular";
@@ -228,7 +250,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
   const isCompanionNode = node?.type === PLANK_COMPANION_TYPE;
   useEffect(() => {
     const frame = requestAnimationFrame(() => {
-      node && graph.actions(node);
+      node && graph.expand(node.id);
     });
     return () => cancelAnimationFrame(frame);
   }, [
@@ -240,6 +262,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
     solo: breakpoint !== "mobile" && (part === "solo" || part === "deck"),
     incrementStart: canIncrementStart,
     incrementEnd: canIncrementEnd,
+    fullscreen: !isCompanionNode,
     companion: !isCompanionNode && companions && companions.length > 0
   }), [
     breakpoint,
@@ -259,7 +282,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
     } else {
       return [
         actions,
-        graph.actions(node)
+        graph.getActions(node.id)
       ].filter((a) => a.length > 0);
     }
   }, [
@@ -268,28 +291,30 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
     variant,
     graph
   ]);
-  const handleAction = useCallback2((action) => {
+  const handleAction = useCallback3((action) => {
     typeof action.data === "function" && action.data?.({
-      node: action,
+      parent: node,
       caller: DECK_PLUGIN
     });
-  }, []);
-  const handlePlankAction = useCallback2((eventType) => {
+  }, [
+    node
+  ]);
+  const handlePlankAction = useCallback3((eventType) => {
     if (eventType.startsWith("solo")) {
-      return dispatch(createIntent2(DeckAction.Adjust, {
+      return dispatch(createIntent3(DeckAction.Adjust, {
         type: eventType,
         id
       }));
     } else if (eventType === "close") {
       if (part === "complementary") {
-        return dispatch(createIntent2(LayoutAction.UpdateComplementary, {
+        return dispatch(createIntent3(LayoutAction2.UpdateComplementary, {
           part: "complementary",
           options: {
             state: "collapsed"
           }
         }));
       } else {
-        return dispatch(createIntent2(LayoutAction.Close, {
+        return dispatch(createIntent3(LayoutAction2.Close, {
           part: "main",
           subject: [
             id
@@ -300,7 +325,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
         }));
       }
     } else {
-      return dispatch(createIntent2(DeckAction.Adjust, {
+      return dispatch(createIntent3(DeckAction.Adjust, {
         type: eventType,
         id
       }));
@@ -311,11 +336,11 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
     part
   ]);
   const ActionRoot = node && popoverAnchorId === `dxos.org/ui/${DECK_PLUGIN}/${node.id}` ? Popover.Anchor : Fragment;
-  const handleTabClick = useCallback2((event) => {
+  const handleTabClick = useCallback3((event) => {
     const target = event.target.closest("[data-id]");
     const tabId = target?.dataset?.id;
     if (primaryId && tabId) {
-      void dispatch(createIntent2(DeckAction.ChangeCompanion, {
+      void dispatch(createIntent3(DeckAction.ChangeCompanion, {
         primary: primaryId,
         companion: tabId
       }));
@@ -326,16 +351,22 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
   return /* @__PURE__ */ React3.createElement(StackItem.Heading, {
     classNames: [
       "plb-1 border-be border-separator items-stretch gap-1 sticky inline-start-12 app-drag min-is-0 contain-layout",
-      part === "solo" ? soloInlinePadding : "pli-1"
-    ]
+      part === "solo" ? soloInlinePadding : "pli-1",
+      ...layoutMode === "solo--fullscreen" ? [
+        hoverableControls,
+        hoverableFocusedWithinControls,
+        "[&>*]:transition-opacity [&>*]:opacity-[--controls-opacity] bg-transparent border-transparent transition-[background-color,border-color] hover-hover:hover:bg-headerSurface focus-within:bg-headerSurface hover-hover:hover:border-separator focus-within:border-separator"
+      ] : []
+    ],
+    "data-plank-heading": true
   }, companions && isCompanionNode ? /* @__PURE__ */ React3.createElement("div", {
     role: "none",
     className: "flex-1 min-is-0 overflow-x-auto scrollbar-thin flex gap-1"
-  }, companions.map(({ id: id2, properties: { icon: icon2, label: label4 } }) => /* @__PURE__ */ React3.createElement(IconButton2, {
+  }, companions.map(({ id: id2, properties: { icon: icon2, label: label4 } }) => /* @__PURE__ */ React3.createElement(IconButton3, {
     key: id2,
     "data-id": id2,
     icon: icon2,
-    iconOnly: node?.id !== id2,
+    iconOnly: companions.length > MAX_COMPANIONS && node?.id !== id2,
     label: toLocalizedString(label4, t),
     size: 5,
     variant: node?.id === id2 ? "primary" : "default",
@@ -354,7 +385,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
     }
   })) : /* @__PURE__ */ React3.createElement(StackItem.SigilButton, null, /* @__PURE__ */ React3.createElement("span", {
     className: "sr-only"
-  }, label3), /* @__PURE__ */ React3.createElement(Icon2, {
+  }, label3), /* @__PURE__ */ React3.createElement(Icon, {
     icon,
     size: 5
   }))), /* @__PURE__ */ React3.createElement(TextTooltip, {
@@ -399,7 +430,7 @@ var PlankContentError = ({ error }) => {
     className: "overflow-auto p-8 attention-surface grid place-items-center"
   }, /* @__PURE__ */ React5.createElement("p", {
     role: "alert",
-    className: mx2(descriptionText, "break-words border border-dashed border-separator rounded-lg p-8", errorString.length < 256 && "text-lg")
+    className: mx2(descriptionMessage, "break-words rounded-lg p-8", errorString.length < 256 && "text-lg")
   }, error ? errorString : t("error fallback message")));
 };
 var PlankError = ({ id, part, node, error }) => {
@@ -417,55 +448,66 @@ var PlankError = ({ id, part, node, error }) => {
   }) : /* @__PURE__ */ React5.createElement(PlankLoading, null));
 };
 
-// packages/plugins/plugin-deck/src/hooks/useNodeActionExpander.ts
-import { useEffect as useEffect3 } from "react";
-import { ACTION_GROUP_TYPE, ACTION_TYPE, getGraph } from "@dxos/plugin-graph";
-var expandNodeActions = async (node) => {
-  const graph = getGraph(node);
-  await graph.expand(node, "outbound", ACTION_GROUP_TYPE);
-  await graph.expand(node, "outbound", ACTION_TYPE);
-};
-var useNodeActionExpander = (node) => {
-  useEffect3(() => {
-    if (node) {
-      const frame = requestAnimationFrame(() => {
-        void expandNodeActions(node);
-      });
-      return () => cancelAnimationFrame(frame);
-    }
-  }, [
-    node
-  ]);
-};
-
-// packages/plugins/plugin-deck/src/hooks/useMainSize.ts
-import { useMainContext } from "@dxos/react-ui";
-var useMainSize = () => {
-  const { navigationSidebarState, complementarySidebarState } = useMainContext("DeckPluginPlank");
-  return {
-    "data-sidebar-inline-start-state": navigationSidebarState,
-    "data-sidebar-inline-end-state": complementarySidebarState
-  };
-};
-
 // packages/plugins/plugin-deck/src/components/Plank/Plank.tsx
 var UNKNOWN_ID = "unknown_id";
-var PlankImpl = /* @__PURE__ */ memo2(({ id, node, part, path, order, active, layoutMode, companioned, primary, companions, settings }) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher3();
+var Plank = /* @__PURE__ */ memo2(({ id = UNKNOWN_ID, companionId, ...props }) => {
+  const { graph } = useAppGraph2();
+  const node = useNode(graph, id);
+  const companions = useCompanions(id);
+  const currentCompanion = companions.find(({ id: id2 }) => id2 === companionId);
+  const hasCompanion = !!(companionId && currentCompanion);
+  return /* @__PURE__ */ React6.createElement(PlankContainer, {
+    solo: props.part === "solo",
+    companion: hasCompanion
+  }, /* @__PURE__ */ React6.createElement(PlankComponent, {
+    id,
+    node,
+    companioned: hasCompanion ? "primary" : void 0,
+    companions: hasCompanion ? [] : companions,
+    ...props,
+    ...props.part === "solo" ? {
+      part: "solo-primary"
+    } : {}
+  }), hasCompanion && /* @__PURE__ */ React6.createElement(PlankComponent, {
+    id: companionId,
+    node: currentCompanion,
+    primary: node,
+    companions,
+    companioned: "companion",
+    ...props,
+    ...props.part === "solo" ? {
+      part: "solo-companion"
+    } : {
+      order: (props.order ?? 0) + 1
+    }
+  }));
+});
+var PlankContainer = ({ children, solo, companion }) => {
+  const sizeAttrs = useMainSize();
+  if (!solo) {
+    return children;
+  }
+  return /* @__PURE__ */ React6.createElement("div", {
+    role: "none",
+    className: mx3("absolute inset-0 grid", companion && "grid-cols-[1fr_1fr]", railGridHorizontal, mainIntrinsicSize),
+    ...sizeAttrs
+  }, children);
+};
+var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order, active, companioned, node, primary, companions, settings }) => {
+  const { dispatchPromise: dispatch } = useIntentDispatcher4();
   const { deck, popoverAnchorId, scrollIntoView } = useCapability2(DeckCapabilities.DeckState);
-  const rootElement = useRef(null);
   const canResize = layoutMode === "deck";
-  const Root = part.startsWith("solo") ? "article" : StackItem2.Root;
   const attendableAttrs = useAttendableAttributes(primary?.id ?? id);
   const index = active ? active.findIndex((entryId) => entryId === id) : 0;
   const length = active?.length ?? 1;
   const canIncrementStart = active && index !== void 0 && index > 0 && length !== void 0 && length > 1;
   const canIncrementEnd = active && index !== void 0 && index < length - 1 && length !== void 0;
+  const rootElement = useRef(null);
   const { variant } = parseEntryId(id);
-  const sizeKey = `${id.split("+")[0]}${variant ? `${ATTENDABLE_PATH_SEPARATOR2}${variant}` : ""}`;
+  const sizeKey = `${id.split("+")[0]}${variant ? `${ATTENDABLE_PATH_SEPARATOR}${variant}` : ""}`;
   const size = deck.plankSizing[sizeKey];
-  const setSize = useCallback3(debounce((nextSize) => {
-    return dispatch(createIntent3(DeckAction.UpdatePlankSize, {
+  const handleSizeChange = useCallback4(debounce((nextSize) => {
+    return dispatch(createIntent4(DeckAction.UpdatePlankSize, {
       id: sizeKey,
       size: nextSize
     }));
@@ -473,7 +515,7 @@ var PlankImpl = /* @__PURE__ */ memo2(({ id, node, part, path, order, active, la
     dispatch,
     sizeKey
   ]);
-  const handleKeyDown = useCallback3((event) => {
+  const handleKeyDown = useCallback4((event) => {
     if (event.target === event.currentTarget && event.key === "Escape") {
       rootElement.current?.closest("main")?.focus();
     }
@@ -488,7 +530,7 @@ var PlankImpl = /* @__PURE__ */ memo2(({ id, node, part, path, order, active, la
         behavior: "smooth",
         inline: "center"
       });
-      void dispatch(createIntent3(LayoutAction2.ScrollIntoView, {
+      void dispatch(createIntent4(LayoutAction3.ScrollIntoView, {
         part: "current",
         subject: void 0
       }));
@@ -512,9 +554,11 @@ var PlankImpl = /* @__PURE__ */ memo2(({ id, node, part, path, order, active, la
     node?.data,
     path,
     popoverAnchorId,
-    primary?.data
+    primary?.data,
+    variant
   ]);
   const placeholder = useMemo2(() => /* @__PURE__ */ React6.createElement(PlankLoading, null), []);
+  const Root = part.startsWith("solo") ? "article" : StackItem2.Root;
   const className = mx3("attention-surface relative", isSolo && mainIntrinsicSize, isSolo && railGridHorizontal, isSolo && "absolute inset-0", part.startsWith("solo") && "grid", part === "deck" && (companioned === "companion" ? "!border-separator border-ie" : "!border-separator border-li"), part.startsWith("solo-") && "row-span-2 grid-rows-subgrid min-is-0", part === "solo-companion" && "!border-separator border-is");
   return /* @__PURE__ */ React6.createElement(Root, {
     ref: rootElement,
@@ -528,7 +572,7 @@ var PlankImpl = /* @__PURE__ */ memo2(({ id, node, part, path, order, active, la
         id
       },
       size,
-      onSizeChange: setSize,
+      onSizeChange: handleSizeChange,
       classNames: className,
       order,
       role: "article"
@@ -559,51 +603,6 @@ var PlankImpl = /* @__PURE__ */ memo2(({ id, node, part, path, order, active, la
     part
   }), canResize && /* @__PURE__ */ React6.createElement(StackItem2.ResizeHandle, null));
 });
-var SplitFrame = ({ children }) => {
-  const sizeAttrs = useMainSize();
-  return /* @__PURE__ */ React6.createElement("div", {
-    role: "none",
-    className: mx3("grid grid-cols-[1fr_1fr] absolute inset-0", railGridHorizontal, mainIntrinsicSize),
-    ...sizeAttrs
-  }, children);
-};
-var Plank = ({ id = UNKNOWN_ID, ...props }) => {
-  const { graph } = useAppGraph2();
-  const node = useNode(graph, id);
-  const companions = useCompanions(id);
-  const currentCompanion = companions.find(({ id: id2 }) => id2 === props.companionId);
-  if (props.companionId) {
-    const Root = props.part === "solo" ? SplitFrame : Fragment2;
-    return /* @__PURE__ */ React6.createElement(Root, null, /* @__PURE__ */ React6.createElement(PlankImpl, {
-      id,
-      node,
-      companioned: "primary",
-      ...props,
-      ...props.part === "solo" ? {
-        part: "solo-primary"
-      } : {}
-    }), /* @__PURE__ */ React6.createElement(PlankImpl, {
-      id: props.companionId,
-      node: currentCompanion,
-      companioned: "companion",
-      primary: node,
-      companions,
-      ...props,
-      ...props.part === "solo" ? {
-        part: "solo-companion"
-      } : {
-        order: props.order + 1
-      }
-    }));
-  } else {
-    return /* @__PURE__ */ React6.createElement(PlankImpl, {
-      id,
-      node,
-      companions,
-      ...props
-    });
-  }
-};
 
 // packages/plugins/plugin-deck/src/components/Sidebar/ComplementarySidebar.tsx
 var label = [
@@ -612,20 +611,9 @@ var label = [
     ns: DECK_PLUGIN
   }
 ];
-var getCompanionId = (id) => {
-  const [_, companionId] = id.split(ATTENDABLE_PATH_SEPARATOR);
-  return companionId ?? "never";
-};
-var useDeckCompanions = () => {
-  const { graph } = useAppGraph3();
-  const companions = graph.nodes(graph.root, {
-    type: DECK_COMPANION_TYPE
-  });
-  return companions.toSorted((a, b) => byPosition(a.properties, b.properties));
-};
 var ComplementarySidebar = ({ current }) => {
   const { t } = useTranslation5(DECK_PLUGIN);
-  const { dispatchPromise: dispatch } = useIntentDispatcher4();
+  const { dispatchPromise: dispatch } = useIntentDispatcher5();
   const layout = useCapability3(DeckCapabilities.MutableDeckState);
   const layoutMode = getMode(layout.deck);
   const breakpoint = useBreakpoints();
@@ -635,19 +623,19 @@ var ComplementarySidebar = ({ current }) => {
   const activeCompanion = companions.find((companion) => getCompanionId(companion.id) === current);
   const activeId = activeCompanion && getCompanionId(activeCompanion.id);
   const [internalValue, setInternalValue] = useState2(activeId);
-  useEffect4(() => {
+  useEffect3(() => {
     setInternalValue(activeId);
   }, [
     activeId
   ]);
-  const handleTabClick = useCallback4((event) => {
+  const handleTabClick = useCallback5((event) => {
     const nextValue = event.currentTarget.getAttribute("data-value");
     if (nextValue === activeId) {
       layout.complementarySidebarState = layout.complementarySidebarState === "expanded" ? "collapsed" : "expanded";
     } else {
       setInternalValue(nextValue);
       layout.complementarySidebarState = "expanded";
-      void dispatch(createIntent4(LayoutAction3.UpdateComplementary, {
+      void dispatch(createIntent5(LayoutAction4.UpdateComplementary, {
         part: "complementary",
         subject: nextValue
       }));
@@ -664,9 +652,9 @@ var ComplementarySidebar = ({ current }) => {
     activeCompanion?.id,
     activeCompanion?.data
   ]);
-  useEffect4(() => {
+  useEffect3(() => {
     if (!activeId) {
-      void dispatch(createIntent4(LayoutAction3.UpdateComplementary, {
+      void dispatch(createIntent5(LayoutAction4.UpdateComplementary, {
         part: "complementary",
         options: {
           state: "collapsed"
@@ -697,7 +685,7 @@ var ComplementarySidebar = ({ current }) => {
     key: getCompanionId(companion.id),
     value: getCompanionId(companion.id),
     asChild: true
-  }, /* @__PURE__ */ React7.createElement(IconButton3, {
+  }, /* @__PURE__ */ React7.createElement(IconButton4, {
     label: toLocalizedString2(companion.properties.label, t),
     icon: companion.properties.icon,
     size: 5,
@@ -739,7 +727,7 @@ var ComplementarySidebarPanel = ({ companion, activeId, data, hoistStatusbar })
   if (getCompanionId(companion.id) !== activeId && !data) {
     return null;
   }
-  const Wrapper = companion.properties.fixed ? Fragment3 : ScrollArea;
+  const Wrapper = companion.properties.fixed ? Fragment2 : ScrollArea;
   return /* @__PURE__ */ React7.createElement(React7.Fragment, null, /* @__PURE__ */ React7.createElement("h2", {
     className: "flex items-center pli-2 border-separator border-be font-medium"
   }, toLocalizedString2(companion.properties.label, t)), /* @__PURE__ */ React7.createElement(Wrapper, null, /* @__PURE__ */ React7.createElement(Surface3, {
@@ -829,8 +817,8 @@ var Banner = ({ variant, classNames }) => {
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/DeckLayout.tsx
 import { untracked } from "@preact/signals-core";
-import React17, { useCallback as useCallback6, useEffect as useEffect6, useMemo as useMemo5, useRef as useRef3, Fragment as Fragment4 } from "react";
-import { Capabilities, LayoutAction as LayoutAction4, createIntent as createIntent5, useCapability as useCapability8, useIntentDispatcher as useIntentDispatcher5, usePluginManager } from "@dxos/app-framework";
+import React17, { useCallback as useCallback7, useEffect as useEffect5, useMemo as useMemo6, useRef as useRef3, Fragment as Fragment3 } from "react";
+import { Capabilities, LayoutAction as LayoutAction5, createIntent as createIntent6, useCapability as useCapability8, useIntentDispatcher as useIntentDispatcher6, usePluginManager } from "@dxos/app-framework";
 import { AttentionCapabilities } from "@dxos/plugin-attention";
 import { Main as Main3, useMediaQuery, useOnTransition } from "@dxos/react-ui";
 import { Stack, StackContext, DEFAULT_HORIZONTAL_SIZE } from "@dxos/react-ui-stack";
@@ -838,12 +826,12 @@ import { mainPaddingTransitions } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/ActiveNode.tsx
 import React10 from "react";
-import { Surface as Surface6, useAppGraph as useAppGraph4 } from "@dxos/app-framework";
+import { Surface as Surface6, useAppGraph as useAppGraph3 } from "@dxos/app-framework";
 import { useNode as useNode2 } from "@dxos/plugin-graph";
 import { useAttended } from "@dxos/react-ui-attention";
 var ActiveNode = () => {
   const [id] = useAttended();
-  const { graph } = useAppGraph4();
+  const { graph } = useAppGraph3();
   const activeNode = useNode2(graph, id);
   useNodeActionExpander(activeNode);
   return /* @__PURE__ */ React10.createElement("div", {
@@ -868,7 +856,7 @@ var ContentEmpty = () => {
   const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
   return /* @__PURE__ */ React11.createElement("div", {
     role: "none",
-    className: "grid place-items-center p-8 relative bg-deck",
+    className: "grid place-items-center p-8 relative bg-deckSurface",
     "data-testid": "layoutPlugin.firstRunMessage"
   }, /* @__PURE__ */ React11.createElement(Surface7, {
     role: "keyshortcuts"
@@ -911,62 +899,83 @@ var Dialog = () => {
 };
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/Popover.tsx
-import React13, { useCallback as useCallback5, useEffect as useEffect5, useRef as useRef2, useState as useState3 } from "react";
+import { createContext } from "@radix-ui/react-context";
+import React13, { useCallback as useCallback6, useEffect as useEffect4, useMemo as useMemo5, useRef as useRef2, useState as useState3 } from "react";
 import { Surface as Surface9, useCapability as useCapability7 } from "@dxos/app-framework";
 import { Popover as Popover2 } from "@dxos/react-ui";
+var DEBOUNCE_DELAY = 40;
+var [DeckPopoverProvider, useDeckPopoverContext] = createContext("DeckPopover");
 var PopoverRoot = ({ children }) => {
-  const context = useCapability7(DeckCapabilities.MutableDeckState);
+  const layout = useCapability7(DeckCapabilities.MutableDeckState);
   const virtualRef = useRef2(null);
   const [virtualIter, setVirtualIter] = useState3(0);
-  const [delayedPopoverVisibility, setDelayedPopoverVisibility] = useState3(false);
-  useEffect5(() => {
-    context.popoverOpen ? setTimeout(() => setDelayedPopoverVisibility(true), 40) : setDelayedPopoverVisibility(false);
-  }, [
-    context.popoverOpen
-  ]);
-  const handlePopoverOpenChange = useCallback5((nextOpen) => {
-    if (nextOpen && (context.popoverAnchor || context.popoverAnchorId)) {
-      context.popoverOpen = true;
-    } else {
-      context.popoverOpen = false;
-      context.popoverAnchor = void 0;
-      context.popoverAnchorId = void 0;
-      context.popoverSide = void 0;
+  const [open, setOpen] = useState3(false);
+  const debounceRef = useRef2(null);
+  useEffect4(() => {
+    setOpen(false);
+    if (layout.popoverOpen) {
+      if (debounceRef.current) {
+        clearTimeout(debounceRef.current);
+      }
+      if (layout.popoverAnchor && virtualRef.current !== layout.popoverAnchor) {
+        virtualRef.current = layout.popoverAnchor ?? null;
+        setVirtualIter((iter) => iter + 1);
+      }
+      debounceRef.current = setTimeout(() => setOpen(true), DEBOUNCE_DELAY);
     }
   }, [
-    context
-  ]);
-  useEffect5(() => {
-    virtualRef.current = context.popoverAnchor ?? null;
-    setVirtualIter((iter) => iter + 1);
-  }, [
-    context.popoverAnchor
+    layout.popoverOpen,
+    layout.popoverAnchorId,
+    layout.popoverAnchor,
+    layout.popoverContent
   ]);
-  return /* @__PURE__ */ React13.createElement(Popover2.Root, {
-    modal: true,
-    open: !!((context.popoverAnchor || context.popoverAnchorId) && delayedPopoverVisibility),
-    onOpenChange: handlePopoverOpenChange
-  }, context.popoverAnchor && /* @__PURE__ */ React13.createElement(Popover2.VirtualTrigger, {
+  return /* @__PURE__ */ React13.createElement(DeckPopoverProvider, {
+    setOpen
+  }, /* @__PURE__ */ React13.createElement(Popover2.Root, {
+    modal: false,
+    open
+  }, layout.popoverAnchor && /* @__PURE__ */ React13.createElement(Popover2.VirtualTrigger, {
     key: virtualIter,
     virtualRef
-  }), children);
+  }), children));
 };
 var PopoverContent = () => {
-  const context = useCapability7(DeckCapabilities.MutableDeckState);
-  const handlePopoverClose = useCallback5(() => {
-    context.popoverOpen = false;
-    context.popoverAnchor = void 0;
-    context.popoverAnchorId = void 0;
-    context.popoverSide = void 0;
+  const layout = useCapability7(DeckCapabilities.MutableDeckState);
+  const { setOpen } = useDeckPopoverContext("PopoverContent");
+  const handleClose = useCallback6((event) => {
+    if (
+      // TODO(thure): CodeMirror should not focus itself when it updates.
+      event.type === "dismissableLayer.focusOutside" && event.currentTarget?.classList.contains("cm-content")
+    ) {
+      event.preventDefault();
+    } else {
+      setOpen(false);
+      layout.popoverOpen = false;
+      layout.popoverAnchor = void 0;
+      layout.popoverAnchorId = void 0;
+      layout.popoverSide = void 0;
+    }
   }, [
-    context
+    setOpen
+  ]);
+  const collisionBoundaries = useMemo5(() => {
+    const closest = layout.popoverAnchor?.closest("[data-popover-collision-boundary]");
+    return closest ? [
+      closest
+    ] : [];
+  }, [
+    layout.popoverAnchor
   ]);
   return /* @__PURE__ */ React13.createElement(Popover2.Portal, null, /* @__PURE__ */ React13.createElement(Popover2.Content, {
-    side: context.popoverSide,
-    onEscapeKeyDown: handlePopoverClose
+    side: layout.popoverSide,
+    onInteractOutside: handleClose,
+    onEscapeKeyDown: handleClose,
+    collisionBoundary: collisionBoundaries,
+    sticky: "always",
+    hideWhenDetached: true
   }, /* @__PURE__ */ React13.createElement(Popover2.Viewport, null, /* @__PURE__ */ React13.createElement(Surface9, {
     role: "popover",
-    data: context.popoverContent,
+    data: layout.popoverContent,
     limit: 1
   })), /* @__PURE__ */ React13.createElement(Popover2.Arrow, null)));
 };
@@ -992,7 +1001,7 @@ var StatusBar = ({ showHints }) => {
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/Toast.tsx
 import React15 from "react";
-import { Button as Button2, Icon as Icon3, Toast as NaturalToast, toLocalizedString as toLocalizedString3, useTranslation as useTranslation7 } from "@dxos/react-ui";
+import { Button, Icon as Icon2, Toast as NaturalToast, toLocalizedString as toLocalizedString3, useTranslation as useTranslation7 } from "@dxos/react-ui";
 var Toast = ({ id, title, description, icon, duration, actionLabel, actionAlt, closeLabel, onAction, onOpenChange }) => {
   const { t } = useTranslation7(DECK_PLUGIN);
   return /* @__PURE__ */ React15.createElement(NaturalToast.Root, {
@@ -1002,20 +1011,20 @@ var Toast = ({ id, title, description, icon, duration, actionLabel, actionAlt, c
     onOpenChange
   }, /* @__PURE__ */ React15.createElement(NaturalToast.Body, null, /* @__PURE__ */ React15.createElement(NaturalToast.Title, {
     classNames: "items-center"
-  }, icon && /* @__PURE__ */ React15.createElement(Icon3, {
+  }, icon && /* @__PURE__ */ React15.createElement(Icon2, {
     icon,
     size: 5,
     classNames: "inline mr-1"
   }), title && /* @__PURE__ */ React15.createElement("span", null, toLocalizedString3(title, t))), description && /* @__PURE__ */ React15.createElement(NaturalToast.Description, null, description && toLocalizedString3(description, t))), /* @__PURE__ */ React15.createElement(NaturalToast.Actions, null, onAction && actionAlt && actionLabel && /* @__PURE__ */ React15.createElement(NaturalToast.Action, {
     altText: toLocalizedString3(actionAlt, t),
     asChild: true
-  }, /* @__PURE__ */ React15.createElement(Button2, {
+  }, /* @__PURE__ */ React15.createElement(Button, {
     "data-testid": "toast.action",
     variant: "primary",
     onClick: () => onAction?.()
   }, toLocalizedString3(actionLabel, t))), closeLabel && /* @__PURE__ */ React15.createElement(NaturalToast.Close, {
     asChild: true
-  }, /* @__PURE__ */ React15.createElement(Button2, {
+  }, /* @__PURE__ */ React15.createElement(Button, {
     "data-testid": "toast.close"
   }, toLocalizedString3(closeLabel, t)))));
 };
@@ -1031,13 +1040,13 @@ var Topbar = () => {
 // packages/plugins/plugin-deck/src/components/DeckLayout/DeckLayout.tsx
 var PlankSeparator = ({ order }) => order > 0 ? /* @__PURE__ */ React17.createElement("span", {
   role: "separator",
-  className: "row-span-2 bg-deck is-4",
+  className: "row-span-2 bg-deckSurface is-4",
   style: {
     gridColumn: order
   }
 }) : null;
 var DeckLayout = ({ onDismissToast }) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher5();
+  const { dispatchPromise: dispatch } = useIntentDispatcher6();
   const settings = useCapability8(Capabilities.SettingsStore).getStore(DECK_PLUGIN).value;
   const context = useCapability8(DeckCapabilities.MutableDeckState);
   const { sidebarState, complementarySidebarState, complementarySidebarPanel, deck, toasts } = context;
@@ -1049,9 +1058,9 @@ var DeckLayout = ({ onDismissToast }) => {
   const pluginManager = usePluginManager();
   const scrollLeftRef = useRef3();
   const deckRef = useRef3(null);
-  useEffect6(() => {
+  useEffect5(() => {
     const attended = untracked(() => {
-      const attention = pluginManager.context.requestCapability(AttentionCapabilities.Attention);
+      const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
       return attention.current;
     });
     const firstId = solo ?? active[0];
@@ -1063,14 +1072,14 @@ var DeckLayout = ({ onDismissToast }) => {
     ssr: false
   });
   const shouldRevert = useRef3(false);
-  useEffect6(() => {
+  useEffect5(() => {
     if (!isNotMobile && getMode(deck) === "deck") {
       const attended = untracked(() => {
-        const attention = pluginManager.context.requestCapability(AttentionCapabilities.Attention);
+        const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
         return attention.current;
       });
       shouldRevert.current = true;
-      void dispatch(createIntent5(LayoutAction4.SetLayoutMode, {
+      void dispatch(createIntent6(LayoutAction5.SetLayoutMode, {
         part: "mode",
         subject: attended[0],
         options: {
@@ -1078,7 +1087,7 @@ var DeckLayout = ({ onDismissToast }) => {
         }
       }));
     } else if (isNotMobile && getMode(deck) === "solo" && shouldRevert.current) {
-      void dispatch(createIntent5(LayoutAction4.SetLayoutMode, {
+      void dispatch(createIntent6(LayoutAction5.SetLayoutMode, {
         part: "mode",
         options: {
           revert: true
@@ -1090,9 +1099,9 @@ var DeckLayout = ({ onDismissToast }) => {
     deck,
     dispatch
   ]);
-  useEffect6(() => {
-    if (!settings.enableDeck) {
-      void dispatch(createIntent5(LayoutAction4.SetLayoutMode, {
+  useEffect5(() => {
+    if (!settings.enableDeck && layoutMode === "deck") {
+      void dispatch(createIntent6(LayoutAction5.SetLayoutMode, {
         part: "mode",
         subject: active[0],
         options: {
@@ -1103,24 +1112,25 @@ var DeckLayout = ({ onDismissToast }) => {
   }, [
     settings.enableDeck,
     dispatch,
-    active
+    active,
+    layoutMode
   ]);
-  const handleResize = useCallback6(() => {
+  const handleResize = useCallback7(() => {
     scrollLeftRef.current = null;
   }, []);
-  useEffect6(() => {
+  useEffect5(() => {
     window.addEventListener("resize", handleResize);
     return () => window.removeEventListener("resize", handleResize);
   }, [
     handleResize
   ]);
-  const restoreScroll = useCallback6(() => {
+  const restoreScroll = useCallback7(() => {
     if (deckRef.current && scrollLeftRef.current != null) {
       deckRef.current.scrollLeft = scrollLeftRef.current;
     }
   }, []);
   useOnTransition(layoutMode, (mode) => mode !== "deck", "deck", restoreScroll);
-  const handleScroll = useCallback6((event) => {
+  const handleScroll = useCallback7((event) => {
     if (!solo && event.currentTarget === event.target) {
       scrollLeftRef.current = event.target.scrollLeft;
     }
@@ -1128,7 +1138,7 @@ var DeckLayout = ({ onDismissToast }) => {
     solo
   ]);
   const isEmpty = !solo && active.length === 0;
-  const padding = useMemo5(() => {
+  const padding = useMemo6(() => {
     if (!solo && settings.overscroll === "centering") {
       return calculateOverscroll(active.length);
     }
@@ -1138,7 +1148,7 @@ var DeckLayout = ({ onDismissToast }) => {
     settings.overscroll,
     deck
   ]);
-  const mainPosition = useMemo5(() => [
+  const mainPosition = useMemo6(() => [
     "grid !block-start-[env(safe-area-inset-top)]",
     topbar && "!block-start-[calc(env(safe-area-inset-top)+var(--rail-size))]",
     hoistStatusbar && "lg:block-end-[--statusbar-size]"
@@ -1146,7 +1156,7 @@ var DeckLayout = ({ onDismissToast }) => {
     topbar,
     hoistStatusbar
   ]);
-  const { order, itemsCount } = useMemo5(() => {
+  const { order, itemsCount } = useMemo6(() => {
     return active.reduce((acc, entryId) => {
       acc.order[entryId] = acc.itemsCount + 1;
       acc.itemsCount += activeCompanions?.[entryId] ? 3 : 2;
@@ -1172,8 +1182,8 @@ var DeckLayout = ({ onDismissToast }) => {
     classNames: mainPosition
   }, /* @__PURE__ */ React17.createElement(ContentEmpty, null)), !isEmpty && /* @__PURE__ */ React17.createElement(Main3.Content, {
     bounce: true,
-    classNames: mainPosition,
     handlesFocus: true,
+    classNames: mainPosition,
     style: {
       "--dx-main-sidebarWidth": sidebarState === "expanded" ? "var(--nav-sidebar-size)" : sidebarState === "collapsed" ? "var(--l0-size)" : "0",
       "--dx-main-complementaryWidth": complementarySidebarState === "expanded" ? "var(--complementary-sidebar-size)" : complementarySidebarState === "collapsed" ? "var(--rail-size)" : "0",
@@ -1182,7 +1192,7 @@ var DeckLayout = ({ onDismissToast }) => {
     }
   }, /* @__PURE__ */ React17.createElement("div", {
     role: "none",
-    className: !solo ? "relative bg-deck overflow-hidden" : "sr-only",
+    className: !solo ? "relative bg-deckSurface overflow-hidden" : "sr-only",
     ...solo && {
       inert: ""
     }
@@ -1201,7 +1211,7 @@ var DeckLayout = ({ onDismissToast }) => {
     itemsCount: itemsCount - 1,
     style: padding,
     onScroll: handleScroll
-  }, active.map((entryId) => /* @__PURE__ */ React17.createElement(Fragment4, {
+  }, active.map((entryId) => /* @__PURE__ */ React17.createElement(Fragment3, {
     key: entryId
   }, /* @__PURE__ */ React17.createElement(PlankSeparator, {
     order: order[entryId] - 1
@@ -1215,7 +1225,7 @@ var DeckLayout = ({ onDismissToast }) => {
     settings
   }))))), /* @__PURE__ */ React17.createElement("div", {
     role: "none",
-    className: solo ? "relative bg-deck overflow-hidden" : "sr-only",
+    className: solo ? "relative bg-deckSurface overflow-hidden" : "sr-only",
     ...!solo && {
       inert: ""
     }
@@ -1306,4 +1316,4 @@ export {
   DeckLayout,
   DeckSettings
 };
-//# sourceMappingURL=chunk-VP6FCWFV.mjs.map
+//# sourceMappingURL=chunk-KIGMELV2.mjs.map