gridstack 9.1.0 → 9.2.0

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.1.0
+ * GridStack 9.2.0
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021-2022 Alain Dumesny
@@ -590,7 +590,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
      *
      * @example
      * see http://gridstackjs.com/demo/serialization.html
-     **/
+     */
     GridStack.prototype.load = function (layout, addRemove) {
         var _this = this;
         if (addRemove === void 0) { addRemove = GridStack.addRemoveCB || true; }
@@ -730,7 +730,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
         }
         this.opts.cellHeightUnit = data.unit;
         this.opts.cellHeight = data.h;
-        this.doContentResize(false);
+        this.doContentResize(false, true); // no anim wait, but use attributes since we only change row height
         if (update) {
             this._updateStyles(true); // true = force re-create for current # of rows
         }
@@ -752,7 +752,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
      * 'compact' might re-order items to fill any empty space
      *
      * doSort - 'false' to let you do your own sorting ahead in case you need to control a different order. (default to sort)
-     **/
+     */
     GridStack.prototype.compact = function (layout, doSort) {
         if (layout === void 0) { layout = 'compact'; }
         if (doSort === void 0) { doSort = true; }
@@ -928,7 +928,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
         this._prepareElement(el, true, options);
         var node = el.gridstackNode;
         this._updateContainerHeight();
-        this.doContentResize(false, node);
+        this.doContentResize(false, false, node);
         // see if there is a sub-grid to create
         if (node.subGridOpts) {
             this.makeSubGrid(el, node.subGridOpts, undefined, false); // node.subGrid will be used as option in method, no need to pass
@@ -1189,72 +1189,78 @@ var GridStack = exports.GridStack = /** @class */ (function () {
         this._triggerChangeEvent();
         this.engine.endUpdate();
     };
-    /** Updates widget height to match the content height to avoid v-scrollbar or dead space.
-     Note: this assumes only 1 child under '.grid-stack-item-content' (sized to gridItem minus padding) that is at the entire content size wanted */
-    GridStack.prototype.resizeToContent = function (els) {
-        var _this = this;
-        GridStack.getElements(els).forEach(function (el) {
-            if (!el.clientHeight)
-                return; // 0 when hidden, skip
-            var n = el === null || el === void 0 ? void 0 : el.gridstackNode;
-            if (!n)
-                return;
-            var grid = n.grid;
-            if (grid !== _this)
-                return grid === null || grid === void 0 ? void 0 : grid.resizeToContent(el);
-            if (el.parentElement !== _this.el)
-                return; // skip if we are not inside a grid
-            var cell = _this.getCellHeight();
-            if (!cell)
-                return;
-            var height = n.h ? n.h * cell : el.clientHeight; // getBoundingClientRect().height seem to flicker back and forth
-            var item;
-            if (n.resizeToContentParent)
-                item = el.querySelector(n.resizeToContentParent);
-            if (!item)
-                item = el.querySelector(GridStack.resizeToContentParent);
-            if (!item)
-                return;
-            var child = item.firstElementChild;
+    /**
+     * Updates widget height to match the content height to avoid v-scrollbar or dead space.
+     * Note: this assumes only 1 child under resizeToContentParent='.grid-stack-item-content' (sized to gridItem minus padding) that is at the entire content size wanted.
+     * useAttrSize set to true if GridStackNode.h should be used instead of actual container height when we don't need to wait for animation to finish to get actual DOM heights
+     */
+    GridStack.prototype.resizeToContent = function (el, useAttrSize) {
+        if (useAttrSize === void 0) { useAttrSize = false; }
+        el === null || el === void 0 ? void 0 : el.classList.remove('size-to-content-max');
+        if (!(el === null || el === void 0 ? void 0 : el.clientHeight))
+            return; // 0 when hidden, skip
+        var n = el.gridstackNode;
+        if (!n)
+            return;
+        var grid = n.grid;
+        if (!grid)
+            return;
+        if (el.parentElement !== grid.el)
+            return; // skip if we are not inside a grid
+        var cell = grid.getCellHeight();
+        if (!cell)
+            return;
+        var height = useAttrSize && n.h ? n.h * cell : el.clientHeight; // getBoundingClientRect().height seem to flicker back and forth
+        var item;
+        if (n.resizeToContentParent)
+            item = el.querySelector(n.resizeToContentParent);
+        if (!item)
+            item = el.querySelector(GridStack.resizeToContentParent);
+        if (!item)
+            return;
+        var padding = el.clientHeight - item.clientHeight; // full - available height to our child (minus border, padding...)
+        var itemH = useAttrSize && n.h ? n.h * cell - padding : item.clientHeight; // calculated to what cellHeight is or will become (rather than actual to prevent waiting for animation to finish)
+        var wantedH;
+        if (n.subGrid) {
+            // sub-grid - use their actual row count * their cell height
+            wantedH = n.subGrid.getRow() * n.subGrid.getCellHeight();
+        }
+        else {
             // NOTE: clientHeight & getBoundingClientRect() is undefined for text and other leaf nodes. use <div> container!
+            var child = item.firstElementChild;
             if (!child) {
                 console.log("Error: resizeToContent() '".concat(GridStack.resizeToContentParent, "'.firstElementChild is null, make sure to have a div like container. Skipping sizing."));
                 return;
             }
-            var padding = el.clientHeight - item.clientHeight; // full - available height to our child (minus border, padding...)
-            var itemH = n.h ? n.h * cell - padding : item.clientHeight; // calculated to what cellHeight is or will become (rather than actual to prevent waiting for animation to finish)
-            var wantedH = child.getBoundingClientRect().height || itemH;
-            if (itemH === wantedH)
-                return;
-            height += wantedH - itemH;
-            var h = Math.ceil(height / cell);
-            // check for min/max and special sizing
-            var softMax = Number.isInteger(n.sizeToContent) ? n.sizeToContent : 0;
-            if (softMax) {
-                if (h > softMax) {
-                    h = softMax;
-                    el.classList.remove('size-to-content'); // get v-scroll back
-                }
-                else
-                    el.classList.add('size-to-content');
-            }
-            if (n.minH && h < n.minH)
-                h = n.minH;
-            else if (n.maxH && h > n.maxH)
-                h = n.maxH;
-            if (h !== n.h) {
-                _this._ignoreLayoutsNodeChange = true;
-                _this.moveNode(n, { h: h });
-                delete _this._ignoreLayoutsNodeChange;
-            }
-        });
+            wantedH = child.getBoundingClientRect().height || itemH;
+        }
+        if (itemH === wantedH)
+            return;
+        height += wantedH - itemH;
+        var h = Math.ceil(height / cell);
+        // check for min/max and special sizing
+        var softMax = Number.isInteger(n.sizeToContent) ? n.sizeToContent : 0;
+        if (softMax && h > softMax) {
+            h = softMax;
+            el.classList.add('size-to-content-max'); // get v-scroll back
+        }
+        if (n.minH && h < n.minH)
+            h = n.minH;
+        else if (n.maxH && h > n.maxH)
+            h = n.maxH;
+        if (h !== n.h) {
+            grid._ignoreLayoutsNodeChange = true;
+            grid.moveNode(n, { h: h });
+            delete grid._ignoreLayoutsNodeChange;
+        }
     };
     /** call the user resize (so we can do extra work) else our build in version */
-    GridStack.prototype.resizeToContentCheck = function (el) {
+    GridStack.prototype.resizeToContentCheck = function (el, useAttr) {
+        if (useAttr === void 0) { useAttr = false; }
         if (GridStack.resizeToContentCB)
             GridStack.resizeToContentCB(el);
         else
-            this.resizeToContent(el);
+            this.resizeToContent(el, useAttr);
     };
     /**
      * Updates the margins which will set all 4 sides at once - see `GridStackOptions.margin` for format options (CSS string format of 1,2,4 values or single number).
@@ -1430,13 +1436,18 @@ var GridStack = exports.GridStack = /** @class */ (function () {
         this.el.setAttribute('gs-current-row', String(row));
         if (row === 0) {
             this.el.style.removeProperty('min-height');
-            return this;
         }
-        var cellHeight = this.opts.cellHeight;
-        var unit = this.opts.cellHeightUnit;
-        if (!cellHeight)
-            return this;
-        this.el.style.minHeight = row * cellHeight + unit;
+        else {
+            var cellHeight = this.opts.cellHeight;
+            var unit = this.opts.cellHeightUnit;
+            if (!cellHeight)
+                return this;
+            this.el.style.minHeight = row * cellHeight + unit;
+        }
+        // if we're a nested grid inside an sizeToContent item, tell it to resize itself too
+        if (this.parentGridItem && !this.parentGridItem.grid.engine.batchMode && utils_1.Utils.shouldSizeToContent(this.parentGridItem)) {
+            this.parentGridItem.grid.resizeToContentCheck(this.parentGridItem.el);
+        }
         return this;
     };
     /** @internal */
@@ -1590,30 +1601,34 @@ var GridStack = exports.GridStack = /** @class */ (function () {
             if (n.subGrid)
                 n.subGrid.onResize();
         });
-        this.doContentResize(columnChanged);
+        if (!this._skipInitialResize)
+            this.doContentResize(columnChanged); // wait for anim of column changed (DOM reflow before we can size correctly)
+        delete this._skipInitialResize;
         this.batchUpdate(false);
         return this;
     };
-    GridStack.prototype.doContentResize = function (delay, n) {
+    GridStack.prototype.doContentResize = function (delay, useAttr, n) {
         var _this = this;
         if (delay === void 0) { delay = true; }
+        if (useAttr === void 0) { useAttr = false; }
         if (n === void 0) { n = undefined; }
         // 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 (n) {
                 if (utils_1.Utils.shouldSizeToContent(n))
-                    _this.resizeToContentCheck(n.el);
+                    _this.resizeToContentCheck(n.el, useAttr);
             }
-            else {
+            else if (_this.engine.nodes.some(function (n) { return utils_1.Utils.shouldSizeToContent(n); })) {
                 var nodes = __spreadArray([], _this.engine.nodes, true); // in case order changes while resizing one
                 _this.batchUpdate();
                 nodes.forEach(function (n) {
                     if (utils_1.Utils.shouldSizeToContent(n))
-                        _this.resizeToContentCheck(n.el);
+                        _this.resizeToContentCheck(n.el, useAttr);
                 });
                 _this.batchUpdate(false);
             }
+            // call this regardless of shouldSizeToContent because widget might need to stretch to take available space after a resize
             if (_this._gsEventHandler['resizecontent'])
                 _this._gsEventHandler['resizecontent'](null, n ? [n] : _this.engine.nodes);
         }, delay ? 300 + 10 : 0);
@@ -1624,11 +1639,13 @@ var GridStack = exports.GridStack = /** @class */ (function () {
         if (forceRemove === void 0) { forceRemove = false; }
         // only add event if we're not nested (parent will call us) and we're auto sizing cells or supporting oneColumn (i.e. doing work)
         // or supporting new sizeToContent option.
-        var trackSize = !this.parentGridItem && (this._isAutoCellHeight || this.opts.sizeToContent || !this.opts.disableOneColumnMode || this.engine.nodes.find(function (n) { return n.sizeToContent; }));
+        var trackSize = !this.parentGridItem && (this._isAutoCellHeight || this.opts.sizeToContent || !this.opts.disableOneColumnMode
+            || this.engine.nodes.find(function (n) { return n.sizeToContent; }));
         if (!forceRemove && trackSize && !this.resizeObserver) {
             this._sizeThrottle = utils_1.Utils.throttle(function () { return _this.onResize(); }, this.opts.cellHeightThrottle);
             this.resizeObserver = new ResizeObserver(function (entries) { return _this._sizeThrottle(); });
             this.resizeObserver.observe(this.el);
+            this._skipInitialResize = true; // makeWidget will originally have called on startup
         }
         else if ((forceRemove || !trackSize) && this.resizeObserver) {
             this.resizeObserver.disconnect();
@@ -1730,7 +1747,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
      * @param dragIn string selector (ex: '.sidebar .grid-stack-item') or list of dom elements
      * @param dragInOptions options - see DDDragInOpt. (default: {handle: '.grid-stack-item-content', appendTo: 'body'}
      * @param root optional root which defaults to document (for shadow dom pas the parent HTMLDocument)
-     **/
+     */
     GridStack.setupDragIn = function (dragIn, dragInOptions, root) {
         if (root === void 0) { root = document; }
         if ((dragInOptions === null || dragInOptions === void 0 ? void 0 : dragInOptions.pause) !== undefined) {
@@ -2120,7 +2137,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
         }
         return this;
     };
-    /** @internal prepares the element for drag&drop **/
+    /** @internal prepares the element for drag&drop */
     GridStack.prototype._prepareDragDropByNode = function (node) {
         var _this = this;
         var el = node.el;
@@ -2196,7 +2213,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
                 if (event.type === 'resizestop') {
                     if (Number.isInteger(node.sizeToContent))
                         node.sizeToContent = node.h; // new soft limit
-                    _this.doContentResize(false, node);
+                    _this.doContentResize(false, true, node); // no amin wait as will use the actual sized coordinate attr
                 }
             };
             dd.draggable(el, {
@@ -2215,7 +2232,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
             .resizable(el, noResize ? 'disable' : 'enable');
         return this;
     };
-    /** @internal handles actual drag/resize start **/
+    /** @internal handles actual drag/resize start */
     GridStack.prototype._onStartMoving = function (el, event, ui, node, cellWidth, cellHeight) {
         this.engine.cleanNodes()
             .beginUpdate(node);
@@ -2246,7 +2263,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
             }
         }
     };
-    /** @internal handles actual drag/resize **/
+    /** @internal handles actual drag/resize */
     GridStack.prototype._dragOrResize = function (el, event, ui, node, cellWidth, cellHeight) {
         var p = __assign({}, node._orig); // could be undefined (_isExternal) which is ok (drag only set x,y and w,h will default to node value)
         var resizing;
@@ -2334,7 +2351,7 @@ var GridStack = exports.GridStack = /** @class */ (function () {
     /** @internal called when item leaving our area by either cursor dropout event
      * or shape is outside our boundaries. remove it from us, and mark temporary if this was
      * our item to start with else restore prev node values from prev grid it came from.
-     **/
+     */
     GridStack.prototype._leave = function (el, helper) {
         var node = el.gridstackNode;
         if (!node)
@@ -2372,7 +2389,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.1.0';
+    GridStack.GDRev = '9.2.0';
     return GridStack;
 }());
 //# sourceMappingURL=gridstack.js.map