gridstack 9.0.2 → 9.1.1

package/dist/gridstack.js

@@ -1,5 +1,5 @@
 /*!
- * GridStack 9.0.2
+ * GridStack 9.1.1
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021-2022 Alain Dumesny
@@ -674,7 +674,7 @@ class GridStack {
         }
         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
         }
@@ -866,7 +866,7 @@ class GridStack {
         this._prepareElement(el, true, options);
         const 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
@@ -1114,57 +1114,69 @@ class GridStack {
         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 */
-    resizeToContent(els) {
-        GridStack.getElements(els).forEach(el => {
-            let n = el?.gridstackNode;
-            if (!n)
-                return;
-            const grid = n.grid;
-            if (grid !== this)
-                return grid?.resizeToContent(el);
-            if (el.parentElement !== this.el)
-                return; // skip if we are not inside a grid
-            const cell = this.getCellHeight();
-            if (!cell)
-                return;
-            let height = n.h ? n.h * cell : el.clientHeight; // getBoundingClientRect().height seem to flicker back and forth
-            if (!height)
-                return; // 0 when hidden, skip
-            const item = el.querySelector(GridStack.resizeToContentParent);
-            if (!item)
-                return;
-            const child = item.firstElementChild;
-            // NOTE: clientHeight & getBoundingClientRect() is undefined for text and other leaf nodes. use <div> container!
-            if (!child) {
-                console.log(`Error: resizeToContent() '${GridStack.resizeToContentParent}'.firstElementChild is null, make sure to have a div like container. Skipping sizing.`);
-                return;
-            }
-            const padding = el.clientHeight - item.clientHeight; // full - available height to our child (minus border, padding...)
-            const 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)
-            const wantedH = child.getBoundingClientRect().height || itemH;
-            if (itemH === wantedH)
-                return;
-            height += wantedH - itemH;
-            let h = Math.ceil(height / cell);
-            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 });
-                delete this._ignoreLayoutsNodeChange;
-            }
-        });
+    /**
+     * 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
+     **/
+    resizeToContent(el, useAttrSize = false) {
+        el?.classList.remove('size-to-content-max');
+        if (!el?.clientHeight)
+            return; // 0 when hidden, skip
+        let n = el.gridstackNode;
+        if (!n)
+            return;
+        const grid = n.grid;
+        if (!grid)
+            return;
+        if (el.parentElement !== grid.el)
+            return; // skip if we are not inside a grid
+        const cell = grid.getCellHeight();
+        if (!cell)
+            return;
+        let height = useAttrSize && n.h ? n.h * cell : el.clientHeight; // getBoundingClientRect().height seem to flicker back and forth
+        let item;
+        if (n.resizeToContentParent)
+            item = el.querySelector(n.resizeToContentParent);
+        if (!item)
+            item = el.querySelector(GridStack.resizeToContentParent);
+        if (!item)
+            return;
+        const child = item.firstElementChild;
+        // NOTE: clientHeight & getBoundingClientRect() is undefined for text and other leaf nodes. use <div> container!
+        if (!child) {
+            console.log(`Error: resizeToContent() '${GridStack.resizeToContentParent}'.firstElementChild is null, make sure to have a div like container. Skipping sizing.`);
+            return;
+        }
+        const padding = el.clientHeight - item.clientHeight; // full - available height to our child (minus border, padding...)
+        const 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)
+        const wantedH = child.getBoundingClientRect().height || itemH;
+        if (itemH === wantedH)
+            return;
+        height += wantedH - itemH;
+        let h = Math.ceil(height / cell);
+        // check for min/max and special sizing
+        const 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 });
+            delete grid._ignoreLayoutsNodeChange;
+        }
     }
     /** call the user resize (so we can do extra work) else our build in version */
