Merge pull request #1874 from adumesny/master

#1868 prevent swap during resize

Author: adumesny

doc/CHANGES.md

@@ -5,6 +5,7 @@ Change log
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
+- [4.3.0-dev (TBD)](#430-dev-tbd)
 - [4.3.0 (2021-10-15)](#430-2021-10-15)
 - [4.2.7 (2021-9-12)](#427-2021-9-12)
 - [4.2.6 (2021-7-11)](#426-2021-7-11)
@@ -62,6 +63,9 @@ Change log
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## 4.3.0-dev (TBD)
+* fix [#1868](https://github.com/gridstack/gridstack.js/issues/1868) prevent swap during resize
+
 ## 4.3.0 (2021-10-15)
 * you can now swap items of different width if they are the same row/height. Thanks to [spektrummedia](http://spektrummedia.com) for sponsoring it.
 * fix [#1860](https://github.com/gridstack/gridstack.js/issues/1860) nested grid save inf loop fix

src/gridstack-dd.ts

@@ -594,7 +594,7 @@ GridStack.prototype._dragOrResize = function(this: GridStack, el: GridItemHTMLEl
     w: (ui.size ? ui.size.width : node.w * cellWidth) - mLeft - mRight,
     h: (ui.size ? ui.size.height : node.h * cellHeight) - mTop - mBottom
   };
-  if (this.engine.moveNodeCheck(node, {...p, cellWidth, cellHeight, rect})) {
+  if (this.engine.moveNodeCheck(node, {...p, cellWidth, cellHeight, rect, resizing})) {
     node._lastUiPosition = ui.position;
     this.engine.cacheRects(cellWidth, cellHeight, mTop, mRight, mBottom, mLeft);
     delete node._skipDown;

src/gridstack-engine.ts

@@ -537,8 +537,8 @@ export class GridStackEngine {
     // if maxRow make sure we are still valid size
     if (this.maxRow && canMove) {
       canMove = (clone.getRow() <= this.maxRow);
-      // turns out we can't grow, then see if we can swap instead (ex: full grid)
-      if (!canMove) {
+      // turns out we can't grow, then see if we can swap instead (ex: full grid) if we're not resizing
+      if (!canMove && !o.resizing) {
         let collide = this.collide(node, o);
         if (collide && this.swap(node, collide)) {
           this._notify();

src/types.ts

@@ -210,6 +210,8 @@ export interface GridStackMoveOpts extends GridStackPosition {
   marginRight?: number;
   /** position in pixels of the currently dragged items (for overlap check) */
   rect?: GridStackPosition;
+  /** true if we're live resizing */
+  resizing?: boolean;
 }
 
 export interface GridStackPosition {