gridstack 7.0.1 → 7.1.1

package/dist/gridstack.js

@@ -12,7 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GridStack = void 0;
 /*!
- * GridStack 7.0.1
+ * GridStack 7.1.1
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021-2022 Alain Dumesny
@@ -148,16 +148,19 @@ class GridStack {
         if (this.opts.auto) {
             this.batchUpdate(); // prevent in between re-layout #1535 TODO: this only set float=true, need to prevent collision check...
             let elements = [];
+            let column = this.getColumn();
+            if (column === 1 && this._prevColumn)
+                column = this._prevColumn; // do 12 column when reading into 1 column mode
             this.getGridItems().forEach(el => {
                 let x = parseInt(el.getAttribute('gs-x'));
                 let y = parseInt(el.getAttribute('gs-y'));
                 elements.push({
                     el,
                     // if x,y are missing (autoPosition) add them to end of list - but keep their respective DOM order
-                    i: (Number.isNaN(x) ? 1000 : x) + (Number.isNaN(y) ? 1000 : y) * this.getColumn()
+                    i: (Number.isNaN(x) ? 1000 : x) + (Number.isNaN(y) ? 1000 : y) * column
                 });
             });
-            elements.sort((a, b) => a.i - b.i).forEach(e => this._prepareElement(e.el));
+            elements.sort((a, b) => b.i - a.i).forEach(e => this._prepareElement(e.el)); // revert sort so lowest item wins
             this.batchUpdate(false);
         }
         this.setAnimation(this.opts.animate);
@@ -298,14 +301,6 @@ class GridStack {
      * @param options widget position/size options (optional, and ignore if first param is already option) - see GridStackWidget
      */
     addWidget(els, options) {
-        // support legacy call for now ?
-        if (arguments.length > 2) {
-            console.warn('gridstack.ts: `addWidget(el, x, y, width...)` is deprecated. Use `addWidget({x, y, w, content, ...})`. It will be removed soon');
-            // eslint-disable-next-line prefer-rest-params
-            let a = arguments, i = 1, opt = { x: a[i++], y: a[i++], w: a[i++], h: a[i++], autoPosition: a[i++],
-                minW: a[i++], maxW: a[i++], minH: a[i++], maxH: a[i++], id: a[i++] };
-            return this.addWidget(els, opt);
-        }
         function isGridStackWidget(w) {
             return w.x !== undefined || w.y !== undefined || w.w !== undefined || w.h !== undefined || w.content !== undefined ? true : false;
         }
@@ -346,8 +341,14 @@ class GridStack {
         if (node.subGrid) {
             this.makeSubGrid(node.el, undefined, undefined, false);
         }
+        // if we're adding an item into 1 column (_prevColumn is set only when going to 1) make sure
+        // we don't override the larger 12 column layout that was already saved. #1985
+        if (this._prevColumn && this.opts.column === 1) {
+            this._ignoreLayoutsNodeChange = true;
+        }
         this._triggerAddEvent();
         this._triggerChangeEvent();
+        delete this._ignoreLayoutsNodeChange;
         return el;
     }
     /**
@@ -531,7 +532,7 @@ class GridStack {
     load(layout, addAndRemove = true) {
         let items = GridStack.Utils.sort([...layout], -1, this._prevColumn || this.getColumn()); // make copy before we mod/sort
         this._insertNotAppend = true; // since create in reverse order...
-        // if we're loading a layout into 1 column (_prevColumn is set only when going to 1) and items don't fit, make sure to save
+        // if we're loading a layout into for example 1 column (_prevColumn is set only when going to 1) and items don't fit, make sure to save
         // the original wanted layout so we can scale back up correctly #1471
         if (this._prevColumn && this._prevColumn !== this.opts.column && items.some(n => (n.x + n.w) > this.opts.column)) {
             this._ignoreLayoutsNodeChange = true; // skip layout update
@@ -905,7 +906,7 @@ class GridStack {
      */
     removeWidget(els, removeDOM = true, triggerEvent = true) {
         GridStack.getElements(els).forEach(el => {
-            if (el.parentElement !== this.el)
+            if (el.parentElement && el.parentElement !== this.el)
                 return; // not our child!
             let node = el.gridstackNode;
             // For Meteor support: https://github.com/gridstack/gridstack.js/pull/272
@@ -1537,7 +1538,7 @@ exports.GridStack = GridStack;
 GridStack.Utils = utils_1.Utils;
 /** scoping so users can call new GridStack.Engine(12) for example */
 GridStack.Engine = gridstack_engine_1.GridStackEngine;
-GridStack.GDRev = '7.0.1';
+GridStack.GDRev = '7.1.1';
 const dd_touch_1 = require("./dd-touch");
 const dd_manager_1 = require("./dd-manager");
 __exportStar(require("./dd-gridstack"), exports);