@trops/dash-core 0.1.405 → 0.1.407

package/dist/index.js

@@ -26924,15 +26924,18 @@ function moveWidgetAcrossContainers(workspace, sourceGridId, sourceCell, targetG
 
   // Build a list of every bucket with a stable name so we can locate
   // grid containers across them and patch them back in place.
+  //
+  // IMPORTANT: pages are listed BEFORE the top-level `layout` bucket.
+  // `handleClickSaveWorkspace` writes `workspace.layout = activePage.layout`
+  // as a backward-compat mirror of the active page — so a dashboard
+  // grid's id typically exists in BOTH `workspace.layout` AND
+  // `workspace.pages[activeIdx].layout`. If we checked `layout` first,
+  // findBucket would match there and we'd mutate a bucket React never
+  // renders (renderers read from pages[i].layout), so the user would
+  // see the widget "disappear" with no visible target update.
+  // Sidebar is last because its ids (90000+) can never collide with
+  // page grids.
   var buckets = [];
-  if (Array.isArray(workspace.layout)) {
-    buckets.push({
-      key: "layout",
-      get: function get() {
-        return workspace.layout;
-      }
-    });
-  }
   if (Array.isArray(workspace.pages)) {
     var _loop = function _loop() {
       var _workspace$pages$i;
@@ -26950,6 +26953,14 @@ function moveWidgetAcrossContainers(workspace, sourceGridId, sourceCell, targetG
       _loop();
     }
   }
+  if (Array.isArray(workspace.layout)) {
+    buckets.push({
+      key: "layout",
+      get: function get() {
+        return workspace.layout;
+      }
+    });
+  }
   if (Array.isArray(workspace.sidebarLayout)) {
     buckets.push({
       key: "sidebarLayout",
@@ -55726,12 +55737,53 @@ var DashboardStageInner = function DashboardStageInner(_ref3) {
   React.useEffect(function () {
     if (popout) return;
     var handler = function handler(e) {
+      var _sidebarWorkspaceRef$;
       var detail = (e === null || e === void 0 ? void 0 : e.detail) || {};
       if (!workspaceSelected) return;
-      var updated = moveWidgetAcrossContainers(workspaceSelected, detail.sourceGridContainerId, detail.sourceCellNumber, detail.targetGridContainerId, detail.targetCellNumber);
+
+      // CRITICAL: LayoutBuilder edits (deletes, same-container moves,
+      // new widget drops) live in each LayoutBuilder's internal state
+      // and propagate upward only via refs — they never write back
+      // into `workspaceSelected`. So we must overlay the LIVE refs
+      // before applying the cross-container move, otherwise we'd base
+      // the move on stale state and clobber the user's unsaved edits
+      // (they'd see deleted widgets reappear after a cross-container
+      // drop). This mirrors `handleClickSaveWorkspace`'s own logic.
+      var liveWorkspace = JSON.parse(JSON.stringify(workspaceSelected));
+      liveWorkspace.pages = (liveWorkspace.pages || []).map(function (page) {
+        var _pageRef$current;
+        var pageRef = pageRefsMap.current[page.id];
+        var liveLayout = pageRef === null || pageRef === void 0 || (_pageRef$current = pageRef.current) === null || _pageRef$current === void 0 ? void 0 : _pageRef$current.layout;
+        return liveLayout ? _objectSpread$6(_objectSpread$6({}, page), {}, {
+          layout: liveLayout
+        }) : page;
+      });
+      if ((_sidebarWorkspaceRef$ = sidebarWorkspaceRef.current) !== null && _sidebarWorkspaceRef$ !== void 0 && _sidebarWorkspaceRef$.layout && Array.isArray(sidebarWorkspaceRef.current.layout)) {
+        liveWorkspace.sidebarLayout = sidebarWorkspaceRef.current.layout;
+      }
+      var updated = moveWidgetAcrossContainers(liveWorkspace, detail.sourceGridContainerId, detail.sourceCellNumber, detail.targetGridContainerId, detail.targetCellNumber);
       if (!updated) {
         return;
       }
+
+      // Sync the refs so when LayoutBuilder's useEffect re-seeds
+      // currentWorkspace from the new workspace prop below, and the
+      // refs are also updated for the next save/cross-move.
+      (updated.pages || []).forEach(function (page) {
+        if (!pageRefsMap.current[page.id]) {
+          pageRefsMap.current[page.id] = {
+            current: null
+          };
+        }
+        pageRefsMap.current[page.id].current = {
+          layout: page.layout
+        };
+      });
+      if (sidebarWorkspaceRef.current) {
+        sidebarWorkspaceRef.current = _objectSpread$6(_objectSpread$6({}, sidebarWorkspaceRef.current || {}), {}, {
+          layout: updated.sidebarLayout || []
+        });
+      }
       updateTabWorkspace(updated);
       if (dashApi && credentials !== null && credentials !== void 0 && credentials.appId) {
         try {
@@ -56263,9 +56315,9 @@ var DashboardStageInner = function DashboardStageInner(_ref3) {
     // adding a new page (especially relevant when going from 1 → 2
     // pages where the lone page's tab is hidden but its grid is live).
     var existingPages = workspacePages.map(function (p) {
-      var _pageRef$current;
+      var _pageRef$current2;
       var pageRef = pageRefsMap.current[p.id];
-      var liveLayout = pageRef === null || pageRef === void 0 || (_pageRef$current = pageRef.current) === null || _pageRef$current === void 0 ? void 0 : _pageRef$current.layout;
+      var liveLayout = pageRef === null || pageRef === void 0 || (_pageRef$current2 = pageRef.current) === null || _pageRef$current2 === void 0 ? void 0 : _pageRef$current2.layout;
       return liveLayout ? _objectSpread$6(_objectSpread$6({}, p), {}, {
         layout: liveLayout
       }) : p;
@@ -56502,11 +56554,11 @@ var DashboardStageInner = function DashboardStageInner(_ref3) {
 
   // Derive scrollable state from the active page's root layout item
   function getRootScrollable() {
-    var _pageRef$current2, _ws$pages;
+    var _pageRef$current3, _ws$pages;
     var ws = currentWorkspaceRef.current || workspaceSelected;
     if (!ws) return false;
     var pageRef = pageRefsMap.current[currentActivePageId];
-    var layout = (pageRef === null || pageRef === void 0 || (_pageRef$current2 = pageRef.current) === null || _pageRef$current2 === void 0 ? void 0 : _pageRef$current2.layout) || ((_ws$pages = ws.pages) === null || _ws$pages === void 0 || (_ws$pages = _ws$pages.find(function (p) {
+    var layout = (pageRef === null || pageRef === void 0 || (_pageRef$current3 = pageRef.current) === null || _pageRef$current3 === void 0 ? void 0 : _pageRef$current3.layout) || ((_ws$pages = ws.pages) === null || _ws$pages === void 0 || (_ws$pages = _ws$pages.find(function (p) {
       return p.id === currentActivePageId;
     })) === null || _ws$pages === void 0 ? void 0 : _ws$pages.layout);
     if (!layout) return false;
@@ -56517,15 +56569,15 @@ var DashboardStageInner = function DashboardStageInner(_ref3) {
   }
   function handleClickSaveWorkspace() {
     try {
-      var _sidebarWorkspaceRef$;
+      var _sidebarWorkspaceRef$2;
       // we have to remove the widgetConfig which contains the component
       // sanitize the workspace layout remove widgetConfig items
       // Gather latest layout from each page's LayoutBuilder ref
       var workspaceToSave = DashReact.deepCopy(workspaceSelected);
       workspaceToSave.pages = (workspaceToSave.pages || []).map(function (page) {
-        var _pageRef$current3;
+        var _pageRef$current4;
         var pageRef = pageRefsMap.current[page.id];
-        var latestLayout = (pageRef === null || pageRef === void 0 || (_pageRef$current3 = pageRef.current) === null || _pageRef$current3 === void 0 ? void 0 : _pageRef$current3.layout) || page.layout || [];
+        var latestLayout = (pageRef === null || pageRef === void 0 || (_pageRef$current4 = pageRef.current) === null || _pageRef$current4 === void 0 ? void 0 : _pageRef$current4.layout) || page.layout || [];
         return _objectSpread$6(_objectSpread$6({}, page), {}, {
           layout: latestLayout.map(function (item) {
             var copy = _objectSpread$6({}, item);
@@ -56544,7 +56596,7 @@ var DashboardStageInner = function DashboardStageInner(_ref3) {
       }
 
       // Gather sidebar layout from its LayoutBuilder ref
-      if ((_sidebarWorkspaceRef$ = sidebarWorkspaceRef.current) !== null && _sidebarWorkspaceRef$ !== void 0 && _sidebarWorkspaceRef$.layout) {
+      if ((_sidebarWorkspaceRef$2 = sidebarWorkspaceRef.current) !== null && _sidebarWorkspaceRef$2 !== void 0 && _sidebarWorkspaceRef$2.layout) {
         workspaceToSave.sidebarLayout = sidebarWorkspaceRef.current.layout.map(function (item) {
           var copy = _objectSpread$6({}, item);
           delete copy.widgetConfig;