Avoid multiple api loads (google-map-react#955)

itsmichaeldiego · web-flow · commit e66f96f40fbc · 2020-10-03T15:22:06.000+02:00
diff --git a/src/loaders/google_map_loader.js b/src/loaders/google_map_loader.js
@@ -1,7 +1,6 @@
 import { Loader } from '@googlemaps/js-api-loader';
 
-let loader_ = null;
-
+let loadPromise_;
 let resolveCustomPromise_;
 
 const _customPromise = new Promise((resolve) => {
@@ -16,6 +15,11 @@ export default (bootstrapURLKeys, heatmapLibrary) => {
     return _customPromise;
   }
 
+  // avoid api to be loaded multiple times
+  if (loadPromise_) {
+    return loadPromise_;
+  }
+
   if (!bootstrapURLKeys.libraries) {
     bootstrapURLKeys.libraries = [];
   }
@@ -50,23 +54,21 @@ export default (bootstrapURLKeys, heatmapLibrary) => {
     throw new Error('google map cannot be loaded outside browser env');
   }
 
-  if (!loader_) {
-    const { key, ...restKeys } = bootstrapURLKeys;
+  const { key, ...restKeys } = bootstrapURLKeys;
 
-    loader_ = new Loader({
-      // need to keep key for backwards compatibility
-      apiKey: key || '',
-      ...restKeys,
-      libraries,
-    });
-  }
+  const loader_ = new Loader({
+    // need to keep key for backwards compatibility
+    apiKey: key || '',
+    ...restKeys,
+    libraries,
+  });
 
-  const loadPromise = loader_.load().then(() => {
+  loadPromise_ = loader_.load().then(() => {
     resolveCustomPromise_(window.google.maps);
     return window.google.maps;
   });
 
-  resolveCustomPromise_(loadPromise);
+  resolveCustomPromise_(loadPromise_);
 
-  return loadPromise;
+  return loadPromise_;
 };
