@dxos/plugin-deck 0.8.2-main.fbd8ed0 → 0.8.2-staging.7ac8446

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

@@ -1,27 +1,25 @@
 import {
-  getCompanionId,
-  useBreakpoints,
-  useCompanions,
-  useDeckCompanions,
-  useHoistStatusbar,
-  useMainSize,
-  useNodeActionExpander
-} from "./chunk-3O2UZVBA.mjs";
+  parseEntryId
+} from "./chunk-FLOVGNYB.mjs";
 import {
   calculateOverscroll,
   layoutAppliesTopbar,
-  parseEntryId
-} from "./chunk-TRFYUEBA.mjs";
+  useBreakpoints,
+  useCompanions,
+  useHoistStatusbar
+} from "./chunk-6ZSOFCPP.mjs";
 import {
   DeckCapabilities
 } from "./chunk-XMCG42ID.mjs";
 import {
+  ATTENDABLE_PATH_SEPARATOR,
+  DECK_COMPANION_TYPE,
   DeckAction,
   NewPlankPositions,
   OverscrollOptions,
   PLANK_COMPANION_TYPE,
   getMode
-} from "./chunk-JAYQ5BTF.mjs";
+} from "./chunk-RJNCG4ND.mjs";
 import {
   DECK_PLUGIN
 } from "./chunk-NSATFAEE.mjs";
@@ -33,14 +31,15 @@ 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 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 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 { Tabs } from "@dxos/react-ui-tabs";
+import { byPosition } from "@dxos/util";
 
 // packages/plugins/plugin-deck/src/components/Sidebar/SidebarButton.tsx
-import React, { useCallback } from "react";
-import { createIntent, LayoutAction, useCapability, useIntentDispatcher } from "@dxos/app-framework";
+import React from "react";
+import { useCapability } from "@dxos/app-framework";
 import { IconButton, useTranslation } from "@dxos/react-ui";
 var ToggleSidebarButton = ({ classNames, variant = "ghost" }) => {
   const layoutContext = useCapability(DeckCapabilities.MutableDeckState);
@@ -68,30 +67,12 @@ var CloseSidebarButton = () => {
     classNames: "rounded-none pli-1 dx-focus-ring-inset pie-[max(.5rem,env(safe-area-inset-left))]"
   });
 };
