gridstack 9.1.1 → 9.2.1

package/dist/gridstack.js

@@ -1,5 +1,5 @@
 /*!
- * GridStack 9.1.1
+ * GridStack 9.2.1
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021-2022 Alain Dumesny
@@ -540,7 +540,7 @@ class GridStack {
      *
      * @example
      * see http://gridstackjs.com/demo/serialization.html
-     **/
+     */
     load(layout, addRemove = GridStack.addRemoveCB || true) {
         // if passed list has coordinates, use them (insert from end to beginning for conflict resolution) else force widget same order
         const haveCoord = layout.some(w => w.x !== undefined || w.y !== undefined);
@@ -696,7 +696,7 @@ class GridStack {
      * '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)
-     **/
+     */
     compact(layout = 'compact', doSort = true) {
         this.engine.compact(layout, doSort);
         this._triggerChangeEvent();
@@ -1118,10 +1118,12 @@ class GridStack {
      * 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)
+        if (!el)
+            return;
+        el.classList.remove('size-to-content-max');
+        if (!el.clientHeight)
             return; // 0 when hidden, skip
         let n = el.gridstackNode;
         if (!n)
@@ -1142,15 +1144,22 @@ class GridStack {
             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;
+        let 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!
+            const child = item.firstElementChild;
+            if (!child) {
+                console.log(`Error: resizeToContent() '${GridStack.resizeToContentParent}'.firstElementChild is null, make sure to have a div like container. Skipping sizing.`);
+                return;
+            }
+            wantedH = child.getBoundingClientRect().height || itemH;
+        }
         if (itemH === wantedH)
             return;
         height += wantedH - itemH;
@@ -1171,10 +1180,10 @@ class GridStack {
             delete grid._ignoreLayoutsNodeChange;
         }
     }
-    /** call the user resize (so we can do extra work) else our build in version */
+    /** call the user resize (so they can do extra work) else our build in version */
     resizeToContentCheck(el, useAttr = false) {
         if (GridStack.resizeToContentCB)
-            GridStack.resizeToContentCB(el);
+            GridStack.resizeToContentCB(el, useAttr);
         else
             this.resizeToContent(el, useAttr);
     }
@@ -1335,27 +1344,33 @@ class GridStack {
     _updateContainerHeight() {
         if (!this.engine || this.engine.batchMode)
             return this;
-        let row = this.getRow() + this._extraDragRow; // checks for minRow already
-        // check for css min height
-        // Note: we don't handle %,rem correctly so comment out, beside we don't need need to create un-necessary
-        // rows as the CSS will make us bigger than our set height if needed... not sure why we had this.
-        // let cssMinHeight = parseInt(getComputedStyle(this.el)['min-height']);
-        // if (cssMinHeight > 0) {
-        //   let minRow = Math.round(cssMinHeight / this.getCellHeight(true));
-        //   if (row < minRow) {
-        //     row = minRow;
-        //   }
-        // }
-        this.el.setAttribute('gs-current-row', String(row));
-        if (row === 0) {
-            this.el.style.removeProperty('min-height');
-            return this;
-        }
-        let cellHeight = this.opts.cellHeight;
-        let unit = this.opts.cellHeightUnit;
+        const parent = this.parentGridItem;
+        let row = this.getRow() + this._extraDragRow; // this checks for minRow already
+        const cellHeight = this.opts.cellHeight;
+        const unit = this.opts.cellHeightUnit;
         if (!cellHeight)
             return this;
-        this.el.style.minHeight = row * cellHeight + unit;
+        // check for css min height (non nested grid). TODO: support mismatch, say: min % while unit is px.
+        if (!parent) {
+            const cssMinHeight = Utils.parseHeight(getComputedStyle(this.el)['minHeight']);
+            if (cssMinHeight.h > 0 && cssMinHeight.unit === unit) {
+                const minRow = Math.floor(cssMinHeight.h / cellHeight);
+                if (row < minRow) {
+                    row = minRow;
+                }
+            }
+        }
+        this.el.setAttribute('gs-current-row', String(row));
+        this.el.style.removeProperty('min-height');
+        this.el.style.removeProperty('height');
+        if (row) {
+            // nested grids have 'insert:0' to fill the space of parent by default, but we may be taller so use min-height for possible scrollbars
+            this.el.style[parent ? 'minHeight' : 'height'] = row * cellHeight + unit;
+        }
+        // if we're a nested grid inside an sizeToContent item, tell it to resize itself too
+        if (parent && !parent.grid.engine.batchMode && Utils.shouldSizeToContent(parent)) {
+            parent.grid.resizeToContentCheck(parent.el);
+        }
         return this;
     }
     /** @internal */
@@ -1505,7 +1520,9 @@ class GridStack {
             if (n.subGrid)
                 n.subGrid.onResize();
         });
-        this.doContentResize(columnChanged); // wait for anim of column changed (DOM reflow before we can size correctly)
+        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;
     }
@@ -1517,7 +1534,7 @@ class GridStack {
                 if (Utils.shouldSizeToContent(n))
                     this.resizeToContentCheck(n.el, useAttr);
             }
-            else {
+            else if (this.engine.nodes.some(n => Utils.shouldSizeToContent(n))) {
                 const nodes = [...this.engine.nodes]; // in case order changes while resizing one
                 this.batchUpdate();
                 nodes.forEach(n => {
@@ -1526,6 +1543,7 @@ class GridStack {
                 });
                 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);
@@ -1534,11 +1552,13 @@ class GridStack {
     _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 sizeToContent option.
-        const trackSize = !this.parentGridItem && (this._isAutoCellHeight || this.opts.sizeToContent || !this.opts.disableOneColumnMode || this.engine.nodes.find(n => n.sizeToContent));
+        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());
             this.resizeObserver.observe(this.el);
+            this._skipInitialResize = true; // makeWidget will originally have called on startup
         }
         else if ((forceRemove || !trackSize) && this.resizeObserver) {
             this.resizeObserver.disconnect();
@@ -1634,7 +1654,7 @@ class GridStack {
      * @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)
-     **/
+     */
     static setupDragIn(dragIn, dragInOptions, root = document) {
         if (dragInOptions?.pause !== undefined) {
             DDManager.pauseDrag = dragInOptions.pause;
@@ -2011,7 +2031,7 @@ class GridStack {
         }
         return this;
     }
-    /** @internal prepares the element for drag&drop **/
+    /** @internal prepares the element for drag&drop */
     _prepareDragDropByNode(node) {
         let el = node.el;
         const noMove = node.noMove || this.opts.disableDrag;
@@ -2105,7 +2125,7 @@ class GridStack {
             .resizable(el, noResize ? 'disable' : 'enable');
         return this;
     }
-    /** @internal handles actual drag/resize start **/
+    /** @internal handles actual drag/resize start */
     _onStartMoving(el, event, ui, node, cellWidth, cellHeight) {
         this.engine.cleanNodes()
             .beginUpdate(node);
@@ -2136,7 +2156,7 @@ class GridStack {
             }
         }
     }
-    /** @internal handles actual drag/resize **/
+    /** @internal handles actual drag/resize */
     _dragOrResize(el, event, ui, node, cellWidth, cellHeight) {
         let p = { ...node._orig }; // could be undefined (_isExternal) which is ok (drag only set x,y and w,h will default to node value)
         let resizing;
@@ -2224,7 +2244,7 @@ class GridStack {
     /** @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.
-     **/
+     */
     _leave(el, helper) {
         let node = el.gridstackNode;
         if (!node)
@@ -2263,6 +2283,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.1.1';
+GridStack.GDRev = '9.2.1';
 export { GridStack };
 //# sourceMappingURL=gridstack.js.map