@trops/dash-core 0.1.280 → 0.1.281

package/dist/index.js

@@ -22,6 +22,7 @@ var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstru
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _inherits = require('@babel/runtime/helpers/inherits');
 var colors = require('tailwindcss/colors');
+var _readOnlyError = require('@babel/runtime/helpers/readOnlyError');
 var ReactDOM = require('react-dom');
 var algoliasearch = require('algoliasearch');
 var reactInstantsearchHooksWeb = require('react-instantsearch-hooks-web');
@@ -21017,8 +21018,19 @@ var LayoutBuilder = function LayoutBuilder(_ref) {
    */
   function handleSelectWidgetForCell(widgetName, cellNumber, cellData, component, workspace) {
     try {
+      var _gridContainer$grid2;
       // create the new dashboard.
       var dashboard = new DashboardModel(workspace);
+
+      // Remove old widget from layout if the target cell is already occupied
+      var gridContainer = dashboard.layout.find(function (item) {
+        return item.id === component.id;
+      });
+      if (gridContainer !== null && gridContainer !== void 0 && (_gridContainer$grid2 = gridContainer.grid) !== null && _gridContainer$grid2 !== void 0 && (_gridContainer$grid2 = _gridContainer$grid2[cellNumber]) !== null && _gridContainer$grid2 !== void 0 && _gridContainer$grid2.component) {
+        var oldWidgetId = gridContainer.grid[cellNumber].component;
+        dashboard.removeItemFromLayout(oldWidgetId);
+        gridContainer.grid[cellNumber].component = null;
+      }
       var componentToAdd = ComponentManager.getComponent(widgetName);
       var widget = LayoutModel(componentToAdd, dashboard.workspace(), dashboard.id);
       dashboard.addChildToLayoutItem(widget, component.id, cellNumber);
@@ -29377,13 +29389,31 @@ var DashboardModel = /*#__PURE__*/function () {
         }
         if (activeItemIds.size === 0) return;
 
-        // Keep root items (parent: 0) and items referenced by grid cells
-        var before = this.layout.length;
+        // Identify orphaned item IDs before removing them
+        var orphanedIds = this.layout.filter(function (item) {
+          return item.parent !== 0 && !activeItemIds.has(item.id);
+        }).map(function (item) {
+          return item.id;
+        });
+        if (orphanedIds.length === 0) return;
+
+        // Remove orphaned items from layout
         this.layout = this.layout.filter(function (item) {
           return item.parent === 0 || activeItemIds.has(item.id);
         });
-        var removed = before - this.layout.length;
-        if (removed > 0) {
+
+        // Clean listener references on remaining items for each removed orphan
+        var _iterator2 = _createForOfIteratorHelper$8(orphanedIds),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var id = _step2.value;
+            this._cleanupListenerReferencesForId(id);
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
         }
       } catch (e) {
       }
@@ -50402,6 +50432,11 @@ var DashboardStageInner = function DashboardStageInner(_ref2) {
       });
       workspaceToSave["layout"] = layout;
 
+      // Clean orphaned layout items and stale listener references before save
+      var dashboardForCleanup = new DashboardModel(workspaceToSave);
+      dashboardForCleanup.cleanOrphanedItems();
+      dashboardForCleanup.workspace(), _readOnlyError("workspaceToSave");
+
       // lets set a version so that we can compare...
       workspaceToSave["version"] = Date.now();
       if (dashApi && credentials) {