-    resizeToContentCheck(el) {
+    resizeToContentCheck(el, 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).
@@ -1359,8 +1371,8 @@ class GridStack {
         if (!Utils.same(node, copy)) {
             this._writeAttr(el, node);
         }
-        if (Utils.shouldFitToContent(node))
-            el.classList.add('fit-to-content');
+        if (Utils.shouldSizeToContent(node))
+            el.classList.add('size-to-content');
         this._prepareDragDropByNode(node);
         return this;
     }
@@ -1456,7 +1468,7 @@ class GridStack {
     /**
      * called when we are being resized - check if the one Column Mode needs to be turned on/off
      * and remember the prev columns we used, or get our count from parent, as well as check for cellHeight==='auto' (square)
-     * or `fitToContent` gridItem options.
+     * or `sizeToContent` gridItem options.
      */
     onResize() {
         if (!this.el?.clientWidth)
@@ -1479,7 +1491,7 @@ class GridStack {
             let oneColumn = !this.opts.disableOneColumnMode && this.el.clientWidth <= this.opts.oneColumnSize ||
                 (this.opts.column === 1 && !this._prevColumn);
             if ((this.opts.column === 1) !== oneColumn) {
-                // if (this.opts.animate) this.setAnimation(false); // 1 <-> 12 is too radical, turn off animation and we need it for fitToContent
+                // if (this.opts.animate) this.setAnimation(false); // 1 <-> 12 is too radical, turn off animation and we need it for sizeToContent
                 this.column(oneColumn ? 1 : this._prevColumn);
                 // if (this.opts.animate) setTimeout(() => this.setAnimation(true));
                 columnChanged = true;
@@ -1493,24 +1505,24 @@ class GridStack {
             if (n.subGrid)
                 n.subGrid.onResize();
         });
-        this.doContentResize(columnChanged);
+        this.doContentResize(columnChanged); // wait for anim of column changed (DOM reflow before we can size correctly)
         this.batchUpdate(false);
         return this;
     }
-    doContentResize(delay = true, n = undefined) {
-        // update any gridItem height with fitToContent, but wait for DOM $animation_speed to settle if we changed column count
+    doContentResize(delay = true, useAttr = false, 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(() => {
             if (n) {
-                if (Utils.shouldFitToContent(n))
-                    this.resizeToContentCheck(n.el);
+                if (Utils.shouldSizeToContent(n))
+                    this.resizeToContentCheck(n.el, useAttr);
             }
             else {
                 const nodes = [...this.engine.nodes]; // in case order changes while resizing one
                 this.batchUpdate();
                 nodes.forEach(n => {
-                    if (Utils.shouldFitToContent(n))
-                        this.resizeToContentCheck(n.el);
+                    if (Utils.shouldSizeToContent(n))
+                        this.resizeToContentCheck(n.el, useAttr);
                 });
                 this.batchUpdate(false);
             }
@@ -1521,8 +1533,8 @@ class GridStack {
     /** add or remove the grid element size event handler */
     _updateResizeEvent(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 fitToContent option.
-        const trackSize = !this.parentGridItem && (this._isAutoCellHeight || this.opts.fitToContent || !this.opts.disableOneColumnMode || this.engine.nodes.find(n => n.fitToContent));
+        // or supporting new sizeToContent option.
+        const trackSize = !this.parentGridItem && (this._isAutoCellHeight || this.opts.sizeToContent || !this.opts.disableOneColumnMode || this.engine.nodes.find(n => n.sizeToContent));
         if (!forceRemove && trackSize && !this.resizeObserver) {
             this._sizeThrottle = Utils.throttle(() => this.onResize(), this.opts.cellHeightThrottle);
             this.resizeObserver = new ResizeObserver(entries => this._sizeThrottle());
@@ -2071,8 +2083,11 @@ class GridStack {
                 this._updateContainerHeight(); // @ts-ignore
                 this._triggerChangeEvent();
                 this.engine.endUpdate();
-                if (event.type === 'resizestop')
-                    this.doContentResize(false, node);
+                if (event.type === 'resizestop') {
+                    if (Number.isInteger(node.sizeToContent))
+                        node.sizeToContent = node.h; // new soft limit
+                    this.doContentResize(false, true, node); // no amin wait as will use the actual sized coordinate attr
+                }
             };
             dd.draggable(el, {
                 start: onStartMoving,
@@ -2248,6 +2263,6 @@ GridStack.resizeToContentParent = '.grid-stack-item-content';
 GridStack.Utils = Utils;
 /** scoping so users can call new GridStack.Engine(12) for example */
 GridStack.Engine = GridStackEngine;
-GridStack.GDRev = '9.0.2';
+GridStack.GDRev = '9.1.1';
 export { GridStack };
 //# sourceMappingURL=gridstack.js.map