@dxos/plugin-deck 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

package/dist/lib/browser/{chunk-QHJ7N7BF.mjs → chunk-SBJLGRJV.mjs}

@@ -6,7 +6,7 @@ import {
   useHoistStatusbar,
   useMainSize,
   useNodeActionExpander
-} from "./chunk-7CL25AYA.mjs";
+} from "./chunk-MFFZK4LT.mjs";
 import {
   calculateOverscroll,
   layoutAppliesTopbar,
@@ -14,17 +14,17 @@ import {
 } from "./chunk-CNTGBCMK.mjs";
 import {
   DeckCapabilities
-} from "./chunk-HUWUYTOI.mjs";
+} from "./chunk-5KMJPIQC.mjs";
 import {
   DeckAction,
   NewPlankPositions,
   OverscrollOptions,
   PLANK_COMPANION_TYPE,
   getMode
-} from "./chunk-VSJ7FFQS.mjs";
+} from "./chunk-F3VCCHVL.mjs";
 import {
   meta
-} from "./chunk-MHP4GPX5.mjs";
+} from "./chunk-UXLU6CMW.mjs";
 
 // src/components/DeckLayout/Banner.tsx
 import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
@@ -318,7 +318,8 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
         ...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-subduedSeparator focus-within:border-subduedSeparator"
+          "*: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-subduedSeparator focus-within:border-subduedSeparator"
         ] : []
       ],
       "data-plank-heading": true
