@trops/dash-core 0.1.519 → 0.1.521

package/dist/index.js

@@ -52,8 +52,8 @@ var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React);
 var jsxRuntime__namespace = /*#__PURE__*/_interopNamespaceDefault(jsxRuntime);
 var ReactDOM__namespace = /*#__PURE__*/_interopNamespaceDefault(ReactDOM);
 
-function ownKeys$11(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$11(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$11(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$11(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$12(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$12(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$12(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$12(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var event = {
   list: new Map(),
   //  Map(1) { '<widget-UUID>' => { 'CustomSearchbar[10].searchQueryChanged': [] } }
@@ -115,7 +115,7 @@ var event = {
           uuid: subscriber["uuid"]
         };
         if ("action" in subscriber && subscriber.action !== undefined) {
-          subscriber["action"](_objectSpread$11({}, objectToSend));
+          subscriber["action"](_objectSpread$12({}, objectToSend));
         }
       });
     }
@@ -2964,8 +2964,8 @@ var DashboardWrapper = function DashboardWrapper(_ref) {
   });
 };
 
-function ownKeys$10(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$10(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$10(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$10(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$11(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$11(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$11(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$11(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function ThemeBroadcast(_ref) {
   var ctx = _ref.ctx;
   React.useEffect(function () {
@@ -2998,7 +2998,7 @@ var DashboardThemeProvider = function DashboardThemeProvider(_ref2) {
     var dashboardTheme = themes[themeKey];
     var themeValue = dashboardTheme ? dashboardTheme[themeVariant] || null : null;
     if (!themeValue) return null;
-    return _objectSpread$10(_objectSpread$10({}, parentContext), {}, {
+    return _objectSpread$11(_objectSpread$11({}, parentContext), {}, {
       currentTheme: themeValue,
       currentThemeKey: themeKey,
       theme: themeValue,
@@ -3025,8 +3025,8 @@ var DashboardThemeProvider = function DashboardThemeProvider(_ref2) {
   });
 };
 
-function ownKeys$$(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$$(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$$(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$$(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$10(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$10(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$10(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$10(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var AppThemeScope = function AppThemeScope(_ref) {
   var children = _ref.children;
   var ctx = React.useContext(DashReact.ThemeContext);
@@ -3034,7 +3034,7 @@ var AppThemeScope = function AppThemeScope(_ref) {
     children: children
   });
   return /*#__PURE__*/jsxRuntime.jsx(DashReact.ThemeContext.Provider, {
-    value: _objectSpread$$(_objectSpread$$({}, ctx), {}, {
+    value: _objectSpread$10(_objectSpread$10({}, ctx), {}, {
       currentTheme: ctx.appTheme,
       currentThemeKey: ctx.appThemeKey,
       theme: ctx.appTheme,
@@ -3146,8 +3146,8 @@ var LayoutContainer = function LayoutContainer(_ref) {
   });
 };
 
-function ownKeys$_(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$_(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$_(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$_(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$$(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$$(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$$(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$$(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper$C(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$C(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$C(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$C(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$C(r, a) : void 0; } }
 function _arrayLikeToArray$C(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -3429,7 +3429,7 @@ function createLayoutFromTemplate(template) {
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var cell = _step.value;
-      grid[cell.key] = _objectSpread$_({
+      grid[cell.key] = _objectSpread$$({
         component: null,
         hide: cell.hide || false
       }, cell.span ? {
@@ -4608,8 +4608,8 @@ var DashboardInstallOptionsModal = function DashboardInstallOptionsModal(_ref) {
 function _createForOfIteratorHelper$B(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$B(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$B(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$B(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$B(r, a) : void 0; } }
 function _arrayLikeToArray$B(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$Z(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$Z(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$Z(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$Z(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$_(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$_(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$_(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$_(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var RegistryDashboardDetail = function RegistryDashboardDetail(_ref) {
   var dashboardPackage = _ref.dashboardPackage,
     appId = _ref.appId,
@@ -4842,7 +4842,7 @@ var RegistryDashboardDetail = function RegistryDashboardDetail(_ref) {
                 setProgressWidgets(function (prev) {
                   var next = _toConsumableArray(prev);
                   if (data.index >= 0 && data.index < next.length) {
-                    next[data.index] = _objectSpread$Z(_objectSpread$Z({}, next[data.index]), {}, {
+                    next[data.index] = _objectSpread$_(_objectSpread$_({}, next[data.index]), {}, {
                       status: data.status,
                       error: data.error || null
                     });
@@ -4938,7 +4938,7 @@ var RegistryDashboardDetail = function RegistryDashboardDetail(_ref) {
     var raw = preview === null || preview === void 0 ? void 0 : preview.compatibility;
     if (!raw) return raw;
     var cMap = ComponentManager.componentMap();
-    var augWidgets = _objectSpread$Z({}, raw.widgets);
+    var augWidgets = _objectSpread$_({}, raw.widgets);
     var fixedCount = 0;
     var _loop = function _loop() {
       var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
@@ -8373,8 +8373,8 @@ var WizardCustomizeStep = function WizardCustomizeStep(_ref) {
   });
 };
 
-function ownKeys$Y(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$Y(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$Y(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$Y(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$Z(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$Z(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$Z(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$Z(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TOTAL_STEPS = 5; // Steps 0-4: Discover, Name, Folder, Theme, Review
 
 var initialState = {
@@ -8400,20 +8400,20 @@ var initialState = {
 function wizardReducer(state, action) {
   switch (action.type) {
     case "SET_STEP":
-      return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
+      return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
         step: action.payload
       });
     case "SET_FILTERS":
-      return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
-        filters: _objectSpread$Y(_objectSpread$Y({}, state.filters), action.payload)
+      return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
+        filters: _objectSpread$Z(_objectSpread$Z({}, state.filters), action.payload)
       });
     case "TOGGLE_FILTER_CATEGORY":
       {
         var categories = state.filters.categories.includes(action.payload) ? state.filters.categories.filter(function (c) {
           return c !== action.payload;
         }) : [].concat(_toConsumableArray(state.filters.categories), [action.payload]);
-        return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
-          filters: _objectSpread$Y(_objectSpread$Y({}, state.filters), {}, {
+        return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
+          filters: _objectSpread$Z(_objectSpread$Z({}, state.filters), {}, {
             categories: categories
           })
         });
@@ -8423,15 +8423,15 @@ function wizardReducer(state, action) {
         var providers = state.filters.providers.includes(action.payload) ? state.filters.providers.filter(function (p) {
           return p !== action.payload;
         }) : [].concat(_toConsumableArray(state.filters.providers), [action.payload]);
-        return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
-          filters: _objectSpread$Y(_objectSpread$Y({}, state.filters), {}, {
+        return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
+          filters: _objectSpread$Z(_objectSpread$Z({}, state.filters), {}, {
             providers: providers
           })
         });
       }
     case "SET_SEARCH_QUERY":
-      return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
-        filters: _objectSpread$Y(_objectSpread$Y({}, state.filters), {}, {
+      return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
+        filters: _objectSpread$Z(_objectSpread$Z({}, state.filters), {}, {
           query: action.payload
         })
       });
@@ -8441,7 +8441,7 @@ function wizardReducer(state, action) {
         var widgetOrder = action.payload.map(function (w) {
           return w.name || w.key;
         });
-        return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
+        return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
           selectedWidgets: action.payload,
           layout: {
             templateKey: templateKey,
@@ -8461,7 +8461,7 @@ function wizardReducer(state, action) {
         var toggleWidgetOrder = selectedWidgets.map(function (w) {
           return w.name || w.key;
         });
-        return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
+        return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
           selectedWidgets: selectedWidgets,
           layout: {
             templateKey: toggleTemplateKey,
@@ -8470,29 +8470,29 @@ function wizardReducer(state, action) {
         });
       }
     case "SET_SELECTED_DASHBOARD":
-      return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
+      return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
         selectedDashboard: action.payload
       });
     case "SET_PATH":
-      return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
+      return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
         path: action.payload
       });
     case "SET_LAYOUT":
-      return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
+      return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
         layout: action.payload
       });
     case "REORDER_WIDGETS":
-      return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
-        layout: _objectSpread$Y(_objectSpread$Y({}, state.layout), {}, {
+      return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
+        layout: _objectSpread$Z(_objectSpread$Z({}, state.layout), {}, {
           widgetOrder: action.payload
         })
       });
     case "SET_CUSTOMIZATION":
-      return _objectSpread$Y(_objectSpread$Y({}, state), {}, {
-        customization: _objectSpread$Y(_objectSpread$Y({}, state.customization), action.payload)
+      return _objectSpread$Z(_objectSpread$Z({}, state), {}, {
+        customization: _objectSpread$Z(_objectSpread$Z({}, state.customization), action.payload)
       });
     case "RESET":
-      return _objectSpread$Y({}, initialState);
+      return _objectSpread$Z({}, initialState);
     default:
       return state;
   }
@@ -9268,6 +9268,96 @@ var PanelEditItem = function PanelEditItem(_ref) {
   });
 };
 
+function ownKeys$Y(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$Y(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$Y(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$Y(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/**
+ * gridMergeOps
+ *
+ * Pure helpers for merging adjacent grid cells in the layout editor.
+ *
+ * Bug history: pre-extraction, the inline implementations in
+ * GridEditor blindly `delete`d the absorbed cell. When the user
+ * merged an empty cell into a cell that already contained a widget,
+ * the widget's component reference vanished with the deleted entry.
+ * These helpers preserve the absorbed cell's component when the
+ * current cell is empty — so a merge always shows the merged cell
+ * with whichever widget existed.
+ *
+ * Conflict policy when BOTH cells have widgets: current wins (matches
+ * the pre-fix semantics; surfaces no surprise behavior change). The
+ * MergeCellsModal flow handles explicit conflict resolution for
+ * multi-cell selections — that's a separate code path.
+ */
+
+var META_KEYS = new Set(["rows", "cols", "gap"]);
+
+/**
+ * Merge `(row, col)` with the cell to its right. Skips empty
+ * column slots if the immediate next col was already absorbed by a
+ * prior merge. Preserves the absorbed cell's `component` and `hide`
+ * when the current cell has no component.
+ */
+function mergeRightOp(grid, row, col) {
+  var currentKey = "".concat(row, ".").concat(col);
+  var current = grid[currentKey];
+  if (!current) return grid;
+
+  // Find the next existing cell to the right in the same row.
+  var nextKey = "".concat(row, ".").concat(col + 1);
+  if (!grid[nextKey]) {
+    var bestCol = Infinity;
+    for (var _i = 0, _Object$keys = Object.keys(grid); _i < _Object$keys.length; _i++) {
+      var k = _Object$keys[_i];
+      if (META_KEYS.has(k)) continue;
+      var _k$split$map = k.split(".").map(function (n) {
+          return parseInt(n, 10);
+        }),
+        _k$split$map2 = _slicedToArray(_k$split$map, 2),
+        r = _k$split$map2[0],
+        c = _k$split$map2[1];
+      if (r === parseInt(row, 10) && c > parseInt(col, 10) && c < bestCol) {
+        bestCol = c;
+        nextKey = k;
+      }
+    }
+    if (!grid[nextKey]) return grid;
+  }
+  var next = grid[nextKey];
+  if (!next) return grid;
+  var newGrid = _objectSpread$Y({}, grid);
+  newGrid[currentKey] = _objectSpread$Y(_objectSpread$Y({}, current), {}, {
+    colSpan: (current.colSpan || 1) + 1,
+    // Migrate component (and hide) from absorbed cell when current
+    // is empty. Without this, mergeRight on (empty, widget) silently
+    // destroys the widget — the bug we're fixing.
+    component: current.component != null ? current.component : next.component,
+    hide: current.component != null ? current.hide : next.hide
+  });
+  delete newGrid[nextKey];
+  return newGrid;
+}
+
+/**
+ * Merge `(row, col)` with the cell directly below. Same widget-
+ * preservation semantics as mergeRightOp.
+ */
+function mergeDownOp(grid, row, col) {
+  var currentKey = "".concat(row, ".").concat(col);
+  var current = grid[currentKey];
+  if (!current) return grid;
+  var belowKey = "".concat(row + 1, ".").concat(col);
+  var below = grid[belowKey];
+  if (!below) return grid;
+  var newGrid = _objectSpread$Y({}, grid);
+  newGrid[currentKey] = _objectSpread$Y(_objectSpread$Y({}, current), {}, {
+    rowSpan: (current.rowSpan || 1) + 1,
+    component: current.component != null ? current.component : below.component,
+    hide: current.component != null ? current.hide : below.hide
+  });
+  delete newGrid[belowKey];
+  return newGrid;
+}
+
 var _excluded$6 = ["rows", "cols"];
 function _createForOfIteratorHelper$y(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$y(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$y(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$y(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$y(r, a) : void 0; } }
@@ -9324,46 +9414,15 @@ function GridEditor(_ref) {
     saveGridChanges(newGrid);
   };
   var mergeRight = function mergeRight(row, col) {
-    var currentKey = "".concat(row, ".").concat(col);
-    var nextKey = "".concat(row, ".").concat(col + 1);
-    // we have to make sure that the key exists, in case something had skipped..
-    if (!grid[nextKey]) {
-      Object.keys(grid).filter(function (v) {
-        return v !== "rows" && v !== "cols";
-      }).forEach(function (k) {
-        if (!grid[nextKey]) {
-          var parts = k.split(".");
-          var tempRow = parseInt(parts[0]);
-          var tempCol = parseInt(parts[1]);
-          if (tempRow === parseInt(row) && tempCol > parseInt(col)) {
-            nextKey = "".concat(tempRow, ".").concat(tempCol);
-          }
-        }
-      });
-    }
-    if (grid[nextKey]) {
-      var newGrid = _objectSpread$X({}, grid);
-      newGrid[currentKey] = _objectSpread$X(_objectSpread$X({}, newGrid[currentKey]), {}, {
-        colSpan: newGrid[currentKey].colSpan + 1
-      });
-      delete newGrid[nextKey];
-
-      // now we have to sort the grid
-      saveGridChanges(newGrid);
-    }
+    // Pure helper preserves the absorbed cell's widget when the
+    // current cell is empty (see gridMergeOps.js for the bug fix
+    // that shipped this extraction).
+    var newGrid = mergeRightOp(grid, row, col);
+    if (newGrid !== grid) saveGridChanges(newGrid);
   };
   var mergeDown = function mergeDown(row, col) {
-    var currentKey = "".concat(row, ".").concat(col);
-    var belowKey = "".concat(row + 1, ".").concat(col);
-    if (grid[belowKey]) {
-      var newGrid = _objectSpread$X({}, grid);
-      newGrid[currentKey] = _objectSpread$X(_objectSpread$X({}, newGrid[currentKey]), {}, {
-        rowSpan: newGrid[currentKey].rowSpan + 1
-      });
-      delete newGrid[belowKey];
-      // now we have to sort the grid
-      saveGridChanges(newGrid);
-    }
+    var newGrid = mergeDownOp(grid, row, col);
+    if (newGrid !== grid) saveGridChanges(newGrid);
   };
 
   /**
@@ -50853,7 +50912,7 @@ var AppSettingsModal = function AppSettingsModal(_ref) {
         className: "flex-1 overflow-y-auto p-6 ".concat(panelStyles.textColor || "text-gray-200"),
         children: /*#__PURE__*/jsxRuntime.jsx(AiAssistantSection, {})
       }), activeSection === "privacy-security" && /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "flex-1 overflow-y-auto ".concat(panelStyles.textColor || "text-gray-200"),
+        className: "flex-1 flex flex-col min-h-0 ".concat(panelStyles.textColor || "text-gray-200"),
         children: /*#__PURE__*/jsxRuntime.jsx(PrivacySecuritySection, {})
       })]
     }), /*#__PURE__*/jsxRuntime.jsx(DashReact.SettingsModal.Footer, {