@dxos/plugin-deck 0.6.13-main.ed424a1 → 0.6.13-staging.1e988a3

package/dist/lib/browser/index.mjs

@@ -1,15 +1,15 @@
 import {
   DECK_PLUGIN,
   meta_default
-} from "./chunk-GVOGPULO.mjs";
+} from "./chunk-YVHGFQQR.mjs";
 
 // packages/plugins/plugin-deck/src/DeckPlugin.tsx
-import { batch } from "@preact/signals-core";
+import { ArrowsOut } from "@phosphor-icons/react";
+import { batch, effect } from "@preact/signals-core";
 import { setAutoFreeze } from "immer";
 import React15 from "react";
-import { IntentAction, LayoutAction as LayoutAction3, NavigationAction as NavigationAction4, parseGraphPlugin, parseIntentPlugin, resolvePlugin, Toast as ToastSchema, SLUG_PATH_SEPARATOR as SLUG_PATH_SEPARATOR4, isLayoutParts, isLayoutAdjustment, isLayoutMode, openIds as openIds2 } from "@dxos/app-framework";
+import { IntentAction, LayoutAction as LayoutAction3, NavigationAction as NavigationAction3, parseGraphPlugin, parseIntentPlugin, resolvePlugin, Toast as ToastSchema, SLUG_PATH_SEPARATOR as SLUG_PATH_SEPARATOR5, isLayoutParts, isLayoutAdjustment, isLayoutMode, openIds as openIds2 } from "@dxos/app-framework";
 import { create, getTypename, isReactiveObject } from "@dxos/echo-schema";
-import { scheduledEffect } from "@dxos/echo-signals/core";
 import { LocalStorageStore } from "@dxos/local-storage";
 import { log } from "@dxos/log";
 import { parseAttentionPlugin } from "@dxos/plugin-attention";
@@ -18,6 +18,7 @@ import { createExtension } from "@dxos/plugin-graph";
 import { ObservabilityAction } from "@dxos/plugin-observability/meta";
 import { fullyQualifiedId } from "@dxos/react-client/echo";
 import { translations as deckTranslations } from "@dxos/react-ui-deck";
+import { Mosaic } from "@dxos/react-ui-mosaic";
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/constants.ts
 var NAV_ID = "NavTree";
@@ -25,12 +26,11 @@ var SURFACE_PREFIX = "surface:";
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/DeckLayout.tsx
 import { Sidebar as MenuIcon } from "@phosphor-icons/react";
-import React13, { useCallback as useCallback2, useEffect as useEffect5, useMemo as useMemo3, useRef as useRef2 } from "react";
-import { Surface as Surface9, firstIdInPart, usePlugin } from "@dxos/app-framework";
-import { Button as Button3, Dialog, Main as Main3, Popover as Popover2, useOnTransition, useTranslation as useTranslation5 } from "@dxos/react-ui";
-import { useAttended as useAttended3 } from "@dxos/react-ui-attention";
+import React13, { useCallback as useCallback2, useEffect as useEffect5, useMemo as useMemo2, useRef as useRef2, useState as useState3, useLayoutEffect as useLayoutEffect2 } from "react";
+import { SLUG_PATH_SEPARATOR as SLUG_PATH_SEPARATOR3, Surface as Surface9, firstIdInPart, usePlugin } from "@dxos/app-framework";
+import { Button as Button3, Dialog, Main as Main3, Popover as Popover2, useTranslation as useTranslation5 } from "@dxos/react-ui";
 import { Deck } from "@dxos/react-ui-deck";
-import { getSize, mainPaddingTransitions as mainPaddingTransitions2 } from "@dxos/react-ui-theme";
+import { getSize } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/ActiveNode.tsx
 import React from "react";