@@ -445,7 +446,8 @@ var Plank = /* @__PURE__ */ memo2(({ id = UNKNOWN_ID, companionId, ...props }) =
     const hasCompanion = !!(companionId && currentCompanion);
     return /* @__PURE__ */ React5.createElement(PlankContainer, {
       solo: props.part === "solo",
-      companion: hasCompanion
+      companion: hasCompanion,
+      encapsulate: !!props.settings?.encapsulatedPlanks
     }, /* @__PURE__ */ React5.createElement(PlankComponent, {
       id,
       node,
@@ -472,7 +474,7 @@ var Plank = /* @__PURE__ */ memo2(({ id = UNKNOWN_ID, companionId, ...props }) =
     _effect.f();
   }
 });
-var PlankContainer = ({ children, solo, companion }) => {
+var PlankContainer = ({ children, solo, companion, encapsulate }) => {
   var _effect = _useSignals5();
   try {
     const sizeAttrs = useMainSize();
@@ -481,7 +483,7 @@ var PlankContainer = ({ children, solo, companion }) => {
     }
     return /* @__PURE__ */ React5.createElement("div", {
       role: "none",
-      className: mx3("absolute inset-0 grid", companion && "grid-cols-[1fr_1fr]", railGridHorizontal, mainIntrinsicSize),
+      className: mx3("absolute inset-[--main-spacing] grid", encapsulate && "border border-separator rounded overflow-hidden", companion && "grid-cols-[6fr_4fr]", railGridHorizontal, mainIntrinsicSize),
       ...sizeAttrs
     }, children);
   } finally {
@@ -519,11 +521,7 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     }, []);
     useLayoutEffect(() => {
       if (scrollIntoView === id) {
-        const focusable = rootElement.current?.querySelector("button") || rootElement.current;
-        focusable?.focus({
-          preventScroll: true
-        });
-        layoutMode === "deck" && focusable?.scrollIntoView({
+        layoutMode === "deck" && rootElement.current?.scrollIntoView({
           behavior: "smooth",
           inline: "center"
         });
@@ -541,14 +539,17 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     const isAttendable = layoutMode.startsWith("solo") && part.startsWith("solo") || layoutMode === "deck" && part === "deck";
     const sizeAttrs = useMainSize();
     const data = useMemo2(() => node && {
+      attendableId: id,
       subject: node.data,
       companionTo: primary?.data,
+      properties: node.properties,
       variant,
       path,
       popoverAnchorId
     }, [
       node,
       node?.data,
+      node?.properties,
       path,
       popoverAnchorId,
       primary?.data,
@@ -556,7 +557,7 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     ]);
     const placeholder = useMemo2(() => /* @__PURE__ */ React5.createElement(PlankLoading, null), []);
     const Root = part.startsWith("solo") ? "article" : StackItem2.Root;
-    const className = mx3("attention-surface relative dx-focus-ring-inset-over-all density-coarse", 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");
+    const className = mx3("attention-surface relative dx-focus-ring-inset-over-all density-coarse", isSolo && "absolute inset-0", isSolo && mainIntrinsicSize, railGridHorizontal, 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", settings?.encapsulatedPlanks && !part.startsWith("solo") && "mli-[--main-spacing] !border-separator border rounded overflow-hidden");
     return /* @__PURE__ */ React5.createElement(Root, {
       ref: rootElement,
       "data-testid": "deck.plank",
@@ -923,14 +924,9 @@ var Banner = ({ variant, classNames }) => {
 };
 
 // src/components/DeckLayout/DeckLayout.tsx
-import { useSignals as _useSignals17 } from "@preact-signals/safe-react/tracking";
-import { untracked } from "@preact/signals-core";
-import React17, { Fragment as Fragment3, useCallback as useCallback7, useEffect as useEffect5, useMemo as useMemo6, useRef as useRef3 } 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 { DEFAULT_HORIZONTAL_SIZE, Stack, StackContext } from "@dxos/react-ui-stack";
-import { mainPaddingTransitions } from "@dxos/react-ui-theme";
+import { useSignals as _useSignals18 } from "@preact-signals/safe-react/tracking";
+import React18 from "react";
+import { useCapability as useCapability9 } from "@dxos/app-framework";
 
 // src/components/DeckLayout/ActiveNode.tsx
 import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
@@ -960,6 +956,16 @@ var ActiveNode = () => {
   }
 };
 
+// src/components/DeckLayout/DeckMain.tsx
+import { useSignals as _useSignals14 } from "@preact-signals/safe-react/tracking";
+import { untracked } from "@preact/signals-core";
+import React14, { Fragment as Fragment3, useCallback as useCallback6, useEffect as useEffect4, useMemo as useMemo5, useRef as useRef2 } from "react";
+import { Capabilities, LayoutAction as LayoutAction5, createIntent as createIntent6, useCapability as useCapability6, 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 { DEFAULT_HORIZONTAL_SIZE, Stack, StackContext } from "@dxos/react-ui-stack";
+import { mainPaddingTransitions, mx as mx5 } from "@dxos/react-ui-theme";
+
 // src/components/DeckLayout/ContentEmpty.tsx
 import { useSignals as _useSignals11 } from "@preact-signals/safe-react/tracking";
 import React11 from "react";
@@ -986,156 +992,23 @@ var ContentEmpty = () => {
   }
 };
 
-// src/components/DeckLayout/Dialog.tsx
+// src/components/DeckLayout/StatusBar.tsx
 import { useSignals as _useSignals12 } from "@preact-signals/safe-react/tracking";
 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 = () => {
-  var _effect = _useSignals12();
-  try {
-    const context = useCapability6(DeckCapabilities.MutableDeckState);
-    const { dialogOpen, dialogType, dialogBlockAlign, dialogOverlayClasses, dialogOverlayStyle, dialogContent } = 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,
-      classNames: dialogOverlayClasses,
-      style: dialogOverlayStyle
-    }, /* @__PURE__ */ React12.createElement(Surface8, {
-      role: "dialog",
-      data: dialogContent,
-      limit: 1,
-      fallback: PlankContentError
-    })));
-  } finally {
-    _effect.f();
-  }
-};
-
-// src/components/DeckLayout/Popover.tsx
-import { useSignals as _useSignals13 } from "@preact-signals/safe-react/tracking";
-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 }) => {
-  var _effect = _useSignals13();
-  try {
-    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));
-  } finally {
-    _effect.f();
-  }
-};
-var PopoverContent = () => {
-  var _effect = _useSignals13();
-  try {
-    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;
-      }
-    }, [
-      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: "card--popover",
-      data: layout.popoverContent,
-      limit: 1
-    })), /* @__PURE__ */ React13.createElement(Popover2.Arrow, null)));
-  } finally {
-    _effect.f();
-  }
-};
-
-// src/components/DeckLayout/StatusBar.tsx
-import { useSignals as _useSignals14 } from "@preact-signals/safe-react/tracking";
-import React14 from "react";
-import { Surface as Surface10 } from "@dxos/app-framework";
+import { Surface as Surface8 } from "@dxos/app-framework";
 import { useLandmarkMover } from "@dxos/react-ui";
 var StatusBar = ({ showHints }) => {
-  var _effect = _useSignals14();
+  var _effect = _useSignals12();
   try {
     const mover = useLandmarkMover(void 0, "3");
-    return /* @__PURE__ */ React14.createElement("div", {
+    return /* @__PURE__ */ React12.createElement("div", {
       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__ */ React12.createElement(Surface8, {
       role: "hints",
       limit: 1
-    }), /* @__PURE__ */ React14.createElement(Surface10, {
+    }), /* @__PURE__ */ React12.createElement(Surface8, {
       role: "status-bar",
       limit: 1
     }));
@@ -1144,49 +1017,13 @@ var StatusBar = ({ showHints }) => {
   }
 };
 
-// src/components/DeckLayout/Toast.tsx
-import { useSignals as _useSignals15 } from "@preact-signals/safe-react/tracking";
-import React15 from "react";
-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 }) => {
-  var _effect = _useSignals15();
-  try {
-    const { t } = useTranslation7(meta.id);
-    return /* @__PURE__ */ React15.createElement(NaturalToast.Root, {
-      "data-testid": id,
-      defaultOpen: true,
-      duration,
-      onOpenChange
-    }, /* @__PURE__ */ React15.createElement(NaturalToast.Body, null, /* @__PURE__ */ React15.createElement(NaturalToast.Title, {
-      classNames: "items-center"
-    }, 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(Button, {
-      "data-testid": "toast.action",
-      variant: "primary",
-      onClick: () => onAction?.()
-    }, toLocalizedString3(actionLabel, t))), closeLabel && /* @__PURE__ */ React15.createElement(NaturalToast.Close, {
-      asChild: true
-    }, /* @__PURE__ */ React15.createElement(Button, {
-      "data-testid": "toast.close"
-    }, toLocalizedString3(closeLabel, t)))));
-  } finally {
-    _effect.f();
-  }
-};
-
 // src/components/DeckLayout/Topbar.tsx
-import { useSignals as _useSignals16 } from "@preact-signals/safe-react/tracking";
-import React16 from "react";
+import { useSignals as _useSignals13 } from "@preact-signals/safe-react/tracking";
+import React13 from "react";
 var Topbar = () => {
-  var _effect = _useSignals16();
+  var _effect = _useSignals13();
   try {
-    return /* @__PURE__ */ React16.createElement(Banner, {
+    return /* @__PURE__ */ React13.createElement(Banner, {
       variant: "topbar"
     });
   } finally {
@@ -1194,37 +1031,23 @@ var Topbar = () => {
   }
 };
 
-// src/components/DeckLayout/DeckLayout.tsx
-var PlankSeparator = ({ order }) => {
-  var _effect = _useSignals17();
-  try {
-    return order > 0 ? /* @__PURE__ */ React17.createElement("span", {
-      role: "separator",
-      className: "row-span-2 bg-deckSurface is-4",
-      style: {
-        gridColumn: order
-      }
-    }) : null;
-  } finally {
-    _effect.f();
-  }
-};
-var DeckLayout = ({ onDismissToast }) => {
-  var _effect = _useSignals17();
+// src/components/DeckLayout/DeckMain.tsx
+var DeckMain = () => {
+  var _effect = _useSignals14();
   try {
     const { dispatchPromise: dispatch } = useIntentDispatcher6();
-    const settings = useCapability8(Capabilities.SettingsStore).getStore(meta.id).value;
-    const context = useCapability8(DeckCapabilities.MutableDeckState);
-    const { sidebarState, complementarySidebarState, complementarySidebarPanel, deck, toasts } = context;
+    const settings = useCapability6(Capabilities.SettingsStore).getStore(meta.id)?.value;
+    const context = useCapability6(DeckCapabilities.MutableDeckState);
+    const { sidebarState, complementarySidebarState, complementarySidebarPanel, deck } = context;
     const { active, activeCompanions, fullscreen, solo, plankSizing } = deck;
-    const breakpoint = useBreakpoints();
     const layoutMode = getMode(deck);
+    const breakpoint = useBreakpoints();
     const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
     const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
     const pluginManager = usePluginManager();
-    const scrollLeftRef = useRef3(null);
-    const deckRef = useRef3(null);
-    useEffect5(() => {
+    const scrollLeftRef = useRef2(null);
+    const deckRef = useRef2(null);
+    useEffect4(() => {
       const attended = untracked(() => {
         const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
         return attention.current;
@@ -1234,11 +1057,9 @@ var DeckLayout = ({ onDismissToast }) => {
         document.querySelector(`article[data-attendable-id="${firstId}"] button`)?.focus();
       }
     }, []);
-    const [isNotMobile] = useMediaQuery("md", {
-      ssr: false
-    });
-    const shouldRevert = useRef3(false);
-    useEffect5(() => {
+    const [isNotMobile] = useMediaQuery("md");
+    const shouldRevert = useRef2(false);
+    useEffect4(() => {
       if (!isNotMobile && getMode(deck) === "deck") {
         const attended = untracked(() => {
           const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
@@ -1265,8 +1086,8 @@ var DeckLayout = ({ onDismissToast }) => {
       deck,
       dispatch
     ]);
-    useEffect5(() => {
-      if (!settings.enableDeck && layoutMode === "deck") {
+    useEffect4(() => {
+      if (!settings?.enableDeck && layoutMode === "deck") {
         void dispatch(createIntent6(LayoutAction5.SetLayoutMode, {
           part: "mode",
           subject: active[0],
@@ -1276,27 +1097,27 @@ var DeckLayout = ({ onDismissToast }) => {
         }));
       }
     }, [
-      settings.enableDeck,
+      settings?.enableDeck,
       dispatch,
       active,
       layoutMode
     ]);
-    const handleResize = useCallback7(() => {
+    const handleResize = useCallback6(() => {
       scrollLeftRef.current = null;
     }, []);
-    useEffect5(() => {
+    useEffect4(() => {
       window.addEventListener("resize", handleResize);
       return () => window.removeEventListener("resize", handleResize);
     }, [
       handleResize
     ]);
-    const restoreScroll = useCallback7(() => {
+    const restoreScroll = useCallback6(() => {
       if (deckRef.current && scrollLeftRef.current != null) {
         deckRef.current.scrollLeft = scrollLeftRef.current;
       }
     }, []);
     useOnTransition(layoutMode, (mode) => mode !== "deck", "deck", restoreScroll);
-    const handleScroll = useCallback7((event) => {
+    const handleScroll = useCallback6((event) => {
       if (!solo && event.currentTarget === event.target) {
         scrollLeftRef.current = event.target.scrollLeft;
       }
@@ -1304,17 +1125,17 @@ var DeckLayout = ({ onDismissToast }) => {
       solo
     ]);
     const isEmpty = !solo && active.length === 0;
-    const padding = useMemo6(() => {
-      if (!solo && settings.overscroll === "centering") {
+    const padding = useMemo5(() => {
+      if (!solo && settings?.overscroll === "centering") {
         return calculateOverscroll(active.length);
       }
       return {};
     }, [
       solo,
-      settings.overscroll,
+      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]"
@@ -1322,7 +1143,7 @@ var DeckLayout = ({ onDismissToast }) => {
       topbar,
       hoistStatusbar
     ]);
-    const { order, itemsCount } = useMemo6(() => {
+    const { order, itemsCount } = useMemo5(() => {
       return active.reduce((acc, entryId) => {
         acc.order[entryId] = acc.itemsCount + 1;
         acc.itemsCount += activeCompanions?.[entryId] ? 3 : 2;
@@ -1335,53 +1156,55 @@ var DeckLayout = ({ onDismissToast }) => {
       active,
       activeCompanions
     ]);
-    return /* @__PURE__ */ React17.createElement(PopoverRoot, null, /* @__PURE__ */ React17.createElement(ActiveNode, null), /* @__PURE__ */ React17.createElement(Main3.Root, {
+    return /* @__PURE__ */ React14.createElement(Main3.Root, {
       navigationSidebarState: fullscreen ? "closed" : context.sidebarState,
       onNavigationSidebarStateChange: (next) => context.sidebarState = next,
       complementarySidebarState: fullscreen ? "closed" : context.complementarySidebarState,
       onComplementarySidebarStateChange: (next) => context.complementarySidebarState = next
-    }, /* @__PURE__ */ React17.createElement(Sidebar, null), /* @__PURE__ */ React17.createElement(ComplementarySidebar, {
+    }, /* @__PURE__ */ React14.createElement(Sidebar, null), /* @__PURE__ */ React14.createElement(ComplementarySidebar, {
       current: complementarySidebarPanel
-    }), /* @__PURE__ */ React17.createElement(Main3.Overlay, null), isEmpty && /* @__PURE__ */ React17.createElement(Main3.Content, {
+    }), /* @__PURE__ */ React14.createElement(Main3.Overlay, null), isEmpty && /* @__PURE__ */ React14.createElement(Main3.Content, {
       bounce: true,
       handlesFocus: true,
       classNames: mainPosition
-    }, /* @__PURE__ */ React17.createElement(ContentEmpty, null)), !isEmpty && /* @__PURE__ */ React17.createElement(Main3.Content, {
+    }, /* @__PURE__ */ React14.createElement(ContentEmpty, null)), !isEmpty && /* @__PURE__ */ React14.createElement(Main3.Content, {
       bounce: true,
       handlesFocus: true,
       classNames: mainPosition,
       style: {
+        "--main-spacing": settings?.encapsulatedPlanks ? "0.75rem" : "0",
         "--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",
         "--dx-main-contentFirstWidth": `${plankSizing[active[0] ?? "never"] ?? DEFAULT_HORIZONTAL_SIZE}rem`,
         "--dx-main-contentLastWidth": `${plankSizing[active[(active.length ?? 1) - 1] ?? "never"] ?? DEFAULT_HORIZONTAL_SIZE}rem`
       }
-    }, /* @__PURE__ */ React17.createElement("div", {
+    }, /* @__PURE__ */ React14.createElement("div", {
       role: "none",
       className: !solo ? "relative bg-deckSurface overflow-hidden" : "sr-only",
       ...solo && {
         inert: true
       }
-    }, !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleSidebarButton, {
+    }, !topbar && !fullscreen && /* @__PURE__ */ React14.createElement(ToggleSidebarButton, {
       classNames: fixedSidebarToggleStyles
-    }), !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleComplementarySidebarButton, {
+    }), !topbar && !fullscreen && /* @__PURE__ */ React14.createElement(ToggleComplementarySidebarButton, {
       classNames: fixedComplementarySidebarToggleStyles
-    }), /* @__PURE__ */ React17.createElement(Stack, {
+    }), /* @__PURE__ */ React14.createElement(Stack, {
       ref: deckRef,
       orientation: "horizontal",
       size: "contain",
+      itemsCount: itemsCount - 1,
       classNames: [
-        "absolute inset-block-0 -inset-inline-px",
+        "absolute inset-block-[--main-spacing] -inset-inline-px bs-[calc(100%-2*var(--main-spacing))]",
         mainPaddingTransitions
       ],
-      itemsCount: itemsCount - 1,
       style: padding,
       onScroll: handleScroll
-    }, active.map((entryId) => /* @__PURE__ */ React17.createElement(Fragment3, {
+    }, active.map((entryId) => /* @__PURE__ */ React14.createElement(Fragment3, {
       key: entryId
-    }, /* @__PURE__ */ React17.createElement(PlankSeparator, {
-      order: order[entryId] - 1
-    }), /* @__PURE__ */ React17.createElement(Plank, {
+    }, /* @__PURE__ */ React14.createElement(PlankSeparator, {
+      order: order[entryId] - 1,
+      encapsulate: !!settings?.enableDeck
+    }), /* @__PURE__ */ React14.createElement(Plank, {
       id: entryId,
       companionId: activeCompanions?.[entryId],
       part: "deck",
@@ -1389,36 +1212,227 @@ var DeckLayout = ({ onDismissToast }) => {
       active,
       layoutMode,
       settings
-    }))))), /* @__PURE__ */ React17.createElement("div", {
+    }))))), /* @__PURE__ */ React14.createElement("div", {
       role: "none",
-      className: solo ? "relative bg-deckSurface overflow-hidden" : "sr-only",
+      className: solo ? "relative overflow-hidden bg-deckSurface" : "sr-only",
       ...!solo && {
         inert: true
       }
-    }, !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleSidebarButton, {
+    }, !topbar && !fullscreen && /* @__PURE__ */ React14.createElement(ToggleSidebarButton, {
       classNames: fixedSidebarToggleStyles
-    }), !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleComplementarySidebarButton, {
+    }), !topbar && !fullscreen && /* @__PURE__ */ React14.createElement(ToggleComplementarySidebarButton, {
       classNames: fixedComplementarySidebarToggleStyles
-    }), /* @__PURE__ */ React17.createElement(StackContext.Provider, {
+    }), /* @__PURE__ */ React14.createElement(StackContext.Provider, {
       value: {
-        size: "contain",
         orientation: "horizontal",
+        size: "contain",
         rail: true
       }
-    }, /* @__PURE__ */ React17.createElement(Plank, {
+    }, /* @__PURE__ */ React14.createElement(Plank, {
       id: solo,
       companionId: solo ? activeCompanions?.[solo] : void 0,
       part: "solo",
       layoutMode,
       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, {
+    })))), topbar && /* @__PURE__ */ React14.createElement(Topbar, null), hoistStatusbar && /* @__PURE__ */ React14.createElement(StatusBar, {
+      showHints: settings?.showHints
+    }));
+  } finally {
+    _effect.f();
+  }
+};
+var PlankSeparator = ({ order, encapsulate }) => {
+  var _effect = _useSignals14();
+  try {
+    return order > 0 ? /* @__PURE__ */ React14.createElement("span", {
+      role: "separator",
+      className: mx5("row-span-2 bg-deckSurface", encapsulate ? "is-0" : "is-4"),
+      style: {
+        gridColumn: order
+      }
+    }) : null;
+  } finally {
+    _effect.f();
+  }
+};
+
+// src/components/DeckLayout/Dialog.tsx
+import { useSignals as _useSignals15 } from "@preact-signals/safe-react/tracking";
+import React15 from "react";
+import { Surface as Surface9, useCapability as useCapability7 } from "@dxos/app-framework";
+import { AlertDialog, Dialog as NaturalDialog } from "@dxos/react-ui";
+var Dialog = () => {
+  var _effect = _useSignals15();
+  try {
+    const context = useCapability7(DeckCapabilities.MutableDeckState);
+    const { dialogOpen, dialogType, dialogBlockAlign, dialogOverlayClasses, dialogOverlayStyle, dialogContent } = context;
+    const Root = dialogType === "alert" ? AlertDialog.Root : NaturalDialog.Root;
+    const Overlay = dialogType === "alert" ? AlertDialog.Overlay : NaturalDialog.Overlay;
+    return /* @__PURE__ */ React15.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__ */ React15.createElement(Surface9, {
+        role: "dialog",
+        data: dialogContent,
+        limit: 1,
+        fallback: PlankContentError,
+        placeholder: /* @__PURE__ */ React15.createElement("div", null)
+      })
+    ) : /* @__PURE__ */ React15.createElement(Overlay, {
+      blockAlign: dialogBlockAlign,
+      classNames: dialogOverlayClasses,
+      style: dialogOverlayStyle
+    }, /* @__PURE__ */ React15.createElement(Surface9, {
+      role: "dialog",
+      data: dialogContent,
+      limit: 1,
+      fallback: PlankContentError
+    })));
+  } finally {
+    _effect.f();
+  }
+};
+
+// src/components/DeckLayout/Popover.tsx
+import { useSignals as _useSignals16 } from "@preact-signals/safe-react/tracking";
+import { createContext } from "@radix-ui/react-context";
+import React16, { useCallback as useCallback7, useEffect as useEffect5, useMemo as useMemo6, useRef as useRef3, useState as useState3 } from "react";
+import { Surface as Surface10, useCapability as useCapability8 } from "@dxos/app-framework";
+import { Popover as Popover2 } from "@dxos/react-ui";
+var DEBOUNCE_DELAY = 40;
+var [DeckPopoverProvider, useDeckPopoverContext] = createContext("DeckPopover");
+var PopoverRoot = ({ children }) => {
+  var _effect = _useSignals16();
+  try {
+    const layout = useCapability8(DeckCapabilities.MutableDeckState);
+    const virtualRef = useRef3(null);
+    const [virtualIter, setVirtualIter] = useState3(0);
+    const [open, setOpen] = useState3(false);
+    const debounceRef = useRef3(null);
+    useEffect5(() => {
+      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__ */ React16.createElement(DeckPopoverProvider, {
+      setOpen
+    }, /* @__PURE__ */ React16.createElement(Popover2.Root, {
+      modal: false,
+      open
+    }, layout.popoverAnchor && /* @__PURE__ */ React16.createElement(Popover2.VirtualTrigger, {
+      key: virtualIter,
+      virtualRef
+    }), children));
+  } finally {
+    _effect.f();
+  }
+};
+var PopoverContent = () => {
+  var _effect = _useSignals16();
+  try {
+    const layout = useCapability8(DeckCapabilities.MutableDeckState);
+    const { setOpen } = useDeckPopoverContext("PopoverContent");
+    const handleClose = useCallback7((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;
+      }
+    }, [
+      setOpen
+    ]);
+    const collisionBoundaries = useMemo6(() => {
+      const closest = layout.popoverAnchor?.closest("[data-popover-collision-boundary]");
+      return closest ? [
+        closest
+      ] : [];
+    }, [
+      layout.popoverAnchor
+    ]);
+    return /* @__PURE__ */ React16.createElement(Popover2.Portal, null, /* @__PURE__ */ React16.createElement(Popover2.Content, {
+      side: layout.popoverSide,
+      onInteractOutside: handleClose,
+      onEscapeKeyDown: handleClose,
+      collisionBoundary: collisionBoundaries,
+      sticky: "always",
+      hideWhenDetached: true
+    }, /* @__PURE__ */ React16.createElement(Popover2.Viewport, null, /* @__PURE__ */ React16.createElement(Surface10, {
+      role: "card--popover",
+      data: layout.popoverContent,
+      limit: 1
+    })), /* @__PURE__ */ React16.createElement(Popover2.Arrow, null)));
+  } finally {
+    _effect.f();
+  }
+};
+
+// src/components/DeckLayout/Toast.tsx
+import { useSignals as _useSignals17 } from "@preact-signals/safe-react/tracking";
+import React17 from "react";
+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 }) => {
+  var _effect = _useSignals17();
+  try {
+    const { t } = useTranslation7(meta.id);
+    return /* @__PURE__ */ React17.createElement(NaturalToast.Root, {
+      "data-testid": id,
+      defaultOpen: true,
+      duration,
+      onOpenChange
+    }, /* @__PURE__ */ React17.createElement(NaturalToast.Body, null, /* @__PURE__ */ React17.createElement(NaturalToast.Title, {
+      classNames: "items-center"
+    }, icon && /* @__PURE__ */ React17.createElement(Icon2, {
+      icon,
+      size: 5,
+      classNames: "inline mr-1"
+    }), title && /* @__PURE__ */ React17.createElement("span", null, toLocalizedString3(title, t))), description && /* @__PURE__ */ React17.createElement(NaturalToast.Description, null, description && toLocalizedString3(description, t))), /* @__PURE__ */ React17.createElement(NaturalToast.Actions, null, onAction && actionAlt && actionLabel && /* @__PURE__ */ React17.createElement(NaturalToast.Action, {
+      altText: toLocalizedString3(actionAlt, t),
+      asChild: true
+    }, /* @__PURE__ */ React17.createElement(Button, {
+      "data-testid": "toast.action",
+      variant: "primary",
+      onClick: () => onAction?.()
+    }, toLocalizedString3(actionLabel, t))), closeLabel && /* @__PURE__ */ React17.createElement(NaturalToast.Close, {
+      asChild: true
+    }, /* @__PURE__ */ React17.createElement(Button, {
+      "data-testid": "toast.close"
+    }, toLocalizedString3(closeLabel, t)))));
+  } finally {
+    _effect.f();
+  }
+};
+var Toaster = ({ toasts, onDismissToast }) => {
+  var _effect = _useSignals17();
+  try {
+    return /* @__PURE__ */ React17.createElement(React17.Fragment, null, toasts?.map((toast) => /* @__PURE__ */ React17.createElement(Toast, {
       ...toast,
       key: toast.id,
       onOpenChange: (open) => {
         if (!open) {
-          onDismissToast(toast.id);
+          onDismissToast?.(toast.id);
         }
         return open;
       }
@@ -1428,60 +1442,80 @@ var DeckLayout = ({ onDismissToast }) => {
   }
 };
 
+// src/components/DeckLayout/DeckLayout.tsx
+var DeckLayout = ({ onDismissToast }) => {
+  var _effect = _useSignals18();
+  try {
+    const context = useCapability9(DeckCapabilities.MutableDeckState);
+    const { toasts } = context;
+    return /* @__PURE__ */ React18.createElement(PopoverRoot, null, /* @__PURE__ */ React18.createElement(ActiveNode, null), /* @__PURE__ */ React18.createElement(DeckMain, null), /* @__PURE__ */ React18.createElement(PopoverContent, null), /* @__PURE__ */ React18.createElement(Dialog, null), /* @__PURE__ */ React18.createElement(Toaster, {
+      toasts,
+      onDismissToast
+    }));
+  } finally {
+    _effect.f();
+  }
+};
+
 // src/components/DeckSettings/DeckSettings.tsx
-import { useSignals as _useSignals18 } from "@preact-signals/safe-react/tracking";
-import React18 from "react";
+import { useSignals as _useSignals19 } from "@preact-signals/safe-react/tracking";
+import React19 from "react";
 import { Input, Select, useTranslation as useTranslation8 } from "@dxos/react-ui";
 import { ControlGroup, ControlItemInput, ControlPage, ControlSection } from "@dxos/react-ui-form";
 var isSocket = !!globalThis.__args;
 var DeckSettings = ({ settings }) => {
-  var _effect = _useSignals18();
+  var _effect = _useSignals19();
   try {
     const { t } = useTranslation8(meta.id);
-    return /* @__PURE__ */ React18.createElement(ControlPage, null, /* @__PURE__ */ React18.createElement(ControlSection, {
+    return /* @__PURE__ */ React19.createElement(ControlPage, null, /* @__PURE__ */ React19.createElement(ControlSection, {
       title: t("settings title", {
         ns: meta.id
       })
-    }, /* @__PURE__ */ React18.createElement(ControlGroup, null, /* @__PURE__ */ React18.createElement(ControlItemInput, {
+    }, /* @__PURE__ */ React19.createElement(ControlGroup, null, /* @__PURE__ */ React19.createElement(ControlItemInput, {
       title: t("settings enable deck label")
-    }, /* @__PURE__ */ React18.createElement(Input.Switch, {
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
       checked: settings.enableDeck,
       onCheckedChange: (checked) => settings.enableDeck = checked
-    })), /* @__PURE__ */ React18.createElement(ControlItemInput, {
+    })), /* @__PURE__ */ React19.createElement(ControlItemInput, {
+      title: t("settings encapsulated planks label")
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
+      checked: settings.encapsulatedPlanks ?? false,
+      onCheckedChange: (checked) => settings.encapsulatedPlanks = checked
+    })), /* @__PURE__ */ React19.createElement(ControlItemInput, {
       title: t("select new plank positioning label")
-    }, /* @__PURE__ */ React18.createElement(Select.Root, {
+    }, /* @__PURE__ */ React19.createElement(Select.Root, {
       disabled: !settings.enableDeck,
       value: settings.newPlankPositioning ?? "start",
       onValueChange: (value) => settings.newPlankPositioning = value
-    }, /* @__PURE__ */ React18.createElement(Select.TriggerButton, {
+    }, /* @__PURE__ */ React19.createElement(Select.TriggerButton, {
       placeholder: t("select new plank positioning placeholder")
-    }), /* @__PURE__ */ React18.createElement(Select.Portal, null, /* @__PURE__ */ React18.createElement(Select.Content, null, /* @__PURE__ */ React18.createElement(Select.Viewport, null, NewPlankPositions.map((position) => /* @__PURE__ */ React18.createElement(Select.Option, {
+    }), /* @__PURE__ */ React19.createElement(Select.Portal, null, /* @__PURE__ */ React19.createElement(Select.Content, null, /* @__PURE__ */ React19.createElement(Select.Viewport, null, NewPlankPositions.map((position) => /* @__PURE__ */ React19.createElement(Select.Option, {
       key: position,
       value: position
-    }, t(`settings new plank position ${position} label`)))), /* @__PURE__ */ React18.createElement(Select.Arrow, null))))), /* @__PURE__ */ React18.createElement(ControlItemInput, {
+    }, t(`settings new plank position ${position} label`)))), /* @__PURE__ */ React19.createElement(Select.Arrow, null))))), /* @__PURE__ */ React19.createElement(ControlItemInput, {
       title: t("settings overscroll label")
-    }, /* @__PURE__ */ React18.createElement(Select.Root, {
+    }, /* @__PURE__ */ React19.createElement(Select.Root, {
       disabled: !settings.enableDeck,
       value: settings.overscroll ?? "none",
       onValueChange: (value) => settings.overscroll = value
-    }, /* @__PURE__ */ React18.createElement(Select.TriggerButton, {
+    }, /* @__PURE__ */ React19.createElement(Select.TriggerButton, {
       placeholder: t("select overscroll placeholder")
-    }), /* @__PURE__ */ React18.createElement(Select.Portal, null, /* @__PURE__ */ React18.createElement(Select.Content, null, /* @__PURE__ */ React18.createElement(Select.Viewport, null, OverscrollOptions.map((option) => /* @__PURE__ */ React18.createElement(Select.Option, {
+    }), /* @__PURE__ */ React19.createElement(Select.Portal, null, /* @__PURE__ */ React19.createElement(Select.Content, null, /* @__PURE__ */ React19.createElement(Select.Viewport, null, OverscrollOptions.map((option) => /* @__PURE__ */ React19.createElement(Select.Option, {
       key: option,
       value: option
-    }, t(`settings overscroll ${option} label`)))), /* @__PURE__ */ React18.createElement(Select.Arrow, null))))), /* @__PURE__ */ React18.createElement(ControlItemInput, {
+    }, t(`settings overscroll ${option} label`)))), /* @__PURE__ */ React19.createElement(Select.Arrow, null))))), /* @__PURE__ */ React19.createElement(ControlItemInput, {
       title: t("settings enable statusbar label")
-    }, /* @__PURE__ */ React18.createElement(Input.Switch, {
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
       checked: settings.enableStatusbar,
       onCheckedChange: (checked) => settings.enableStatusbar = checked
-    })), /* @__PURE__ */ React18.createElement(ControlItemInput, {
+    })), /* @__PURE__ */ React19.createElement(ControlItemInput, {
       title: t("settings show hints label")
-    }, /* @__PURE__ */ React18.createElement(Input.Switch, {
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
       checked: settings.showHints,
       onCheckedChange: (checked) => settings.showHints = checked
-    })), !isSocket && /* @__PURE__ */ React18.createElement(ControlItemInput, {
+    })), !isSocket && /* @__PURE__ */ React19.createElement(ControlItemInput, {
       title: t("settings native redirect label")
-    }, /* @__PURE__ */ React18.createElement(Input.Switch, {
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
       checked: settings.enableNativeRedirect,
       onCheckedChange: (checked) => settings.enableNativeRedirect = checked
     })))));
@@ -1495,4 +1529,4 @@ export {
   DeckLayout,
   DeckSettings
 };
-//# sourceMappingURL=chunk-QHJ7N7BF.mjs.map
+//# sourceMappingURL=chunk-SBJLGRJV.mjs.map