@schneideress/dashboardframework 20.0.10 → 20.0.11

package/fesm2022/schneideress-dashboardframework.mjs

@@ -5212,6 +5212,62 @@ class RADashboardArea {
     }
     /**To rearrange widgets position in the dashboard, compactLeft&Up,compactLeft,compactUp,etc*/
     rearrangeWidgets() {
+        // Site Detail dashboard: deterministic reflow instead of zeroing all positions
+        if (this.isSiteDetailDashboard) {
+            const isDesktop = this.responsiveService.IsDesktopView;
+            const maxCols = (this.options && (this.options.maxCols || this.options.minCols)) || this.responsiveService.maxColsDesktop;
+            if (isDesktop) {
+                let curX = 0;
+                let curY = 0;
+                this.userWidgets.forEach(w => {
+                    let width = w.width || this.widgetWidth;
+                    if (width > maxCols) {
+                        width = maxCols;
+                        w.width = width;
+                    }
+                    if (curX + width > maxCols) {
+                        curX = 0;
+                        curY++;
+                    }
+                    w.position_x = curX;
+                    w.position_y = curY;
+                    curX += width;
+                });
+                // Update existing gridster items in-place if counts match; else rebuild
+                if (this.widgetList.length === this.userWidgets.length) {
+                    this.widgetList.forEach(item => {
+                        const w = item.widgetInfo;
+                        item.x = w.position_x;
+                        item.y = w.position_y;
+                    });
+                }
+                else {
+                    this.widgetList = this.mapObjectListToGridsterItemList(this.userWidgets);
+                }
+            }
+            else { // mobile view: vertical stack
+                this.userWidgets.forEach((w, idx) => { w.position_x = 0; w.position_y = idx; });
+                if (this.widgetList.length === this.userWidgets.length) {
+                    this.widgetList.forEach(item => { const w = item.widgetInfo; item.x = 0; item.y = w.position_y; });
+                }
+                else {
+                    this.widgetList = this.mapObjectListToGridsterItemList(this.userWidgets);
+                }
+            }
+            this.options?.api?.optionsChanged?.();
+            this.raDashboardEventBus.publish(RAEvent.HideDashboardBanner, false);
+            // Persist new positions (desktop only)
+            if (this.responsiveService.IsDesktopView) {
+                setTimeout(() => {
+                    this.widgetList.forEach(item => { const id = item.widgetInfo?.widgetInstanceId; if (id) {
+                        this.updateWidgetPosition(id);
+                    } });
+                }, 50);
+            }
+            setTimeout(() => { this.setAreaHeight(); });
+            return;
+        }
+        // Legacy behaviour for other dashboards (reset + rebuild)
         for (let i = 0; i < this.userWidgets.length; i++) {
             this.userWidgets[i].position_x = 0;
             this.userWidgets[i].position_y = 0;
@@ -5224,17 +5280,6 @@ class RADashboardArea {
         setTimeout(() => {
             this.setAreaHeight();
         });
-        // Centralized persistence for Site Detail dashboards (desktop only)
-        if (this.isSiteDetailDashboard && this.responsiveService.IsDesktopView) {
-            setTimeout(() => {
-                this.widgetList.forEach(item => {
-                    const id = item.widgetInfo?.widgetInstanceId;
-                    if (id) {
-                        this.updateWidgetPosition(id);
-                    }
-                });
-            }, 50);
-        }
     }
     /**To add widget instance to the database with the next available position and to make changes in
      * dashboard area.