@trops/dash-core 0.1.352 → 0.1.353

package/dist/index.js

@@ -25346,9 +25346,15 @@ var LayoutGridContainer = /*#__PURE__*/React.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__*/jsxRuntime.jsx(PopoutOverlay, {
         onPopout: function onPopout() {
-          return onWidgetPopout(cellComponent.id);
+          return onWidgetPopout(popoutKey);
         },
         children: rendered
       });
@@ -53723,10 +53729,15 @@ 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 (globally unique
+        // across pages/containers) but older callers may still pass a
+        // bare numeric id. Match uuid first, then fall back to id.
+        // Without the uuid match, widgets on a non-first page get
+        // masked by same-numeric-id widgets in the main layout.
+        var matches = function matches(item) {
+          return item.uuid === widgetId || item.id === widgetId;
+        };
+        var widget = target.layout.find(matches);
         if (!widget && target.pages && Array.isArray(target.pages)) {
           var _iterator = _createForOfIteratorHelper$2(target.pages),
             _step;
@@ -53734,9 +53745,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;
               }
             }
@@ -53747,9 +53756,7 @@ 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) {
           setError("Widget not found in workspace");