fix(src/withGoogleMap): crash when google is not defined

tomchentw · Jul 13, 2018 · b703210 · b703210
1 parent ca5c5c6
commit b703210
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/withGoogleMap.jsx b/src/withGoogleMap.jsx
@@ -46,15 +46,16 @@ export function withGoogleMap(BaseComponent) {
     }
 
     handleComponentMount(node) {
-      if (this.state.map || node === null) {
-        return
-      }
       warning(
         `undefined` !== typeof google,
         `Make sure you've put a <script> tag in your <head> element to load Google Maps JavaScript API v3.
  If you're looking for built-in support to load it for you, use the "async/ScriptjsLoader" instead.
  See https://github.com/tomchentw/react-google-maps/pull/168`
       )
+
+      if (this.state.map || node === null || google == null) {
+        return
+      }
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Map
       const map = new google.maps.Map(node)
       this.setState({ map })