@dxos/plugin-deck 0.6.14-main.2b6a0f3 → 0.6.14-main.f49f251

package/dist/lib/browser/index.mjs

@@ -391,11 +391,13 @@ var ComplementarySidebar = ({ panel, flatDeck }) => {
     flatDeck,
     actions
   }), /* @__PURE__ */ React5.createElement("div", {
-    className: "row-span-2 divide-y divide-separator"
+    className: "row-span-2 divide-y divide-separator overflow-x-hidden overflow-y-scroll"
   }, node && /* @__PURE__ */ React5.createElement(Surface3, {
+    key: id,
     role: `complementary--${part}`,
     data: {
-      subject: node.properties.object,
+      id,
+      subject: node.properties.object ?? node.properties.space,
       popoverAnchorId
     },
     fallback: PlankContentError,
@@ -622,29 +624,25 @@ var Plank = /* @__PURE__ */ memo2(({ entry, layoutParts, part, flatDeck, searchE
 import React10, { useMemo as useMemo4 } from "react";
 import { openIds, Surface as Surface7 } from "@dxos/app-framework";
 import { Main as Main2 } from "@dxos/react-ui";
-import { useAttended as useAttended3 } from "@dxos/react-ui-attention";
 var Sidebar = ({ layoutParts }) => {
   const { layoutMode, popoverAnchorId } = useLayout();
-  const attended = useAttended3();
   const activeIds = useMemo4(() => {
     if (layoutMode === "solo") {
-      return new Set(layoutParts?.solo?.map((e) => e.id) ?? []);
+      return Array.from(new Set(layoutParts?.solo?.map((e) => e.id) ?? []));
     } else if (layoutMode === "deck") {
-      return new Set(layoutParts?.main?.map((e) => e.id) ?? []);
+      return Array.from(new Set(layoutParts?.main?.map((e) => e.id) ?? []));
     }
-    return new Set(openIds(layoutParts));
+    return Array.from(new Set(openIds(layoutParts)));
   }, [
     layoutParts,
     layoutMode
   ]);
   const navigationData = useMemo4(() => ({
     popoverAnchorId,
-    activeIds,
-    attended
+    activeIds
   }), [
     popoverAnchorId,
-    activeIds,
-    attended
+    activeIds
   ]);
   return /* @__PURE__ */ React10.createElement(Main2.NavigationSidebar, null, /* @__PURE__ */ React10.createElement(Surface7, {
     role: "navigation",
@@ -932,8 +930,8 @@ var DeckLayout = ({ layoutParts, toasts, flatDeck, overscroll, showHints, slots,
 
 // packages/plugins/plugin-deck/src/components/LayoutSettings.tsx
 import React14 from "react";
-import { SettingsValue } from "@dxos/plugin-settings";
 import { Input, Select, useTranslation as useTranslation6 } from "@dxos/react-ui";
+import { FormInput } from "@dxos/react-ui-data";
 
 // packages/plugins/plugin-deck/src/types.ts
 var NewPlankPositions = [
@@ -949,7 +947,7 @@ var OverscrollOptions = [
 var isSocket = !!globalThis.__args;
 var LayoutSettings = ({ settings }) => {
   const { t } = useTranslation6(DECK_PLUGIN);
-  return /* @__PURE__ */ React14.createElement(React14.Fragment, null, /* @__PURE__ */ React14.createElement(SettingsValue, {
+  return /* @__PURE__ */ React14.createElement(React14.Fragment, null, /* @__PURE__ */ React14.createElement(FormInput, {
     label: t("select new plank positioning label")
   }, /* @__PURE__ */ React14.createElement(Select.Root, {
     value: settings.newPlankPositioning ?? "start",
@@ -959,7 +957,7 @@ var LayoutSettings = ({ settings }) => {
   }), /* @__PURE__ */ React14.createElement(Select.Portal, null, /* @__PURE__ */ React14.createElement(Select.Content, null, /* @__PURE__ */ React14.createElement(Select.Viewport, null, NewPlankPositions.map((position) => /* @__PURE__ */ React14.createElement(Select.Option, {
     key: position,
     value: position
-  }, t(`settings new plank position ${position} label`)))))))), /* @__PURE__ */ React14.createElement(SettingsValue, {
+  }, t(`settings new plank position ${position} label`)))))))), /* @__PURE__ */ React14.createElement(FormInput, {
     label: t("settings overscroll label")
   }, /* @__PURE__ */ React14.createElement(Select.Root, {
     value: settings.overscroll ?? "none",
@@ -969,22 +967,22 @@ var LayoutSettings = ({ settings }) => {
   }), /* @__PURE__ */ React14.createElement(Select.Portal, null, /* @__PURE__ */ React14.createElement(Select.Content, null, /* @__PURE__ */ React14.createElement(Select.Viewport, null, OverscrollOptions.map((option) => /* @__PURE__ */ React14.createElement(Select.Option, {
     key: option,
     value: option
-  }, t(`settings overscroll ${option} label`)))))))), /* @__PURE__ */ React14.createElement(SettingsValue, {
+  }, t(`settings overscroll ${option} label`)))))))), /* @__PURE__ */ React14.createElement(FormInput, {
     label: t("settings show hints label")
   }, /* @__PURE__ */ React14.createElement(Input.Switch, {
     checked: settings.showHints,
     onCheckedChange: (checked) => settings.showHints = checked
-  })), !isSocket && /* @__PURE__ */ React14.createElement(SettingsValue, {
+  })), !isSocket && /* @__PURE__ */ React14.createElement(FormInput, {
     label: t("settings native redirect label")
   }, /* @__PURE__ */ React14.createElement(Input.Switch, {
     checked: settings.enableNativeRedirect,
     onCheckedChange: (checked) => settings.enableNativeRedirect = checked
-  })), /* @__PURE__ */ React14.createElement(SettingsValue, {
+  })), /* @__PURE__ */ React14.createElement(FormInput, {
     label: t("settings custom slots")
   }, /* @__PURE__ */ React14.createElement(Input.Switch, {
     checked: settings.customSlots,
     onCheckedChange: (checked) => settings.customSlots = checked
-  })), /* @__PURE__ */ React14.createElement(SettingsValue, {
+  })), /* @__PURE__ */ React14.createElement(FormInput, {
     label: t("settings flat deck")
   }, /* @__PURE__ */ React14.createElement(Input.Switch, {
     checked: settings.flatDeck,
@@ -1317,29 +1315,23 @@ var DeckPlugin = ({ observability } = {}) => {
       clientPlugin = resolvePlugin(plugins, parseClientPlugin);
       layout.prop({
         key: "layoutMode",
-        storageKey: "layout-mode",
         type: LocalStorageStore.enum()
       }).prop({
         key: "sidebarOpen",
-        storageKey: "sidebar-open",
         type: LocalStorageStore.bool()
       }).prop({
         key: "complementarySidebarOpen",
-        storageKey: "complementary-sidebar-open",
         type: LocalStorageStore.bool()
       });
       deck.prop({
         key: "plankSizing",
-        storageKey: "plank-sizing",
         type: LocalStorageStore.json()
       });
       location.prop({
         key: "active",
-        storageKey: "active",
         type: LocalStorageStore.json()
       }).prop({
         key: "closed",
-        storageKey: "closed",
         type: LocalStorageStore.json()
       });
       unsubscriptionCallbacks.push(clientPlugin?.provides.client.shell.onReset(() => {
@@ -1349,31 +1341,24 @@ var DeckPlugin = ({ observability } = {}) => {
       }));
       settings.prop({
         key: "showHints",
-        storageKey: "show-hints",
         type: LocalStorageStore.bool()
       }).prop({
         key: "customSlots",
-        storageKey: "customSlots",
         type: LocalStorageStore.bool()
       }).prop({
         key: "flatDeck",
-        storageKey: "flatDeck",
         type: LocalStorageStore.bool()
       }).prop({
         key: "enableNativeRedirect",
-        storageKey: "enable-native-redirect",
         type: LocalStorageStore.bool()
       }).prop({
         key: "disableDeck",
-        storageKey: "disable-deck",
         type: LocalStorageStore.bool()
       }).prop({
         key: "newPlankPositioning",
-        storageKey: "newPlankPositioning",
         type: LocalStorageStore.enum()
       }).prop({
         key: "overscroll",
-        storageKey: "overscroll",
         type: LocalStorageStore.enum()
       });
       if (!isSocket2 && settings.values.enableNativeRedirect) {
@@ -1522,7 +1507,7 @@ var DeckPlugin = ({ observability } = {}) => {
                 } else {
                   log.warn("Invalid layout mode", intent?.data?.layoutMode, {
                     F: __dxlog_file,
-                    L: 404,
+                    L: 392,
                     S: void 0,
                     C: (f, a) => f(...a)
                   });