From 6b8c36169f65cd119d0bfcd3a36dba2dcadb6883 Mon Sep 17 00:00:00 2001
From: Alain Dumesny <alaind831+github@gmail.com>
Date: Fri, 23 Sep 2022 07:56:22 -0700
Subject: [PATCH] * when swapping shapes in maxRow grid, make sure we still
 check for 50% coverage

---
 doc/CHANGES.md          |  1 +
 src/dd-resizable.ts     |  2 +-
 src/gridstack-engine.ts | 13 +++++++------
 src/types.ts            |  2 ++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index ce90eee83..37406a2f4 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -73,6 +73,7 @@ Change log
 
 ## 6.0.1-dev (TBD)
 * fixed [#2034](https://github.com/gridstack/gridstack.js/issues/2034) `removeWidget()` breaking resize handle feedback
+* fixed [#2043](https://github.com/gridstack/gridstack.js/issues/2043) when swapping shapes in maxRow grid, make sure we still check for 50% coverage
 
 ## 6.0.1 (2022-08-27)
 * fixed `float(val)` to set on grid and engine, so save() will read it.
diff --git a/src/dd-resizable.ts b/src/dd-resizable.ts
index d791425a0..7d911e27a 100644
--- a/src/dd-resizable.ts
+++ b/src/dd-resizable.ts
@@ -120,7 +120,7 @@ export class DDResizable extends DDBaseImplement implements HTMLElementExtendOpt
       this.el.removeEventListener('mouseout', this._mouseOut);
       if (DDManager.overResizeElement === this) {
         delete DDManager.overResizeElement;
-      }  
+      }
     }
     return this;
   }
diff --git a/src/gridstack-engine.ts b/src/gridstack-engine.ts
index b8e5c8ead..ac3bb8579 100644
--- a/src/gridstack-engine.ts
+++ b/src/gridstack-engine.ts
@@ -175,6 +175,7 @@ export class GridStackEngine {
         collide = n;
       }
     });
+    o.collide = collide; // save it so we don't have to find it again
     return collide;
   }
 
@@ -541,12 +542,12 @@ export class GridStackEngine {
     });
     if (!clonedNode) return false;
 
-    // make sure we are still valid size
-    let canMove = clone.moveNode(clonedNode, o) && clone.getRow() <= this.maxRow;
-    // 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)) {
+    // check if we're covering 50% collision and could move
+    let canMove = clone.moveNode(clonedNode, o);
+    // make sure we are still valid grid max, else check if we can force a swap (float=true, or different shapes) on non-resize
+    if (!o.resizing && canMove && o.collide && this.float && clone.getRow() > this.maxRow) {
+      let collide = o.collide.el.gridstackNode; // find the source node the clone collided with
+      if (this.swap(node, collide)) { // swaps and mark dirty
         this._notify();
         return true;
       }
diff --git a/src/types.ts b/src/types.ts
index c99dc8601..25338ab81 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -253,6 +253,8 @@ export interface GridStackMoveOpts extends GridStackPosition {
   rect?: GridStackPosition;
   /** true if we're live resizing */
   resizing?: boolean;
+  /** best node (most coverage) we collied with */
+  collide?: GridStackNode;
 }
 
 export interface GridStackPosition {