Merge pull request PaulLeCam#7 from andywer/master

Add new prop type for bounds

Author: PaulLeCam

example/build/lib.js

@@ -1,7 +1,7 @@
 var React = require("react");
 var Leaflet = require("leaflet");
 
-var latlngListType = require("./types/latlngList");
+var boundsType = require("./types/bounds");
 var mapLayerMixin = require("./mixins/mapLayer");
 
 module.exports = React.createClass({
@@ -11,7 +11,7 @@ module.exports = React.createClass({
 
   propTypes: {
     url: React.PropTypes.string.isRequired,
-    bounds: latlngListType.isRequired
+    bounds: boundsType.isRequired
   },
 
   componentWillMount:function() {

lib/ImageOverlay.js

@@ -3,8 +3,8 @@ var isArray = require("lodash-node/modern/objects/isArray");
 var React = require("react/addons");
 var Leaflet = require("leaflet");
 
+var boundsType = require("./types/bounds");
 var latlngType = require("./types/latlng");
-var latlngListType = require("./types/latlngList");
 
 var elementMixin = require("./mixins/element");
 var currentId = 0;
@@ -27,7 +27,7 @@ var Map = React.createClass({
   propTypes: {
     center: latlngType,
     id: React.PropTypes.string,
-    maxBounds: latlngListType,
+    maxBounds: boundsType,
     maxZoom: React.PropTypes.number,
     minZoom: React.PropTypes.number,
     zoom: React.PropTypes.number

lib/Map.js

@@ -1,7 +1,7 @@
 var React = require("react");
 var Leaflet = require("leaflet");
 
-var latlngListType = require("./types/latlngList");
+var boundsType = require("./types/bounds");
 var popupContainerMixin = require("./mixins/popupContainer");
 
 module.exports = React.createClass({
@@ -10,7 +10,7 @@ module.exports = React.createClass({
   mixins: [popupContainerMixin],
 
   propTypes: {
-    bounds: latlngListType.isRequired
+    bounds: boundsType.isRequired
   },
 
   componentWillMount:function() {

lib/Rectangle.js

@@ -0,0 +1,9 @@
+var React = require("react");
+var Leaflet = require("leaflet");
+
+var latlngList = require("./latlngList");
+
+module.exports = React.PropTypes.oneOfType([
+  React.PropTypes.instanceOf(Leaflet.LatLngBounds),
+  latlngList
+]);

lib/types/bounds.js

@@ -1,7 +1,7 @@
 var React = require("react");
 var Leaflet = require("leaflet");
 
-var latlngListType = require("./types/latlngList");
+var boundsType = require("./types/bounds");
 var mapLayerMixin = require("./mixins/mapLayer");
 
 module.exports = React.createClass({
@@ -11,7 +11,7 @@ module.exports = React.createClass({
 
   propTypes: {
     url: React.PropTypes.string.isRequired,
-    bounds: latlngListType.isRequired
+    bounds: boundsType.isRequired
   },
 
   componentWillMount() {

src/ImageOverlay.js

@@ -3,8 +3,8 @@ var isArray = require("lodash-node/modern/objects/isArray");
 var React = require("react/addons");
 var Leaflet = require("leaflet");
 
+var boundsType = require("./types/bounds");
 var latlngType = require("./types/latlng");
-var latlngListType = require("./types/latlngList");
 
 var elementMixin = require("./mixins/element");
 var currentId = 0;
@@ -27,7 +27,7 @@ var Map = React.createClass({
   propTypes: {
     center: latlngType,
     id: React.PropTypes.string,
-    maxBounds: latlngListType,
+    maxBounds: boundsType,
     maxZoom: React.PropTypes.number,
     minZoom: React.PropTypes.number,
     zoom: React.PropTypes.number

src/Map.js

@@ -1,7 +1,7 @@
 var React = require("react");
 var Leaflet = require("leaflet");
 
-var latlngListType = require("./types/latlngList");
+var boundsType = require("./types/bounds");
 var popupContainerMixin = require("./mixins/popupContainer");
 
 module.exports = React.createClass({
@@ -10,7 +10,7 @@ module.exports = React.createClass({
   mixins: [popupContainerMixin],
 
   propTypes: {
-    bounds: latlngListType.isRequired
+    bounds: boundsType.isRequired
   },
 
   componentWillMount() {

src/Rectangle.js

@@ -0,0 +1,9 @@
+var React = require("react");
+var Leaflet = require("leaflet");
+
+var latlngList = require("./latlngList");
+
+module.exports = React.PropTypes.oneOfType([
+  React.PropTypes.instanceOf(Leaflet.LatLngBounds),
+  latlngList
+]);