react-grid-layout 1.5.2 → 1.5.3

package/lib/utils.js

@@ -239,6 +239,8 @@ export function compact(
 ): Layout {
   // Statics go in the compareWith array right away so items flow around them.
   const compareWith = getStatics(layout);
+  // We keep track of the bottom position.
+  let b = bottom(compareWith);
   // We go through the items by row and column.
   const sorted = sortLayoutItems(layout, compactType);
   // Holding for new items.
@@ -249,7 +251,16 @@ export function compact(
 
     // Don't move static elements
     if (!l.static) {
-      l = compactItem(compareWith, l, compactType, cols, sorted, allowOverlap);
+      l = compactItem(
+        compareWith,
+        l,
+        compactType,
+        cols,
+        sorted,
+        allowOverlap,
+        b
+      );
+      b = Math.max(b, l.y + l.h);
 
       // Add to comparison array. We only collide with items before this one.
       // Statics are already in this array.
@@ -319,7 +330,8 @@ export function compactItem(
   compactType: CompactType,
   cols: number,
   fullLayout: Layout,
-  allowOverlap: ?boolean
+  allowOverlap: ?boolean,
+  b: ?number
 ): LayoutItem {
   const compactV = compactType === "vertical";
   const compactH = compactType === "horizontal";
@@ -327,7 +339,11 @@ export function compactItem(
     // Bottom 'y' possible is the bottom of the layout.
     // This allows you to do nice stuff like specify {y: Infinity}
     // This is here because the layout must be sorted in order to get the correct bottom `y`.
-    l.y = Math.min(bottom(compareWith), l.y);
+    if (typeof b === "number") {
+      l.y = Math.min(b, l.y);
+    } else {
+      l.y = Math.min(bottom(compareWith), l.y);
+    }
     // Move the element up as far as it can go without colliding.
     while (l.y > 0 && !getFirstCollision(compareWith, l)) {
       l.y--;
@@ -619,7 +635,7 @@ export function moveElementAwayFromCollision(
         layout,
         itemToMove,
         undefined,
-        collidesWith.y + 1,
+        itemToMove.y + 1,
         isUserAction,
         preventCollision,
         compactType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-grid-layout",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "A draggable and resizable grid layout with responsive breakpoints, for React.",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "build": "make build",
     "build-example": "make build-example",
     "view-example": "make view-example",
-    "dev": "make dev",
+    "dev": "npx @react-grab/claude-code@latest && make dev",
     "prepublishOnly": "make build",
     "validate": "npm ls",
     "flow": "flow",
@@ -83,6 +83,7 @@
     "prettier": "^3.1.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
+    "react-grab": "^0.0.71",
     "react-hot-loader": "^4.13.1",
     "react-transform-hmr": "^1.0.2",
     "style-loader": "^3.3.3",