Skip to content

Commit

Permalink
v2.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@PaulLeCam
PaulLeCam committed Mar 12, 2020
1 parent 3aaf258 commit b573845
Show file tree
Hide file tree
Showing 8 changed files with 601 additions and 468 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## v2.6.2 (2020-03-12)

- Fixed applying `maxZoom` and `minZoom` options to tile layers.
- [website] Added `react-leaflet-geodesic` plugin ([PR #656](https://github.com/PaulLeCam/react-leaflet/pull/656) by _dcdourado_).
- [website] Added `react-leaflet-arrowheads` and `react-leaflet-editable-popup` plugins ([PR #678](https://github.com/PaulLeCam/react-leaflet/pull/678) by _slutske22_).
- [internal] Set babel runtime version ([PR #670](https://github.com/PaulLeCam/react-leaflet/pull/670) by _anajavi_).

## v2.6.1 (2019-12-14)

Fixed catching falsy values in `utils/pick` ([PR #649](https://github.com/PaulLeCam/react-leaflet/pull/649) by _CaptainLexington_).
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ open pull requests to update this list!
| [`react-leaflet-figure-editor`](https://www.npmjs.com/package/react-leaflet-figure-editor) | unknown |
| [`react-leaflet-freedraw`](https://www.npmjs.com/package/react-leaflet-freedraw) | **yes** |
| [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control) | unknown |
| [`react-leaflet-geodesic`](https://www.npmjs.com/package/react-leaflet-geodesic) | **yes** |
| [`react-leaflet-geojson-cluster`](https://www.npmjs.com/package/react-leaflet-geojson-cluster) | unknown |
| [`react-leaflet-geojson-patterns`](https://www.npmjs.com/package/react-leaflet-geojson-patterns) | **yes** |
| [`react-leaflet-google-layer`](https://www.npmjs.com/package/react-leaflet-google-layer) | **yes** |
Expand All @@ -59,4 +60,3 @@ open pull requests to update this list!
| [`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 |
| [`react-leaflet-geodesic`](https://www.npmjs.com/package/react-leaflet-geodesic) | **yes** |
38 changes: 19 additions & 19 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-leaflet",
"version": "2.6.0",
"version": "2.6.2",
"description": "React components for Leaflet maps",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -49,7 +49,7 @@
"src/*"
],
"dependencies": {
"@babel/runtime": "^7.8.3",
"@babel/runtime": "^7.8.7",
"fast-deep-equal": "^3.1.1",
"hoist-non-react-statics": "^3.3.2",
"warning": "^4.0.3"
Expand All @@ -60,48 +60,48 @@
"react-dom": "^16.8.0"
},
"devDependencies": {
"@babel/cli": "^7.8.3",
"@babel/core": "^7.8.3",
"@babel/cli": "^7.8.4",
"@babel/core": "^7.8.7",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-export-default-from": "^7.8.3",
"@babel/plugin-transform-proto-to-assign": "^7.8.3",
"@babel/plugin-transform-runtime": "^7.8.3",
"@babel/plugin-transform-strict-mode": "^7.8.3",
"@babel/preset-env": "^7.8.3",
"@babel/preset-env": "^7.8.7",
"@babel/preset-flow": "^7.8.3",
"@babel/preset-react": "^7.8.3",
"babel-eslint": "^10.0.3",
"babel-eslint": "^10.1.0",
"babel-jest": "^25.1.0",
"babel-loader": "^8.0.6",
"babel-plugin-dev-expression": "^0.2.2",
"cross-env": "^7.0.0",
"cross-env": "^7.0.2",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-flowtype": "^4.6.0",
"eslint-plugin-import": "^2.20.0",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.18.0",
"flow-bin": "^0.117.0",
"eslint-plugin-react": "^7.19.0",
"flow-bin": "^0.120.1",
"flow-copy-source": "^2.0.9",
"flow-typed": "^2.6.2",
"flow-typed": "^3.0.0",
"jest": "^25.1.0",
"leaflet": "^1.6.0",
"prettier": "^1.19.1",
"prettier-eslint": "^9.0.1",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"rimraf": "^3.0.1",
"rollup": "^1.30.1",
"rollup-plugin-babel": "^4.3.3",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"rimraf": "^3.0.2",
"rollup": "^2.0.5",
"rollup-plugin-babel": "^4.4.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-uglify": "^6.0.4",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.10.1"
"webpack": "^4.42.0",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.10.3"
},
"jest": {
"collectCoverage": true
Expand Down
18 changes: 10 additions & 8 deletions src/GridLayer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ 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,
}
const { map } = props.leaflet
if (map != null) {
if (options.maxZoom == null && map.options.maxZoom != null) {
options.maxZoom = map.options.maxZoom
}
if (options.minZoom == null && map.options.minZoom != null) {
options.minZoom = map.options.minZoom
}
}
return options
}

render() {
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"crowdin-download": "crowdin --config ../crowdin.yaml download -b master"
},
"dependencies": {
"highlight.js": "^9.18.0"
"highlight.js": "^9.18.1"
},
"devDependencies": {
"docusaurus": "~1.14.4"
Expand Down
3 changes: 3 additions & 0 deletions website/versioned_docs/version-v2/plugins.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ open pull requests to update this list!
| [`leaflet-drift-marker`](https://www.npmjs.com/package/leaflet-drift-marker) | **yes** |
| [`leaflet-react-track-player`](https://www.npmjs.com/package/leaflet-react-track-player) | unknown |
| [`react-leaflet-ant-path`](https://www.npmjs.com/package/react-leaflet-ant-path) | unknown |
| [`react-leaflet-arrowheads`](https://www.npmjs.com/package/react-leaflet-arrowheads) | **yes** |
| [`react-leaflet-bing-v2`](https://www.npmjs.com/package/react-leaflet-bing-v2) | **yes** |
| [`react-leaflet-box-zoom`](https://www.npmjs.com/package/react-leaflet-box-zoom) | **yes** |
| [`react-leaflet-choropleth`](https://www.npmjs.com/package/react-leaflet-choropleth) | unknown |
Expand All @@ -30,10 +31,12 @@ open pull requests to update this list!
| [`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) | **yes** |
| [`react-leaflet-editable-popup`](https://www.npmjs.com/package/react-leaflet-editable-popup) | **yes** |
| [`react-leaflet-enhanced-marker`](https://www.npmjs.com/package/react-leaflet-enhanced-marker) | **yes** |
| [`react-leaflet-figure-editor`](https://www.npmjs.com/package/react-leaflet-figure-editor) | unknown |
| [`react-leaflet-freedraw`](https://www.npmjs.com/package/react-leaflet-freedraw) | **yes** |
| [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control) | unknown |
| [`react-leaflet-geodesic`](https://www.npmjs.com/package/react-leaflet-geodesic) | **yes** |
| [`react-leaflet-geojson-cluster`](https://www.npmjs.com/package/react-leaflet-geojson-cluster) | unknown |
| [`react-leaflet-geojson-patterns`](https://www.npmjs.com/package/react-leaflet-geojson-patterns) | **yes** |
| [`react-leaflet-google-layer`](https://www.npmjs.com/package/react-leaflet-google-layer) | **yes** |
Expand Down
8 changes: 4 additions & 4 deletions website/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3161,10 +3161,10 @@ highlight.js@^9.16.2:
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==

highlight.js@^9.18.0:
version "9.18.0"
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.0.tgz#6b1763cfcd53744313bd3f31f1210f7beb962c79"
integrity sha512-A97kI1KAUzKoAiEoaGcf2O9YPS8nbDTCRFokaaeBhnqjQTvbAuAJrQMm21zw8s8xzaMtCQBtgbyGXLGxdxQyqQ==
highlight.js@^9.18.1:
version "9.18.1"
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==

hosted-git-info@^2.1.4:
version "2.8.5"
Expand Down

0 comments on commit b573845

Please sign in to comment.