react-resizable 3.0.4 → 3.1.0

package/build/Resizable.js

@@ -2,275 +2,253 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-
 var React = _interopRequireWildcard(require("react"));
-
 var _reactDraggable = require("react-draggable");
-
 var _utils = require("./utils");
-
 var _propTypes = require("./propTypes");
-
-var _excluded = ["children", "className", "draggableOpts", "width", "height", "handle", "handleSize", "lockAspectRatio", "axis", "minConstraints", "maxConstraints", "onResize", "onResizeStop", "onResizeStart", "resizeHandles", "transformScale"];
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-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 _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; }
-
-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(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 _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; }
-
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
+const _excluded = ["children", "className", "draggableOpts", "width", "height", "handle", "handleSize", "lockAspectRatio", "axis", "minConstraints", "maxConstraints", "onResize", "onResizeStop", "onResizeStart", "resizeHandles", "transformScale"];
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 // The base <Resizable> component.
 // This component does not have state and relies on the parent to set its props based on callback data.
-var Resizable = /*#__PURE__*/function (_React$Component) {
-  _inheritsLoose(Resizable, _React$Component);
-
-  function Resizable() {
-    var _this;
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _React$Component.call.apply(_React$Component, [this].concat(args)) || this;
-    _this.handleRefs = {};
-    _this.lastHandleRect = null;
-    _this.slack = null;
-    return _this;
+class Resizable extends React.Component {
+  constructor() {
+    super(...arguments);
+    this.handleRefs = {};
+    this.lastHandleRect = null;
+    this.slack = null;
+    this.lastSize = null;
   }
-
-  var _proto = Resizable.prototype;
-
-  _proto.componentWillUnmount = function componentWillUnmount() {
+  componentWillUnmount() {
     this.resetData();
-  };
-
-  _proto.resetData = function resetData() {
-    this.lastHandleRect = this.slack = null;
-  } // Clamp width and height within provided constraints
-  ;
-
-  _proto.runConstraints = function runConstraints(width, height) {
-    var _this$props = this.props,
-        minConstraints = _this$props.minConstraints,
-        maxConstraints = _this$props.maxConstraints,
-        lockAspectRatio = _this$props.lockAspectRatio; // short circuit
-
-    if (!minConstraints && !maxConstraints && !lockAspectRatio) return [width, height]; // If constraining to min and max, we need to also fit width and height to aspect ratio.
+  }
+  resetData() {
+    this.lastHandleRect = this.slack = this.lastSize = null;
+  }
 
+  // Clamp width and height within provided constraints
+  runConstraints(width, height) {
+    const {
+      minConstraints,
+      maxConstraints,
+      lockAspectRatio
+    } = this.props;
+    // short circuit
+    if (!minConstraints && !maxConstraints && !lockAspectRatio) return [width, height];
+
+    // If constraining to min and max, we need to also fit width and height to aspect ratio.
     if (lockAspectRatio) {
-      var ratio = this.props.width / this.props.height;
-      var deltaW = width - this.props.width;
-      var deltaH = height - this.props.height; // Find which coordinate was greater and should push the other toward it.
+      const ratio = this.props.width / this.props.height;
+      const deltaW = width - this.props.width;
+      const deltaH = height - this.props.height;
+
+      // Find which coordinate was greater and should push the other toward it.
       // E.g.:
       // ratio = 1, deltaW = 10, deltaH = 5, deltaH should become 10.
       // ratio = 2, deltaW = 10, deltaH = 6, deltaW should become 12.
-
       if (Math.abs(deltaW) > Math.abs(deltaH * ratio)) {
         height = width / ratio;
       } else {
         width = height * ratio;
       }
     }
+    const [oldW, oldH] = [width, height];
 
-    var oldW = width,
-        oldH = height; // Add slack to the values used to calculate bound position. This will ensure that if
+    // Add slack to the values used to calculate bound position. This will ensure that if
     // we start removing slack, the element won't react to it right away until it's been
     // completely removed.
-
-    var _ref = this.slack || [0, 0],
-        slackW = _ref[0],
-        slackH = _ref[1];
-
+    let [slackW, slackH] = this.slack || [0, 0];
     width += slackW;
     height += slackH;
-
     if (minConstraints) {
       width = Math.max(minConstraints[0], width);
       height = Math.max(minConstraints[1], height);
     }
-
     if (maxConstraints) {
       width = Math.min(maxConstraints[0], width);
       height = Math.min(maxConstraints[1], height);
-    } // If the width or height 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.
     this.slack = [slackW + (oldW - width), slackH + (oldH - height)];
     return [width, height];
   }
+
   /**
    * Wrapper around drag events to provide more useful data.
    *
    * @param  {String} handlerName Handler name to wrap.
    * @return {Function}           Handler function.
    */
-  ;
-
-  _proto.resizeHandler = function resizeHandler(handlerName, axis) {
-    var _this2 = this;
-
-    return function (e, _ref2) {
-      var node = _ref2.node,
-          deltaX = _ref2.deltaX,
-          deltaY = _ref2.deltaY;
+  resizeHandler(handlerName, axis) {
+    return (e, _ref) => {
+      let {
+        node,
+        deltaX,
+        deltaY
+      } = _ref;
       // Reset data in case it was left over somehow (should not be possible)
-      if (handlerName === 'onResizeStart') _this2.resetData(); // Axis restrictions
+      if (handlerName === 'onResizeStart') this.resetData();
 
-      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.
+      // Axis restrictions
+      const canDragX = (this.props.axis === 'both' || this.props.axis === 'x') && axis !== 'n' && axis !== 's';
+      const canDragY = (this.props.axis === 'both' || this.props.axis === 'y') && axis !== 'e' && axis !== 'w';
+      // No dragging possible.
+      if (!canDragX && !canDragY) return;
 
-      if (!canDragX && !canDragY) return; // Decompose axis for later use
+      // Decompose axis for later use
+      const axisV = axis[0];
+      const axisH = axis[axis.length - 1]; // intentionally not axis[1], so that this catches axis === 'w' for example
 
-      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) {
+      const handleRect = node.getBoundingClientRect();
+      if (this.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;
+          const deltaLeftSinceLast = handleRect.left - this.lastHandleRect.left;
           deltaX += deltaLeftSinceLast;
         }
-
         if (axisV === 'n') {
-          var deltaTopSinceLast = handleRect.top - _this2.lastHandleRect.top;
+          const deltaTopSinceLast = handleRect.top - this.lastHandleRect.top;
           deltaY += deltaTopSinceLast;
         }
-      } // Storage of last rect so we know how much it has really moved.
-
-
-      _this2.lastHandleRect = handleRect; // Reverse delta if using top or left drag handles.
+      }
+      // Storage of last rect so we know how much it has really moved.
+      this.lastHandleRect = handleRect;
 
+      // Reverse delta if using top or left drag handles.
       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];
-      var dimensionsChanged = width !== _this2.props.width || height !== _this2.props.height; // Call user-supplied callback if present.
-
-      var cb = typeof _this2.props[handlerName] === 'function' ? _this2.props[handlerName] : null; // Don't call 'onResize' if dimensions haven't changed.
-
-      var shouldSkipCb = handlerName === 'onResize' && !dimensionsChanged;
+      if (axisV === 'n') deltaY = -deltaY;
+
+      // Update w/h by the deltas. Also factor in transformScale.
+      let width = this.props.width + (canDragX ? deltaX / this.props.transformScale : 0);
+      let height = this.props.height + (canDragY ? deltaY / this.props.transformScale : 0);
+
+      // Run user-provided constraints.
+      [width, height] = this.runConstraints(width, height);
+
+      // For onResizeStop, use the last size from onResize rather than recalculating.
+      // This avoids issues where props.width/height are stale due to React's batched updates.
+      if (handlerName === 'onResizeStop' && this.lastSize) {
+        ({
+          width,
+          height
+        } = this.lastSize);
+      }
+      const dimensionsChanged = width !== this.props.width || height !== this.props.height;
+
+      // Store the size for use in onResizeStop. We do this after the onResizeStop check
+      // above so we don't overwrite the stored value with a potentially stale calculation.
+      if (handlerName !== 'onResizeStop') {
+        this.lastSize = {
+          width,
+          height
+        };
+      }
 
+      // Call user-supplied callback if present.
+      const cb = typeof this.props[handlerName] === 'function' ? this.props[handlerName] : null;
+      // Don't call 'onResize' if dimensions haven't changed.
+      const shouldSkipCb = handlerName === 'onResize' && !dimensionsChanged;
       if (cb && !shouldSkipCb) {
-        e.persist == null ? void 0 : e.persist();
+        e.persist?.();
         cb(e, {
-          node: node,
+          node,
           size: {
-            width: width,
-            height: height
+            width,
+            height
           },
           handle: axis
         });
-      } // Reset internal data
-
+      }
 
-      if (handlerName === 'onResizeStop') _this2.resetData();
+      // Reset internal data
+      if (handlerName === 'onResizeStop') this.resetData();
     };
-  } // Render a resize handle given an axis & DOM ref. Ref *must* be attached for
-  // the underlying draggable library to work properly.
-  ;
-
-  _proto.renderResizeHandle = function renderResizeHandle(handleAxis, ref) {
-    var handle = this.props.handle; // No handle provided, make the default
+  }
 
+  // Render a resize handle given an axis & DOM ref. Ref *must* be attached for
+  // the underlying draggable library to work properly.
+  renderResizeHandle(handleAxis, ref) {
+    const {
+      handle
+    } = this.props;
+    // No handle provided, make the default
     if (!handle) {
       return /*#__PURE__*/React.createElement("span", {
-        className: "react-resizable-handle react-resizable-handle-" + handleAxis,
+        className: `react-resizable-handle react-resizable-handle-${handleAxis}`,
         ref: ref
       });
-    } // Handle is a function, such as:
+    }
+    // Handle is a function, such as:
     // `handle={(handleAxis) => <span className={...} />}`
-
-
     if (typeof handle === 'function') {
       return handle(handleAxis, ref);
-    } // Handle is a React component (composite or DOM).
-
-
-    var isDOMElement = typeof handle.type === 'string';
-
-    var props = _objectSpread({
-      ref: ref
+    }
+    // Handle is a React component (composite or DOM).
+    const isDOMElement = typeof handle.type === 'string';
+    const props = _objectSpread({
+      ref
     }, isDOMElement ? {} : {
-      handleAxis: handleAxis
+      handleAxis
     });
-
     return /*#__PURE__*/React.cloneElement(handle, props);
-  };
-
-  _proto.render = function render() {
-    var _this3 = this;
-
+  }
+  render() {
     // Pass along only props not meant for the `<Resizable>`.`
     // eslint-disable-next-line no-unused-vars
-    var _this$props2 = this.props,
-        children = _this$props2.children,
-        className = _this$props2.className,
-        draggableOpts = _this$props2.draggableOpts,
-        width = _this$props2.width,
-        height = _this$props2.height,
-        handle = _this$props2.handle,
-        handleSize = _this$props2.handleSize,
-        lockAspectRatio = _this$props2.lockAspectRatio,
-        axis = _this$props2.axis,
-        minConstraints = _this$props2.minConstraints,
-        maxConstraints = _this$props2.maxConstraints,
-        onResize = _this$props2.onResize,
-        onResizeStop = _this$props2.onResizeStop,
-        onResizeStart = _this$props2.onResizeStart,
-        resizeHandles = _this$props2.resizeHandles,
-        transformScale = _this$props2.transformScale,
-        p = _objectWithoutPropertiesLoose(_this$props2, _excluded); // What we're doing here is getting the child of this element, and cloning it with this element's props.
+    const _this$props = this.props,
+      {
+        children,
+        className,
+        draggableOpts,
+        width,
+        height,
+        handle,
+        handleSize,
+        lockAspectRatio,
+        axis,
+        minConstraints,
+        maxConstraints,
+        onResize,
+        onResizeStop,
+        onResizeStart,
+        resizeHandles,
+        transformScale
+      } = _this$props,
+      p = _objectWithoutProperties(_this$props, _excluded);
+
+    // 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:
     // 1. Its original children (resizable's child's children), and
     // 2. One or more draggable handles.
-
-
     return (0, _utils.cloneElement)(children, _objectSpread(_objectSpread({}, p), {}, {
-      className: (className ? className + " " : '') + "react-resizable",
-      children: [].concat(children.props.children, resizeHandles.map(function (handleAxis) {
-        var _this3$handleRefs$han;
-
+      className: `${className ? `${className} ` : ''}react-resizable`,
+      children: [...children.props.children, ...resizeHandles.map(handleAxis => {
         // Create a ref to the handle so that `<DraggableCore>` doesn't have to use ReactDOM.findDOMNode().
-        var ref = (_this3$handleRefs$han = _this3.handleRefs[handleAxis]) != null ? _this3$handleRefs$han : _this3.handleRefs[handleAxis] = /*#__PURE__*/React.createRef();
+        const ref = this.handleRefs[handleAxis] ?? (this.handleRefs[handleAxis] = /*#__PURE__*/React.createRef());
         return /*#__PURE__*/React.createElement(_reactDraggable.DraggableCore, _extends({}, draggableOpts, {
           nodeRef: ref,
-          key: "resizableHandle-" + handleAxis,
-          onStop: _this3.resizeHandler('onResizeStop', handleAxis),
-          onStart: _this3.resizeHandler('onResizeStart', handleAxis),
-          onDrag: _this3.resizeHandler('onResize', handleAxis)
-        }), _this3.renderResizeHandle(handleAxis, ref));
-      }))
+          key: `resizableHandle-${handleAxis}`,
+          onStop: this.resizeHandler('onResizeStop', handleAxis),
+          onStart: this.resizeHandler('onResizeStart', handleAxis),
+          onDrag: this.resizeHandler('onResize', handleAxis)
+        }), this.renderResizeHandle(handleAxis, ref));
+      })]
     }));
