react-grid-layout 1.2.4 → 1.2.5

package/lib/GridItem.jsx

@@ -13,7 +13,7 @@ import {
   clamp
 } from "./calculateUtils";
 import {
-  resizeHandlesType,
+  resizeHandleAxesType,
   resizeHandleType
 } from "./ReactGridLayoutPropTypes";
 import classNames from "classnames";
@@ -29,7 +29,7 @@ import type {
 
 import type { PositionParams } from "./calculateUtils";
 import type {
-  ResizeHandles,
+  ResizeHandleAxis,
   ResizeHandle,
   ReactRef
 } from "./ReactGridLayoutPropTypes";
@@ -82,7 +82,7 @@ type Props = {
   maxH: number,
   i: string,
 
-  resizeHandles?: ResizeHandles,
+  resizeHandles?: ResizeHandleAxis[],
   resizeHandle?: ResizeHandle,
 
   onDrag?: GridItemCallback<GridDragEvent>,
@@ -159,7 +159,7 @@ export default class GridItem extends React.Component<Props, State> {
     i: PropTypes.string.isRequired,
 
     // Resize handle options
-    resizeHandles: resizeHandlesType,
+    resizeHandles: resizeHandleAxesType,
     resizeHandle: resizeHandleType,
 
     // Functions
@@ -394,9 +394,9 @@ export default class GridItem extends React.Component<Props, State> {
     ];
     return (
       <Resizable
+        // These are opts for the resize handle itself
         draggableOpts={{
           disabled: !isResizable,
-          nodeRef: this.elementRef
         }}
         className={isResizable ? undefined : "react-resizable-hide"}
         width={position.width}

package/lib/ReactGridLayoutPropTypes.js

@@ -8,17 +8,17 @@ import type {
 } from "react";
 import type { EventCallback, CompactType, Layout, LayoutItem } from "./utils";
 
-type ResizeHandleAxis = "s" | "w" | "e" | "n" | "sw" | "nw" | "se" | "ne";
-export type ResizeHandles = Array<ResizeHandleAxis>;
-export type ResizeHandle =
-  | ReactElement<any>
-  | ((resizeHandleAxis: ResizeHandleAxis) => ReactElement<any>);
-
 // util
 export type ReactRef<T: HTMLElement> = {|
   +current: T | null
 |};
 
+export type ResizeHandleAxis = "s" | "w" | "e" | "n" | "sw" | "nw" | "se" | "ne";
+export type ResizeHandle =
+  | ReactElement<any>
+  | ((resizeHandleAxis: ResizeHandleAxis, ref: ReactRef<HTMLElement>) => ReactElement<any>);
+
+
 // Defines which resize handles should be rendered (default: 'se')
 // Allows for any combination of:
 // 's' - South handle (bottom-center)
@@ -29,7 +29,7 @@ export type ReactRef<T: HTMLElement> = {|
 // 'nw' - Northwest handle (top-left)
 // 'se' - Southeast handle (bottom-right)
 // 'ne' - Northeast handle (top-right)
-export const resizeHandlesType: ReactPropsChainableTypeChecker = PropTypes.arrayOf(
+export const resizeHandleAxesType: ReactPropsChainableTypeChecker = PropTypes.arrayOf(
   PropTypes.oneOf(["s", "w", "e", "n", "sw", "nw", "se", "ne"])
 );
 // Custom component for resize handles
@@ -60,7 +60,7 @@ export type Props = {|
   useCSSTransforms: boolean,
   transformScale: number,
   droppingItem: $Shape<LayoutItem>,
-  resizeHandles: ResizeHandles,
+  resizeHandles: ResizeHandleAxis[],
   resizeHandle?: ResizeHandle,
 
   // Callbacks
@@ -169,7 +169,7 @@ export default {
   isDroppable: PropTypes.bool,
 
   // Resize handle options
-  resizeHandles: resizeHandlesType,
+  resizeHandles: resizeHandleAxesType,
   resizeHandle: resizeHandleType,
 
   //

package/lib/utils.js

@@ -328,6 +328,11 @@ export function compactItem(
       l.y++;
     }
   }
+  
+  // Ensure that there are no negative positions
+  l.y = Math.max(l.y, 0);
+  l.x = Math.max(l.x, 0);
+  
   return l;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-grid-layout",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "A draggable and resizable grid layout with responsive breakpoints, for React.",
   "main": "index.js",
   "scripts": {
@@ -35,51 +35,52 @@
   },
   "homepage": "https://github.com/STRML/react-grid-layout",
   "dependencies": {
-    "classnames": "2.x",
+    "classnames": "2.3.1",
     "lodash.isequal": "^4.0.0",
     "prop-types": "^15.0.0",
     "react-draggable": "^4.0.0",
-    "react-resizable": "^1.10.0"
+    "react-resizable": "^3.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.13.0",
-    "@babel/core": "^7.13.8",
+    "@babel/cli": "^7.13.16",
+    "@babel/core": "^7.14.0",
     "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/plugin-transform-flow-comments": "^7.12.13",
-    "@babel/preset-env": "^7.13.8",
-    "@babel/preset-flow": "^7.12.13",
-    "@babel/preset-react": "^7.12.13",
-    "@babel/register": "^7.13.8",
+    "@babel/preset-env": "^7.14.1",
+    "@babel/preset-flow": "^7.13.13",
+    "@babel/preset-react": "^7.13.13",
+    "@babel/register": "^7.13.16",
+    "@webpack-cli/serve": "^1.4.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.6.3",
     "babel-loader": "^8.2.2",
     "babel-plugin-preval": "^5.0.0",
-    "css-loader": "^5.1.1",
+    "css-loader": "^5.2.4",
     "ejs": "^3.1.6",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.6",
-    "enzyme-to-json": "^3.6.1",
-    "eslint": "^7.21.0",
-    "eslint-plugin-flowtype": "^5.3.1",
-    "eslint-plugin-mocha": "^8.0.0",
-    "eslint-plugin-react": "^7.22.0",
+    "enzyme-to-json": "^3.6.2",
+    "eslint": "^7.26.0",
+    "eslint-plugin-flowtype": "^5.7.2",
+    "eslint-plugin-mocha": "^8.1.0",
+    "eslint-plugin-react": "^7.23.2",
     "exports-loader": "^2.0.0",
-    "flow-bin": "^0.145.0",
-    "husky": "^5.1.2",
+    "flow-bin": "^0.150.1",
+    "husky": "^6.0.0",
     "imports-loader": "^2.0.0",
     "jest": "^26.6.3",
-    "lint-staged": "^10.5.4",
+    "lint-staged": "^11.0.0",
     "lodash": "^4.17.21",
     "opener": "^1.5.2",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-hot-loader": "^4.13.0",
     "react-transform-hmr": "^1.0.2",
     "style-loader": "^2.0.0",
     "timsort": "^0.3.0",
-    "webpack": "^5.24.2",
-    "webpack-cli": "^4.5.0",
+    "webpack": "^5.36.2",
+    "webpack-cli": "^4.7.0",
     "webpack-dev-server": "^3.11.2"
   },
   "peerDependencies": {

package/.husky/pre-commit

@@ -1,6 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn lint-staged
-make lint
-make test

package/.travis.yml

@@ -1,9 +0,0 @@
-language: node_js
-node_js:
-  - 10
-  - 12
-  - "lts/*"
-script:
-  - make build test
-cache: yarn
-