Merge pull request dozoisch#49 from aij/master

Fix race on execute()
infoxchange · Jun 20, 2017 · 9796adb · 9796adb
2 parents 7219e56 + 34bf764
commit 9796adb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/recaptcha.js b/src/recaptcha.js
@@ -22,6 +22,8 @@ export default class ReCAPTCHA extends React.Component {
 
     if (grecaptcha && widgetId !== undefined) {
       return grecaptcha.execute(widgetId);
+    } else {
+      this._executeRequested = true;
     }
   }
 
@@ -56,6 +58,10 @@ export default class ReCAPTCHA extends React.Component {
         widgetId: id,
       }, cb);
     }
+    if (this._executeRequested && this.props.grecaptcha && this.state.widgetId !== undefined) {
+      this._executeRequested = false;
+      this.execute();
+    }
   }
 
   componentDidMount() {