@hcaptcha/react-hcaptcha 1.10.3 → 1.11.0

package/dist/esm/index.js

@@ -23,6 +23,7 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
     _this.resetCaptcha = _this.resetCaptcha.bind(_assertThisInitialized(_this));
     _this.removeCaptcha = _this.removeCaptcha.bind(_assertThisInitialized(_this));
     _this.isReady = _this.isReady.bind(_assertThisInitialized(_this));
+    _this._onReady = null;
 
     // Event Handlers
     _this.loadCaptcha = _this.loadCaptcha.bind(_assertThisInitialized(_this));
@@ -154,6 +155,7 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
     this.apiScriptRequested = true;
   };
   _proto.renderCaptcha = function renderCaptcha(onReady) {
+    var _this4 = this;
     var isApiReady = this.state.isApiReady;
     if (!isApiReady) return;
     var renderParams = Object.assign({
@@ -175,6 +177,7 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
       captchaId: captchaId
     }, function () {
       onReady && onReady();
+      _this4._onReady && _this4._onReady(captchaId);
     });
   };
   _proto.resetCaptcha = function resetCaptcha() {
@@ -208,24 +211,24 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
     });
   };
   _proto.handleOnLoad = function handleOnLoad() {
-    var _this4 = this;
+    var _this5 = this;
     this.setState({
       isApiReady: true
     }, function () {
       try {
-        var element = getMountElement(_this4.props.scriptLocation);
+        var element = getMountElement(_this5.props.scriptLocation);
         var frame = getFrame(element);
-        _this4._hcaptcha = frame.window.hcaptcha;
+        _this5._hcaptcha = frame.window.hcaptcha;
 
         // render captcha and wait for captcha id
-        _this4.renderCaptcha(function () {
+        _this5.renderCaptcha(function () {
           // trigger onLoad if it exists
 
-          var onLoad = _this4.props.onLoad;
+          var onLoad = _this5.props.onLoad;
           if (onLoad) onLoad();
         });
       } catch (error) {
-        _this4.sentryHub.captureException(error);
+        _this5.sentryHub.captureException(error);
       }
     });
   };
@@ -290,21 +293,39 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
     this.props.onChalExpired();
   };
   _proto.execute = function execute(opts) {
+    var _this6 = this;
     if (opts === void 0) {
       opts = null;
     }
+    opts = typeof opts === 'object' ? opts : null;
     try {
       var captchaId = this.state.captchaId;
       var hcaptcha = this._hcaptcha;
       if (!this.isReady()) {
-        return;
-      }
-      if (opts && typeof opts !== "object") {
-        opts = null;
+        var _opts;
+        var onReady = new Promise(function (resolve, reject) {
+          _this6._onReady = function (id) {
+            try {
+              var _hcaptcha = _this6._hcaptcha;
+              if (opts && opts.async) {
+                _hcaptcha.execute(id, opts).then(resolve)["catch"](reject);
+              } else {
+                resolve(_hcaptcha.execute(id, opts));
+              }
+            } catch (e) {
+              reject(e);
+            }
+          };
+        });
+        return (_opts = opts) != null && _opts.async ? onReady : null;
       }
       return hcaptcha.execute(captchaId, opts);
     } catch (error) {
       this.sentryHub.captureException(error);
+      if (opts && opts.async) {
+        return Promise.reject(error);
+      }
+      return null;
     }
   };
   _proto.setData = function setData(data) {

package/dist/index.js

@@ -41,6 +41,7 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
     _this.resetCaptcha = _this.resetCaptcha.bind((0, _assertThisInitialized2["default"])(_this));
     _this.removeCaptcha = _this.removeCaptcha.bind((0, _assertThisInitialized2["default"])(_this));
     _this.isReady = _this.isReady.bind((0, _assertThisInitialized2["default"])(_this));
+    _this._onReady = null;
 
     // Event Handlers
     _this.loadCaptcha = _this.loadCaptcha.bind((0, _assertThisInitialized2["default"])(_this));
@@ -183,6 +184,7 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "renderCaptcha",
     value: function renderCaptcha(onReady) {
+      var _this4 = this;
       var isApiReady = this.state.isApiReady;
       if (!isApiReady) return;
       var renderParams = Object.assign({
@@ -204,6 +206,7 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
         captchaId: captchaId
       }, function () {
         onReady && onReady();
+        _this4._onReady && _this4._onReady(captchaId);
       });
     }
   }, {
@@ -243,24 +246,24 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "handleOnLoad",
     value: function handleOnLoad() {
-      var _this4 = this;
+      var _this5 = this;
       this.setState({
         isApiReady: true
       }, function () {
         try {
-          var element = (0, _utils.getMountElement)(_this4.props.scriptLocation);
+          var element = (0, _utils.getMountElement)(_this5.props.scriptLocation);
           var frame = (0, _utils.getFrame)(element);
-          _this4._hcaptcha = frame.window.hcaptcha;
+          _this5._hcaptcha = frame.window.hcaptcha;
 
           // render captcha and wait for captcha id
-          _this4.renderCaptcha(function () {
+          _this5.renderCaptcha(function () {
             // trigger onLoad if it exists
 
-            var onLoad = _this4.props.onLoad;
+            var onLoad = _this5.props.onLoad;
             if (onLoad) onLoad();
           });
         } catch (error) {
-          _this4.sentryHub.captureException(error);
+          _this5.sentryHub.captureException(error);
         }
       });
     }
@@ -341,19 +344,37 @@ var HCaptcha = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "execute",
     value: function execute() {
+      var _this6 = this;
       var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+      opts = (0, _typeof2["default"])(opts) === 'object' ? opts : null;
       try {
         var captchaId = this.state.captchaId;
         var hcaptcha = this._hcaptcha;
         if (!this.isReady()) {
-          return;
-        }
-        if (opts && (0, _typeof2["default"])(opts) !== "object") {
-          opts = null;
+          var _opts;
+          var onReady = new Promise(function (resolve, reject) {
+            _this6._onReady = function (id) {
+              try {
+                var _hcaptcha = _this6._hcaptcha;
+                if (opts && opts.async) {
+                  _hcaptcha.execute(id, opts).then(resolve)["catch"](reject);
+                } else {
+                  resolve(_hcaptcha.execute(id, opts));
+                }
+              } catch (e) {
+                reject(e);
+              }
+            };
+          });
+          return (_opts = opts) !== null && _opts !== void 0 && _opts.async ? onReady : null;
         }
         return hcaptcha.execute(captchaId, opts);
       } catch (error) {
         this.sentryHub.captureException(error);
+        if (opts && opts.async) {
+          return Promise.reject(error);
+        }
+        return null;
       }
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hcaptcha/react-hcaptcha",
-  "version": "1.10.3",
+  "version": "1.11.0",
   "types": "types/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",

package/src/index.js

@@ -22,6 +22,7 @@ class HCaptcha extends React.Component {
       this.resetCaptcha  = this.resetCaptcha.bind(this);
       this.removeCaptcha = this.removeCaptcha.bind(this);
       this.isReady = this.isReady.bind(this);
+      this._onReady = null;
 
       // Event Handlers
       this.loadCaptcha = this.loadCaptcha.bind(this);
@@ -191,6 +192,7 @@ class HCaptcha extends React.Component {
 
       this.setState({ isRemoved: false, captchaId }, () => {
         onReady && onReady();
+        this._onReady && this._onReady(captchaId);
       });
     }
 
@@ -230,7 +232,7 @@ class HCaptcha extends React.Component {
       });
     }
 
-  handleOnLoad () {
+    handleOnLoad () {
       this.setState({ isApiReady: true }, () => {
         try {
           const element = getMountElement(this.props.scriptLocation);
@@ -327,22 +329,41 @@ class HCaptcha extends React.Component {
     }
 
     execute (opts = null) {
+
+      opts = typeof opts === 'object' ? opts : null;
+
       try {
         const { captchaId } = this.state;
         const hcaptcha = this._hcaptcha;
-
-
+        
         if (!this.isReady()) {
-            return;
-        }
-
-        if (opts && typeof opts !== "object") {
-            opts = null;
+          const onReady = new Promise((resolve, reject) => {
+            
+            this._onReady = (id) => {
+              try {
+                const hcaptcha = this._hcaptcha;
+                
+                if (opts && opts.async) {
+                  hcaptcha.execute(id, opts).then(resolve).catch(reject);
+                } else {
+                  resolve(hcaptcha.execute(id, opts));
+                }
+              } catch (e) {
+                reject(e);
+              }
+            };
+          });
+    
+          return opts?.async ? onReady : null;
         }
-
+        
         return hcaptcha.execute(captchaId, opts);
       } catch (error) {
-          this.sentryHub.captureException(error);
+        this.sentryHub.captureException(error);
+        if (opts && opts.async) {
+          return Promise.reject(error);
+        }
+        return null;
       }
     }