react-grid-layout 1.5.1 → 1.5.3

package/lib/GridItem.jsx

@@ -510,15 +510,15 @@ export default class GridItem extends React.Component<Props, State> {
       const { offsetParent } = node;
 
       if (offsetParent) {
-        const { margin, rowHeight, containerPadding } = this.props;
+        const { margin, rowHeight } = this.props;
         const bottomBoundary =
           offsetParent.clientHeight - calcGridItemWHPx(h, rowHeight, margin[1]);
-        top = clamp(top - containerPadding[1], 0, bottomBoundary);
+        top = clamp(top, 0, bottomBoundary);
 
         const colWidth = calcGridColWidth(positionParams);
         const rightBoundary =
           containerWidth - calcGridItemWHPx(w, colWidth, margin[0]);
-        left = clamp(left - containerPadding[0], 0, rightBoundary);
+        left = clamp(left, 0, rightBoundary);
       }
     }
 

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.1",
+  "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",
@@ -37,10 +37,10 @@
   },
   "homepage": "https://github.com/STRML/react-grid-layout",
   "dependencies": {
-    "clsx": "^2.0.0",
+    "clsx": "^2.1.1",
     "fast-equals": "^4.0.3",
     "prop-types": "^15.8.1",
-    "react-draggable": "^4.4.5",
+    "react-draggable": "^4.4.6",
     "react-resizable": "^3.0.5",
     "resize-observer-polyfill": "^1.5.1"
   },
@@ -48,23 +48,23 @@
     "fast-equals": "Bug in CRA5 causes fast-equals@5 to fail to import due to .cjs file. See https://github.com/react-grid-layout/react-grid-layout/issues/1904"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.3",
-    "@babel/eslint-parser": "^7.23.3",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-transform-flow-comments": "^7.23.3",
-    "@babel/preset-env": "^7.23.3",
-    "@babel/preset-flow": "^7.23.3",
-    "@babel/preset-react": "^7.23.3",
-    "@babel/register": "^7.22.15",
+    "@babel/cli": "^7.27.2",
+    "@babel/core": "^7.27.4",
+    "@babel/eslint-parser": "^7.27.5",
+    "@babel/plugin-transform-class-properties": "^7.18.6",
+    "@babel/plugin-transform-flow-comments": "^7.27.3",
+    "@babel/preset-env": "^7.27.2",
+    "@babel/preset-flow": "^7.27.1",
+    "@babel/preset-react": "^7.27.1",
+    "@babel/register": "^7.27.1",
     "@webpack-cli/serve": "^2.0.5",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.1.3",
     "babel-plugin-preval": "^5.1.0",
     "css-loader": "^6.8.1",
-    "ejs": "^3.1.9",
+    "ejs": "^3.1.10",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.7",
+    "enzyme-adapter-react-16": "^1.15.8",
     "enzyme-to-json": "^3.6.2",
     "eslint": "^8.54.0",
     "eslint-plugin-flowtype": "^8.0.3",
@@ -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",
@@ -91,6 +92,12 @@
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   },
+  "resolutions": {
+    "**/cheerio": "npm:cheerio@1.0.0-rc.12"
+  },
+  "_resolutionNotes": {
+    "**/cheerio": "See https://github.com/cheeriojs/cheerio/issues/4618"
+  },
   "peerDependencies": {
     "react": ">= 16.3.0",
     "react-dom": ">= 16.3.0"