From d6576f226ffa982f2340b8774f3b136b6b5e09ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Sundli-H=C3=A4rdig?= Date: Fri, 25 May 2018 12:05:45 +0200 Subject: [PATCH] Avoid null error (#570) Avoid the error "Cannot read property 'removeEventListener' of null" --- src/google_map.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/google_map.js b/src/google_map.js index fdc96da..af16a60 100644 --- a/src/google_map.js +++ b/src/google_map.js @@ -396,9 +396,11 @@ export default class GoogleMap extends Component { componentWillUnmount() { this.mounted_ = false; const mapDom = ReactDOM.findDOMNode(this.googleMapDom_); + if (mapDom) { + mapDom.removeEventListener('mousedown', this._onMapMouseDownNative, true); + } window.removeEventListener('resize', this._onWindowResize); window.removeEventListener('keydown', this._onKeyDownCapture); - mapDom.removeEventListener('mousedown', this._onMapMouseDownNative, true); window.removeEventListener('mouseup', this._onChildMouseUp, false); if (this.props.resetBoundsOnResize) { detectElementResize.removeResizeListener(