@@ -40,11 +40,8 @@ import { useGraph } from "@dxos/plugin-graph";
 // packages/plugins/plugin-deck/src/hooks/useNode.ts
 import { useEffect, useState } from "react";
 var useNode = (graph, id, timeout) => {
-  const [nodeState, setNodeState] = useState(id ? graph.findNode(id, false) : void 0);
+  const [nodeState, setNodeState] = useState(id ? graph.findNode(id) : void 0);
   useEffect(() => {
-    if (!id && nodeState) {
-      setNodeState(void 0);
-    }
     if (nodeState?.id === id || !id) {
       return;
     }
@@ -116,25 +113,36 @@ var ActiveNode = ({ id }) => {
 };
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/ComplementarySidebar.tsx
-import React5, { useMemo } from "react";
-import { NavigationAction as NavigationAction2, SLUG_PATH_SEPARATOR as SLUG_PATH_SEPARATOR2, Surface as Surface3, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import React5 from "react";
+import { SLUG_PATH_SEPARATOR as SLUG_PATH_SEPARATOR2, Surface as Surface3 } from "@dxos/app-framework";
 import { useGraph as useGraph3 } from "@dxos/plugin-graph";
 import { Main } from "@dxos/react-ui";
-import { useAttended } from "@dxos/react-ui-attention";
+import { createAttendableAttributes } from "@dxos/react-ui-attention";
 import { deckGrid } from "@dxos/react-ui-deck";
 import { mx as mx2 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/NodePlankHeading.tsx
+import { Placeholder } from "@phosphor-icons/react";
 import React2, { Fragment, useEffect as useEffect3 } from "react";
-import { LayoutAction, NavigationAction, SLUG_PATH_SEPARATOR, Surface as Surface2, useIntentDispatcher, indexInPart, partLength } from "@dxos/app-framework";
+import { LayoutAction, NavigationAction, SLUG_COLLECTION_INDICATOR, SLUG_PATH_SEPARATOR, Surface as Surface2, useIntentDispatcher, indexInPart, partLength } from "@dxos/app-framework";
 import { useGraph as useGraph2 } from "@dxos/plugin-graph";
-import { Icon, Popover, toLocalizedString, useMediaQuery, useTranslation } from "@dxos/react-ui";
-import { PlankHeading } from "@dxos/react-ui-deck";
+import { Popover, toLocalizedString, useMediaQuery, useTranslation } from "@dxos/react-ui";
+import { PlankHeading, plankHeadingIconProps } from "@dxos/react-ui-deck";
 import { TextTooltip } from "@dxos/react-ui-text-tooltip";
-var NodePlankHeading = ({ node, id, layoutParts, layoutPart, popoverAnchorId, pending, flatDeck, actions = [] }) => {
+var NodePlankHeading = ({
+  node,
+  id,
+  layoutParts,
+  layoutPart,
+  // TODO(wittjosiah): Unused?
+  layoutEntry,
+  popoverAnchorId,
+  pending,
+  flatDeck
+}) => {
   const { t } = useTranslation(DECK_PLUGIN);
   const { graph } = useGraph2();
-  const icon = node?.properties?.icon ?? "ph--placeholder--regular";
+  const Icon = node?.properties?.icon ?? Placeholder;
   const label = pending ? t("pending heading") : toLocalizedString(node?.properties?.label ?? [
     "plank heading fallback label",
     {
@@ -164,14 +172,10 @@ var NodePlankHeading = ({ node, id, layoutParts, layoutPart, popoverAnchorId, pe
   return /* @__PURE__ */ React2.createElement(PlankHeading.Root, (layoutPart !== "main" || !flatDeck) && {
     classNames: "pie-1 border-b border-separator"
   }, /* @__PURE__ */ React2.createElement(ActionRoot, null, node ? /* @__PURE__ */ React2.createElement(PlankHeading.ActionsMenu, {
-    icon,
-    related: layoutPart === "complementary",
+    Icon,
     attendableId,
     triggerLabel: t("actions menu label"),
-    actions: [
-      actions,
-      graph.actions(node)
-    ].filter((a) => a.length > 0),
+    actions: graph.actions(node),
     onAction: (action) => typeof action.data === "function" && action.data?.({
       node: action,
       caller: DECK_PLUGIN
@@ -183,15 +187,11 @@ var NodePlankHeading = ({ node, id, layoutParts, layoutPart, popoverAnchorId, pe
     }
   })) : /* @__PURE__ */ React2.createElement(PlankHeading.Button, null, /* @__PURE__ */ React2.createElement("span", {
     className: "sr-only"
-  }, label), /* @__PURE__ */ React2.createElement(Icon, {
-    icon,
-    size: 5
-  }))), /* @__PURE__ */ React2.createElement(TextTooltip, {
+  }, label), /* @__PURE__ */ React2.createElement(Icon, plankHeadingIconProps))), /* @__PURE__ */ React2.createElement(TextTooltip, {
     text: label,
     onlyWhenTruncating: true
   }, /* @__PURE__ */ React2.createElement(PlankHeading.Label, {
-    attendableId,
-    related: layoutPart === "complementary",
+    attendableId: node?.id,
     ...pending && {
       classNames: "text-description"
     }
@@ -237,6 +237,9 @@ var NodePlankHeading = ({ node, id, layoutParts, layoutPart, popoverAnchorId, pe
         action: NavigationAction.CLOSE,
         data: {
           activeParts: {
+            complementary: [
+              `${id}${SLUG_PATH_SEPARATOR}comments${SLUG_COLLECTION_INDICATOR}`
+            ],
             [layoutPart]: [
               id
             ]
@@ -250,7 +253,7 @@ var NodePlankHeading = ({ node, id, layoutParts, layoutPart, popoverAnchorId, pe
         }
       });
     },
-    close: layoutPart === "complementary" ? "minify-end" : true
+    close: layoutCoordinate?.part === "complementary" ? "minify-end" : true
   }));
 };
 
@@ -311,68 +314,13 @@ var LayoutContext = createContext(null);
 var useLayout = () => useContext(LayoutContext) ?? raise(new Error("Missing LayoutContext"));
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/ComplementarySidebar.tsx
-var panels = [
-  "comments",
-  "settings",
-  "debug"
-];
-var nodes = [
-  {
-    id: "comments",
-    icon: "ph--chat-text--regular"
-  },
-  {
-    id: "settings",
-    icon: "ph--gear--regular"
-  },
-  {
-    id: "debug",
-    icon: "ph--bug--regular"
-  }
-];
-var getPanel = (part) => {
-  if (part && panels.findIndex((panel) => panel === part) !== -1) {
-    return part;
-  } else {
-    return "settings";
-  }
-};
-var ComplementarySidebar = ({ layoutParts, flatDeck }) => {
+var ComplementarySidebar = ({ id, layoutParts, flatDeck }) => {
   const { popoverAnchorId } = useLayout();
-  const attended = useAttended();
-  const part = getPanel(layoutParts.complementary?.[0].id);
-  const id = attended[0] ? `${attended[0]}${SLUG_PATH_SEPARATOR2}${part}` : void 0;
   const { graph } = useGraph3();
   const node = useNode(graph, id);
-  const dispatch = useIntentDispatcher2();
+  const complementaryAttrs = createAttendableAttributes(id?.split(SLUG_PATH_SEPARATOR2)[0] ?? "never");
   useNodeActionExpander(node);
-  const actions = useMemo(() => nodes.map(({ id: id2, icon }) => ({
-    id: `complementary-${id2}`,
-    data: () => {
-      void dispatch({
-        action: NavigationAction2.OPEN,
-        data: {
-          activeParts: {
-            complementary: id2
-          }
-        }
-      });
-    },
-    properties: {
-      label: [
-        `${id2} label`,
-        {
-          ns: DECK_PLUGIN
-        }
-      ],
-      icon,
-      menuItemType: "toggle",
-      isChecked: part === id2
-    }
-  })), [
-    part
-  ]);
-  return /* @__PURE__ */ React5.createElement(Main.ComplementarySidebar, null, /* @__PURE__ */ React5.createElement("div", {
+  return /* @__PURE__ */ React5.createElement(Main.ComplementarySidebar, complementaryAttrs, node ? /* @__PURE__ */ React5.createElement("div", {
     role: "none",
     className: mx2(deckGrid, "grid-cols-1 bs-full")
   }, /* @__PURE__ */ React5.createElement(NodePlankHeading, {
@@ -381,19 +329,18 @@ var ComplementarySidebar = ({ layoutParts, flatDeck }) => {
     layoutParts,
     layoutPart: "complementary",
     popoverAnchorId,
-    flatDeck,
-    actions
-  }), /* @__PURE__ */ React5.createElement("div", {
-    className: "row-span-2"
-  }, node && /* @__PURE__ */ React5.createElement(Surface3, {
-    role: `complementary--${part}`,
+    flatDeck
+  }), /* @__PURE__ */ React5.createElement(Surface3, {
+    role: "article",
     data: {
-      subject: node.properties.object,
+      subject: node.data,
+      part: "complementary",
       popoverAnchorId
     },
+    limit: 1,
     fallback: PlankContentError,
     placeholder: /* @__PURE__ */ React5.createElement(PlankLoading, null)
-  }))));
+  })) : null);
 };
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/ContentEmpty.tsx
@@ -454,11 +401,11 @@ var Fullscreen = ({ id }) => {
 // packages/plugins/plugin-deck/src/components/DeckLayout/Plank.tsx
 import { Plus } from "@phosphor-icons/react";
 import React9, { useCallback, useLayoutEffect, useRef } from "react";
-import { LayoutAction as LayoutAction2, NavigationAction as NavigationAction3, Surface as Surface6, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
+import { LayoutAction as LayoutAction2, NavigationAction as NavigationAction2, Surface as Surface6, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
 import { debounce } from "@dxos/async";
 import { useGraph as useGraph5 } from "@dxos/plugin-graph";
 import { Button, Tooltip, useTranslation as useTranslation4 } from "@dxos/react-ui";
-import { useAttendableAttributes } from "@dxos/react-ui-attention";
+import { createAttendableAttributes as createAttendableAttributes2 } from "@dxos/react-ui-attention";
 import { Plank as NaturalPlank } from "@dxos/react-ui-deck";
 import { mainIntrinsicSize } from "@dxos/react-ui-theme";
 
@@ -471,14 +418,14 @@ var useDeckContext = () => useContext2(DeckContext) ?? raise2(new Error("Missing
 // packages/plugins/plugin-deck/src/components/DeckLayout/Plank.tsx
 var Plank = ({ entry, layoutParts, part, flatDeck, searchEnabled, layoutMode }) => {
   const { t } = useTranslation4(DECK_PLUGIN);
-  const dispatch = useIntentDispatcher3();
+  const dispatch = useIntentDispatcher2();
   const { popoverAnchorId, scrollIntoView } = useLayout();
   const { plankSizing } = useDeckContext();
   const { graph } = useGraph5();
   const node = useNode(graph, entry.id);
   const rootElement = useRef(null);
   const resizeable = layoutMode === "deck";
-  const attendableAttrs = useAttendableAttributes(entry.id);
+  const attendableAttrs = createAttendableAttributes2(entry.id);
   const coordinate = {
     part,
     entryId: entry.id
@@ -516,7 +463,7 @@ var Plank = ({ entry, layoutParts, part, flatDeck, searchEnabled, layoutMode })
     layoutMode
   ]);
   const isSolo = layoutMode === "solo" && part === "solo";
-  const isSuppressed = layoutMode === "solo" && part !== "solo" || layoutMode === "deck" && part === "solo";
+  const isSuppressed = layoutMode === "solo" && part !== "solo";
   const sizeAttrs = useMainSize();
   return /* @__PURE__ */ React9.createElement(NaturalPlank.Root, {
     size,
@@ -582,7 +529,7 @@ var Plank = ({ entry, layoutParts, part, flatDeck, searchEnabled, layoutMode })
           component: "dxos.org/plugin/search/Dialog",
           dialogBlockAlign: "start",
           subject: {
-            action: NavigationAction3.SET,
+            action: NavigationAction2.SET,
             position: "add-after",
             coordinate
           }
@@ -602,14 +549,12 @@ var Plank = ({ entry, layoutParts, part, flatDeck, searchEnabled, layoutMode })
 };
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/Sidebar.tsx
-import React10, { useMemo as useMemo2 } from "react";
+import React10, { useMemo } from "react";
 import { openIds, Surface as Surface7 } from "@dxos/app-framework";
 import { Main as Main2 } from "@dxos/react-ui";
-import { useAttended as useAttended2 } from "@dxos/react-ui-attention";
-var Sidebar = ({ layoutParts }) => {
+var Sidebar = ({ attention, layoutParts }) => {
   const { layoutMode, popoverAnchorId } = useLayout();
-  const attended = useAttended2();
-  const activeIds = useMemo2(() => {
+  const activeIds = useMemo(() => {
     if (layoutMode === "solo") {
       return new Set(layoutParts?.solo?.map((e) => e.id) ?? []);
     } else if (layoutMode === "deck") {
@@ -620,14 +565,14 @@ var Sidebar = ({ layoutParts }) => {
     layoutParts,
     layoutMode
   ]);
-  const navigationData = useMemo2(() => ({
+  const navigationData = useMemo(() => ({
     popoverAnchorId,
     activeIds,
-    attended
+    attended: attention.attended
   }), [
     popoverAnchorId,
     activeIds,
-    attended
+    attention.attended
   ]);
   return /* @__PURE__ */ React10.createElement(Main2.NavigationSidebar, null, /* @__PURE__ */ React10.createElement(Surface7, {
     role: "navigation",
@@ -641,19 +586,14 @@ var Sidebar = ({ layoutParts }) => {
 // packages/plugins/plugin-deck/src/components/DeckLayout/StatusBar.tsx
 import React11 from "react";
 import { Surface as Surface8 } from "@dxos/app-framework";
-import { mainPadding, mainPaddingTransitions, mx as mx4 } from "@dxos/react-ui-theme";
-var StatusBar = ({ showHints }) => {
+import { mainPadding, mx as mx4 } from "@dxos/react-ui-theme";
+var StatusBar = () => {
   const sizeAttrs = useMainSize();
   return /* @__PURE__ */ React11.createElement("div", {
     role: "none",
     ...sizeAttrs,
-    className: mx4("fixed flex justify-between block-end-0 inset-inline-0 items-center border-bs border-separator z-[2]", mainPadding, mainPaddingTransitions)
-  }, /* @__PURE__ */ React11.createElement("div", {
-    role: "none"
-  }, showHints && /* @__PURE__ */ React11.createElement(Surface8, {
-    role: "hints",
-    limit: 1
-  })), /* @__PURE__ */ React11.createElement(Surface8, {
+    className: mx4("fixed block-end-0 inset-inline-0 z-[2]", mainPadding)
+  }, /* @__PURE__ */ React11.createElement(Surface8, {
     role: "status-bar",
     limit: 1
   }));
@@ -706,10 +646,7 @@ var getEffectivePart = (partName, layoutMode) => layoutMode === "solo" && partNa
 import { PLANK_DEFAULTS } from "@dxos/react-ui-deck";
 var calculateOverscroll = (planks, plankSizing, sidebarOpen, complementarySidebarOpen) => {
   if (!planks?.length) {
-    return {
-      paddingInlineStart: 0,
-      paddingInlineEnd: 0
-    };
+    return;
   }
   const sidebarWidth = sidebarOpen ? "270px" : "0px";
   const complementarySidebarWidth = complementarySidebarOpen ? "360px" : "0px";
@@ -719,8 +656,8 @@ var calculateOverscroll = (planks, plankSizing, sidebarOpen, complementarySideba
     const plankSize = getPlankSize(plank.id);
     const overscrollPadding = `max(0px, calc(((100dvw - ${sidebarWidth} - ${complementarySidebarWidth} - (${plankSize} + 20px)) / 2)))`;
     return {
-      paddingInlineStart: overscrollPadding,
-      paddingInlineEnd: overscrollPadding
+      paddingLeft: overscrollPadding,
+      paddingRight: overscrollPadding
     };
   } else {
     const first = planks[0];
@@ -728,33 +665,27 @@ var calculateOverscroll = (planks, plankSizing, sidebarOpen, complementarySideba
     const last = planks[planks.length - 1];
     const lastSize = getPlankSize(last.id);
     return {
-      paddingInlineStart: `max(0px, calc(((100dvw - (${firstSize} + 20px)) / 2) - ${sidebarWidth}))`,
-      paddingInlineEnd: `max(0px, calc(((100dvw - (${lastSize} + 20px)) / 2) - ${complementarySidebarWidth}))`
+      paddingLeft: `max(0px, calc(((100dvw - (${firstSize} + 20px)) / 2) - ${sidebarWidth}))`,
+      paddingRight: `max(0px, calc(((100dvw - (${lastSize} + 20px)) / 2) - ${complementarySidebarWidth}))`
     };
   }
 };
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/DeckLayout.tsx
-var DeckLayout = ({ layoutParts, toasts, flatDeck, overscroll, showHints, slots, onDismissToast }) => {
+var DeckLayout = ({ layoutParts, attention, toasts, flatDeck, overscroll, showHintsFooter, slots, onDismissToast }) => {
   const context = useLayout();
   const { layoutMode, sidebarOpen, complementarySidebarOpen, dialogOpen, dialogContent, dialogBlockAlign, popoverOpen, popoverContent, popoverAnchorId } = context;
   const { t } = useTranslation5(DECK_PLUGIN);
   const { plankSizing } = useDeckContext();
-  const attended = useAttended3();
   const searchPlugin = usePlugin("dxos.org/plugin/search");
-  const fullScreenSlug = useMemo3(() => firstIdInPart(layoutParts, "fullScreen"), [
+  const fullScreenSlug = useMemo2(() => firstIdInPart(layoutParts, "fullScreen"), [
     layoutParts
   ]);
-  const scrollLeftRef = useRef2();
+  const [scrollLeft, setScrollLeft] = useState3(null);
   const deckRef = useRef2(null);
-  useEffect5(() => {
-    const firstId = layoutMode === "solo" ? firstIdInPart(layoutParts, "solo") : firstIdInPart(layoutParts, "main");
-    if (attended.length === 0 && firstId) {
-      document.querySelector(`article[data-attendable-id="${firstId}"] button`)?.focus();
-    }
-  }, []);
+  const restoreScrollRef = useRef2(false);
   const handleResize = useCallback2(() => {
-    scrollLeftRef.current = null;
+    setScrollLeft(null);
   }, []);
   useEffect5(() => {
     window.addEventListener("resize", handleResize);
@@ -762,20 +693,36 @@ var DeckLayout = ({ layoutParts, toasts, flatDeck, overscroll, showHints, slots,
   }, [
     handleResize
   ]);
-  const restoreScroll = useCallback2(() => {
-    if (deckRef.current && scrollLeftRef.current != null) {
-      deckRef.current.scrollLeft = scrollLeftRef.current;
+  useLayoutEffect2(() => {
+    if (layoutMode !== "deck") {
+      restoreScrollRef.current = true;
+    } else if (restoreScrollRef.current && deckRef.current && scrollLeft) {
+      deckRef.current.scrollLeft = scrollLeft;
+      restoreScrollRef.current = false;
     }
-  }, []);
-  useOnTransition(layoutMode, (mode) => mode !== "deck", "deck", restoreScroll);
+  }, [
+    layoutMode,
+    deckRef.current,
+    scrollLeft
+  ]);
   const handleScroll = useCallback2((event) => {
     if (layoutMode === "deck" && event.currentTarget === event.target) {
-      scrollLeftRef.current = event.target.scrollLeft;
+      setScrollLeft(event.target.scrollLeft);
     }
   }, [
     layoutMode
   ]);
-  const firstAttendedId = attended[0];
+  const complementarySlug = useMemo2(() => {
+    const entry = layoutParts.complementary?.at(0);
+    if (entry) {
+      return entry.path ? `${entry.id}${SLUG_PATH_SEPARATOR3}${entry.path}` : entry.id;
+    }
+  }, [
+    layoutParts
+  ]);
+  const firstAttendedId = useMemo2(() => Array.from(attention.attended ?? [])[0], [
+    attention.attended
+  ]);
   useEffect5(() => {
     if (layoutMode === "deck" && firstAttendedId) {
     }
@@ -783,20 +730,21 @@ var DeckLayout = ({ layoutParts, toasts, flatDeck, overscroll, showHints, slots,
     layoutMode,
     firstAttendedId
   ]);
-  const isEmpty = layoutParts.main?.length === 0 && layoutParts.solo?.length === 0;
-  const padding = useMemo3(() => {
-    if (layoutMode === "deck" && overscroll === "centering") {
-      return calculateOverscroll(layoutParts.main, plankSizing, sidebarOpen, complementarySidebarOpen);
+  const parts = useMemo2(() => {
+    const parts2 = [
+      ...layoutParts.main ?? []
+    ];
+    for (const part of layoutParts.solo ?? []) {
+      if (!parts2.find((entry) => entry.id === part.id)) {
+        parts2.push(part);
+      }
     }
-    return {};
+    return parts2;
   }, [
-    layoutMode,
-    overscroll,
     layoutParts.main,
-    plankSizing,
-    sidebarOpen,
-    complementarySidebarOpen
+    layoutParts.solo
   ]);
+  const padding = layoutMode === "deck" && overscroll === "centering" ? calculateOverscroll(layoutParts.main, plankSizing, sidebarOpen, complementarySidebarOpen) : {};
   if (layoutMode === "fullscreen") {
     return /* @__PURE__ */ React13.createElement(Fullscreen, {
       id: fullScreenSlug
@@ -818,13 +766,19 @@ var DeckLayout = ({ layoutParts, toasts, flatDeck, overscroll, showHints, slots,
   }), /* @__PURE__ */ React13.createElement(Main3.Root, {
     navigationSidebarOpen: context.sidebarOpen,
     onNavigationSidebarOpenChange: (next) => context.sidebarOpen = next,
-    complementarySidebarOpen: context.complementarySidebarOpen,
-    onComplementarySidebarOpenChange: (next) => context.complementarySidebarOpen = next
+    ...complementarySidebarOpen !== null && {
+      complementarySidebarOpen: (
+        /* complementaryAvailable && */
+        context.complementarySidebarOpen
+      ),
+      onComplementarySidebarOpenChange: (next) => context.complementarySidebarOpen = next
+    }
   }, /* @__PURE__ */ React13.createElement(Main3.Notch, {
     classNames: "z-[21]"
   }, /* @__PURE__ */ React13.createElement(Surface9, {
     role: "notch-start"
   }), /* @__PURE__ */ React13.createElement(Button3, {
+    // disabled={!sidebarAvailable}
     onClick: () => context.sidebarOpen = !context.sidebarOpen,
     variant: "ghost",
     classNames: "p-1"
@@ -834,6 +788,7 @@ var DeckLayout = ({ layoutParts, toasts, flatDeck, overscroll, showHints, slots,
     weight: "light",
     className: getSize(5)
   })), /* @__PURE__ */ React13.createElement(Button3, {
+    // disabled={!complementaryAvailable}
     onClick: () => context.complementarySidebarOpen = !context.complementarySidebarOpen,
     variant: "ghost",
     classNames: "p-1"
@@ -846,14 +801,15 @@ var DeckLayout = ({ layoutParts, toasts, flatDeck, overscroll, showHints, slots,
   })), /* @__PURE__ */ React13.createElement(Surface9, {
     role: "notch-end"
   })), /* @__PURE__ */ React13.createElement(Sidebar, {
+    attention,
     layoutParts
   }), /* @__PURE__ */ React13.createElement(ComplementarySidebar, {
-    context: "comments",
+    id: complementarySlug,
     layoutParts,
     flatDeck
-  }), /* @__PURE__ */ React13.createElement(Main3.Overlay, null), isEmpty && /* @__PURE__ */ React13.createElement(Main3.Content, {
+  }), /* @__PURE__ */ React13.createElement(Main3.Overlay, null), parts.length === 0 && /* @__PURE__ */ React13.createElement(Main3.Content, {
     handlesFocus: true
-  }, /* @__PURE__ */ React13.createElement(ContentEmpty, null)), !isEmpty && /* @__PURE__ */ React13.createElement(Main3.Content, {
+  }, /* @__PURE__ */ React13.createElement(ContentEmpty, null)), parts.length !== 0 && /* @__PURE__ */ React13.createElement(Main3.Content, {
     bounce: true,
     classNames: "grid block-end-[--statusbar-size]",
     handlesFocus: true
@@ -864,33 +820,26 @@ var DeckLayout = ({ layoutParts, toasts, flatDeck, overscroll, showHints, slots,
     style: padding,
     classNames: [
       !flatDeck && "bg-deck",
-      mainPaddingTransitions2,
       "absolute inset-0",
       slots?.wallpaper?.classNames
     ],
     solo: layoutMode === "solo",
     onScroll: handleScroll,
     ref: deckRef
-  }, /* @__PURE__ */ React13.createElement(Plank, {
-    entry: layoutParts.solo?.[0] ?? {
-      id: "unknown-solo"
-    },
-    layoutParts,
-    part: "solo",
-    layoutMode,
-    flatDeck,
-    searchEnabled: !!searchPlugin
-  }), layoutParts.main?.map((layoutEntry) => /* @__PURE__ */ React13.createElement(Plank, {
+  }, parts.map((layoutEntry) => /* @__PURE__ */ React13.createElement(Plank, {
     key: layoutEntry.id,
     entry: layoutEntry,
     layoutParts,
-    part: "main",
+    part: layoutMode === "solo" && layoutEntry.id === layoutParts.solo?.[0]?.id ? "solo" : "main",
     layoutMode,
     flatDeck,
     searchEnabled: !!searchPlugin
-  }))))), /* @__PURE__ */ React13.createElement(StatusBar, {
-    showHints
-  }), /* @__PURE__ */ React13.createElement(Popover2.Portal, null, /* @__PURE__ */ React13.createElement(Popover2.Content, {
+  }))))), /* @__PURE__ */ React13.createElement(StatusBar, null), showHintsFooter && /* @__PURE__ */ React13.createElement("div", {
+    className: "fixed bottom-0 left-0 right-0 h-[32px] z-[1] flex justify-center"
+  }, /* @__PURE__ */ React13.createElement(Surface9, {
+    role: "hints",
+    limit: 1
+  })), /* @__PURE__ */ React13.createElement(Popover2.Portal, null, /* @__PURE__ */ React13.createElement(Popover2.Content, {
     classNames: "z-[60]",
     onEscapeKeyDown: () => {
       context.popoverOpen = false;
@@ -959,31 +908,31 @@ var LayoutSettings = ({ settings }) => {
     key: option,
     value: option
   }, t(`settings overscroll ${option} label`)))))))), /* @__PURE__ */ React14.createElement(SettingsValue, {
-    label: t("settings show hints label")
+    label: t("settings show footer label")
   }, /* @__PURE__ */ React14.createElement(Input.Switch, {
-    checked: settings.showHints,
-    onCheckedChange: (checked) => settings.showHints = checked
+    checked: settings.showFooter,
+    onCheckedChange: (checked) => settings.showFooter = !!checked
   })), !isSocket && /* @__PURE__ */ React14.createElement(SettingsValue, {
     label: t("settings native redirect label")
   }, /* @__PURE__ */ React14.createElement(Input.Switch, {
     checked: settings.enableNativeRedirect,
-    onCheckedChange: (checked) => settings.enableNativeRedirect = checked
+    onCheckedChange: (checked) => settings.enableNativeRedirect = !!checked
   })), /* @__PURE__ */ React14.createElement(SettingsValue, {
     label: t("settings custom slots")
   }, /* @__PURE__ */ React14.createElement(Input.Switch, {
     checked: settings.customSlots,
-    onCheckedChange: (checked) => settings.customSlots = checked
+    onCheckedChange: (checked) => settings.customSlots = !!checked
   })), /* @__PURE__ */ React14.createElement(SettingsValue, {
     label: t("settings flat deck")
   }, /* @__PURE__ */ React14.createElement(Input.Switch, {
     checked: settings.flatDeck,
-    onCheckedChange: (checked) => settings.flatDeck = checked
+    onCheckedChange: (checked) => settings.flatDeck = !!checked
   })));
 };
 
 // packages/plugins/plugin-deck/src/layout.ts
 import { produce } from "immer";
-import { SLUG_ENTRY_SEPARATOR, SLUG_KEY_VALUE_SEPARATOR, SLUG_LIST_SEPARATOR, SLUG_PATH_SEPARATOR as SLUG_PATH_SEPARATOR3 } from "@dxos/app-framework";
+import { SLUG_ENTRY_SEPARATOR, SLUG_KEY_VALUE_SEPARATOR, SLUG_LIST_SEPARATOR, SLUG_PATH_SEPARATOR as SLUG_PATH_SEPARATOR4 } from "@dxos/app-framework";
 var partsThatSupportIncrement = [
   "main"
 ];
@@ -1096,7 +1045,7 @@ var mergeLayoutParts = (...layoutParts) => {
   }), {});
 };
 var parseLayoutEntry = (itemString) => {
-  const [id, path] = itemString.split(SLUG_PATH_SEPARATOR3);
+  const [id, path] = itemString.split(SLUG_PATH_SEPARATOR4);
   const entry = {
     id
   };
@@ -1123,7 +1072,7 @@ var soloPartToUri = (layout) => {
     return "";
   }
   const entry = soloPart[0];
-  return `${entry.id}${entry.path ? SLUG_PATH_SEPARATOR3 + entry.path : ""}`;
+  return `${entry.id}${entry.path ? SLUG_PATH_SEPARATOR4 + entry.path : ""}`;
 };
 
 // packages/plugins/plugin-deck/src/translations.ts
@@ -1139,7 +1088,7 @@ var translations_default = [
         "content fallback message": "Unsupported",
         "content fallback description": "No plugin had a response for the address you navigated\xA0to. Double-check the URL, and ensure you\u2019ve enabled a plugin that supports the\xA0object.",
         "toggle fullscreen label": "Toggle fullscreen",
-        "settings show hints label": "Show hints",
+        "settings show footer label": "Show footer (experimental)",
         "settings native redirect label": "Enable native url redirect (experimental)",
         "settings custom slots": "Theme option (experimental)",
         "settings new plank position start label": "Start",
@@ -1163,9 +1112,7 @@ var translations_default = [
         "select overscroll placeholder": "Select plank overscrolling behavior",
         "settings overscroll centering label": "Centering",
         "settings overscroll none label": "None",
-        "settings flat deck": "Flatten deck appearance",
-        "comments label": "Show Comments",
-        "settings label": "Show Settings"
+        "settings flat deck": "Flatten deck appearance"
       }
     }
   }
@@ -1195,7 +1142,7 @@ var DeckPlugin = ({ observability } = {}) => {
   let currentUndoId;
   let handleNavigation;
   const settings = new LocalStorageStore("dxos.org/settings/layout", {
-    showHints: true,
+    showFooter: false,
     customSlots: false,
     flatDeck: false,
     enableNativeRedirect: false,
@@ -1280,22 +1227,6 @@ var DeckPlugin = ({ observability } = {}) => {
       }
     }
   };
-  const handleSetLocation = (next) => {
-    if (attentionPlugin) {
-      const attended = attentionPlugin.provides.attention.attended;
-      const [attendedId] = Array.from(attended);
-      const ids = (layout.values.layoutMode === "deck" ? next.main : next.solo)?.map(({ id }) => id) ?? [];
-      const isAttendedAvailable = !!attendedId && ids.includes(attendedId);
-      if (!isAttendedAvailable) {
-        requestAnimationFrame(() => {
-          const nextAttended = layout.values.layoutMode === "solo" ? next.solo?.[0].id : next.main?.[0]?.id;
-          const article = document.querySelector(`article[data-attendable-id="${nextAttended}"]`);
-          article?.focus();
-        });
-      }
-    }
-    location.values.active = next;
-  };
   return {
     meta: meta_default,
     ready: async (plugins) => {
@@ -1336,8 +1267,8 @@ var DeckPlugin = ({ observability } = {}) => {
         deck.expunge();
       }));
       settings.prop({
-        key: "showHints",
-        storageKey: "show-hints",
+        key: "showFooter",
+        storageKey: "show-footer",
         type: LocalStorageStore.bool()
       }).prop({
         key: "customSlots",
@@ -1370,13 +1301,13 @@ var DeckPlugin = ({ observability } = {}) => {
       handleNavigation = async () => {
         const pathname = window.location.pathname;
         if (pathname === "/reset") {
-          handleSetLocation({
+          location.values.active = {
             sidebar: [
               {
                 id: NAV_ID
               }
             ]
-          });
+          };
           location.values.closed = [];
           layout.values.layoutMode = "solo";
           window.location.pathname = "/";
@@ -1387,16 +1318,26 @@ var DeckPlugin = ({ observability } = {}) => {
           return;
         }
         const startingLayout = removePart(location.values.active, "solo");
-        handleSetLocation(mergeLayoutParts(layoutFromUri, startingLayout));
+        location.values.active = mergeLayoutParts(layoutFromUri, startingLayout);
         layout.values.layoutMode = "solo";
       };
       await handleNavigation();
       window.addEventListener("popstate", handleNavigation);
-      unsubscriptionCallbacks.push(scheduledEffect(() => ({
-        selectedPath: soloPartToUri(location.values.active)
-      }), ({ selectedPath }) => {
+      unsubscriptionCallbacks.push(effect(() => {
+        const selectedPath = soloPartToUri(location.values.active);
         history.pushState(null, "", `/${selectedPath}${window.location.search}`);
       }));
+      unsubscriptionCallbacks.push(effect(() => {
+        const soloId = location.values.active.solo?.[0].id;
+        if (layout.values.layoutMode === "solo" && soloId && layout.values.scrollIntoView !== soloId) {
+          void intentPlugin?.provides.intent.dispatch({
+            action: LayoutAction3.SCROLL_INTO_VIEW,
+            data: {
+              id: soloId
+            }
+          });
+        }
+      }));
       layoutModeHistory.values.push(`${layout.values.layoutMode}`);
     },
     unload: async () => {
@@ -1439,7 +1380,8 @@ var DeckPlugin = ({ observability } = {}) => {
                       ns: DECK_PLUGIN
                     }
                   ],
-                  icon: "ph--arrows-out--regular",
+                  icon: (props) => /* @__PURE__ */ React15.createElement(ArrowsOut, props),
+                  iconSymbol: "ph--arrows-out--regular",
                   keyBinding: {
                     macos: "ctrl+meta+f",
                     windows: "shift+ctrl+f"
@@ -1456,9 +1398,12 @@ var DeckPlugin = ({ observability } = {}) => {
         value: deck.values
       }, props.children)),
       root: () => {
-        return /* @__PURE__ */ React15.createElement(DeckLayout, {
+        return /* @__PURE__ */ React15.createElement(Mosaic.Root, null, /* @__PURE__ */ React15.createElement(DeckLayout, {
+          attention: attentionPlugin?.provides.attention ?? {
+            attended: /* @__PURE__ */ new Set()
+          },
           layoutParts: location.values.active,
-          showHints: settings.values.showHints,
+          showHintsFooter: settings.values.showFooter,
           overscroll: settings.values.overscroll,
           flatDeck: settings.values.flatDeck,
           slots: settings.values.customSlots ? customSlots : void 0,
@@ -1474,7 +1419,7 @@ var DeckPlugin = ({ observability } = {}) => {
               }, 1e3);
             }
           }
-        });
+        }), /* @__PURE__ */ React15.createElement(Mosaic.DragOverlay, null));
       },
       surface: {
         component: ({ data, role }) => {
@@ -1510,7 +1455,7 @@ var DeckPlugin = ({ observability } = {}) => {
                 } else {
                   log.warn("Invalid layout mode", intent?.data?.layoutMode, {
                     F: __dxlog_file,
-                    L: 404,
+                    L: 390,
                     S: void 0,
                     C: (f, a) => f(...a)
                   });
@@ -1556,7 +1501,7 @@ var DeckPlugin = ({ observability } = {}) => {
                 data: true
               };
             }
-            case NavigationAction4.OPEN: {
+            case NavigationAction3.OPEN: {
               const previouslyOpenIds = new Set(openIds2(location.values.active));
               const layoutMode = layout.values.layoutMode;
               batch(() => {
@@ -1565,7 +1510,7 @@ var DeckPlugin = ({ observability } = {}) => {
                 }
                 const processLayoutEntry = (partName, entryString, currentLayout) => {
                   const toggle = true;
-                  const [id, path] = entryString.split(SLUG_PATH_SEPARATOR4);
+                  const [id, path] = entryString.split(SLUG_PATH_SEPARATOR5);
                   const layoutEntry = {
                     id,
                     ...path ? {
@@ -1594,7 +1539,7 @@ var DeckPlugin = ({ observability } = {}) => {
                     newLayout = processLayoutEntry(partName, layoutEntries, newLayout);
                   }
                 });
-                handleSetLocation(newLayout);
+                location.values.active = newLayout;
               });
               const ids = openIds2(location.values.active);
               const newlyOpen = ids.filter((i) => !previouslyOpenIds.has(i));
@@ -1613,7 +1558,7 @@ var DeckPlugin = ({ observability } = {}) => {
                   ] : [],
                   intent.data?.object ? [
                     {
-                      action: NavigationAction4.EXPOSE,
+                      action: NavigationAction3.EXPOSE,
                       data: {
                         id: fullyQualifiedId(intent.data.object)
                       }
@@ -1636,16 +1581,16 @@ var DeckPlugin = ({ observability } = {}) => {
                 ]
               };
             }
-            case NavigationAction4.ADD_TO_ACTIVE: {
+            case NavigationAction3.ADD_TO_ACTIVE: {
               const data = intent.data;
               const layoutEntry = {
                 id: data.id
               };
               const effectivePart = getEffectivePart(data.part, layout.values.layoutMode);
-              handleSetLocation(openEntry(location.values.active, effectivePart, layoutEntry, {
+              location.values.active = openEntry(location.values.active, effectivePart, layoutEntry, {
                 positioning: data.positioning ?? settings.values.newPlankPositioning,
                 pivotId: data.pivotId
-              }));
+              });
               const intents = [];
               if (data.scrollIntoView && layout.values.layoutMode === "deck") {
                 intents.push([
@@ -1662,7 +1607,7 @@ var DeckPlugin = ({ observability } = {}) => {
                 intents
               };
             }
-            case NavigationAction4.CLOSE: {
+            case NavigationAction3.CLOSE: {
               return batch(() => {
                 if (!intent.data) {
                   return;
@@ -1687,32 +1632,32 @@ var DeckPlugin = ({ observability } = {}) => {
                     });
                   }
                 });
-                handleSetLocation(newLayout);
+                location.values.active = newLayout;
                 return {
                   data: true
                 };
               });
             }
             // TODO(wittjosiah): Factor out.
-            case NavigationAction4.SET: {
+            case NavigationAction3.SET: {
               return batch(() => {
                 if (isLayoutParts(intent.data?.activeParts)) {
-                  handleSetLocation(intent.data.activeParts);
+                  location.values.active = intent.data.activeParts;
                 }
                 return {
                   data: true
                 };
               });
             }
-            case NavigationAction4.ADJUST: {
+            case NavigationAction3.ADJUST: {
               return batch(() => {
                 if (isLayoutAdjustment(intent.data)) {
                   const adjustment = intent.data;
                   if (adjustment.type === "increment-end" || adjustment.type === "increment-start") {
-                    handleSetLocation(incrementPlank(location.values.active, {
+                    location.values.active = incrementPlank(location.values.active, {
                       type: adjustment.type,
                       layoutCoordinate: adjustment.layoutCoordinate
-                    }));
+                    });
                   }
                   if (adjustment.type === "solo") {
                     const entryId = adjustment.layoutCoordinate.entryId;
@@ -1728,7 +1673,7 @@ var DeckPlugin = ({ observability } = {}) => {
                               }
                             },
                             {
-                              action: NavigationAction4.OPEN,
+                              action: NavigationAction3.OPEN,
                               data: {
                                 activeParts: {
                                   solo: [
@@ -1752,7 +1697,7 @@ var DeckPlugin = ({ observability } = {}) => {
                               }
                             },
                             {
-                              action: NavigationAction4.CLOSE,
+                              action: NavigationAction3.CLOSE,
                               data: {
                                 activeParts: {
                                   solo: [
@@ -1762,7 +1707,7 @@ var DeckPlugin = ({ observability } = {}) => {
                               }
                             },
                             {
-                              action: NavigationAction4.OPEN,
+                              action: NavigationAction3.OPEN,
                               data: {
                                 noToggle: true,
                                 activeParts: {