gridstack 7.0.0 → 7.1.0

package/dist/es5/gridstack.js

@@ -30,7 +30,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GridStack = void 0;
 /*!
- * GridStack 7.0.0
+ * GridStack 7.1.0
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021-2022 Alain Dumesny
@@ -168,16 +168,19 @@ var GridStack = /** @class */ (function () {
         if (this.opts.auto) {
             this.batchUpdate(); // prevent in between re-layout #1535 TODO: this only set float=true, need to prevent collision check...
             var elements_1 = [];
+            var column_1 = this.getColumn();
+            if (column_1 === 1 && this._prevColumn)
+                column_1 = this._prevColumn; // do 12 column when reading into 1 column mode
             this.getGridItems().forEach(function (el) {
                 var x = parseInt(el.getAttribute('gs-x'));
                 var y = parseInt(el.getAttribute('gs-y'));
                 elements_1.push({
                     el: 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_1
                 });
             });
-            elements_1.sort(function (a, b) { return a.i - b.i; }).forEach(function (e) { return _this._prepareElement(e.el); });
+            elements_1.sort(function (a, b) { return b.i - a.i; }).forEach(function (e) { return _this._prepareElement(e.el); }); // revert sort so lowest item wins
             this.batchUpdate(false);
         }
         this.setAnimation(this.opts.animate);
@@ -327,14 +330,6 @@ var GridStack = /** @class */ (function () {
      * @param options widget position/size options (optional, and ignore if first param is already option) - see GridStackWidget
      */
     GridStack.prototype.addWidget = function (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
-            var 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;
         }
@@ -375,8 +370,14 @@ var GridStack = /** @class */ (function () {
         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;
     };
     /**
@@ -566,7 +567,7 @@ var GridStack = /** @class */ (function () {
         if (addAndRemove === void 0) { addAndRemove = true; }
         var items = GridStack.Utils.sort(__spreadArrays(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(function (n) { return (n.x + n.w) > _this.opts.column; })) {
             this._ignoreLayoutsNodeChange = true; // skip layout update
@@ -952,7 +953,7 @@ var GridStack = /** @class */ (function () {
         if (removeDOM === void 0) { removeDOM = true; }
         if (triggerEvent === void 0) { triggerEvent = true; }
         GridStack.getElements(els).forEach(function (el) {
-            if (el.parentElement !== _this.el)
+            if (el.parentElement && el.parentElement !== _this.el)
                 return; // not our child!
             var node = el.gridstackNode;
             // For Meteor support: https://github.com/gridstack/gridstack.js/pull/272
@@ -1598,7 +1599,7 @@ var GridStack = /** @class */ (function () {
     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.0';
+    GridStack.GDRev = '7.1.0';
     return GridStack;
 }());
 exports.GridStack = GridStack;