react-measure - npm Package Compare versions

Comparing version 1.4.4 to 1.4.5

CHANGELOG.md

 ## CHANGELOG
+### 1.4.5
+Update to `resize-observer-polyfill` 1.3.1 to fix Webpack 2 issues [#29](https://github.com/souporserious/react-measure/issues/29)
+
+Remove monkey patch for importing `resize-observer-polyfill`
+
 ### 1.4.4
@@ -3,0 +8,0 @@ Use ResizeObserver.default if available. This fixes older browsers in the local dev environment.

dist/react-measure.js

 /*!
- * React Measure 1.4.4
+ * React Measure 1.4.5
  * https://github.com/souporserious/react-measure
@@ -8,9 +8,9 @@ * Copyright (c) 2016 React Measure Authors
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("react"), require("react-dom"), require("get-node-dimensions"), require("resize-observer-polyfill"));
+		module.exports = factory(require("react"), require("react-dom"), require("resize-observer-polyfill"), require("get-node-dimensions"));
 	else if(typeof define === 'function' && define.amd)
-		define(["react", "react-dom", "get-node-dimensions", "resize-observer-polyfill"], factory);
+		define(["react", "react-dom", "resize-observer-polyfill", "get-node-dimensions"], factory);
 	else if(typeof exports === 'object')
-		exports["Measure"] = factory(require("react"), require("react-dom"), require("get-node-dimensions"), require("resize-observer-polyfill"));
+		exports["Measure"] = factory(require("react"), require("react-dom"), require("resize-observer-polyfill"), require("get-node-dimensions"));
 	else
-		root["Measure"] = factory(root["React"], root["ReactDOM"], root["getNodeDimensions"], root["ResizeObserver"]);
+		root["Measure"] = factory(root["React"], root["ReactDOM"], root["ResizeObserver"], root["getNodeDimensions"]);
 })(this, function(__WEBPACK_EXTERNAL_MODULE_2__, __WEBPACK_EXTERNAL_MODULE_3__, __WEBPACK_EXTERNAL_MODULE_4__, __WEBPACK_EXTERNAL_MODULE_5__) {
@@ -101,4 +101,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
-	var _getNodeDimensions = __webpack_require__(4);
+	var _resizeObserverPolyfill = __webpack_require__(4);
 
+	var _resizeObserverPolyfill2 = _interopRequireDefault(_resizeObserverPolyfill);
+
+	var _getNodeDimensions = __webpack_require__(5);
+
 	var _getNodeDimensions2 = _interopRequireDefault(_getNodeDimensions);
@@ -114,10 +118,2 @@
 
-	var isWindowDefined = typeof window !== 'undefined';
-
-	// only require ResizeObserver polyfill if it isn't available and we aren't in a SSR environment
-	if (isWindowDefined && !window.ResizeObserver) {
-	  var _ResizeObserver = __webpack_require__(5);
-	  window.ResizeObserver = _ResizeObserver.default || _ResizeObserver;
-	}
-
 	var Measure = function (_Component) {
@@ -193,8 +189,6 @@ _inherits(Measure, _Component);
 	      // add component to resize observer to detect changes on resize
-	      if (isWindowDefined) {
-	        this.resizeObserver = new ResizeObserver(function () {
-	          return _this2.measure();
-	        });
-	        this.resizeObserver.observe(this._node);
-	      }
+	      this.resizeObserver = new _resizeObserverPolyfill2.default(function () {
+	        return _this2.measure();
+	      });
+	      this.resizeObserver.observe(this._node);
 	    }
@@ -217,5 +211,3 @@ }, {
 	    value: function componentWillUnmount() {
-	      if (isWindowDefined) {
-	        this.resizeObserver.disconnect(this._node);
-	      }
+	      this.resizeObserver.disconnect(this._node);
 	      this._node = null;
@@ -222,0 +214,0 @@ }

dist/react-measure.min.js

 /*!
- * React Measure 1.4.4
+ * React Measure 1.4.5
  * https://github.com/souporserious/react-measure
  * Copyright (c) 2016 React Measure Authors
  */
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react"),require("react-dom"),require("get-node-dimensions"),require("resize-observer-polyfill")):"function"==typeof define&&define.amd?define(["react","react-dom","get-node-dimensions","resize-observer-polyfill"],t):"object"==typeof exports?exports.Measure=t(require("react"),require("react-dom"),require("get-node-dimensions"),require("resize-observer-polyfill")):e.Measure=t(e.React,e.ReactDOM,e.getNodeDimensions,e.ResizeObserver)}(this,function(e,t,o,r){return function(e){function t(r){if(o[r])return o[r].exports;var n=o[r]={exports:{},id:r,loaded:!1};return e[r].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var o={};return t.m=e,t.c=o,t.p="dist/",t(0)}([function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=void 0;var n=o(1),i=r(n);t["default"]=i["default"],e.exports=t["default"]},function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var o=arguments[t];for(var r in o)Object.prototype.hasOwnProperty.call(o,r)&&(e[r]=o[r])}return e},l=function(){function e(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,o,r){return o&&e(t.prototype,o),r&&e(t,r),t}}(),a=o(2),p=(r(a),o(3)),c=r(p),f=o(4),d=r(f),h="undefined"!=typeof window;if(h&&!window.ResizeObserver){var v=o(5);window.ResizeObserver=v["default"]||v}var Measure=function(e){function Measure(e){n(this,Measure);var t=i(this,(Measure.__proto__||Object.getPrototypeOf(Measure)).call(this,e));return t.measure=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:t.props.includeMargin,o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t.props.useClone;if(t.props.shouldMeasure){t._node.parentNode||t._setDOMNode();var r=t.getDimensions(t._node,e,o),n="function"==typeof t.props.children;t._propsToMeasure.some(function(e){if(r[e]!==t._lastDimensions[e])return t.props.onMeasure(r),n&&"undefined"!=typeof t&&t.setState({dimensions:r}),t._lastDimensions=r,!0})}},t.state={dimensions:{width:0,height:0,top:0,right:0,bottom:0,left:0}},t._node=null,t._propsToMeasure=t._getPropsToMeasure(e),t._lastDimensions={},t}return s(Measure,e),l(Measure,[{key:"componentDidMount",value:function(){var e=this;this._setDOMNode(),this.measure(),h&&(this.resizeObserver=new ResizeObserver(function(){return e.measure()}),this.resizeObserver.observe(this._node))}},{key:"componentWillReceiveProps",value:function(e){var t=(e.config,e.whitelist),o=e.blacklist;this.props.whitelist===t&&this.props.blacklist===o||(this._propsToMeasure=this._getPropsToMeasure({whitelist:t,blacklist:o}))}},{key:"componentWillUnmount",value:function(){h&&this.resizeObserver.disconnect(this._node),this._node=null}},{key:"_setDOMNode",value:function(){this._node=c["default"].findDOMNode(this)}},{key:"getDimensions",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this._node,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.props.includeMargin,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:this.props.useClone,r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:this.props.cloneOptions;return(0,d["default"])(e,u({margin:t,clone:o},r))}},{key:"_getPropsToMeasure",value:function(e){var t=e.whitelist,o=e.blacklist;return t.filter(function(e){return o.indexOf(e)<0})}},{key:"render",value:function(){var e=this.props.children;return a.Children.only("function"==typeof e?e(this.state.dimensions):e)}}]),Measure}(a.Component);Measure.propTypes={whitelist:a.PropTypes.array,blacklist:a.PropTypes.array,includeMargin:a.PropTypes.bool,useClone:a.PropTypes.bool,cloneOptions:a.PropTypes.object,shouldMeasure:a.PropTypes.bool,onMeasure:a.PropTypes.func},Measure.defaultProps={whitelist:["width","height","top","right","bottom","left"],blacklist:[],includeMargin:!0,useClone:!1,cloneOptions:{},shouldMeasure:!0,onMeasure:function(){return null}},t["default"]=Measure,e.exports=t["default"]},function(t,o){t.exports=e},function(e,o){e.exports=t},function(e,t){e.exports=o},function(e,t){e.exports=r}])});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react"),require("react-dom"),require("resize-observer-polyfill"),require("get-node-dimensions")):"function"==typeof define&&define.amd?define(["react","react-dom","resize-observer-polyfill","get-node-dimensions"],t):"object"==typeof exports?exports.Measure=t(require("react"),require("react-dom"),require("resize-observer-polyfill"),require("get-node-dimensions")):e.Measure=t(e.React,e.ReactDOM,e.ResizeObserver,e.getNodeDimensions)}(this,function(e,t,o,n){return function(e){function t(n){if(o[n])return o[n].exports;var r=o[n]={exports:{},id:n,loaded:!1};return e[n].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var o={};return t.m=e,t.c=o,t.p="dist/",t(0)}([function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=void 0;var r=o(1),i=n(r);t["default"]=i["default"],e.exports=t["default"]},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var o=arguments[t];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(e[n]=o[n])}return e},l=function(){function e(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(t,o,n){return o&&e(t.prototype,o),n&&e(t,n),t}}(),a=o(2),p=(n(a),o(3)),c=n(p),f=o(4),d=n(f),h=o(5),y=n(h),Measure=function(e){function Measure(e){r(this,Measure);var t=i(this,(Measure.__proto__||Object.getPrototypeOf(Measure)).call(this,e));return t.measure=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:t.props.includeMargin,o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t.props.useClone;if(t.props.shouldMeasure){t._node.parentNode||t._setDOMNode();var n=t.getDimensions(t._node,e,o),r="function"==typeof t.props.children;t._propsToMeasure.some(function(e){if(n[e]!==t._lastDimensions[e])return t.props.onMeasure(n),r&&"undefined"!=typeof t&&t.setState({dimensions:n}),t._lastDimensions=n,!0})}},t.state={dimensions:{width:0,height:0,top:0,right:0,bottom:0,left:0}},t._node=null,t._propsToMeasure=t._getPropsToMeasure(e),t._lastDimensions={},t}return s(Measure,e),l(Measure,[{key:"componentDidMount",value:function(){var e=this;this._setDOMNode(),this.measure(),this.resizeObserver=new d["default"](function(){return e.measure()}),this.resizeObserver.observe(this._node)}},{key:"componentWillReceiveProps",value:function(e){var t=(e.config,e.whitelist),o=e.blacklist;this.props.whitelist===t&&this.props.blacklist===o||(this._propsToMeasure=this._getPropsToMeasure({whitelist:t,blacklist:o}))}},{key:"componentWillUnmount",value:function(){this.resizeObserver.disconnect(this._node),this._node=null}},{key:"_setDOMNode",value:function(){this._node=c["default"].findDOMNode(this)}},{key:"getDimensions",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this._node,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.props.includeMargin,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:this.props.useClone,n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:this.props.cloneOptions;return(0,y["default"])(e,u({margin:t,clone:o},n))}},{key:"_getPropsToMeasure",value:function(e){var t=e.whitelist,o=e.blacklist;return t.filter(function(e){return o.indexOf(e)<0})}},{key:"render",value:function(){var e=this.props.children;return a.Children.only("function"==typeof e?e(this.state.dimensions):e)}}]),Measure}(a.Component);Measure.propTypes={whitelist:a.PropTypes.array,blacklist:a.PropTypes.array,includeMargin:a.PropTypes.bool,useClone:a.PropTypes.bool,cloneOptions:a.PropTypes.object,shouldMeasure:a.PropTypes.bool,onMeasure:a.PropTypes.func},Measure.defaultProps={whitelist:["width","height","top","right","bottom","left"],blacklist:[],includeMargin:!0,useClone:!1,cloneOptions:{},shouldMeasure:!0,onMeasure:function(){return null}},t["default"]=Measure,e.exports=t["default"]},function(t,o){t.exports=e},function(e,o){e.exports=t},function(e,t){e.exports=o},function(e,t){e.exports=n}])});

