v1.1.3

PaulLeCam · Mar 15, 2017 · 048bb98 · 048bb98
1 parent 83a10ae
commit 048bb98
Show file tree

Hide file tree

Showing 32 changed files with 261 additions and 166 deletions.
diff --git a/.babelrc b/.babelrc
@@ -3,5 +3,10 @@
     "es2015",
     "react",
     "stage-1"
-  ]
+  ],
+  "plugins": [
+    "dev-expression",
+    "lodash",
+    "transform-proto-to-assign",
+  ],
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.1.3 (2017-03-15)
+
+Fixed regressions in `GridLayer` and Babel configuration.
+
 ## v1.1.2 (2017-03-14)
 
 Make `GridLayer` inherit `maxZoom` and `minZoom` properties from `Map`.

diff --git a/dist/react-leaflet.js b/dist/react-leaflet.js
@@ -110,23 +110,6 @@ exports.default = _react.PropTypes.oneOfType([_react.PropTypes.arrayOf(_react.Pr
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _leaflet = __webpack_require__(1);
-
-var _react = __webpack_require__(0);
-
-exports.default = _react.PropTypes.instanceOf(_leaflet.Map);
-
-/***/ }),
-/* 4 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -207,6 +190,23 @@ Path.childContextTypes = {
 };
 exports.default = Path;
 
+/***/ }),
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _leaflet = __webpack_require__(1);
+
+var _react = __webpack_require__(0);
+
+exports.default = _react.PropTypes.instanceOf(_leaflet.Map);
+
 /***/ }),
 /* 5 */
 /***/ (function(module, exports) {
@@ -291,7 +291,7 @@ var _layerContainer = __webpack_require__(9);
 
 var _layerContainer2 = _interopRequireDefault(_layerContainer);
 
-var _map = __webpack_require__(3);
+var _map = __webpack_require__(4);
 
 var _map2 = _interopRequireDefault(_map);
 
@@ -585,7 +585,7 @@ var _controlPosition = __webpack_require__(8);
 
 var _controlPosition2 = _interopRequireDefault(_controlPosition);
 
-var _map = __webpack_require__(3);
+var _map = __webpack_require__(4);
 
 var _map2 = _interopRequireDefault(_map);
 
@@ -938,10 +938,6 @@ var _children = __webpack_require__(2);
 
 var _children2 = _interopRequireDefault(_children);
 
-var _map = __webpack_require__(3);
-
-var _map2 = _interopRequireDefault(_map);
-
 var _MapLayer2 = __webpack_require__(7);
 
 var _MapLayer3 = _interopRequireDefault(_MapLayer2);
@@ -966,10 +962,12 @@ var GridLayer = function (_MapLayer) {
   }
 
   GridLayer.prototype.getOptions = function getOptions(props) {
-    return _extends({
-      maxZoom: this.context.map.options.maxZoom,
-      minZoom: this.context.map.options.minZoom
-    }, _MapLayer.prototype.getOptions.call(this, props));
+    var options = _MapLayer.prototype.getOptions.call(this, props);
+    var map = this.context.map;
+    return map ? _extends({
+      maxZoom: map.options.maxZoom,
+      minZoom: map.options.minZoom
+    }, options) : options;
   };
 
   GridLayer.prototype.createLeafletElement = function createLeafletElement(props) {
@@ -1000,9 +998,6 @@ GridLayer.propTypes = {
   opacity: _react.PropTypes.number,
   zIndex: _react.PropTypes.number
 };
-GridLayer.contextTypes = {
-  map: _map2.default
-};
 exports.default = GridLayer;
 
 /***/ }),
@@ -2113,7 +2108,7 @@ var _latlng = __webpack_require__(6);
 
 var _latlng2 = _interopRequireDefault(_latlng);
 
-var _Path2 = __webpack_require__(4);
+var _Path2 = __webpack_require__(3);
 
 var _Path3 = _interopRequireDefault(_Path2);
 
@@ -2188,7 +2183,7 @@ var _latlng = __webpack_require__(6);
 
 var _latlng2 = _interopRequireDefault(_latlng);
 
-var _Path2 = __webpack_require__(4);
+var _Path2 = __webpack_require__(3);
 
 var _Path3 = _interopRequireDefault(_Path2);
 
@@ -2262,7 +2257,7 @@ var _layerContainer = __webpack_require__(9);
 
 var _layerContainer2 = _interopRequireDefault(_layerContainer);
 
-var _Path2 = __webpack_require__(4);
+var _Path2 = __webpack_require__(3);
 
 var _Path3 = _interopRequireDefault(_Path2);
 
@@ -2334,7 +2329,7 @@ var _children = __webpack_require__(2);
 
 var _children2 = _interopRequireDefault(_children);
 
-var _Path2 = __webpack_require__(4);
+var _Path2 = __webpack_require__(3);
 
 var _Path3 = _interopRequireDefault(_Path2);
 
@@ -2558,7 +2553,7 @@ var _layerContainer = __webpack_require__(9);
 
 var _layerContainer2 = _interopRequireDefault(_layerContainer);
 
-var _map = __webpack_require__(3);
+var _map = __webpack_require__(4);
 
 var _map2 = _interopRequireDefault(_map);
 
@@ -2832,7 +2827,7 @@ var _layerContainer = __webpack_require__(9);
 
 var _layerContainer2 = _interopRequireDefault(_layerContainer);
 
-var _map = __webpack_require__(3);
+var _map = __webpack_require__(4);
 
 var _map2 = _interopRequireDefault(_map);
 
@@ -3135,7 +3130,7 @@ var _children = __webpack_require__(2);
 
 var _children2 = _interopRequireDefault(_children);
 
-var _map = __webpack_require__(3);
+var _map = __webpack_require__(4);
 
 var _map2 = _interopRequireDefault(_map);
 
@@ -3331,7 +3326,7 @@ var _latlngList = __webpack_require__(15);
 
 var _latlngList2 = _interopRequireDefault(_latlngList);
 
-var _Path2 = __webpack_require__(4);
+var _Path2 = __webpack_require__(3);
 
 var _Path3 = _interopRequireDefault(_Path2);
 
@@ -3405,7 +3400,7 @@ var _latlngList = __webpack_require__(15);
 
 var _latlngList2 = _interopRequireDefault(_latlngList);
 
-var _Path2 = __webpack_require__(4);
+var _Path2 = __webpack_require__(3);
 
 var _Path3 = _interopRequireDefault(_Path2);
 
@@ -3474,7 +3469,7 @@ var _latlng = __webpack_require__(6);
 
 var _latlng2 = _interopRequireDefault(_latlng);
 
-var _map = __webpack_require__(3);
+var _map = __webpack_require__(4);
 
 var _map2 = _interopRequireDefault(_map);
 
@@ -3633,7 +3628,7 @@ var _children = __webpack_require__(2);
 
 var _children2 = _interopRequireDefault(_children);
 
-var _Path2 = __webpack_require__(4);
+var _Path2 = __webpack_require__(3);
 
 var _Path3 = _interopRequireDefault(_Path2);
 
@@ -3825,7 +3820,7 @@ var _react = __webpack_require__(0);
 
 var _reactDom = __webpack_require__(54);
 
-var _map = __webpack_require__(3);
+var _map = __webpack_require__(4);
 
 var _map2 = _interopRequireDefault(_map);
 
@@ -4115,7 +4110,7 @@ var _layerContainer2 = __webpack_require__(9);
 
 var _layerContainer3 = _interopRequireDefault(_layerContainer2);
 
-var _map2 = __webpack_require__(3);
+var _map2 = __webpack_require__(4);
 
 var _map3 = _interopRequireDefault(_map2);
 
@@ -6877,7 +6872,7 @@ var _Pane2 = __webpack_require__(65);
 
 var _Pane3 = _interopRequireDefault(_Pane2);
 
-var _Path2 = __webpack_require__(4);
+var _Path2 = __webpack_require__(3);
 
 var _Path3 = _interopRequireDefault(_Path2);
 

diff --git a/dist/react-leaflet.min.js b/dist/react-leaflet.min.js
diff --git a/lib/AttributionControl.js b/lib/AttributionControl.js
@@ -20,11 +20,13 @@ var _MapControl3 = _interopRequireDefault(_MapControl2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
 var AttributionControl = function (_MapControl) {
   _inherits(AttributionControl, _MapControl);

diff --git a/lib/Circle.js b/lib/Circle.js
@@ -24,13 +24,15 @@ var _Path3 = _interopRequireDefault(_Path2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }
+
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
 var Circle = function (_Path) {
   _inherits(Circle, _Path);

diff --git a/lib/CircleMarker.js b/lib/CircleMarker.js
@@ -24,13 +24,15 @@ var _Path3 = _interopRequireDefault(_Path2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }
+
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
 var CircleMarker = function (_Path) {
   _inherits(CircleMarker, _Path);

diff --git a/lib/FeatureGroup.js b/lib/FeatureGroup.js
@@ -26,11 +26,13 @@ var _Path3 = _interopRequireDefault(_Path2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
 var FeatureGroup = function (_Path) {
   _inherits(FeatureGroup, _Path);

diff --git a/lib/GeoJSON.js b/lib/GeoJSON.js
@@ -4,12 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _isFunction2 = require('lodash/isFunction');
+
+var _isFunction3 = _interopRequireDefault(_isFunction2);
+
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 var _leaflet = require('leaflet');
 
-var _lodash = require('lodash');
-
 var _react = require('react');
 
 var _children = require('./types/children');
@@ -22,13 +24,15 @@ var _Path3 = _interopRequireDefault(_Path2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }
+
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
 var GeoJSON = function (_Path) {
   _inherits(GeoJSON, _Path);
@@ -50,7 +54,7 @@ var GeoJSON = function (_Path) {
   }, {
     key: 'updateLeafletElement',
     value: function updateLeafletElement(fromProps, toProps) {
-      if ((0, _lodash.isFunction)(toProps.style)) {
+      if ((0, _isFunction3.default)(toProps.style)) {
         this.setStyle(toProps.style);
       } else {
         this.setStyleIfChanged(fromProps, toProps);