@dxos/plugin-deck 0.6.8-main.046e6cf → 0.6.8-staging.77f93a3

package/dist/lib/browser/index.mjs

@@ -30,7 +30,7 @@ import React12, { useMemo as useMemo2 } from "react";
 import { SLUG_PATH_SEPARATOR as SLUG_PATH_SEPARATOR3, Surface as Surface8, 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, mx as mx4 } 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";
@@ -390,7 +390,7 @@ var Fullscreen = ({ id }) => {
 
 // packages/plugins/plugin-deck/src/components/DeckLayout/Plank.tsx
 import { Plus } from "@phosphor-icons/react";
-import React9, { useCallback } from "react";
+import React9, { useCallback, useLayoutEffect, useRef } from "react";
 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";
@@ -430,22 +430,32 @@ var Plank = ({ entry, layoutParts, part, resizeable, flatDeck, searchEnabled, cl
     part,
     entryId: entry.id
   };
+  const ref = useRef(null);
+  useLayoutEffect(() => {
+    if (scrollIntoView === entry.id) {
+      ref.current?.scrollIntoView({
+        behavior: "smooth",
+        inline: "center"
+      });
+    }
+  }, [
+    scrollIntoView
+  ]);
   return /* @__PURE__ */ React9.createElement(NaturalPlank.Root, {
     size,
     setSize
   }, /* @__PURE__ */ React9.createElement(NaturalPlank.Content, {
     ...attendableAttrs,
+    ref,
     classNames: [
       !flatDeck && "surface-base",
       classNames
-    ],
-    scrollIntoViewOnMount: entry.id === scrollIntoView,
-    suppressAutofocus: entry.id === NAV_ID || !!node?.properties?.managesAutofocus
+    ]
   }, node ? /* @__PURE__ */ React9.createElement(React9.Fragment, null, /* @__PURE__ */ React9.createElement(NodePlankHeading, {
+    id: entry.id,
+    node,
     layoutPart: coordinate.part,
     layoutParts,
-    node,
-    id: entry.id,
     popoverAnchorId,
     flatDeck
   }), /* @__PURE__ */ React9.createElement(Surface6, {
@@ -583,7 +593,7 @@ var getEffectivePart = (partName, layoutMode) => layoutMode === "solo" && partNa
 
 // packages/plugins/plugin-deck/src/util/overscroll.ts
 import { PLANK_DEFAULTS } from "@dxos/react-ui-deck";
-var calculateOverscroll = (layoutMode, sidebarOpen, complementarySidebarOpen, layoutParts, plankSizing, overscroll) => {
+var calculateOverscroll = (layoutMode, layoutParts, plankSizing, sidebarOpen, complementarySidebarOpen, overscroll) => {
   if (!(layoutMode === "deck" && overscroll === "centering")) {
     return;
   }
@@ -621,6 +631,7 @@ var DeckLayout = ({ showHintsFooter, toasts, onDismissToast, flatDeck, attention
   const { layoutMode, sidebarOpen, complementarySidebarOpen, dialogOpen, dialogContent, dialogBlockAlign, popoverOpen, popoverContent, popoverAnchorId } = context;
   const { t } = useTranslation5(DECK_PLUGIN);
   const { plankSizing } = useDeckContext();
+  const searchEnabled = !!usePlugin("dxos.org/plugin/search");
   const fullScreenSlug = useMemo2(() => firstIdInPart(layoutParts, "fullScreen"), [
     layoutParts
   ]);
@@ -632,11 +643,11 @@ var DeckLayout = ({ showHintsFooter, toasts, onDismissToast, flatDeck, attention
   }, [
     layoutParts
   ]);
-  const searchEnabled = !!usePlugin("dxos.org/plugin/search");
   const activeId = useMemo2(() => Array.from(attention.attended ?? [])[0], [
     attention.attended
   ]);
-  const overscrollAmount = calculateOverscroll(layoutMode, sidebarOpen, complementarySidebarOpen, layoutParts, plankSizing, overscroll);
+  const overscrollAmount = calculateOverscroll(layoutMode, layoutParts, plankSizing, sidebarOpen, complementarySidebarOpen, overscroll);
+  const isEmpty = layoutMode === "solo" && (!layoutParts.solo || layoutParts.solo.length === 0) || layoutMode === "deck" && (!layoutParts.main || layoutParts.main.length === 0);
   if (layoutMode === "fullscreen") {
     return /* @__PURE__ */ React12.createElement(Fullscreen, {
       id: fullScreenSlug
@@ -699,53 +710,44 @@ var DeckLayout = ({ showHintsFooter, toasts, onDismissToast, flatDeck, attention
     id: complementarySlug,
     layoutParts,
     flatDeck
-  }), /* @__PURE__ */ React12.createElement(Main3.Overlay, null), layoutMode === "deck" && layoutParts.main && layoutParts.main.length > 0 && /* @__PURE__ */ React12.createElement(Main3.Content, {
+  }), /* @__PURE__ */ React12.createElement(Main3.Overlay, null), isEmpty && /* @__PURE__ */ React12.createElement(Main3.Content, null, /* @__PURE__ */ React12.createElement(ContentEmpty, null)), !isEmpty && /* @__PURE__ */ React12.createElement(Main3.Content, {
     bounce: true,
     classNames: [
       "grid",
       "block-end-[--statusbar-size]"
     ]
-  }, /* @__PURE__ */ React12.createElement("div", {
-    role: "none",
-    className: "relative"
   }, /* @__PURE__ */ React12.createElement(Deck.Root, {
-    classNames: mx4("absolute inset-0", !flatDeck && "surface-deck", slots?.wallpaper?.classNames, slots?.deck?.classNames, "transition-[padding] duration-200 ease-in-out"),
+    classNames: [
+      !flatDeck && "surface-deck",
+      layoutMode === "deck" && [
+        "absolute inset-0",
+        "transition-[padding] duration-200 ease-in-out",
+        slots?.wallpaper?.classNames
+      ]
+    ],
+    solo: layoutMode === "solo",
     style: {
       ...overscrollAmount
     }
-  }, layoutParts.main.map((layoutEntry) => {
+  }, layoutMode === "solo" && layoutParts.solo?.map((layoutEntry) => {
     return /* @__PURE__ */ React12.createElement(Plank, {
       key: layoutEntry.id,
       entry: layoutEntry,
       layoutParts,
-      part: "main",
-      resizeable: true,
-      flatDeck,
-      searchEnabled
+      part: "solo",
+      flatDeck
     });
-  })))), layoutMode === "solo" && layoutParts.solo && layoutParts.solo.length > 0 && /* @__PURE__ */ React12.createElement(Main3.Content, {
-    bounce: true,
-    classNames: [
-      "grid",
-      "block-end-[--statusbar-size]"
-    ]
-  }, /* @__PURE__ */ React12.createElement(Deck.Root, {
-    classNames: [
-      !flatDeck && "surface-deck",
-      slots?.wallpaper?.classNames,
-      slots?.deck?.classNames
-    ],
-    solo: true
-  }, layoutParts.solo.map((layoutEntry) => {
+  }), layoutMode === "deck" && layoutParts.main?.map((layoutEntry) => {
     return /* @__PURE__ */ React12.createElement(Plank, {
       key: layoutEntry.id,
       entry: layoutEntry,
       layoutParts,
-      part: "solo",
+      part: "main",
+      resizeable: true,
       flatDeck,
-      classNames: slots?.plank?.classNames
+      searchEnabled
     });
-  }))), (layoutMode === "solo" && (!layoutParts.solo || layoutParts.solo.length === 0) || layoutMode === "deck" && (!layoutParts.main || layoutParts.main.length === 0)) && /* @__PURE__ */ React12.createElement(Main3.Content, null, /* @__PURE__ */ React12.createElement(ContentEmpty, null)), /* @__PURE__ */ React12.createElement(Main3.Content, {
+  }))), /* @__PURE__ */ React12.createElement(Main3.Content, {
     role: "none",
     classNames: [
       "fixed inset-inline-0 block-end-0 z-[2]"
@@ -1044,12 +1046,6 @@ var appScheme = "composer://";
 var customSlots = {
   wallpaper: {
     classNames: "bg-cover bg-no-repeat dark:bg-[url(https://cdn.midjourney.com/3865ba61-f98a-4d94-b91a-1763ead01f4f/0_0.jpeg)]"
-  },
-  deck: {
-    classNames: "px-96 bg-neutral-50 __dark:bg-neutral-950 dark:bg-transparent dark:opacity-95"
-  },
-  plank: {
-    classNames: "mx-1 bg-neutral-25 dark:bg-neutral-900"
   }
 };
 setAutoFreeze(false);
@@ -1224,7 +1220,21 @@ var DeckPlugin = ({ observability } = {}) => {
         checkAppScheme(appScheme);
       }
       handleNavigation = async () => {
-        const layoutFromUri = uriToSoloPart(window.location.pathname);
+        const pathname = window.location.pathname;
+        if (pathname === "/reset") {
+          location.values.active = {
+            sidebar: [
+              {
+                id: NAV_ID
+              }
+            ]
+          };
+          location.values.closed = [];
+          layout.values.layoutMode = "solo";
+          window.location.pathname = "/";
+          return;
+        }
+        const layoutFromUri = uriToSoloPart(pathname);
         if (!layoutFromUri) {
           return;
         }
@@ -1364,7 +1374,7 @@ var DeckPlugin = ({ observability } = {}) => {
                 } else {
                   log.warn("Invalid layout mode", intent?.data?.layoutMode, {
                     F: __dxlog_file,
-                    L: 384,
+                    L: 388,
                     S: void 0,
                     C: (f, a) => f(...a)
                   });
@@ -1417,8 +1427,8 @@ var DeckPlugin = ({ observability } = {}) => {
                 if (!intent.data || !intent.data?.activeParts) {
                   return;
                 }
-                const newPlankPositioning = settings.values.newPlankPositioning;
                 const processLayoutEntry = (partName, entryString, currentLayout) => {
+                  const toggle = false;
                   const [id, path] = entryString.split(SLUG_PATH_SEPARATOR5);
                   const layoutEntry = {
                     id,
@@ -1427,14 +1437,14 @@ var DeckPlugin = ({ observability } = {}) => {
                     } : {}
                   };
                   const effectivePart = getEffectivePart(partName, layoutMode);
-                  if (layoutMode === "deck" && effectivePart === "main" && currentLayout[effectivePart]?.some((entry) => entry.id === id) && !intent.data?.noToggle) {
+                  if (toggle && layoutMode === "deck" && effectivePart === "main" && currentLayout[effectivePart]?.some((entry) => entry.id === id) && !intent.data?.noToggle) {
                     return closeEntry(currentLayout, {
                       part: effectivePart,
                       entryId: id
                     });
                   } else {
                     return openEntry(currentLayout, effectivePart, layoutEntry, {
-                      positioning: newPlankPositioning
+                      positioning: settings.values.newPlankPositioning
                     });
                   }
                 };
@@ -1562,11 +1572,10 @@ var DeckPlugin = ({ observability } = {}) => {
                 if (isLayoutAdjustment(intent.data)) {
                   const adjustment = intent.data;
                   if (adjustment.type === "increment-end" || adjustment.type === "increment-start") {
-                    const nextActive = incrementPlank(location.values.active, {
+                    location.values.active = incrementPlank(location.values.active, {
                       type: adjustment.type,
                       layoutCoordinate: adjustment.layoutCoordinate
                     });
-                    location.values.active = nextActive;
                   }
                   if (adjustment.type === "solo") {
                     const entryId = adjustment.layoutCoordinate.entryId;