From 30830b727b2d40ec8f0becc2d40041de2a05607c Mon Sep 17 00:00:00 2001
From: Xiaoji Chen <Pessimistress@users.noreply.github.com>
Date: Mon, 10 Feb 2020 14:57:13 -0800
Subject: [PATCH] Sanity check in source/layer update (#1022)

---
 src/components/layer.js  | 2 +-
 src/components/source.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/layer.js b/src/components/layer.js
index 7d9b063a..b4e0e2c6 100644
--- a/src/components/layer.js
+++ b/src/components/layer.js
@@ -158,7 +158,7 @@ export default class Layer<Props: LayerProps> extends PureComponent<Props> {
   /* eslint-disable complexity */
 
   _render(context: MapContextProps) {
-    if (!this._map) {
+    if (!this._map && context.map) {
       this._map = context.map;
       this._map.on('styledata', this._updateLayer);
     }
diff --git a/src/components/source.js b/src/components/source.js
index 2919071e..000fb3e7 100644
--- a/src/components/source.js
+++ b/src/components/source.js
@@ -128,7 +128,7 @@ export default class Source<Props: SourceProps> extends PureComponent<Props> {
   /* eslint-enable complexity */
 
   _render(context: MapContextProps) {
-    if (!this._map) {
+    if (!this._map && context.map) {
       this._map = context.map;
       this._map.on('styledata', this._updateSource);
     }