lib/Measure.js

@@ -19,2 +19,6 @@ 'use strict';
 
+var _resizeObserverPolyfill = require('resize-observer-polyfill');
+
+var _resizeObserverPolyfill2 = _interopRequireDefault(_resizeObserverPolyfill);
+
 var _getNodeDimensions = require('get-node-dimensions');
@@ -32,10 +36,2 @@
 
-var isWindowDefined = typeof window !== 'undefined';
-
-// only require ResizeObserver polyfill if it isn't available and we aren't in a SSR environment
-if (isWindowDefined && !window.ResizeObserver) {
-  var _ResizeObserver = require('resize-observer-polyfill');
-  window.ResizeObserver = _ResizeObserver.default || _ResizeObserver;
-}
-
 var Measure = function (_Component) {
@@ -111,8 +107,6 @@ _inherits(Measure, _Component);
       // add component to resize observer to detect changes on resize
-      if (isWindowDefined) {
-        this.resizeObserver = new ResizeObserver(function () {
-          return _this2.measure();
-        });
-        this.resizeObserver.observe(this._node);
-      }
+      this.resizeObserver = new _resizeObserverPolyfill2.default(function () {
+        return _this2.measure();
+      });
+      this.resizeObserver.observe(this._node);
     }
@@ -135,5 +129,3 @@ }, {
     value: function componentWillUnmount() {
-      if (isWindowDefined) {
-        this.resizeObserver.disconnect(this._node);
-      }
+      this.resizeObserver.disconnect(this._node);
       this._node = null;
@@ -140,0 +132,0 @@ }

package.json

 {
   "name": "react-measure",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "Compute measurements of React components.",
@@ -45,3 +45,3 @@ "main": "lib/react-measure.js",
     "get-node-dimensions": "^1.2.0",
-    "resize-observer-polyfill": "^1.2.1"
+    "resize-observer-polyfill": "1.3.1"
   },
@@ -48,0 +48,0 @@ "devDependencies": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

35571

decreased by-1.15%

Lines of code

421

decreased by-3.66%

Dependency changes

• + Addedresize-observer-polyfill@1.3.1(transitive)

• - Removedresize-observer-polyfill@1.5.1(transitive)

• Updatedresize-observer-polyfill@1.3.1