@trops/dash-core 0.1.352 → 0.1.354

package/dist/index.esm.js

@@ -25328,9 +25328,15 @@ var LayoutGridContainer = /*#__PURE__*/memo(function (_ref3) {
     }
     var rendered = renderComponent(cellComponent.component, cellComponent.id, cellComponent, null);
     if (onWidgetPopout && cellComponent.component) {
+      // Prefer uuid over id — uuid is `${dashboardId}-${component}-${id}`
+      // which is globally unique, while id is only unique within a
+      // single page/container. Passing bare id causes WidgetPopoutStage
+      // to find-first-match across layout/pages and render the wrong
+      // widget when two pages share the same numeric id.
+      var popoutKey = cellComponent.uuid || cellComponent.id;
       return /*#__PURE__*/jsx(PopoutOverlay, {
         onPopout: function onPopout() {
-          return onWidgetPopout(cellComponent.id);
+          return onWidgetPopout(popoutKey);
         },
         children: rendered
       });
@@ -53705,10 +53711,29 @@ var WidgetPopoutInner = function WidgetPopoutInner(_ref2) {
         }
         setWorkspace(target);
 
-        // Find the widget across all layout locations
-        var widget = target.layout.find(function (item) {
-          return item.id === widgetId;
-        });
+        // `widgetId` carries the layout item's uuid. That uuid is
+        //   `${dashboardId}-${component}-${id}`
+        // but the dashboardId prefix can differ between the main
+        // window's LayoutModel instance and the one rebuilt here,
+        // so we match on several shapes to be robust:
+        //
+        //   1. full uuid match (preferred)
+        //   2. trailing `component-id` suffix (strip dashboardId)
+        //   3. bare numeric id (legacy callers that pre-date uuid)
+        //
+        // Extract the suffix once: everything after the first "-"
+        // when the string starts with a dashboard-looking prefix.
+        var tail = String(widgetId).split("-").slice(-2).join("-");
+        var matches = function matches(item) {
+          if (item.uuid === widgetId) return true;
+          if (item.uuid && item.uuid.endsWith("-" + tail)) return true;
+          var itemTail = "".concat(item.component, "-").concat(item.id);
+          if (itemTail === widgetId) return true;
+          if (itemTail === tail) return true;
+          if (item.id === widgetId) return true;
+          return false;
+        };
+        var widget = target.layout.find(matches);
         if (!widget && target.pages && Array.isArray(target.pages)) {
           var _iterator = _createForOfIteratorHelper$2(target.pages),
             _step;
@@ -53716,9 +53741,7 @@ var WidgetPopoutInner = function WidgetPopoutInner(_ref2) {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               var page = _step.value;
               if (page.layout && Array.isArray(page.layout)) {
-                widget = page.layout.find(function (item) {
-                  return item.id === widgetId;
-                });
+                widget = page.layout.find(matches);
                 if (widget) break;
               }
             }
@@ -53729,11 +53752,41 @@ var WidgetPopoutInner = function WidgetPopoutInner(_ref2) {
           }
         }
         if (!widget && target.sidebarLayout && Array.isArray(target.sidebarLayout)) {
-          widget = target.sidebarLayout.find(function (item) {
-            return item.id === widgetId;
-          });
+          widget = target.sidebarLayout.find(matches);
         }
         if (!widget) {
+          // Diagnostic dump — helps pinpoint id/uuid mismatches when
+          // the user reports a "Widget not available" popout.
+          var dump = {
+            searchedFor: widgetId,
+            suffix: tail,
+            mainLayout: (target.layout || []).map(function (i) {
+              return {
+                id: i.id,
+                uuid: i.uuid,
+                component: i.component
+              };
+            }),
+            pages: (target.pages || []).map(function (p) {
+              return {
+                pageId: p.id,
+                items: (p.layout || []).map(function (i) {
+                  return {
+                    id: i.id,
+                    uuid: i.uuid,
+                    component: i.component
+                  };
+                })
+              };
+            }),
+            sidebar: (target.sidebarLayout || []).map(function (i) {
+              return {
+                id: i.id,
+                uuid: i.uuid,
+                component: i.component
+              };
+            })
+          };
           setError("Widget not found in workspace");
           return;
         }