Merge pull request #19 from cmcewen/safe-remove

jeremiahrhall · web-flow · commit de3d767779b0 · 2017-10-06T16:05:37.000-07:00
Fix small unmount bug
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.0.1 Release
+- Fix bug in componentWillUnmount->safeRemoveLayer where getPanes doesn't return anything so .contains is called on undefined. 
+
 # 1.0.0 Release
 - Leaflet 1.0.0 support
 - React-Leaflet 1.0.0 support
diff --git a/lib/HeatmapLayer.js b/lib/HeatmapLayer.js
@@ -68,7 +68,7 @@ function safeRemoveLayer(leafletMap, el) {
   var _leafletMap$getPanes = leafletMap.getPanes(),
       overlayPane = _leafletMap$getPanes.overlayPane;
 
-  if (overlayPane.contains(el)) {
+  if (overlayPane && overlayPane.contains(el)) {
     overlayPane.removeChild(el);
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-leaflet-heatmap-layer",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A custom layer for heatmaps in react-leaflet",
   "main": "lib/HeatmapLayer.js",
   "scripts": {
diff --git a/src/HeatmapLayer.js b/src/HeatmapLayer.js
@@ -64,7 +64,7 @@ function isInvalidLatLngArray(arr: Array<number>): boolean {
 
 function safeRemoveLayer(leafletMap: Map, el): void {
   const { overlayPane } = leafletMap.getPanes();
-  if (overlayPane.contains(el)) {
+  if (overlayPane && overlayPane.contains(el)) {
     overlayPane.removeChild(el);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ function safeRemoveLayer(leafletMap, el) {`
`68`	`68`	`var _leafletMap$getPanes = leafletMap.getPanes(),`
`69`	`69`	`overlayPane = _leafletMap$getPanes.overlayPane;`
`70`	`70`
`71`		`- if (overlayPane.contains(el)) {`
	`71`	`+ if (overlayPane && overlayPane.contains(el)) {`
`72`	`72`	`overlayPane.removeChild(el);`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-leaflet-heatmap-layer",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"description": "A custom layer for heatmaps in react-leaflet",`
`5`	`5`	`"main": "lib/HeatmapLayer.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ function isInvalidLatLngArray(arr: Array<number>): boolean {`
`64`	`64`
`65`	`65`	`function safeRemoveLayer(leafletMap: Map, el): void {`
`66`	`66`	`const { overlayPane } = leafletMap.getPanes();`
`67`		`- if (overlayPane.contains(el)) {`
	`67`	`+ if (overlayPane && overlayPane.contains(el)) {`
`68`	`68`	`overlayPane.removeChild(el);`
`69`	`69`	`}`
`70`	`70`	`}`