#172: Avoid race condition - allow unregistering 'load' event

Author: rangoo94

src/GoogleApiComponent.js

@@ -72,12 +72,19 @@ export const wrapper = input => WrappedComponent => {
     }
 
     initialize(options) {
+      // Avoid race condition: remove previous 'load' listener
+      if (this.unregisterLoadHandler) {
+        this.unregisterLoadHandler();
+        this.unregisterLoadHandler = null;
+      }
+
       // Load cache factory
       const createCache = options.createCache || defaultCreateCache;
 
       // Build script
       this.scriptCache = createCache(options);
-      this.scriptCache.google.onLoad(this.onLoad.bind(this));
+      this.unregisterLoadHandler =
+        this.scriptCache.google.onLoad(this.onLoad.bind(this));
 
       // Store information about loading container
       this.LoadingContainer =

src/lib/ScriptCache.js

@@ -9,15 +9,27 @@ export const ScriptCache = (function(global) {
 
         Cache._onLoad = function(key) {
             return (cb) => {
+                let registered = true;
+
+                function unregister() {
+                    registered = false;
+                }
+
                 let stored = scriptMap.get(key);
+
                 if (stored) {
                     stored.promise.then(() => {
-                        stored.error ? cb(stored.error) : cb(null, stored)
+                        if (registered) {
+                          stored.error ? cb(stored.error) : cb(null, stored)
+                        }
+
                         return stored;
                     });
                 } else {
                     // TODO:
                 }
+
+                return unregister;
             }
         }