fix(verticalCompact): 'isUserAction' not properly reset after main collision

Fixes react-grid-layout#714, react-grid-layout#720, react-grid-layout#729

Thanks @alexanderzobnin

Author: STRML

lib/utils.js

@@ -445,6 +445,9 @@ export function moveElementAwayFromCollision(
   // We only do this on the main collision as this can get funky in cascades and cause
   // unwanted swapping behavior.
   if (isUserAction) {
+    // Reset isUserAction flag because we're not in the main collision anymore.
+    isUserAction = false;
+
     // Make a mock item so we don't modify the item here, only modify in moveElement.
     const fakeItem: LayoutItem = {
       x: compactH ? Math.max(collidesWith.x - itemToMove.w, 0) : itemToMove.x,
@@ -454,17 +457,8 @@ export function moveElementAwayFromCollision(
       i: "-1"
     };
 
-    // This makes it feel a bit more precise by waiting to swap for just a bit when moving up.
-    const [axis, dimension] =
-      compactType === "horizontal" ? ["x", "w"] : ["y", "h"];
-    const shouldSkip =
-      false &&
-      // Our collision is below the item to move, and only encroaches by 25% of its dimension; ignore
-      (collidesWith[axis] > itemToMove[axis] &&
-        collidesWith[axis] - itemToMove[axis] > itemToMove[dimension] / 4);
-
     // No collision? If so, we can go up there; otherwise, we'll end up moving down as normal
-    if (!shouldSkip && !getFirstCollision(layout, fakeItem)) {
+    if (!getFirstCollision(layout, fakeItem)) {
       log(
         `Doing reverse collision on ${itemToMove.i} up to [${fakeItem.x},${
           fakeItem.y

test/spec/utils-test.js

@@ -265,6 +265,36 @@ describe("moveElement", () => {
       ]
     );
   });
+
+  it("Moves one element to another should cause moving down panels below when compaction is vertical", () => {
+    const layout = [
+      { x: 0, y: 0, w: 2, h: 1, i: "A" },
+      { x: 2, y: 0, w: 2, h: 1, i: "B" },
+      { x: 0, y: 1, w: 1, h: 1, i: "C" },
+      { x: 1, y: 1, w: 3, h: 1, i: "D" }
+    ];
+    // move B left slightly so it collides with A; can cause C to jump above A
+    // this test will check that that does not happen
+    const itemB = layout[1];
+    assert.deepEqual(
+      moveElement(
+        layout,
+        itemB,
+        1,
+        0, // x, y
+        true,
+        false, // isUserAction, preventCollision
+        "vertical",
+        4 // compactType, cols
+      ),
+      [
+        { x: 0, y: 1, w: 2, h: 1, i: "A", moved: true },
+        { x: 1, y: 0, w: 2, h: 1, i: "B", moved: true },
+        { x: 0, y: 2, w: 1, h: 1, i: "C", moved: true },
+        { x: 1, y: 2, w: 3, h: 1, i: "D", moved: true }
+      ]
+    );
+  });
 });
 
 describe("compact vertical", () => {