gridstack 9.5.1 → 10.0.1

package/dist/gridstack.js

@@ -1,5 +1,5 @@
 /*!
- * GridStack 9.5.1
+ * GridStack 10.0.1
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021-2022 Alain Dumesny
@@ -17,7 +17,6 @@ import { gridDefaults, dragInDefaultOptions } from './types';
 import { DDGridStack } from './dd-gridstack';
 import { isTouch } from './dd-touch';
 import { DDManager } from './dd-manager';
-/** global instance */
 const dd = new DDGridStack;
 // export all dependent file as well to make it easier for users to just import the main file
 export * from './types';
@@ -156,6 +155,7 @@ class GridStack {
         this._gsEventHandler = {};
         /** @internal extra row added when dragging at the bottom of the grid */
         this._extraDragRow = 0;
+        el.gridstack = this;
         this.el = el; // exposed HTML element to the user
         opts = opts || {}; // handles null/undefined/0
         if (!el.classList.contains('grid-stack')) {
@@ -175,6 +175,41 @@ class GridStack {
         if (opts.alwaysShowResizeHandle !== undefined) {
             opts._alwaysShowResizeHandle = opts.alwaysShowResizeHandle;
         }
+        let bk = opts.columnOpts?.breakpoints;
+        // LEGACY: oneColumnMode stuff changed in v10.x - check if user explicitly set something to convert over
+        const oldOpts = opts;
+        if (oldOpts.oneColumnModeDomSort) {
+            delete oldOpts.oneColumnModeDomSort;
+            console.log('Error: Gridstack oneColumnModeDomSort no longer supported. Check GridStackOptions.columnOpts instead.');
+        }
+        if (oldOpts.oneColumnSize || oldOpts.disableOneColumnMode === false) {
+            const oneSize = oldOpts.oneColumnSize || 768;
+            delete oldOpts.oneColumnSize;
+            delete oldOpts.disableOneColumnMode;
+            opts.columnOpts = opts.columnOpts || {};
+            bk = opts.columnOpts.breakpoints = opts.columnOpts.breakpoints || [];
+            let oneColumn = bk.find(b => b.c === 1);
+            if (!oneColumn) {
+                oneColumn = { c: 1, w: oneSize };
+                bk.push(oneColumn, { c: 12, w: oneSize + 1 });
+            }
+            else
+                oneColumn.w = oneSize;
+        }
+        //...end LEGACY
+        // cleanup responsive opts (must have columnWidth | breakpoints) then sort breakpoints by size (so we can match during resize)
+        const resp = opts.columnOpts;
+        if (resp) {
+            if (!resp.columnWidth && !resp.breakpoints?.length) {
+                delete opts.columnOpts;
+                bk = undefined;
+            }
+            else {
+                resp.columnMax = resp.columnMax || 12;
+            }
+        }
+        if (bk?.length > 1)
+            bk.sort((a, b) => (b.w || 0) - (a.w || 0));
         // elements DOM attributes override any passed options (like CSS style) - merge the two together
         let defaults = { ...Utils.cloneDeep(gridDefaults),
             column: Utils.toNumber(el.getAttribute('gs-column')) || gridDefaults.column,
@@ -196,10 +231,8 @@ class GridStack {
         opts = null; // make sure we use this.opts instead
         this._initMargin(); // part of settings defaults...
         // Now check if we're loading into 1 column mode FIRST so we don't do un-necessary work (like cellHeight = width / 12 then go 1 column)
-        if (this.opts.column !== 1 && !this.opts.disableOneColumnMode && this._widthOrContainer() <= this.opts.oneColumnSize) {
-            this._prevColumn = this.getColumn();
-            this.opts.column = 1;
-        }
+        this.checkDynamicColumn();
+        this.el.classList.add('gs-' + this.opts.column);
         if (this.opts.rtl === 'auto') {
             this.opts.rtl = (el.style.direction === 'rtl');
         }
@@ -259,6 +292,8 @@ class GridStack {
                 this._updateStyles(false, maxH); // false = don't recreate, just append if need be
             }
         });
+        // create initial global styles BEFORE loading children so resizeToContent margin can be calculated correctly
+        this._updateStyles(false, 0);
         if (this.opts.auto) {
             this.batchUpdate(); // prevent in between re-layout #1535 TODO: this only set float=true, need to prevent collision check...
             this.getGridItems().forEach(el => this._prepareElement(el));
@@ -271,9 +306,8 @@ class GridStack {
             if (children.length)
                 this.load(children); // don't load empty
         }
+        // if (this.engine.nodes.length) this._updateStyles(); // update based on # of children. done in engine onChange CB
         this.setAnimation(this.opts.animate);
-        this._updateStyles();
-        this.el.classList.add('gs-' + this.opts.column);
         // dynamic grids require pausing during drag to detect over to nest vs push
         if (this.opts.subGridDynamic && !DDManager.pauseDrag)
             DDManager.pauseDrag = true;
@@ -380,7 +414,7 @@ class GridStack {
         if (ops.column === 'auto') {
             autoColumn = true;
             ops.column = Math.max(node.w || 1, nodeToAdd?.w || 1);
-            ops.disableOneColumnMode = true; // driven by parent
+            delete ops.columnOpts; // driven by parent
         }
         // if we're converting an existing full item, move over the content to be the first sub item in the new grid
         let content = node.el.querySelector('.grid-stack-item-content');
@@ -516,7 +550,6 @@ class GridStack {
             }
             if (this._autoColumn) {
                 o.column = 'auto';
-                delete o.disableOneColumnMode;
             }
             const origShow = o._alwaysShowResizeHandle;
             delete o._alwaysShowResizeHandle;
@@ -544,17 +577,17 @@ class GridStack {
      */
     load(items, addRemove = GridStack.addRemoveCB || true) {
         items = Utils.cloneDeep(items); // so we can mod
-        // if passed list has coordinates, use them (insert from end to beginning for conflict resolution) else force widget same order
+        const column = this.getColumn();
+        // if passed list has coordinates, use them (insert from end to beginning for conflict resolution) else keep widget order
         const haveCoord = items.some(w => w.x !== undefined || w.y !== undefined);
         if (haveCoord)
-            items = Utils.sort(items, -1, this._prevColumn || this.getColumn());
+            items = Utils.sort(items, -1, column);
         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
+        // if we're loading a layout into for example 1 column and items don't fit, make sure to save
         // the original wanted layout so we can scale back up correctly #1471
-        const column = this.opts.column;
-        if (this._prevColumn && this._prevColumn !== column && items.some(n => ((n.x || 0) + n.w) > column)) {
+        if (items.some(n => ((n.x || 0) + (n.w || 1)) > column)) {
             this._ignoreLayoutsNodeChange = true; // skip layout update
-            this.engine.cacheLayout(items, this._prevColumn, true);
+            this.engine.cacheLayout(items, 12, true); // TODO: 12 is arbitrary. use max value in layout ?
         }
         // if given a different callback, temporally set it as global option so creating will use it
         const prevCB = GridStack.addRemoveCB;
@@ -562,6 +595,10 @@ class GridStack {
             GridStack.addRemoveCB = addRemove;
         let removed = [];
         this.batchUpdate();
+        // if we are blank (loading into empty like startup) temp remove animation
+        const noAnim = !this.engine.nodes.length;
+        if (noAnim)
+            this.setAnimation(false);
         // see if any items are missing from new layout and need to be removed first
         if (addRemove) {
             let copyNodes = [...this.engine.nodes]; // don't loop through array you modify
@@ -587,21 +624,19 @@ class GridStack {
             } // remove if found from list
             return true;
         });
-        let widthChanged = false;
         items.forEach(w => {
             let item = Utils.find(updateNodes, w.id);
             if (item) {
-                // if item sizes to content, re-use the exiting height so it's a better guess at the final size 9same if width doesn't change)
+                // if item sizes to content, re-use the exiting height so it's a better guess at the final size (same if width doesn't change)
                 if (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...
+                this.engine.nodeBoundFix(w);
                 if (w.autoPosition || w.x === undefined || w.y === undefined) {
                     w.w = w.w || item.w;
                     w.h = w.h || item.h;
                     this.engine.findEmptyPosition(w);
                 }
-                widthChanged = widthChanged || (w.w !== undefined && w.w !== item.w);
                 // add back to current list BUT force a collision check if it 'appears' we didn't change to make sure we don't overlap others now
                 this.engine.nodes.push(item);
                 if (Utils.samePos(item, w)) {
@@ -621,12 +656,14 @@ class GridStack {
             }
         });
         this.engine.removedNodes = removed;
-        this.doContentResize(widthChanged, true); // we only need to wait for animation if we changed any widths
         this.batchUpdate(false);
         // after commit, clear that flag
         delete this._ignoreLayoutsNodeChange;
         delete this._insertNotAppend;
         prevCB ? GridStack.addRemoveCB = prevCB : delete GridStack.addRemoveCB;
+        // delay adding animation back
+        if (noAnim && this.opts.animate)
+            setTimeout(() => this.setAnimation(this.opts.animate));
         return this;
     }
     /**
@@ -651,11 +688,18 @@ class GridStack {
             (!forcePixel || !this.opts.cellHeightUnit || this.opts.cellHeightUnit === 'px')) {
             return this.opts.cellHeight;
         }
+        // do rem/em to px conversion
+        if (this.opts.cellHeightUnit === 'rem') {
+            return this.opts.cellHeight * parseFloat(getComputedStyle(document.documentElement).fontSize);
+        }
+        if (this.opts.cellHeightUnit === 'em') {
+            return this.opts.cellHeight * parseFloat(getComputedStyle(this.el).fontSize);
+        }
         // else get first cell height
         let el = this.el.querySelector('.' + this.opts.itemClass);
         if (el) {
-            let height = Utils.toNumber(el.getAttribute('gs-h')) || 1; // since we don't write 1 anymore
-            return Math.round(el.offsetHeight / height);
+            let h = Utils.toNumber(el.getAttribute('gs-h')) || 1; // since we don't write 1 anymore
+            return Math.round(el.offsetHeight / h);
         }
         // else do entire grid and # of rows (but doesn't work if min-height is the actual constrain)
         let rows = parseInt(this.el.getAttribute('gs-current-row'));
@@ -698,7 +742,7 @@ class GridStack {
         }
         this.opts.cellHeightUnit = data.unit;
         this.opts.cellHeight = data.h;
-        this.doContentResize(false, true); // no anim wait, but use attributes since we only change row height
+        this.resizeToContentCheck();
         if (update) {
             this._updateStyles(true); // true = force re-create for current # of rows
         }
@@ -708,11 +752,37 @@ class GridStack {
     cellWidth() {
         return this._widthOrContainer() / this.getColumn();
     }
-    /** return our expected width (or parent) for 1 column check */
-    _widthOrContainer() {
+    /** return our expected width (or parent) , and optionally of window for dynamic column check */
+    _widthOrContainer(forBreakpoint = false) {
         // use `offsetWidth` or `clientWidth` (no scrollbar) ?
         // https://stackoverflow.com/questions/21064101/understanding-offsetwidth-clientwidth-scrollwidth-and-height-respectively
-        return (this.el.clientWidth || this.el.parentElement.clientWidth || window.innerWidth);
+        return forBreakpoint && this.opts.columnOpts?.breakpointForWindow ? window.innerWidth : (this.el.clientWidth || this.el.parentElement.clientWidth || window.innerWidth);
+    }
+    /** checks for dynamic column count for our current size, returning true if changed */
+    checkDynamicColumn() {
+        const resp = this.opts.columnOpts;
+        if (!resp || (!resp.columnWidth && !resp.breakpoints?.length))
+            return false;
+        const column = this.getColumn();
+        let newColumn = column;
+        const w = this._widthOrContainer(true);
+        if (resp.columnWidth) {
+            newColumn = Math.min(Math.round(w / resp.columnWidth) || 1, resp.columnMax);
+        }
+        else {
+            // find the closest breakpoint (already sorted big to small) that matches
+            newColumn = resp.columnMax;
+            let i = 0;
+            while (i < resp.breakpoints.length && w <= resp.breakpoints[i].w) {
+                newColumn = resp.breakpoints[i++].c || column;
+            }
+        }
+        if (newColumn !== column) {
+            const bk = resp.breakpoints?.find(b => b.c === newColumn);
+            this.column(newColumn, bk?.layout || resp.layout);
+            return true;
+        }
+        return false;
     }
     /**
      * re-layout grid items to reclaim any empty space. Options are:
@@ -739,34 +809,19 @@ class GridStack {
         if (!column || column < 1 || this.opts.column === column)
             return this;
         let oldColumn = this.getColumn();
-        // 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 && !this.opts.disableOneColumnMode) {
-            this._prevColumn = oldColumn;
-        }
-        else {
-            delete this._prevColumn;
-        }
+        this.opts.column = column;
+        if (!this.engine)
+            return this; // called in constructor, noting else to do
+        this.engine.column = column;
         this.el.classList.remove('gs-' + oldColumn);
         this.el.classList.add('gs-' + column);
-        this.opts.column = this.engine.column = column;
-        // update the items now - see if the dom order nodes should be passed instead (else default to current list)
-        let domNodes;
-        if (column === 1 && this.opts.oneColumnModeDomSort) {
-            domNodes = [];
-            this.getGridItems().forEach(el => {
-                if (el.gridstackNode) {
-                    domNodes.push(el.gridstackNode);
-                }
-            });
-            if (!domNodes.length) {
-                domNodes = undefined;
-            }
-        }
-        this.engine.columnChanged(oldColumn, column, domNodes, layout);
+        // update the items now, checking if we have a custom children layout
+        /*const newChildren = this.opts.columnOpts?.breakpoints?.find(r => r.c === column)?.children;
+        if (newChildren) this.load(newChildren);
+        else*/ this.engine.columnChanged(oldColumn, column, undefined, layout);
         if (this._isAutoCellHeight)
             this.cellHeight();
-        this.doContentResize();
+        this.resizeToContentCheck(true); // wait for width resizing
         // and trigger our event last...
         this._ignoreLayoutsNodeChange = true; // skip layout update
         this._triggerChangeEvent();
@@ -776,9 +831,7 @@ class GridStack {
     /**
      * get the number of columns in the grid (default 12)
      */
-    getColumn() {
-        return this.opts.column;
-    }
+    getColumn() { return this.opts.column; }
     /** returns an array of grid HTML elements (no placeholder) - used to iterate through our children in DOM order */
     getGridItems() {
         return Array.from(this.el.children)
@@ -890,14 +943,13 @@ class GridStack {
         this._prepareElement(el, true, options);
         const node = el.gridstackNode;
         this._updateContainerHeight();
-        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
         }
-        // if we're adding an item into 1 column (_prevColumn is set only when going to 1) make sure
+        // if we're adding an item into 1 column make sure
         // we don't override the larger 12 column layout that was already saved. #1985
-        if (this._prevColumn && this.opts.column === 1) {
+        if (this.opts.column === 1) {
             this._ignoreLayoutsNodeChange = true;
         }
         this._triggerAddEvent();
@@ -928,8 +980,8 @@ class GridStack {
             names.forEach(name => this.on(name, callback));
             return this;
         }
+        // native CustomEvent handlers - cash the generic handlers so we can easily remove
         if (name === 'change' || name === 'added' || name === 'removed' || name === 'enable' || name === 'disable') {
-            // native CustomEvent handlers - cash the generic handlers so we can easily remove
             let noData = (name === 'enable' || name === 'disable');
             if (noData) {
                 this._gsEventHandler[name] = (event) => callback(event);
@@ -946,7 +998,7 @@ class GridStack {
             this._gsEventHandler[name] = callback;
         }
         else {
-            console.log('GridStack.on(' + name + ') event not supported, but you can still use $(".grid-stack").on(...) while jquery-ui is still used internally.');
+            console.log('GridStack.on(' + name + ') event not supported');
         }
         return this;
     }
@@ -1036,6 +1088,8 @@ class GridStack {
         }
         return this;
     }
+    /** @internal */
+    hasAnimationCSS() { return this.el.classList.contains('grid-stack-animate'); }
     /**
      * Toggle the grid static state, which permanently removes/add Drag&Drop support, unlike disable()/enable() that just turns it off/on.
      * Also toggle the grid-stack-static class.
@@ -1121,8 +1175,11 @@ class GridStack {
             }
             Utils.sanitizeMinMax(n);
             // finally move the widget and update attr
-            if (m)
+            if (m) {
+                const widthChanged = (m.w !== undefined && m.w !== n.w);
                 this.moveNode(n, m);
+                this.resizeToContentCheck(widthChanged, n); // wait for animation if we changed width
+            }
             if (m || changed) {
                 this._writeAttr(el, n);
             }
@@ -1143,26 +1200,25 @@ 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
+     * @param el grid item element
+     * @param useNodeH 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) {
+    resizeToContent(el) {
         if (!el)
             return;
         el.classList.remove('size-to-content-max');
         if (!el.clientHeight)
             return; // 0 when hidden, skip
-        let n = el.gridstackNode;
+        const n = el.gridstackNode;
         if (!n)
             return;
         const grid = n.grid;
-        if (!grid)
-            return;
-        if (el.parentElement !== grid.el)
+        if (!grid || el.parentElement !== grid.el)
             return; // skip if we are not inside a grid
-        const cell = grid.getCellHeight();
+        const cell = grid.getCellHeight(true);
         if (!cell)
             return;
-        let height = useAttrSize && n.h ? n.h * cell : el.clientHeight; // getBoundingClientRect().height seem to flicker back and forth
+        let height = 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);
@@ -1171,11 +1227,11 @@ class GridStack {
         if (!item)
             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 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)
         let wantedH;
         if (n.subGrid) {
             // sub-grid - use their actual row count * their cell height
-            wantedH = n.subGrid.getRow() * n.subGrid.getCellHeight();
+            wantedH = n.subGrid.getRow() * n.subGrid.getCellHeight(true);
         }
         else {
             // NOTE: clientHeight & getBoundingClientRect() is undefined for text and other leaf nodes. use <div> container!
@@ -1207,11 +1263,11 @@ class GridStack {
         }
     }
     /** call the user resize (so they can do extra work) else our build in version */
-    resizeToContentCheck(el, useAttr = false) {
+    resizeToContentCBCheck(el) {
         if (GridStack.resizeToContentCB)
-            GridStack.resizeToContentCB(el, useAttr);
+            GridStack.resizeToContentCB(el);
         else
-            this.resizeToContent(el, useAttr);
+            this.resizeToContent(el);
     }
     /**
      * 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).
@@ -1304,7 +1360,8 @@ class GridStack {
     /** @internal called to delete the current dynamic style sheet used for our layout */
     _removeStylesheet() {
         if (this._styles) {
-            Utils.removeStylesheet(this._styleSheetClass);
+            const styleLocation = this.opts.styleInHead ? undefined : this.el.parentNode;
+            Utils.removeStylesheet(this._styleSheetClass, styleLocation);
             delete this._styles;
         }
         return this;
@@ -1315,7 +1372,7 @@ class GridStack {
         if (forceUpdate) {
             this._removeStylesheet();
         }
-        if (!maxH)
+        if (maxH === undefined)
             maxH = this.getRow();
         this._updateContainerHeight();
         // if user is telling us they will handle the CSS themselves by setting heights to 0. Do we need this opts really ??
@@ -1328,7 +1385,7 @@ class GridStack {
         // create one as needed
         if (!this._styles) {
             // insert style to parent (instead of 'head' by default) to support WebComponent
-            let styleLocation = this.opts.styleInHead ? undefined : this.el.parentNode;
+            const styleLocation = this.opts.styleInHead ? undefined : this.el.parentNode;
             this._styles = Utils.createStylesheet(this._styleSheetClass, styleLocation, {
                 nonce: this.opts.nonce,
             });
@@ -1395,25 +1452,24 @@ class GridStack {
         }
         // 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);
+            parent.grid.resizeToContentCBCheck(parent.el);
         }
         return this;
     }
     /** @internal */
     _prepareElement(el, triggerAddEvent = false, node) {
-        el.classList.add(this.opts.itemClass);
         node = node || this._readAttr(el);
         el.gridstackNode = node;
         node.el = el;
         node.grid = this;
-        let copy = { ...node };
         node = this.engine.addNode(node, triggerAddEvent);
-        // write node attr back in case there was collision or we have to fix bad values during addNode()
-        if (!Utils.same(node, copy)) {
-            this._writeAttr(el, node);
-        }
-        if (Utils.shouldSizeToContent(node))
-            el.classList.add('size-to-content');
+        // write the dom sizes and class
+        this._writeAttr(el, node);
+        el.classList.add(gridDefaults.itemClass, this.opts.itemClass);
+        const sizeToContent = Utils.shouldSizeToContent(node);
+        sizeToContent ? el.classList.add('size-to-content') : el.classList.remove('size-to-content');
+        if (sizeToContent)
+            this.resizeToContentCheck(false, node);
         this._prepareDragDropByNode(node);
         return this;
     }
@@ -1528,15 +1584,8 @@ class GridStack {
             }
         }
         else {
-            // else check for 1 column in/out behavior
-            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 sizeToContent
-                this.column(oneColumn ? 1 : this._prevColumn);
-                // if (this.opts.animate) setTimeout(() => this.setAnimation(true));
-                columnChanged = true;
-            }
+            // else check for dynamic column
+            columnChanged = this.checkDynamicColumn();
         }
         // make the cells content square again
         if (this._isAutoCellHeight)
@@ -1547,40 +1596,41 @@ class GridStack {
                 n.subGrid.onResize();
         });
         if (!this._skipInitialResize)
-            this.doContentResize(columnChanged); // wait for anim of column changed (DOM reflow before we can size correctly)
+            this.resizeToContentCheck(columnChanged); // wait for anim of column changed (DOM reflow before we can size correctly)
         delete this._skipInitialResize;
         this.batchUpdate(false);
         return this;
     }
-    doContentResize(delay = true, useAttr = false, n = undefined) {
+    /** resizes content for given node (or all) if shouldSizeToContent() is true */
+    resizeToContentCheck(delay = false, n = undefined) {
+        if (!this.engine)
+            return; // we've been deleted in between!
         // 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 (!this.engine)
-                return; // we've been deleted in between!
-            if (n) {
+        if (delay && this.hasAnimationCSS())
+            return setTimeout(() => this.resizeToContentCheck(false, n), 300 + 10);
+        if (n) {
+            if (Utils.shouldSizeToContent(n))
+                this.resizeToContentCBCheck(n.el);
+        }
+        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 => {
                 if (Utils.shouldSizeToContent(n))
-                    this.resizeToContentCheck(n.el, useAttr);
-            }
-            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 => {
-                    if (Utils.shouldSizeToContent(n))
-                        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);
+                    this.resizeToContentCBCheck(n.el);
+            });
+            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);
     }
     /** 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)
+        // only add event if we're not nested (parent will call us) and we're auto sizing cells or supporting dynamic column (i.e. doing work)
         // or supporting new sizeToContent option.
-        const trackSize = !this.parentGridItem && (this._isAutoCellHeight || this.opts.sizeToContent || !this.opts.disableOneColumnMode
+        const trackSize = !this.parentGridItem && (this._isAutoCellHeight || this.opts.sizeToContent || this.opts.columnOpts
             || this.engine.nodes.find(n => n.sizeToContent));
         if (!forceRemove && trackSize && !this.resizeObserver) {
             this._sizeThrottle = Utils.throttle(() => this.onResize(), this.opts.cellHeightThrottle);
@@ -1705,7 +1755,7 @@ class GridStack {
         if (this.opts.staticGrid)
             return this; // can't move a static grid!
         GridStack.getElements(els).forEach(el => {
-            let n = el.gridstackNode;
+            const n = el.gridstackNode;
             if (!n)
                 return;
             val ? delete n.noMove : n.noMove = true;
@@ -1961,8 +2011,12 @@ class GridStack {
             // ignore drop on ourself from ourself that didn't come from the outside - dragend will handle the simple move instead
             if (node?.grid === this && !node._isExternal)
                 return false;
-            let wasAdded = !!this.placeholder.parentElement; // skip items not actually added to us because of constrains, but do cleanup #1419
+            const wasAdded = !!this.placeholder.parentElement; // skip items not actually added to us because of constrains, but do cleanup #1419
             this.placeholder.remove();
+            // disable animation when replacing a placeholder (already positioned) with actual content
+            const noAnim = wasAdded && this.opts.animate;
+            if (noAnim)
+                this.setAnimation(false);
             // notify previous grid of removal
             // console.log('drop delete _gridstackNodeOrig') // TEST
             let origNode = el._gridstackNodeOrig;
@@ -2007,15 +2061,13 @@ class GridStack {
             // @ts-ignore
             Utils.copyPos(node, this._readAttr(this.placeholder)); // placeholder values as moving VERY fast can throw things off #1578
             Utils.removePositioningStyles(el); // @ts-ignore
-            this._writeAttr(el, node);
-            el.classList.add(gridDefaults.itemClass, this.opts.itemClass);
             this.el.appendChild(el); // @ts-ignore // TODO: now would be ideal time to _removeHelperStyle() overriding floating styles (native only)
+            this._prepareElement(el, true, node);
             if (subGrid) {
                 subGrid.parentGridItem = node;
                 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
@@ -2024,6 +2076,9 @@ class GridStack {
             if (this._gsEventHandler['dropped']) {
                 this._gsEventHandler['dropped']({ ...event, type: 'dropped' }, origNode && origNode.grid ? origNode : undefined, node);
             }
+            // delay adding animation back
+            if (noAnim)
+                setTimeout(() => this.setAnimation(this.opts.animate));
             return false; // prevent parent from receiving msg (which may be grid as well)
         });
         return this;
@@ -2091,6 +2146,7 @@ class GridStack {
                 delete node._moving;
                 delete node._event;
                 delete node._lastTried;
+                const widthChanged = node.w !== node._orig.w;
                 // if the item has moved to another grid, we're done here
                 let target = event.target;
                 if (!target.gridstackNode || target.gridstackNode.grid !== this)
@@ -2128,7 +2184,7 @@ class GridStack {
                 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
+                    this.resizeToContentCheck(widthChanged, node); // wait for width animation if changed
                 }
             };
             dd.draggable(el, {
@@ -2305,6 +2361,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.5.1';
+GridStack.GDRev = '10.0.1';
 export { GridStack };
 //# sourceMappingURL=gridstack.js.map