react-resizable 1.10.1 → 1.11.0

package/build/Resizable.js

@@ -5,19 +5,19 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _reactDraggable = require("react-draggable");
 
 var _utils = require("./utils");
 
+var _propTypes = require("./propTypes");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
@@ -27,9 +27,7 @@ function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.crea
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var Resizable =
-/*#__PURE__*/
-function (_React$Component) {
+var Resizable = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(Resizable, _React$Component);
 
   function Resizable() {
@@ -41,31 +39,42 @@ function (_React$Component) {
 
     _this = _React$Component.call.apply(_React$Component, [this].concat(args)) || this;
 
-    _defineProperty(_assertThisInitialized(_this), "state", {
-      slackW: 0,
-      slackH: 0
-    });
+    _defineProperty(_assertThisInitialized(_this), "state", undefined);
+
+    _defineProperty(_assertThisInitialized(_this), "lastHandleRect", null);
+
+    _defineProperty(_assertThisInitialized(_this), "slack", null);
 
     return _this;
   }
 
   var _proto = Resizable.prototype;
 
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    this.resetData();
+  };
+
   _proto.lockAspectRatio = function lockAspectRatio(width, height, aspectRatio) {
     height = width / aspectRatio;
     width = height * aspectRatio;
     return [width, height];
-  } // If you do this, be careful of constraints
+  };
+
+  _proto.resetData = function resetData() {
+    this.lastHandleRect = this.slack = null;
+  } // Clamp width and height within provided constraints
   ;
 
   _proto.runConstraints = function runConstraints(width, height) {
     var _ref = [this.props.minConstraints, this.props.maxConstraints],
         min = _ref[0],
         max = _ref[1];
-    if (!min && !max) return [width, height]; // Fit width & height to aspect ratio
+    if (!min && !max) return [width, height]; // If constraining to min and max, we need to also fit width and height to aspect ratio.
 
     if (this.props.lockAspectRatio) {
-      if (height === this.props.height) {
+      var resizingHorizontally = height === this.props.height;
+
+      if (resizingHorizontally) {
         var ratio = this.props.width / this.props.height;
         height = width / ratio;
         width = height * ratio;
@@ -84,9 +93,10 @@ function (_React$Component) {
     // we start removing slack, the element won't react to it right away until it's been
     // completely removed.
 
-    var _this$state = this.state,
-        slackW = _this$state.slackW,
-        slackH = _this$state.slackH;
+    var _ref2 = this.slack || [0, 0],
+        slackW = _ref2[0],
+        slackH = _ref2[1];
+
     width += slackW;
     height += slackH;
 
@@ -98,19 +108,10 @@ function (_React$Component) {
     if (max) {
       width = Math.min(max[0], width);
       height = Math.min(max[1], height);
-    } // If the numbers changed, we must have introduced some slack. Record it for the next iteration.
+    } // If the width or height changed, we must have introduced some slack. Record it for the next iteration.
 
 
-    slackW += oldW - width;
-    slackH += oldH - height;
-
-    if (slackW !== this.state.slackW || slackH !== this.state.slackH) {
-      this.setState({
-        slackW: slackW,
-        slackH: slackH
-      });
-    }
-
+    this.slack = [slackW + (oldW - width), slackH + (oldH - height)];
     return [width, height];
   }
   /**
@@ -124,94 +125,105 @@ function (_React$Component) {
   _proto.resizeHandler = function resizeHandler(handlerName, axis) {
     var _this2 = this;
 
-    return function (e, _ref2) {
-      var node = _ref2.node,
-          deltaX = _ref2.deltaX,
-          deltaY = _ref2.deltaY;
-      deltaX /= _this2.props.transformScale;
-      deltaY /= _this2.props.transformScale; // Axis restrictions
+    return function (e, _ref3) {
+      var node = _ref3.node,
+          deltaX = _ref3.deltaX,
+          deltaY = _ref3.deltaY;
+      // Reset data in case it was left over somehow (should not be possible)
+      if (handlerName === 'onResizeStart') _this2.resetData(); // Axis restrictions
 
-      var canDragX = (_this2.props.axis === 'both' || _this2.props.axis === 'x') && ['n', 's'].indexOf(axis) === -1;
-      var canDragY = (_this2.props.axis === 'both' || _this2.props.axis === 'y') && ['e', 'w'].indexOf(axis) === -1; // reverse delta if using top or left drag handles
+      var canDragX = (_this2.props.axis === 'both' || _this2.props.axis === 'x') && axis !== 'n' && axis !== 's';
+      var canDragY = (_this2.props.axis === 'both' || _this2.props.axis === 'y') && axis !== 'e' && axis !== 'w'; // No dragging possible.
 
-      if (canDragX && axis[axis.length - 1] === 'w') {
-        deltaX = -deltaX;
-      }
+      if (!canDragX && !canDragY) return; // Decompose axis for later use
+
+      var axisV = axis[0];
+      var axisH = axis[axis.length - 1]; // intentionally not axis[1], so that this catches axis === 'w' for example
+      // Track the element being dragged to account for changes in position.
+      // If a handle's position is changed between callbacks, we need to factor this in to the next callback.
+      // Failure to do so will cause the element to "skip" when resized upwards or leftwards.
+
+      var handleRect = node.getBoundingClientRect();
+
+      if (_this2.lastHandleRect != null) {
+        // If the handle has repositioned on either axis since last render,
+        // we need to increase our callback values by this much.
+        // Only checking 'n', 'w' since resizing by 's', 'w' won't affect the overall position on page,
+        if (axisH === 'w') {
+          var deltaLeftSinceLast = handleRect.left - _this2.lastHandleRect.left;
+          deltaX += deltaLeftSinceLast;
+        }
 
-      if (canDragY && axis[0] === 'n') {
-        deltaY = -deltaY;
-      } // Update w/h
+        if (axisV === 'n') {
+          var deltaTopSinceLast = handleRect.top - _this2.lastHandleRect.top;
+          deltaY += deltaTopSinceLast;
+        }
+      } // Storage of last rect so we know how much it has really moved.
 
 
-      var width = _this2.props.width + (canDragX ? deltaX : 0);
-      var height = _this2.props.height + (canDragY ? deltaY : 0); // Early return if no change
+      _this2.lastHandleRect = handleRect; // Reverse delta if using top or left drag handles.
 
-      var widthChanged = width !== _this2.props.width,
-          heightChanged = height !== _this2.props.height;
-      if (handlerName === 'onResize' && !widthChanged && !heightChanged) return;
+      if (axisH === 'w') deltaX = -deltaX;
+      if (axisV === 'n') deltaY = -deltaY; // Update w/h by the deltas. Also factor in transformScale.
+
+      var width = _this2.props.width + (canDragX ? deltaX / _this2.props.transformScale : 0);
+      var height = _this2.props.height + (canDragY ? deltaY / _this2.props.transformScale : 0); // Run user-provided constraints.
 
       var _this2$runConstraints = _this2.runConstraints(width, height);
 
       width = _this2$runConstraints[0];
       height = _this2$runConstraints[1];
-      // Set the appropriate state for this handler.
-      var newState = {};
+      var dimensionsChanged = width !== _this2.props.width || height !== _this2.props.height; // Call user-supplied callback if present.
 
-      if (handlerName === 'onResizeStart') {// nothing
-      } else if (handlerName === 'onResizeStop') {
-        newState.slackW = newState.slackH = 0;
-      } else {
-        // Early return if no change after constraints
-        if (width === _this2.props.width && height === _this2.props.height) return;
-      }
+      var cb = typeof _this2.props[handlerName] === 'function' ? _this2.props[handlerName] : null; // Don't call 'onResize' if dimensions haven't changed.
 
-      var hasCb = typeof _this2.props[handlerName] === 'function';
+      var shouldSkipCb = handlerName === 'onResize' && !dimensionsChanged;
 
-      if (hasCb) {
-        // $FlowIgnore isn't refining this correctly to SyntheticEvent
+      if (cb && !shouldSkipCb) {
         if (typeof e.persist === 'function') e.persist();
-
-        _this2.setState(newState, function () {
-          return _this2.props[handlerName](e, {
-            node: node,
-            size: {
-              width: width,
-              height: height
-            },
-            handle: axis
-          });
+        cb(e, {
+          node: node,
+          size: {
+            width: width,
+            height: height
+          },
+          handle: axis
         });
-      } else {
-        _this2.setState(newState);
-      }
+      } // Reset internal data
+
+
+      if (handlerName === 'onResizeStop') _this2.resetData();
     };
   };
 
-  _proto.renderResizeHandle = function renderResizeHandle(resizeHandle) {
+  _proto.renderResizeHandle = function renderResizeHandle(resizeHandleAxis) {
     var handle = this.props.handle;
 
     if (handle) {
       if (typeof handle === 'function') {
-        return handle(resizeHandle);
+        return handle(resizeHandleAxis);
       }
 
       return handle;
     }
 
-    return _react.default.createElement("span", {
-      className: "react-resizable-handle react-resizable-handle-" + resizeHandle
+    return /*#__PURE__*/_react.default.createElement("span", {
+      className: "react-resizable-handle react-resizable-handle-" + resizeHandleAxis
     });
   };
 
   _proto.render = function render() {
     var _this3 = this;
 
+    // Pass along only props not meant for the `<Resizable>`.`
     // eslint-disable-next-line no-unused-vars
     var _this$props = this.props,
         children = _this$props.children,
+        className = _this$props.className,
         draggableOpts = _this$props.draggableOpts,
         width = _this$props.width,
         height = _this$props.height,
+        handle = _this$props.handle,
         handleSize = _this$props.handleSize,
         lockAspectRatio = _this$props.lockAspectRatio,
         axis = _this$props.axis,
@@ -222,23 +234,22 @@ function (_React$Component) {
         onResizeStart = _this$props.onResizeStart,
         resizeHandles = _this$props.resizeHandles,
         transformScale = _this$props.transformScale,
-        p = _objectWithoutPropertiesLoose(_this$props, ["children", "draggableOpts", "width", "height", "handleSize", "lockAspectRatio", "axis", "minConstraints", "maxConstraints", "onResize", "onResizeStop", "onResizeStart", "resizeHandles", "transformScale"]);
-
-    var className = p.className ? p.className + " react-resizable" : 'react-resizable'; // What we're doing here is getting the child of this element, and cloning it with this element's props.
+        p = _objectWithoutPropertiesLoose(_this$props, ["children", "className", "draggableOpts", "width", "height", "handle", "handleSize", "lockAspectRatio", "axis", "minConstraints", "maxConstraints", "onResize", "onResizeStop", "onResizeStart", "resizeHandles", "transformScale"]); // What we're doing here is getting the child of this element, and cloning it with this element's props.
     // We are then defining its children as:
     // Its original children (resizable's child's children), and
     // One or more draggable handles.
 
-    return (0, _utils.cloneElement)(children, _objectSpread({}, p, {
-      className: className,
-      children: [children.props.children, resizeHandles.map(function (h) {
-        return _react.default.createElement(_reactDraggable.DraggableCore, _extends({}, draggableOpts, {
-          key: "resizableHandle-" + h,
-          onStop: _this3.resizeHandler('onResizeStop', h),
-          onStart: _this3.resizeHandler('onResizeStart', h),
-          onDrag: _this3.resizeHandler('onResize', h)
-        }), _this3.renderResizeHandle(h));
-      })]
+
+    return (0, _utils.cloneElement)(children, _objectSpread(_objectSpread({}, p), {}, {
+      className: (className ? className + " " : '') + "react-resizable",
+      children: [].concat(children.props.children, resizeHandles.map(function (handleAxis) {
+        return /*#__PURE__*/_react.default.createElement(_reactDraggable.DraggableCore, _extends({}, draggableOpts, {
+          key: "resizableHandle-" + handleAxis,
+          onStop: _this3.resizeHandler('onResizeStop', handleAxis),
+          onStart: _this3.resizeHandler('onResizeStart', handleAxis),
+          onDrag: _this3.resizeHandler('onResize', handleAxis)
+        }), _this3.renderResizeHandle(handleAxis));
+      }))
     }));
   };
 
@@ -247,52 +258,7 @@ function (_React$Component) {
 
 exports.default = Resizable;
 
-_defineProperty(Resizable, "propTypes", {
-  //
-  // Required Props
-  //
-  // Require that one and only one child be present.
-  children: _propTypes.default.element.isRequired,
-  // Initial w/h
-  width: _propTypes.default.number.isRequired,
-  height: _propTypes.default.number.isRequired,
-  //
-  // Optional props
-  //
-  // Custom resize handle
-  handle: _propTypes.default.element,
-  // If you change this, be sure to update your css
-  handleSize: _propTypes.default.array,
-  // Defines which resize handles should be rendered (default: 'se')
-  // Allows for any combination of:
-  // 's' - South handle (bottom-center)
-  // 'w' - West handle (left-center)
-  // 'e' - East handle (right-center)
-  // 'n' - North handle (top-center)
-  // 'sw' - Southwest handle (bottom-left)
-  // 'nw' - Northwest handle (top-left)
-  // 'se' - Southeast handle (bottom-right)
-  // 'ne' - Northeast handle (top-center)
-  resizeHandles: _propTypes.default.arrayOf(_propTypes.default.oneOf(['s', 'w', 'e', 'n', 'sw', 'nw', 'se', 'ne'])),
-  transformScale: _propTypes.default.number,
-  // If true, will only allow width/height to move in lockstep
-  lockAspectRatio: _propTypes.default.bool,
-  // Restricts resizing to a particular axis (default: 'both')
-  // 'both' - allows resizing by width or height
-  // 'x' - only allows the width to be changed
-  // 'y' - only allows the height to be changed
-  // 'none' - disables resizing altogether
-  axis: _propTypes.default.oneOf(['both', 'x', 'y', 'none']),
-  // Min/max size
-  minConstraints: _propTypes.default.arrayOf(_propTypes.default.number),
-  maxConstraints: _propTypes.default.arrayOf(_propTypes.default.number),
-  // Callbacks
-  onResizeStop: _propTypes.default.func,
-  onResizeStart: _propTypes.default.func,
-  onResize: _propTypes.default.func,
-  // These will be passed wholesale to react-draggable's DraggableCore
-  draggableOpts: _propTypes.default.object
-});
+_defineProperty(Resizable, "propTypes", _propTypes.resizableProps);
 
 _defineProperty(Resizable, "defaultProps", {
   handleSize: [20, 20],