gridstack 9.4.0 → 9.5.1

package/dist/es5/gridstack.js

@@ -36,7 +36,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GridStack = void 0;
 /*!
- * GridStack 9.4.0
+ * GridStack 9.5.1
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021-2022 Alain Dumesny
@@ -603,7 +603,8 @@ var GridStack = exports.GridStack = /** @class */ (function () {
         this._insertNotAppend = haveCoord; // if we create in reverse order...
         // 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 || 0) + n.w) > _this.opts.column; })) {
+        var column = this.opts.column;
+        if (this._prevColumn && this._prevColumn !== column && items.some(function (n) { return ((n.x || 0) + n.w) > column; })) {
             this._ignoreLayoutsNodeChange = true; // skip layout update
             this.engine.cacheLayout(items, this._prevColumn, true);
         }
@@ -647,6 +648,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
                 if (utils_1.Utils.shouldSizeToContent(item))
                     w.h = item.h;
                 // check if missing coord, in which case find next empty slot with new (or old if missing) sizes
+                _this.engine.nodeBoundFix(w); // before widthChanged is checked below...
                 if (w.autoPosition || w.x === undefined || w.y === undefined) {
                     w.w = w.w || item.w;
                     w.h = w.h || item.h;
@@ -657,7 +659,6 @@ var GridStack = exports.GridStack = /** @class */ (function () {
                 _this.engine.nodes.push(item);
                 if (utils_1.Utils.samePos(item, w)) {
                     _this.moveNode(item, __assign(__assign({}, w), { forceCollide: true }));
-                    utils_1.Utils.copyPos(w, item, true);
                 }
                 _this.update(item.el, w);
                 if ((_a = w.subGridOpts) === null || _a === void 0 ? void 0 : _a.children) { // update any sub grid as well
@@ -797,9 +798,9 @@ var GridStack = exports.GridStack = /** @class */ (function () {
         if (!column || column < 1 || this.opts.column === column)
             return this;
         var oldColumn = this.getColumn();
-        // if we go into 1 column mode (which happens if we're sized less than minW unless disableOneColumnMode is on)
+        // if we go into 1 column mode due to size change (disableOneColumnMode is off and we hit min width)
         // then remember the original columns so we can restore.
-        if (column === 1) {
+        if (column === 1 && !this.opts.disableOneColumnMode) {
             this._prevColumn = oldColumn;
         }
         else {
@@ -1152,6 +1153,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
             if (!n)
                 return;
             var w = utils_1.Utils.cloneDeep(opt); // make a copy we can modify in case they re-use it or multiple items
+            _this.engine.nodeBoundFix(w);
             delete w.autoPosition;
             delete w.id;
             // move/resize widget if anything changed
@@ -1193,10 +1195,10 @@ var GridStack = exports.GridStack = /** @class */ (function () {
                 }
             }
             utils_1.Utils.sanitizeMinMax(n);
-            // finally move the widget
-            if (m !== undefined)
+            // finally move the widget and update attr
+            if (m)
                 _this.moveNode(n, m);
-            if (changed) { // move will only update x,y,w,h so update the rest too
+            if (m || changed) {
                 _this._writeAttr(el, n);
             }
             if (ddChanged) {
@@ -1642,6 +1644,8 @@ var GridStack = exports.GridStack = /** @class */ (function () {
         // update any gridItem height with sizeToContent, but wait for DOM $animation_speed to settle if we changed column count
         // TODO: is there a way to know what the final (post animation) size of the content will be so we can animate the column width and height together rather than sequentially ?
         setTimeout(function () {
+            if (!_this.engine)
+                return; // we've been deleted in between!
             if (n) {
                 if (utils_1.Utils.shouldSizeToContent(n))
                     _this.resizeToContentCheck(n.el, useAttr);
@@ -2088,6 +2092,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
                 _this.engine.cleanupNode(node); // removes all internal _xyz values
                 node.grid = _this;
             }
+            delete node.grid._isTemp;
             dd.off(el, 'drag');
             // if we made a copy ('helper' which is temp) of the original node then insert a copy, else we move the original node (#1102)
             // as the helper will be nuked by jquery-ui otherwise. TODO: update old code path
@@ -2118,6 +2123,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
                 if (!subGrid.opts.styleInHead)
                     subGrid._updateStyles(true); // re-create sub-grid styles now that we've moved
             }
+            _this._prepareDragDropByNode(node);
             _this._updateContainerHeight();
             _this.engine.addedNodes.push(node); // @ts-ignore
             _this._triggerAddEvent(); // @ts-ignore
@@ -2126,17 +2132,6 @@ var GridStack = exports.GridStack = /** @class */ (function () {
             if (_this._gsEventHandler['dropped']) {
                 _this._gsEventHandler['dropped'](__assign(__assign({}, event), { type: 'dropped' }), origNode && origNode.grid ? origNode : undefined, node);
             }
-            // wait till we return out of the drag callback to set the new drag&resize handler or they may get messed up
-            window.setTimeout(function () {
-                // IFF we are still there (some application will use as placeholder and insert their real widget instead and better call makeWidget())
-                if (node.el && node.el.parentElement) {
-                    _this._prepareDragDropByNode(node);
-                }
-                else {
-                    _this.engine.removeNode(node);
-                }
-                delete node.grid._isTemp;
-            });
             return false; // prevent parent from receiving msg (which may be grid as well)
         });
         return this;
@@ -2419,7 +2414,7 @@ var GridStack = exports.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 = '9.4.0';
+    GridStack.GDRev = '9.5.1';
     return GridStack;
 }());
 //# sourceMappingURL=gridstack.js.map