Skip to content

Commit

Permalink
v2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulLeCam committed Aug 14, 2018
1 parent db0d7e0 commit 37fcbc3
Show file tree
Hide file tree
Showing 9 changed files with 885 additions and 719 deletions.
6 changes: 6 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,11 @@
"trailingComma": "all"
}
]
},
"settings": {
"react": {
"version": "16.3",
"flowVersion": "0.78"
}
}
}
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## v2.0.1 (2018-08-14)

- Fixed setting `maxZoom` and `minZoom` options to `GridLayer` using `Map` options.
- [website] Added `react-leaflet-search` and `react-leaflet-zoom-indicator` plugins ([PR #501](https://github.com/PaulLeCam/react-leaflet/pull/501) by _tumerorkun_).

## v2.0.0 (2018-07-05)

Changes from v1.9.1:
Expand Down
64 changes: 32 additions & 32 deletions docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,35 @@ open pull requests to update this list!

⚠️ These plugins may not be compatible with React-Leaflet v2, make sure to check their documentation.

| Plugin | Compatible with v2 |
| ------ | ------------------ |
| [`react-leaflet-ant-path`](https://www.npmjs.com/package/react-leaflet-ant-path) | unknown
| [`react-leaflet-bing`](https://www.npmjs.com/package/react-leaflet-bing) | unknown
| [`react-leaflet-choropleth`](https://www.npmjs.com/package/react-leaflet-choropleth) | unknown
| [`react-leaflet-cluster-layer`](https://www.npmjs.com/package/react-leaflet-cluster-layer) | unknown
| [`react-leaflet-control`](https://www.npmjs.com/package/react-leaflet-control) | unknown
| [`react-leaflet-d3`](https://www.npmjs.com/package/react-leaflet-d3) | unknown
| [`react-leaflet-deflate`](https://www.npmjs.com/package/react-leaflet-deflate) | unknown
| [`react-leaflet-distance-marker`](https://www.npmjs.com/package/react-leaflet-distance-marker) | unknown
| [`react-leaflet-div-icon`](https://www.npmjs.com/package/react-leaflet-div-icon) | unknown
| [`react-leaflet-draggable-polyline`](https://www.npmjs.com/package/react-leaflet-draggable-polyline) | unknown
| [`react-leaflet-draw`](https://www.npmjs.com/package/react-leaflet-draw) | unknown
| [`react-leaflet-easyprint`](https://www.npmjs.com/package/react-leaflet-easyprint) | unknown
| [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control) | unknown
| [`react-leaflet-geojson-cluster`](https://www.npmjs.com/package/react-leaflet-geojson-cluster) | unknown
| [`react-leaflet-google`](https://www.npmjs.com/package/react-leaflet-google) | unknown
| [`react-leaflet-heatmap-layer`](https://www.npmjs.com/package/react-leaflet-heatmap-layer) | unknown
| [`react-leaflet-locate-control`](https://www.npmjs.com/package/react-leaflet-locate-control) | unknown
| [`react-leaflet-markercluster`](https://www.npmjs.com/package/react-leaflet-markercluster) | unknown
| [`react-leaflet-marker-layer`](https://www.npmjs.com/package/react-leaflet-marker-layer) | unknown
| [`react-leaflet-measure`](https://www.npmjs.com/package/react-leaflet-measure) | unknown
| [`react-leaflet-nmscale`](https://www.npmjs.com/package/@marfle/react-leaflet-nmscale) | **yes**
| [`react-leaflet-pane`](https://www.npmjs.com/package/react-leaflet-pane) | unknown
| [`react-leaflet-rotatedmarker`](https://www.npmjs.com/package/react-leaflet-rotatedmarker) | unknown
| [`react-leaflet-shapefile`](https://www.npmjs.com/package/react-leaflet-shapefile) | unknown
| [`react-leaflet-sidebarv2`](https://www.npmjs.com/package/react-leaflet-sidebarv2) | unknown
| [`react-leaflet-vectorgrid`](https://www.npmjs.com/package/react-leaflet-vectorgrid) | unknown
| [`react-leaflet-zoom-display`](https://www.npmjs.com/package/react-leaflet-zoom-display) | unknown
| [`react-mapbox-components`](https://www.npmjs.com/package/react-mapbox-components) | unknown
| [`react-leaflet-search`](https://www.npmjs.com/package/react-leaflet-search) | **yes**
| [`react-leaflet-zoom-indicator`](https://www.npmjs.com/package/react-leaflet-zoom-indicator) | unknown
| Plugin | Compatible with v2 |
| ---------------------------------------------------------------------------------------------------- | ------------------ |
| [`react-leaflet-ant-path`](https://www.npmjs.com/package/react-leaflet-ant-path) | unknown |
| [`react-leaflet-bing`](https://www.npmjs.com/package/react-leaflet-bing) | unknown |
| [`react-leaflet-choropleth`](https://www.npmjs.com/package/react-leaflet-choropleth) | unknown |
| [`react-leaflet-cluster-layer`](https://www.npmjs.com/package/react-leaflet-cluster-layer) | unknown |
| [`react-leaflet-control`](https://www.npmjs.com/package/react-leaflet-control) | unknown |
| [`react-leaflet-d3`](https://www.npmjs.com/package/react-leaflet-d3) | unknown |
| [`react-leaflet-deflate`](https://www.npmjs.com/package/react-leaflet-deflate) | unknown |
| [`react-leaflet-distance-marker`](https://www.npmjs.com/package/react-leaflet-distance-marker) | unknown |
| [`react-leaflet-div-icon`](https://www.npmjs.com/package/react-leaflet-div-icon) | unknown |
| [`react-leaflet-draggable-polyline`](https://www.npmjs.com/package/react-leaflet-draggable-polyline) | unknown |
| [`react-leaflet-draw`](https://www.npmjs.com/package/react-leaflet-draw) | unknown |
| [`react-leaflet-easyprint`](https://www.npmjs.com/package/react-leaflet-easyprint) | unknown |
| [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control) | unknown |
| [`react-leaflet-geojson-cluster`](https://www.npmjs.com/package/react-leaflet-geojson-cluster) | unknown |
| [`react-leaflet-google`](https://www.npmjs.com/package/react-leaflet-google) | unknown |
| [`react-leaflet-heatmap-layer`](https://www.npmjs.com/package/react-leaflet-heatmap-layer) | unknown |
| [`react-leaflet-locate-control`](https://www.npmjs.com/package/react-leaflet-locate-control) | unknown |
| [`react-leaflet-markercluster`](https://www.npmjs.com/package/react-leaflet-markercluster) | unknown |
| [`react-leaflet-marker-layer`](https://www.npmjs.com/package/react-leaflet-marker-layer) | unknown |
| [`react-leaflet-measure`](https://www.npmjs.com/package/react-leaflet-measure) | unknown |
| [`react-leaflet-nmscale`](https://www.npmjs.com/package/@marfle/react-leaflet-nmscale) | **yes** |
| [`react-leaflet-pane`](https://www.npmjs.com/package/react-leaflet-pane) | unknown |
| [`react-leaflet-rotatedmarker`](https://www.npmjs.com/package/react-leaflet-rotatedmarker) | unknown |
| [`react-leaflet-search`](https://www.npmjs.com/package/react-leaflet-search) | **yes** |
| [`react-leaflet-shapefile`](https://www.npmjs.com/package/react-leaflet-shapefile) | unknown |
| [`react-leaflet-sidebarv2`](https://www.npmjs.com/package/react-leaflet-sidebarv2) | unknown |
| [`react-leaflet-vectorgrid`](https://www.npmjs.com/package/react-leaflet-vectorgrid) | unknown |
| [`react-leaflet-zoom-display`](https://www.npmjs.com/package/react-leaflet-zoom-display) | unknown |
| [`react-leaflet-zoom-indicator`](https://www.npmjs.com/package/react-leaflet-zoom-indicator) | unknown |
| [`react-mapbox-components`](https://www.npmjs.com/package/react-mapbox-components) | unknown |
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-leaflet",
"version": "2.0.0",
"version": "2.0.1",
"description": "React components for Leaflet maps",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -49,7 +49,7 @@
"src/*"
],
"dependencies": {
"hoist-non-react-statics": "^2.5.0",
"hoist-non-react-statics": "^3.0.1",
"lodash": "^4.0.0",
"lodash-es": "^4.0.0",
"warning": "^4.0.0"
Expand All @@ -62,8 +62,8 @@
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-eslint": "^8.2.5",
"babel-jest": "^23.2.0",
"babel-eslint": "^8.2.6",
"babel-jest": "^23.4.2",
"babel-loader": "^7.1.5",
"babel-plugin-dev-expression": "^0.2.1",
"babel-plugin-external-helpers": "^6.22.0",
Expand All @@ -73,32 +73,32 @@
"babel-preset-react": "^6.24.1",
"babel-preset-stage-1": "^6.24.1",
"cross-env": "^5.2.0",
"eslint": "^5.0.1",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-flowtype": "^2.49.3",
"eslint-plugin-import": "^2.13.0",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-prettier": "^2.6.1",
"eslint": "^5.3.0",
"eslint-config-prettier": "^3.0.1",
"eslint-plugin-flowtype": "^2.50.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-node": "^7.0.1",
"eslint-plugin-prettier": "^2.6.2",
"eslint-plugin-promise": "^3.8.0",
"eslint-plugin-react": "^7.10.0",
"flow-bin": "^0.75.0",
"flow-copy-source": "^2.0.1",
"flow-typed": "^2.4.0",
"jest": "^23.3.0",
"leaflet": "^1.3.1",
"prettier": "^1.13.7",
"eslint-plugin-react": "^7.11.0",
"flow-bin": "^0.78.0",
"flow-copy-source": "^2.0.2",
"flow-typed": "^2.5.1",
"jest": "^23.5.0",
"leaflet": "^1.3.3",
"prettier": "^1.14.2",
"prettier-eslint": "^8.8.2",
"react": "^16.4.1",
"react-dom": "^16.4.1",
"rimraf": "^2.6.2",
"rollup": "^0.62.0",
"rollup": "^0.64.1",
"rollup-plugin-babel": "^3.0.7",
"rollup-plugin-commonjs": "^9.1.3",
"rollup-plugin-commonjs": "^9.1.5",
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-uglify": "^4.0.0",
"webpack": "^4.15.1",
"webpack-serve": "^1.0.4"
"webpack": "^4.16.5",
"webpack-serve": "^2.0.2"
},
"jest": {
"collectCoverage": true,
Expand Down
12 changes: 12 additions & 0 deletions src/GridLayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@ export default class GridLayer<
}
}

getOptions(props: Props): Props {
const options = super.getOptions(props)
return props.leaflet.map == null
? options
: // $FlowFixMe: object spread type
{
maxZoom: props.leaflet.map.options.maxZoom,
minZoom: props.leaflet.map.options.minZoom,
...options,
}
}

render() {
return null
}
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"highlight.js": "^9.12.0"
},
"devDependencies": {
"docusaurus": "~1.3.1"
"docusaurus": "~1.3.2"
}
}
62 changes: 32 additions & 30 deletions website/versioned_docs/version-v2/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,35 @@ open pull requests to update this list!

⚠️ These plugins may not be compatible with React-Leaflet v2, make sure to check their documentation.

| Plugin | Compatible with v2 |
| ------ | ------------------ |
| [`react-leaflet-ant-path`](https://www.npmjs.com/package/react-leaflet-ant-path) | unknown
| [`react-leaflet-bing`](https://www.npmjs.com/package/react-leaflet-bing) | unknown
| [`react-leaflet-choropleth`](https://www.npmjs.com/package/react-leaflet-choropleth) | unknown
| [`react-leaflet-cluster-layer`](https://www.npmjs.com/package/react-leaflet-cluster-layer) | unknown
| [`react-leaflet-control`](https://www.npmjs.com/package/react-leaflet-control) | unknown
| [`react-leaflet-d3`](https://www.npmjs.com/package/react-leaflet-d3) | unknown
| [`react-leaflet-deflate`](https://www.npmjs.com/package/react-leaflet-deflate) | unknown
| [`react-leaflet-distance-marker`](https://www.npmjs.com/package/react-leaflet-distance-marker) | unknown
| [`react-leaflet-div-icon`](https://www.npmjs.com/package/react-leaflet-div-icon) | unknown
| [`react-leaflet-draggable-polyline`](https://www.npmjs.com/package/react-leaflet-draggable-polyline) | unknown
| [`react-leaflet-draw`](https://www.npmjs.com/package/react-leaflet-draw) | unknown
| [`react-leaflet-easyprint`](https://www.npmjs.com/package/react-leaflet-easyprint) | unknown
| [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control) | unknown
| [`react-leaflet-geojson-cluster`](https://www.npmjs.com/package/react-leaflet-geojson-cluster) | unknown
| [`react-leaflet-google`](https://www.npmjs.com/package/react-leaflet-google) | unknown
| [`react-leaflet-heatmap-layer`](https://www.npmjs.com/package/react-leaflet-heatmap-layer) | unknown
| [`react-leaflet-locate-control`](https://www.npmjs.com/package/react-leaflet-locate-control) | unknown
| [`react-leaflet-markercluster`](https://www.npmjs.com/package/react-leaflet-markercluster) | unknown
| [`react-leaflet-marker-layer`](https://www.npmjs.com/package/react-leaflet-marker-layer) | unknown
| [`react-leaflet-measure`](https://www.npmjs.com/package/react-leaflet-measure) | unknown
| [`react-leaflet-nmscale`](https://www.npmjs.com/package/@marfle/react-leaflet-nmscale) | **yes**
| [`react-leaflet-pane`](https://www.npmjs.com/package/react-leaflet-pane) | unknown
| [`react-leaflet-rotatedmarker`](https://www.npmjs.com/package/react-leaflet-rotatedmarker) | unknown
| [`react-leaflet-shapefile`](https://www.npmjs.com/package/react-leaflet-shapefile) | unknown
| [`react-leaflet-sidebarv2`](https://www.npmjs.com/package/react-leaflet-sidebarv2) | unknown
| [`react-leaflet-vectorgrid`](https://www.npmjs.com/package/react-leaflet-vectorgrid) | unknown
| [`react-leaflet-zoom-display`](https://www.npmjs.com/package/react-leaflet-zoom-display) | unknown
| [`react-mapbox-components`](https://www.npmjs.com/package/react-mapbox-components) | unknown
| Plugin | Compatible with v2 |
| ---------------------------------------------------------------------------------------------------- | ------------------ |
| [`react-leaflet-ant-path`](https://www.npmjs.com/package/react-leaflet-ant-path) | unknown |
| [`react-leaflet-bing`](https://www.npmjs.com/package/react-leaflet-bing) | unknown |
| [`react-leaflet-choropleth`](https://www.npmjs.com/package/react-leaflet-choropleth) | unknown |
| [`react-leaflet-cluster-layer`](https://www.npmjs.com/package/react-leaflet-cluster-layer) | unknown |
| [`react-leaflet-control`](https://www.npmjs.com/package/react-leaflet-control) | unknown |
| [`react-leaflet-d3`](https://www.npmjs.com/package/react-leaflet-d3) | unknown |
| [`react-leaflet-deflate`](https://www.npmjs.com/package/react-leaflet-deflate) | unknown |
| [`react-leaflet-distance-marker`](https://www.npmjs.com/package/react-leaflet-distance-marker) | unknown |
| [`react-leaflet-div-icon`](https://www.npmjs.com/package/react-leaflet-div-icon) | unknown |
| [`react-leaflet-draggable-polyline`](https://www.npmjs.com/package/react-leaflet-draggable-polyline) | unknown |
| [`react-leaflet-draw`](https://www.npmjs.com/package/react-leaflet-draw) | unknown |
| [`react-leaflet-easyprint`](https://www.npmjs.com/package/react-leaflet-easyprint) | unknown |
| [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control) | unknown |
| [`react-leaflet-geojson-cluster`](https://www.npmjs.com/package/react-leaflet-geojson-cluster) | unknown |
| [`react-leaflet-google`](https://www.npmjs.com/package/react-leaflet-google) | unknown |
| [`react-leaflet-heatmap-layer`](https://www.npmjs.com/package/react-leaflet-heatmap-layer) | unknown |
| [`react-leaflet-locate-control`](https://www.npmjs.com/package/react-leaflet-locate-control) | unknown |
| [`react-leaflet-markercluster`](https://www.npmjs.com/package/react-leaflet-markercluster) | unknown |
| [`react-leaflet-marker-layer`](https://www.npmjs.com/package/react-leaflet-marker-layer) | unknown |
| [`react-leaflet-measure`](https://www.npmjs.com/package/react-leaflet-measure) | unknown |
| [`react-leaflet-nmscale`](https://www.npmjs.com/package/@marfle/react-leaflet-nmscale) | **yes** |
| [`react-leaflet-pane`](https://www.npmjs.com/package/react-leaflet-pane) | unknown |
| [`react-leaflet-rotatedmarker`](https://www.npmjs.com/package/react-leaflet-rotatedmarker) | unknown |
| [`react-leaflet-search`](https://www.npmjs.com/package/react-leaflet-search) | **yes** |
| [`react-leaflet-shapefile`](https://www.npmjs.com/package/react-leaflet-shapefile) | unknown |
| [`react-leaflet-sidebarv2`](https://www.npmjs.com/package/react-leaflet-sidebarv2) | unknown |
| [`react-leaflet-vectorgrid`](https://www.npmjs.com/package/react-leaflet-vectorgrid) | unknown |
| [`react-leaflet-zoom-display`](https://www.npmjs.com/package/react-leaflet-zoom-display) | unknown |
| [`react-leaflet-zoom-indicator`](https://www.npmjs.com/package/react-leaflet-zoom-indicator) | unknown |
| [`react-mapbox-components`](https://www.npmjs.com/package/react-mapbox-components) | unknown |
14 changes: 9 additions & 5 deletions website/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1097,10 +1097,14 @@ [email protected], combined-stream@~1.0.5:
dependencies:
delayed-stream "~1.0.0"

commander@^2.11.0, commander@^2.15.1:
commander@^2.15.1:
version "2.15.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"

commander@^2.16.0:
version "2.17.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"

commander@~2.8.1:
version "2.8.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
Expand Down Expand Up @@ -1423,9 +1427,9 @@ diacritics-map@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/diacritics-map/-/diacritics-map-0.1.0.tgz#6dfc0ff9d01000a2edf2865371cac316e94977af"

docusaurus@~1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.3.1.tgz#b9431ed45bff7899eeedc0ca55349df992f791cc"
docusaurus@~1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.3.2.tgz#1e5001d1831b028178e496f6b8511e436ac7fda9"
dependencies:
babel-plugin-transform-class-properties "^6.24.1"
babel-plugin-transform-object-rest-spread "^6.26.0"
Expand All @@ -1438,7 +1442,7 @@ docusaurus@~1.3.1:
chalk "^2.1.0"
classnames "^2.2.6"
color "^2.0.1"
commander "^2.11.0"
commander "^2.16.0"
crowdin-cli "^0.3.0"
cssnano "^3.10.0"
escape-string-regexp "^1.0.5"
Expand Down
Loading

0 comments on commit 37fcbc3

Please sign in to comment.