-  };
-
-  return Resizable;
-}(React.Component);
-
+  }
+}
 exports.default = Resizable;
 Resizable.propTypes = _propTypes.resizableProps;
 Resizable.defaultProps = {

package/build/Resizable.js.flow

@@ -24,13 +24,14 @@ export default class Resizable extends React.Component<Props, void> {
   handleRefs: {[key: ResizeHandleAxis]: ReactRef<HTMLElement>} = {};
   lastHandleRect: ?ClientRect = null;
   slack: ?[number, number] = null;
+  lastSize: ?{width: number, height: number} = null;
 
   componentWillUnmount() {
     this.resetData();
   }
 
   resetData() {
-    this.lastHandleRect = this.slack = null;
+    this.lastHandleRect = this.slack = this.lastSize = null;
   }
 
   // Clamp width and height within provided constraints
@@ -132,8 +133,20 @@ export default class Resizable extends React.Component<Props, void> {
       // Run user-provided constraints.
       [width, height] = this.runConstraints(width, height);
 
+      // For onResizeStop, use the last size from onResize rather than recalculating.
+      // This avoids issues where props.width/height are stale due to React's batched updates.
+      if (handlerName === 'onResizeStop' && this.lastSize) {
+        ({width, height} = this.lastSize);
+      }
+
       const dimensionsChanged = width !== this.props.width || height !== this.props.height;
 
+      // Store the size for use in onResizeStop. We do this after the onResizeStop check
+      // above so we don't overwrite the stored value with a potentially stale calculation.
+      if (handlerName !== 'onResizeStop') {
+        this.lastSize = {width, height};
+      }
+
       // Call user-supplied callback if present.
       const cb = typeof this.props[handlerName] === 'function' ? this.props[handlerName] : null;
       // Don't call 'onResize' if dimensions haven't changed.