-var ToggleComplementarySidebarButton = ({ inR0, classNames, current }) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+var ToggleComplementarySidebarButton = ({ inR0, classNames }) => {
   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: handleClick,
+    onClick: () => layoutContext.complementarySidebarState = layoutContext.complementarySidebarState === "expanded" ? "collapsed" : "expanded",
     variant: "ghost",
     label: t("open complementary sidebar label"),
     classNames: [
@@ -105,59 +86,62 @@ var ToggleComplementarySidebarButton = ({ inR0, classNames, current }) => {
 };
 
 // packages/plugins/plugin-deck/src/components/Plank/Plank.tsx
-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 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 { debounce } from "@dxos/async";
 import { useNode } from "@dxos/plugin-graph";
-import { ATTENDABLE_PATH_SEPARATOR, useAttendableAttributes } from "@dxos/react-ui-attention";
+import { ATTENDABLE_PATH_SEPARATOR as ATTENDABLE_PATH_SEPARATOR2, 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 { descriptionMessage, mx as mx2 } from "@dxos/react-ui-theme";
+import { descriptionText, mx as mx2 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-deck/src/components/Plank/PlankHeading.tsx
-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 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 { 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 as useCallback2 } from "react";
-import { createIntent as createIntent2, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import React2, { forwardRef, useCallback } from "react";
+import { createIntent, useIntentDispatcher } from "@dxos/app-framework";
 import { invariant } from "@dxos/invariant";
-import { ButtonGroup, IconButton as IconButton2, useTranslation as useTranslation2 } from "@dxos/react-ui";
+import { Button, ButtonGroup, Icon, Tooltip, 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(IconButton2, {
-    iconOnly: true,
-    label: label3,
-    icon,
-    size: 5,
+  return /* @__PURE__ */ React2.createElement(Tooltip.Root, null, /* @__PURE__ */ React2.createElement(Tooltip.Trigger, {
+    asChild: true
+  }, /* @__PURE__ */ React2.createElement(Button, {
     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";
+var plankControlSpacing = "pli-2 plb-3";
 var PlankCompanionControls = /* @__PURE__ */ forwardRef(({ primary }, forwardedRef) => {
   const { t } = useTranslation2(DECK_PLUGIN);
-  const { dispatchPromise: dispatch } = useIntentDispatcher2();
-  const handleCloseCompanion = useCallback2(() => {
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const handleCloseCompanion = useCallback(() => {
     invariant(primary, void 0, {
       F: __dxlog_file,
-      L: 49,
+      L: 68,
       S: void 0,
       A: [
         "primary",
         ""
       ]
     });
-    return dispatch(createIntent2(DeckAction.ChangeCompanion, {
+    return dispatch(createIntent(DeckAction.ChangeCompanion, {
       primary,
       companion: null
     }));
@@ -168,33 +152,28 @@ var PlankCompanionControls = /* @__PURE__ */ forwardRef(({ primary }, forwardedR
   }, /* @__PURE__ */ React2.createElement(PlankControl, {
     label: t("close companion label"),
     variant: "ghost",
-    icon: "ph--x--regular",
+    // icon='ph--minus--regular'
+    icon: "ph--caret-left--regular",
     onClick: handleCloseCompanion,
     classNames: plankControlSpacing
   }));
 });
-var PlankControls = /* @__PURE__ */ forwardRef(({ children, classNames, variant = "default", capabilities, layoutMode, pin, close = false, onClick, ...props }, forwardedRef) => {
+var PlankControls = /* @__PURE__ */ forwardRef(({ children, classNames, variant = "default", capabilities, isSolo, pin, close = false, onClick, ...props }, forwardedRef) => {
   const { t } = useTranslation2(DECK_PLUGIN);
   const buttonClassNames = variant === "hide-disabled" ? `disabled:hidden ${plankControlSpacing}` : plankControlSpacing;
-  const layoutIsAnySolo = !!layoutMode?.startsWith("solo");
   return /* @__PURE__ */ React2.createElement(ButtonGroup, {
     ...props,
     classNames: [
-      "app-no-drag !opacity-100",
+      "app-no-drag",
       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, {
-    label: t("show fullscreen plank label"),
+  }, capabilities.deck && capabilities.solo && /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(PlankControl, {
+    label: isSolo ? t("show deck plank label") : t("show solo 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 deck plank label" : "show solo plank label"),
-    classNames: buttonClassNames,
-    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, {
+    icon: isSolo ? "ph--corners-in--regular" : "ph--corners-out--regular",
+    onClick: () => onClick?.("solo")
+  }), !isSolo && /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(PlankControl, {
     label: t("increment start label"),
     disabled: !capabilities.incrementStart,
     classNames: buttonClassNames,
@@ -206,12 +185,7 @@ var PlankControls = /* @__PURE__ */ forwardRef(({ children, classNames, variant
     classNames: buttonClassNames,
     icon: "ph--caret-right--regular",
     onClick: () => onClick?.("increment-end")
-  }))) : 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, {
+  }))), close && !isSolo && /* @__PURE__ */ React2.createElement(PlankControl, {
     label: t(`${typeof close === "string" ? "minify" : "close"} label`),
     classNames: buttonClassNames,
     "data-testid": "plankHeading.close",
@@ -229,15 +203,14 @@ 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-deckSurface lg:hidden";
+var sidebarToggleStyles = "bs-[--rail-item] is-[--rail-item] absolute block-end-2 z-[1] !bg-deck 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 = [] }) => {
+var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncrementStart, canIncrementEnd, popoverAnchorId, primaryId, pending, companioned, companions, actions = [] }) => {
   const { t } = useTranslation3(DECK_PLUGIN);
-  const { dispatchPromise: dispatch } = useIntentDispatcher3();
+  const { dispatchPromise: dispatch } = useIntentDispatcher2();
   const { graph } = useAppGraph();
   const breakpoint = useBreakpoints();
   const icon = node?.properties?.icon ?? "ph--placeholder--regular";
@@ -250,7 +223,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
   const isCompanionNode = node?.type === PLANK_COMPANION_TYPE;
   useEffect(() => {
     const frame = requestAnimationFrame(() => {
-      node && graph.expand(node.id);
+      node && graph.actions(node);
     });
     return () => cancelAnimationFrame(frame);
   }, [
@@ -262,7 +235,6 @@ 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,
@@ -282,7 +254,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
     } else {
       return [
         actions,
-        graph.getActions(node.id)
+        graph.actions(node)
       ].filter((a) => a.length > 0);
     }
   }, [
@@ -291,30 +263,28 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
     variant,
     graph
   ]);
-  const handleAction = useCallback3((action) => {
+  const handleAction = useCallback2((action) => {
     typeof action.data === "function" && action.data?.({
-      parent: node,
+      node: action,
       caller: DECK_PLUGIN
     });
-  }, [
-    node
-  ]);
-  const handlePlankAction = useCallback3((eventType) => {
-    if (eventType.startsWith("solo")) {
-      return dispatch(createIntent3(DeckAction.Adjust, {
+  }, []);
+  const handlePlankAction = useCallback2((eventType) => {
+    if (eventType === "solo") {
+      return dispatch(createIntent2(DeckAction.Adjust, {
         type: eventType,
         id
       }));
     } else if (eventType === "close") {
       if (part === "complementary") {
-        return dispatch(createIntent3(LayoutAction2.UpdateComplementary, {
+        return dispatch(createIntent2(LayoutAction.UpdateComplementary, {
           part: "complementary",
           options: {
             state: "collapsed"
           }
         }));
       } else {
-        return dispatch(createIntent3(LayoutAction2.Close, {
+        return dispatch(createIntent2(LayoutAction.Close, {
           part: "main",
           subject: [
             id
@@ -325,7 +295,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
         }));
       }
     } else {
-      return dispatch(createIntent3(DeckAction.Adjust, {
+      return dispatch(createIntent2(DeckAction.Adjust, {
         type: eventType,
         id
       }));
@@ -336,11 +306,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 = useCallback3((event) => {
+  const handleTabClick = useCallback2((event) => {
     const target = event.target.closest("[data-id]");
     const tabId = target?.dataset?.id;
     if (primaryId && tabId) {
-      void dispatch(createIntent3(DeckAction.ChangeCompanion, {
+      void dispatch(createIntent2(DeckAction.ChangeCompanion, {
         primary: primaryId,
         companion: tabId
       }));
@@ -350,23 +320,17 @@ 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",
-      ...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
+      "plb-1 border-be border-separator items-stretch gap-1 sticky inline-start-12 app-drag min-is-0 layout-contain",
+      part === "solo" ? soloInlinePadding : "pli-1"
+    ]
   }, 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(IconButton3, {
+  }, companions.map(({ id: id2, properties: { icon: icon2, label: label4 } }) => /* @__PURE__ */ React3.createElement(IconButton2, {
     key: id2,
     "data-id": id2,
     icon: icon2,
-    iconOnly: companions.length > MAX_COMPANIONS && node?.id !== id2,
+    iconOnly: node?.id !== id2,
     label: toLocalizedString(label4, t),
     size: 5,
     variant: node?.id === id2 ? "primary" : "default",
@@ -385,7 +349,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(Icon, {
+  }, label3), /* @__PURE__ */ React3.createElement(Icon2, {
     icon,
     size: 5
   }))), /* @__PURE__ */ React3.createElement(TextTooltip, {
@@ -406,7 +370,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
     primary: primaryId
   }) : /* @__PURE__ */ React3.createElement(PlankControls, {
     capabilities,
-    layoutMode,
+    isSolo: part === "solo",
     close: part === "complementary" ? "minify-end" : true,
     onClick: handlePlankAction
   }));
@@ -430,7 +394,7 @@ var PlankContentError = ({ error }) => {
     className: "overflow-auto p-8 attention-surface grid place-items-center"
   }, /* @__PURE__ */ React5.createElement("p", {
     role: "alert",
-    className: mx2(descriptionMessage, "break-words rounded-lg p-8", errorString.length < 256 && "text-lg")
+    className: mx2(descriptionText, "break-words border border-dashed border-separator rounded-lg p-8", errorString.length < 256 && "text-lg")
   }, error ? errorString : t("error fallback message")));
 };
 var PlankError = ({ id, part, node, error }) => {
@@ -448,66 +412,55 @@ var PlankError = ({ id, part, node, error }) => {
   }) : /* @__PURE__ */ React5.createElement(PlankLoading, null));
 };
 
-// packages/plugins/plugin-deck/src/components/Plank/Plank.tsx
-var UNKNOWN_ID = "unknown_id";
-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
+// 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);
     }
-  }));
-});
-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);
+  }, [
+    node
+  ]);
 };
-var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order, active, companioned, node, primary, companions, settings }) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher4();
+
+// 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();
   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_SEPARATOR}${variant}` : ""}`;
+  const sizeKey = `${id.split("+")[0]}${variant ? `${ATTENDABLE_PATH_SEPARATOR2}${variant}` : ""}`;
   const size = deck.plankSizing[sizeKey];
-  const handleSizeChange = useCallback4(debounce((nextSize) => {
-    return dispatch(createIntent4(DeckAction.UpdatePlankSize, {
+  const setSize = useCallback3(debounce((nextSize) => {
+    return dispatch(createIntent3(DeckAction.UpdatePlankSize, {
       id: sizeKey,
       size: nextSize
     }));
@@ -515,7 +468,7 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     dispatch,
     sizeKey
   ]);
-  const handleKeyDown = useCallback4((event) => {
+  const handleKeyDown = useCallback3((event) => {
     if (event.target === event.currentTarget && event.key === "Escape") {
       rootElement.current?.closest("main")?.focus();
     }
@@ -530,7 +483,7 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
         behavior: "smooth",
         inline: "center"
       });
-      void dispatch(createIntent4(LayoutAction3.ScrollIntoView, {
+      void dispatch(createIntent3(LayoutAction2.ScrollIntoView, {
         part: "current",
         subject: void 0
       }));
@@ -540,8 +493,8 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     scrollIntoView,
     layoutMode
   ]);
-  const isSolo = layoutMode.startsWith("solo") && part === "solo";
-  const isAttendable = layoutMode.startsWith("solo") && part.startsWith("solo") || layoutMode === "deck" && part === "deck";
+  const isSolo = layoutMode === "solo" && part === "solo";
+  const isAttendable = layoutMode === "solo" && part.startsWith("solo") || layoutMode === "deck" && part === "deck";
   const sizeAttrs = useMainSize();
   const data = useMemo2(() => node && {
     subject: node.data,
@@ -554,11 +507,9 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     node?.data,
     path,
     popoverAnchorId,
-    primary?.data,
-    variant
+    primary?.data
   ]);
   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,
@@ -572,7 +523,7 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
         id
       },
       size,
-      onSizeChange: handleSizeChange,
+      onSizeChange: setSize,
       classNames: className,
       order,
       role: "article"
@@ -583,7 +534,6 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     id,
     part: part.startsWith("solo-") ? "solo" : part,
     node,
-    layoutMode,
     deckEnabled: settings?.enableDeck,
     canIncrementStart,
     canIncrementEnd,
@@ -603,6 +553,51 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     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 = [
@@ -611,31 +606,41 @@ 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 } = useIntentDispatcher5();
+  const { dispatchPromise: dispatch } = useIntentDispatcher4();
   const layout = useCapability3(DeckCapabilities.MutableDeckState);
-  const layoutMode = getMode(layout.deck);
   const breakpoint = useBreakpoints();
-  const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
-  const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
+  const topbar = layoutAppliesTopbar(breakpoint);
+  const hoistStatusbar = useHoistStatusbar(breakpoint);
   const companions = useDeckCompanions();
-  const activeCompanion = companions.find((companion) => getCompanionId(companion.id) === current);
-  const activeId = activeCompanion && getCompanionId(activeCompanion.id);
+  const activeCompanion = companions.find((companion) => getCompanionId(companion.id) === current) ?? companions.at(0);
+  const activeId = getCompanionId(activeCompanion?.id ?? "never");
   const [internalValue, setInternalValue] = useState2(activeId);
-  useEffect3(() => {
+  useEffect4(() => {
     setInternalValue(activeId);
   }, [
     activeId
   ]);
-  const handleTabClick = useCallback5((event) => {
+  const handleTabClick = useCallback4((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(createIntent5(LayoutAction4.UpdateComplementary, {
+      void dispatch(createIntent4(LayoutAction3.UpdateComplementary, {
         part: "complementary",
         subject: nextValue
       }));
@@ -652,19 +657,6 @@ var ComplementarySidebar = ({ current }) => {
     activeCompanion?.id,
     activeCompanion?.data
   ]);
-  useEffect3(() => {
-    if (!activeId) {
-      void dispatch(createIntent5(LayoutAction4.UpdateComplementary, {
-        part: "complementary",
-        options: {
-          state: "collapsed"
-        }
-      }));
-    }
-  }, [
-    activeId,
-    dispatch
-  ]);
   return /* @__PURE__ */ React7.createElement(Main.ComplementarySidebar, {
     label,
     classNames: [
@@ -685,7 +677,7 @@ var ComplementarySidebar = ({ current }) => {
     key: getCompanionId(companion.id),
     value: getCompanionId(companion.id),
     asChild: true
-  }, /* @__PURE__ */ React7.createElement(IconButton4, {
+  }, /* @__PURE__ */ React7.createElement(IconButton3, {
     label: toLocalizedString2(companion.properties.label, t),
     icon: companion.properties.icon,
     size: 5,
@@ -703,7 +695,7 @@ var ComplementarySidebar = ({ current }) => {
   })), /* @__PURE__ */ React7.createElement("div", {
     role: "none",
     className: "hidden lg:grid grid-cols-1 auto-rows-[--rail-action] p-1"
-  }, /* @__PURE__ */ React7.createElement(ToggleComplementarySidebarButton, null))), activeId && companions.map((companion) => /* @__PURE__ */ React7.createElement(Tabs.Tabpanel, {
+  }, /* @__PURE__ */ React7.createElement(ToggleComplementarySidebarButton, null))), companions.map((companion) => /* @__PURE__ */ React7.createElement(Tabs.Tabpanel, {
     key: getCompanionId(companion.id),
     value: getCompanionId(companion.id),
     classNames: 'absolute data-[state="inactive"]:-z-[1] inset-block-0 inline-start-0 is-[calc(100%-var(--r0-size))] lg:is-[--r1-size] grid grid-cols-1 grid-rows-[var(--rail-size)_1fr_min-content] pbs-[env(safe-area-inset-top)]',
@@ -727,7 +719,7 @@ var ComplementarySidebarPanel = ({ companion, activeId, data, hoistStatusbar })
   if (getCompanionId(companion.id) !== activeId && !data) {
     return null;
   }
-  const Wrapper = companion.properties.fixed ? Fragment2 : ScrollArea;
+  const Wrapper = companion.properties.fixed ? Fragment3 : 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, {
@@ -755,11 +747,10 @@ var label2 = [
   }
 ];
 var Sidebar = () => {
-  const { popoverAnchorId, activeDeck: current, deck } = useCapability4(DeckCapabilities.DeckState);
+  const { popoverAnchorId, activeDeck: current } = useCapability4(DeckCapabilities.DeckState);
   const breakpoint = useBreakpoints();
-  const layoutMode = getMode(deck);
-  const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
-  const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
+  const topbar = layoutAppliesTopbar(breakpoint);
+  const hoistStatusbar = useHoistStatusbar(breakpoint);
   const navigationData = useMemo4(() => ({
     popoverAnchorId,
     topbar,
@@ -817,21 +808,21 @@ var Banner = ({ variant, classNames }) => {
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/DeckLayout.tsx
 import { untracked } from "@preact/signals-core";
-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 React17, { useCallback as useCallback5, useEffect as useEffect5, useMemo as useMemo5, useRef as useRef2, Fragment as Fragment4, useState as useState3 } from "react";
+import { Capabilities, LayoutAction as LayoutAction4, Surface as Surface10, createIntent as createIntent5, useCapability as useCapability5, useIntentDispatcher as useIntentDispatcher5, usePluginManager } from "@dxos/app-framework";
 import { AttentionCapabilities } from "@dxos/plugin-attention";
-import { Main as Main3, useMediaQuery, useOnTransition } from "@dxos/react-ui";
+import { AlertDialog, Dialog as NaturalDialog, Main as Main3, Popover as Popover2, useMediaQuery, useOnTransition } from "@dxos/react-ui";
 import { Stack, StackContext, DEFAULT_HORIZONTAL_SIZE } from "@dxos/react-ui-stack";
 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 useAppGraph3 } from "@dxos/app-framework";
+import { Surface as Surface6, useAppGraph as useAppGraph4 } 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 } = useAppGraph3();
+  const { graph } = useAppGraph4();
   const activeNode = useNode2(graph, id);
   useNodeActionExpander(activeNode);
   return /* @__PURE__ */ React10.createElement("div", {
@@ -848,15 +839,13 @@ var ActiveNode = () => {
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/ContentEmpty.tsx
 import React11 from "react";
-import { Surface as Surface7, useCapability as useCapability5 } from "@dxos/app-framework";
+import { Surface as Surface7 } from "@dxos/app-framework";
 var ContentEmpty = () => {
   const breakpoint = useBreakpoints();
-  const { deck } = useCapability5(DeckCapabilities.MutableDeckState);
-  const layoutMode = getMode(deck);
-  const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
+  const topbar = layoutAppliesTopbar(breakpoint);
   return /* @__PURE__ */ React11.createElement("div", {
     role: "none",
-    className: "grid place-items-center p-8 relative bg-deckSurface",
+    className: "grid place-items-center p-8 relative bg-deck",
     "data-testid": "layoutPlugin.firstRunMessage"
   }, /* @__PURE__ */ React11.createElement(Surface7, {
     role: "keyshortcuts"
@@ -866,123 +855,51 @@ var ContentEmpty = () => {
   }));
 };
 
-// packages/plugins/plugin-deck/src/components/DeckLayout/Dialog.tsx
+// packages/plugins/plugin-deck/src/components/DeckLayout/Fullscreen.tsx
+import React13 from "react";
+import { Surface as Surface8, useAppGraph as useAppGraph5 } from "@dxos/app-framework";
+import { useNode as useNode3 } from "@dxos/plugin-graph";
+import { fixedInsetFlexLayout } from "@dxos/react-ui-theme";
+
+// packages/plugins/plugin-deck/src/components/DeckLayout/Fallback.tsx
 import React12 from "react";
-import { Surface as Surface8, useCapability as useCapability6 } from "@dxos/app-framework";
-import { AlertDialog, Dialog as NaturalDialog } from "@dxos/react-ui";
-var Dialog = () => {
-  const context = useCapability6(DeckCapabilities.MutableDeckState);
-  const { dialogType, dialogBlockAlign, dialogContent, dialogOpen } = context;
-  const Root = dialogType === "alert" ? AlertDialog.Root : NaturalDialog.Root;
-  const Overlay = dialogType === "alert" ? AlertDialog.Overlay : NaturalDialog.Overlay;
-  return /* @__PURE__ */ React12.createElement(Root, {
-    modal: dialogBlockAlign !== "end",
-    open: dialogOpen,
-    onOpenChange: (nextOpen) => context.dialogOpen = nextOpen
-  }, dialogBlockAlign === "end" ? (
-    // TODO(burdon): Placeholder creates a suspense boundary; replace with defaults.
-    /* @__PURE__ */ React12.createElement(Surface8, {
-      role: "dialog",
-      data: dialogContent,
-      limit: 1,
-      fallback: PlankContentError,
-      placeholder: /* @__PURE__ */ React12.createElement("div", null)
-    })
-  ) : /* @__PURE__ */ React12.createElement(Overlay, {
-    blockAlign: dialogBlockAlign
-  }, /* @__PURE__ */ React12.createElement(Surface8, {
-    role: "dialog",
-    data: dialogContent,
-    limit: 1,
-    fallback: PlankContentError
-  })));
+import { useTranslation as useTranslation7 } from "@dxos/react-ui";
+import { errorText, mx as mx5 } from "@dxos/react-ui-theme";
+var Fallback = () => {
+  const { t } = useTranslation7(DECK_PLUGIN);
+  return /* @__PURE__ */ React12.createElement("div", {
+    role: "none",
+    className: "min-bs-screen is-full flex items-center justify-center p-8"
+  }, /* @__PURE__ */ React12.createElement("p", {
+    role: "alert",
+    className: mx5(errorText, "border border-error-400/50 rounded-lg flex items-center justify-center p-8 font-normal text-lg")
+  }, t("plugin error message")));
 };
 
-// packages/plugins/plugin-deck/src/components/DeckLayout/Popover.tsx
-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 layout = useCapability7(DeckCapabilities.MutableDeckState);
-  const virtualRef = useRef2(null);
-  const [virtualIter, setVirtualIter] = useState3(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);
-    }
-  }, [
-    layout.popoverOpen,
-    layout.popoverAnchorId,
-    layout.popoverAnchor,
-    layout.popoverContent
-  ]);
-  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));
-};
-var PopoverContent = () => {
-  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;
+// packages/plugins/plugin-deck/src/components/DeckLayout/constants.ts
+var SURFACE_PREFIX = "surface:";
+
+// packages/plugins/plugin-deck/src/components/DeckLayout/Fullscreen.tsx
+var Fullscreen = ({ id }) => {
+  const { graph } = useAppGraph5();
+  const fullScreenNode = useNode3(graph, id);
+  return /* @__PURE__ */ React13.createElement("div", {
+    role: "none",
+    className: fixedInsetFlexLayout
+  }, /* @__PURE__ */ React13.createElement(Surface8, {
+    role: "main",
+    limit: 1,
+    fallback: Fallback,
+    data: {
+      subject: fullScreenNode?.data,
+      component: id?.startsWith(SURFACE_PREFIX) ? id.slice(SURFACE_PREFIX.length) : void 0
     }
-  }, [
-    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: 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: layout.popoverContent,
-    limit: 1
-  })), /* @__PURE__ */ React13.createElement(Popover2.Arrow, null)));
+  }));
 };
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/StatusBar.tsx
 import React14 from "react";
-import { Surface as Surface10 } from "@dxos/app-framework";
+import { Surface as Surface9 } from "@dxos/app-framework";
 import { useLandmarkMover } from "@dxos/react-ui";
 var StatusBar = ({ showHints }) => {
   const mover = useLandmarkMover(void 0, "3");
@@ -990,10 +907,10 @@ var StatusBar = ({ showHints }) => {
     role: "contentinfo",
     className: "fixed block-end-0 inset-inline-0 bs-[--statusbar-size] border-bs border-separator z-[2] flex text-description",
     ...mover
-  }, showHints && /* @__PURE__ */ React14.createElement(Surface10, {
+  }, showHints && /* @__PURE__ */ React14.createElement(Surface9, {
     role: "hints",
     limit: 1
-  }), /* @__PURE__ */ React14.createElement(Surface10, {
+  }), /* @__PURE__ */ React14.createElement(Surface9, {
     role: "status-bar",
     limit: 1
   }));
@@ -1001,9 +918,9 @@ var StatusBar = ({ showHints }) => {
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/Toast.tsx
 import React15 from "react";
-import { Button, Icon as Icon2, Toast as NaturalToast, toLocalizedString as toLocalizedString3, useTranslation as useTranslation7 } from "@dxos/react-ui";
+import { Button as Button2, Icon as Icon3, Toast as NaturalToast, toLocalizedString as toLocalizedString3, useTranslation as useTranslation8 } from "@dxos/react-ui";
 var Toast = ({ id, title, description, icon, duration, actionLabel, actionAlt, closeLabel, onAction, onOpenChange }) => {
-  const { t } = useTranslation7(DECK_PLUGIN);
+  const { t } = useTranslation8(DECK_PLUGIN);
   return /* @__PURE__ */ React15.createElement(NaturalToast.Root, {
     "data-testid": id,
     defaultOpen: true,
@@ -1011,20 +928,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(Icon2, {
+  }, icon && /* @__PURE__ */ React15.createElement(Icon3, {
     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(Button, {
+  }, /* @__PURE__ */ React15.createElement(Button2, {
     "data-testid": "toast.action",
     variant: "primary",
     onClick: () => onAction?.()
   }, toLocalizedString3(actionLabel, t))), closeLabel && /* @__PURE__ */ React15.createElement(NaturalToast.Close, {
     asChild: true
-  }, /* @__PURE__ */ React15.createElement(Button, {
+  }, /* @__PURE__ */ React15.createElement(Button2, {
     "data-testid": "toast.close"
   }, toLocalizedString3(closeLabel, t)))));
 };
@@ -1040,27 +957,32 @@ 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-deckSurface is-4",
+  className: "row-span-2 bg-deck is-4",
   style: {
     gridColumn: order
   }
 }) : null;
 var DeckLayout = ({ onDismissToast }) => {
-  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;
+  const { dispatchPromise: dispatch } = useIntentDispatcher5();
+  const settings = useCapability5(Capabilities.SettingsStore).getStore(DECK_PLUGIN).value;
+  const context = useCapability5(DeckCapabilities.MutableDeckState);
+  const { sidebarState, complementarySidebarState, complementarySidebarPanel, dialogOpen, dialogContent, dialogBlockAlign, dialogType, popoverOpen, popoverContent, popoverAnchorId, deck, toasts } = context;
   const { active, activeCompanions, fullscreen, solo, plankSizing } = deck;
   const breakpoint = useBreakpoints();
-  const layoutMode = getMode(deck);
-  const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
-  const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
+  const topbar = layoutAppliesTopbar(breakpoint);
+  const hoistStatusbar = useHoistStatusbar(breakpoint);
   const pluginManager = usePluginManager();
-  const scrollLeftRef = useRef3();
-  const deckRef = useRef3(null);
+  const scrollLeftRef = useRef2();
+  const deckRef = useRef2(null);
+  const [delayedPopoverVisibility, setDelayedPopoverVisibility] = useState3(false);
+  useEffect5(() => {
+    popoverOpen ? setTimeout(() => setDelayedPopoverVisibility(true), 40) : setDelayedPopoverVisibility(false);
+  }, [
+    popoverOpen
+  ]);
   useEffect5(() => {
     const attended = untracked(() => {
-      const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
+      const attention = pluginManager.context.requestCapability(AttentionCapabilities.Attention);
       return attention.current;
     });
     const firstId = solo ?? active[0];
@@ -1071,15 +993,15 @@ var DeckLayout = ({ onDismissToast }) => {
   const [isNotMobile] = useMediaQuery("md", {
     ssr: false
   });
-  const shouldRevert = useRef3(false);
+  const shouldRevert = useRef2(false);
   useEffect5(() => {
     if (!isNotMobile && getMode(deck) === "deck") {
       const attended = untracked(() => {
-        const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
+        const attention = pluginManager.context.requestCapability(AttentionCapabilities.Attention);
         return attention.current;
       });
       shouldRevert.current = true;
-      void dispatch(createIntent6(LayoutAction5.SetLayoutMode, {
+      void dispatch(createIntent5(LayoutAction4.SetLayoutMode, {
         part: "mode",
         subject: attended[0],
         options: {
@@ -1087,7 +1009,7 @@ var DeckLayout = ({ onDismissToast }) => {
         }
       }));
     } else if (isNotMobile && getMode(deck) === "solo" && shouldRevert.current) {
-      void dispatch(createIntent6(LayoutAction5.SetLayoutMode, {
+      void dispatch(createIntent5(LayoutAction4.SetLayoutMode, {
         part: "mode",
         options: {
           revert: true
@@ -1100,8 +1022,8 @@ var DeckLayout = ({ onDismissToast }) => {
     dispatch
   ]);
   useEffect5(() => {
-    if (!settings.enableDeck && layoutMode === "deck") {
-      void dispatch(createIntent6(LayoutAction5.SetLayoutMode, {
+    if (!settings.enableDeck) {
+      void dispatch(createIntent5(LayoutAction4.SetLayoutMode, {
         part: "mode",
         subject: active[0],
         options: {
@@ -1112,10 +1034,9 @@ var DeckLayout = ({ onDismissToast }) => {
   }, [
     settings.enableDeck,
     dispatch,
-    active,
-    layoutMode
+    active
   ]);
-  const handleResize = useCallback7(() => {
+  const handleResize = useCallback5(() => {
     scrollLeftRef.current = null;
   }, []);
   useEffect5(() => {
@@ -1124,13 +1045,14 @@ var DeckLayout = ({ onDismissToast }) => {
   }, [
     handleResize
   ]);
-  const restoreScroll = useCallback7(() => {
+  const restoreScroll = useCallback5(() => {
     if (deckRef.current && scrollLeftRef.current != null) {
       deckRef.current.scrollLeft = scrollLeftRef.current;
     }
   }, []);
+  const layoutMode = getMode(deck);
   useOnTransition(layoutMode, (mode) => mode !== "deck", "deck", restoreScroll);
-  const handleScroll = useCallback7((event) => {
+  const handleScroll = useCallback5((event) => {
     if (!solo && event.currentTarget === event.target) {
       scrollLeftRef.current = event.target.scrollLeft;
     }
@@ -1138,7 +1060,7 @@ var DeckLayout = ({ onDismissToast }) => {
     solo
   ]);
   const isEmpty = !solo && active.length === 0;
-  const padding = useMemo6(() => {
+  const padding = useMemo5(() => {
     if (!solo && settings.overscroll === "centering") {
       return calculateOverscroll(active.length);
     }
@@ -1148,7 +1070,7 @@ var DeckLayout = ({ onDismissToast }) => {
     settings.overscroll,
     deck
   ]);
-  const mainPosition = useMemo6(() => [
+  const mainPosition = useMemo5(() => [
     "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]"
@@ -1156,7 +1078,22 @@ var DeckLayout = ({ onDismissToast }) => {
     topbar,
     hoistStatusbar
   ]);
-  const { order, itemsCount } = useMemo6(() => {
+  const Dialog = dialogType === "alert" ? AlertDialog : NaturalDialog;
+  const handlePopoverOpenChange = useCallback5((nextOpen) => {
+    if (nextOpen && popoverAnchorId) {
+      context.popoverOpen = true;
+    } else {
+      context.popoverOpen = false;
+      context.popoverAnchorId = void 0;
+      context.popoverSide = void 0;
+    }
+  }, [
+    context
+  ]);
+  const handlePopoverClose = useCallback5(() => handlePopoverOpenChange(false), [
+    handlePopoverOpenChange
+  ]);
+  const { order, itemsCount } = useMemo5(() => {
     return active.reduce((acc, entryId) => {
       acc.order[entryId] = acc.itemsCount + 1;
       acc.itemsCount += activeCompanions?.[entryId] ? 3 : 2;
@@ -1169,10 +1106,16 @@ var DeckLayout = ({ onDismissToast }) => {
     active,
     activeCompanions
   ]);
-  return /* @__PURE__ */ React17.createElement(PopoverRoot, null, /* @__PURE__ */ React17.createElement(ActiveNode, null), /* @__PURE__ */ React17.createElement(Main3.Root, {
-    navigationSidebarState: fullscreen ? "closed" : context.sidebarState,
+  return /* @__PURE__ */ React17.createElement(Popover2.Root, {
+    modal: true,
+    open: !!(popoverAnchorId && delayedPopoverVisibility),
+    onOpenChange: handlePopoverOpenChange
+  }, /* @__PURE__ */ React17.createElement(ActiveNode, null), fullscreen && /* @__PURE__ */ React17.createElement(Fullscreen, {
+    id: solo
+  }), !fullscreen && /* @__PURE__ */ React17.createElement(Main3.Root, {
+    navigationSidebarState: context.sidebarState,
     onNavigationSidebarStateChange: (next) => context.sidebarState = next,
-    complementarySidebarState: fullscreen ? "closed" : context.complementarySidebarState,
+    complementarySidebarState: context.complementarySidebarState,
     onComplementarySidebarStateChange: (next) => context.complementarySidebarState = next
   }, /* @__PURE__ */ React17.createElement(Sidebar, null), /* @__PURE__ */ React17.createElement(ComplementarySidebar, {
     current: complementarySidebarPanel
@@ -1182,8 +1125,8 @@ var DeckLayout = ({ onDismissToast }) => {
     classNames: mainPosition
   }, /* @__PURE__ */ React17.createElement(ContentEmpty, null)), !isEmpty && /* @__PURE__ */ React17.createElement(Main3.Content, {
     bounce: true,
-    handlesFocus: true,
     classNames: mainPosition,
+    handlesFocus: true,
     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",
@@ -1192,13 +1135,13 @@ var DeckLayout = ({ onDismissToast }) => {
     }
   }, /* @__PURE__ */ React17.createElement("div", {
     role: "none",
-    className: !solo ? "relative bg-deckSurface overflow-hidden" : "sr-only",
+    className: !solo ? "relative bg-deck overflow-hidden" : "sr-only",
     ...solo && {
       inert: ""
     }
-  }, !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleSidebarButton, {
+  }, !topbar && /* @__PURE__ */ React17.createElement(ToggleSidebarButton, {
     classNames: fixedSidebarToggleStyles
-  }), !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleComplementarySidebarButton, {
+  }), !topbar && /* @__PURE__ */ React17.createElement(ToggleComplementarySidebarButton, {
     classNames: fixedComplementarySidebarToggleStyles
   }), /* @__PURE__ */ React17.createElement(Stack, {
     ref: deckRef,
@@ -1211,7 +1154,7 @@ var DeckLayout = ({ onDismissToast }) => {
     itemsCount: itemsCount - 1,
     style: padding,
     onScroll: handleScroll
-  }, active.map((entryId) => /* @__PURE__ */ React17.createElement(Fragment3, {
+  }, active.map((entryId) => /* @__PURE__ */ React17.createElement(Fragment4, {
     key: entryId
   }, /* @__PURE__ */ React17.createElement(PlankSeparator, {
     order: order[entryId] - 1
@@ -1225,13 +1168,13 @@ var DeckLayout = ({ onDismissToast }) => {
     settings
   }))))), /* @__PURE__ */ React17.createElement("div", {
     role: "none",
-    className: solo ? "relative bg-deckSurface overflow-hidden" : "sr-only",
+    className: solo ? "relative bg-deck overflow-hidden" : "sr-only",
     ...!solo && {
       inert: ""
     }
-  }, !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleSidebarButton, {
+  }, !topbar && /* @__PURE__ */ React17.createElement(ToggleSidebarButton, {
     classNames: fixedSidebarToggleStyles
-  }), !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleComplementarySidebarButton, {
+  }), !topbar && /* @__PURE__ */ React17.createElement(ToggleComplementarySidebarButton, {
     classNames: fixedComplementarySidebarToggleStyles
   }), /* @__PURE__ */ React17.createElement(StackContext.Provider, {
     value: {
@@ -1247,7 +1190,34 @@ var DeckLayout = ({ onDismissToast }) => {
     settings
   })))), topbar && /* @__PURE__ */ React17.createElement(Topbar, null), hoistStatusbar && /* @__PURE__ */ React17.createElement(StatusBar, {
     showHints: settings.showHints
-  })), /* @__PURE__ */ React17.createElement(PopoverContent, null), /* @__PURE__ */ React17.createElement(Dialog, null), toasts?.map((toast) => /* @__PURE__ */ React17.createElement(Toast, {
+  })), /* @__PURE__ */ React17.createElement(Popover2.Portal, null, /* @__PURE__ */ React17.createElement(Popover2.Content, {
+    side: context.popoverSide,
+    onEscapeKeyDown: handlePopoverClose
+  }, /* @__PURE__ */ React17.createElement(Popover2.Viewport, null, /* @__PURE__ */ React17.createElement(Surface10, {
+    role: "popover",
+    data: popoverContent,
+    limit: 1
+  })), /* @__PURE__ */ React17.createElement(Popover2.Arrow, null))), /* @__PURE__ */ React17.createElement(Dialog.Root, {
+    modal: dialogBlockAlign !== "end",
+    open: dialogOpen,
+    onOpenChange: (nextOpen) => context.dialogOpen = nextOpen
+  }, dialogBlockAlign === "end" ? (
+    // TODO(burdon): Placeholder creates a suspense boundary; replace with defaults.
+    /* @__PURE__ */ React17.createElement(Surface10, {
+      role: "dialog",
+      data: dialogContent,
+      limit: 1,
+      fallback: PlankContentError,
+      placeholder: /* @__PURE__ */ React17.createElement("div", null)
+    })
+  ) : /* @__PURE__ */ React17.createElement(Dialog.Overlay, {
+    blockAlign: dialogBlockAlign
+  }, /* @__PURE__ */ React17.createElement(Surface10, {
+    role: "dialog",
+    data: dialogContent,
+    limit: 1,
+    fallback: PlankContentError
+  }))), toasts?.map((toast) => /* @__PURE__ */ React17.createElement(Toast, {
     ...toast,
     key: toast.id,
     onOpenChange: (open) => {
@@ -1261,11 +1231,11 @@ var DeckLayout = ({ onDismissToast }) => {
 
 // packages/plugins/plugin-deck/src/components/DeckSettings/DeckSettings.tsx
 import React18 from "react";
-import { Input, Select, useTranslation as useTranslation8 } from "@dxos/react-ui";
+import { Input, Select, useTranslation as useTranslation9 } from "@dxos/react-ui";
 import { DeprecatedFormContainer, DeprecatedFormInput } from "@dxos/react-ui-form";
 var isSocket = !!globalThis.__args;
 var DeckSettings = ({ settings }) => {
-  const { t } = useTranslation8(DECK_PLUGIN);
+  const { t } = useTranslation9(DECK_PLUGIN);
   return /* @__PURE__ */ React18.createElement(DeprecatedFormContainer, null, /* @__PURE__ */ React18.createElement(DeprecatedFormInput, {
     label: t("settings enable deck label")
   }, /* @__PURE__ */ React18.createElement(Input.Switch, {
@@ -1316,4 +1286,4 @@ export {
   DeckLayout,
   DeckSettings
 };
-//# sourceMappingURL=chunk-KIGMELV2.mjs.map
+//# sourceMappingURL=chunk-FJBMNSUC.mjs.map