Merge pull request react-grid-layout#766 from brian-eightsolutions/fix-for-no-compaction

Fix for bugs when no compaction is on.

Author: STRML

lib/utils.js

@@ -122,7 +122,7 @@ export function childrenEqual(a: ReactChildren, b: ReactChildren): boolean {
  * Given two layoutitems, check if they collide.
  */
 export function collides(l1: LayoutItem, l2: LayoutItem): boolean {
-  if (l1 === l2) return false; // same element
+  if (l1.i === l2.i) return false; // same element
   if (l1.x + l1.w <= l2.x) return false; // l1 is left of l2
   if (l1.x >= l2.x + l2.w) return false; // l1 is right of l2
   if (l1.y + l1.h <= l2.y) return false; // l1 is above l2
@@ -185,7 +185,11 @@ function resolveCompactionCollision(
 ) {
   const sizeProp = heightWidth[axis];
   item[axis] += 1;
-  const itemIndex = layout.indexOf(item);
+  const itemIndex = layout
+    .map(layoutItem => {
+      return layoutItem.i;
+    })
+    .indexOf(item.i);
 
   // Go through each item we collide with.
   for (let i = itemIndex + 1; i < layout.length; i++) {
@@ -441,7 +445,8 @@ export function moveElementAwayFromCollision(
   cols: number
 ): Layout {
   const compactH = compactType === "horizontal";
-  const compactV = compactType === "vertical";
+  // Compact vertically if not set to horizontal
+  const compactV = compactType !== "horizontal";
   const preventCollision = false; // we're already colliding
 
   // If there is enough space above the collision to put this element, move it there.