@formio/js 5.1.0-dev.6026.7f60c92 → 5.1.0-dev.6030.abc8cfc

package/lib/cjs/Webform.d.ts

@@ -455,7 +455,7 @@ declare class Webform extends NestedDataComponent {
      */
     submit(before?: boolean, options?: any): Promise<any>;
     submitUrl(URL: any, headers: any): void;
-    triggerCaptcha(): void;
+    triggerCaptcha(components?: null): void;
     _nosubmit: any;
     get conditions(): any;
     get variables(): any;

package/lib/cjs/Webform.js

@@ -1534,17 +1534,20 @@ class Webform extends NestedDataComponent_1.default {
             return console.warn(message);
         }
     }
-    triggerCaptcha() {
+    triggerCaptcha(components = null) {
         if (!this || !this.components || this.options.preview) {
             return;
         }
         const captchaComponent = [];
-        (0, formUtils_1.eachComponent)(this.components, (component) => {
+        (0, formUtils_1.eachComponent)(components || this.components, (component) => {
             if (/^(re)?captcha$/.test(component.type) && component.component.eventType === 'formLoad') {
                 captchaComponent.push(component);
             }
         }, true);
         if (captchaComponent.length > 0) {
+            if (captchaComponent[0].component.provider === 'google' && components) {
+                return;
+            }
             if (this.parent) {
                 this.parent.subFormReady.then(() => {
                     captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
@@ -1553,7 +1556,6 @@ class Webform extends NestedDataComponent_1.default {
             else {
                 captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
             }
-            ;
         }
     }
     set nosubmit(value) {

package/lib/cjs/Wizard.js

@@ -602,6 +602,7 @@ class Wizard extends Webform_1.default {
             }
             this.redraw().then(() => {
                 this.checkData(this.submission.data);
+                this.triggerCaptcha(this.currentPanel.components);
                 const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
                 if (this.alert) {
                     this.showErrors(errors, true, true);

package/lib/cjs/WizardBuilder.d.ts

@@ -46,6 +46,5 @@ export default class WizardBuilder extends WebformBuilder {
         components: any[];
     };
     pasteComponent(component: any): void;
-    copyComponent(component: any): void;
 }
 import WebformBuilder from './WebformBuilder';

package/lib/cjs/WizardBuilder.js

@@ -261,31 +261,12 @@ class WizardBuilder extends WebformBuilder_1.default {
         if (component instanceof WizardBuilder) {
             return;
         }
-        if (!window.sessionStorage) {
-            return console.warn(this.t('sessionStorageSupportError'));
-        }
-        const isWizardPageCopied = window.sessionStorage.getItem('formio.isWizardPageCopied') === 'true' ? true : false;
-        if (isWizardPageCopied) {
-            const data = window.sessionStorage.getItem('formio.clipboard');
-            if (data) {
-                const schema = JSON.parse(data);
-                if (schema.type !== 'panel') {
-                    window.sessionStorage.setItem('formio.isWizardPageCopied', 'false');
-                    return super.pasteComponent(component);
-                }
-                this.addPage(schema);
-            }
+        if (this._form.components.find(comp => lodash_1.default.isEqual(component.component, comp))) {
+            this.addPage(component);
         }
         else {
             return super.pasteComponent(component);
         }
     }
-    copyComponent(component) {
-        super.copyComponent(component);
-        if (window.sessionStorage) {
-            const isWizardPageCopied = this._form.components.indexOf(comp => lodash_1.default.isEqual(component.component, comp)) !== -1;
-            window.sessionStorage.setItem('formio.isWizardPageCopied', isWizardPageCopied.toString());
-        }
-    }
 }
 exports.default = WizardBuilder;

package/lib/mjs/Webform.d.ts

@@ -455,7 +455,7 @@ declare class Webform extends NestedDataComponent {
      */
     submit(before?: boolean, options?: any): Promise<any>;
     submitUrl(URL: any, headers: any): void;
-    triggerCaptcha(): void;
+    triggerCaptcha(components?: null): void;
     _nosubmit: any;
     get conditions(): any;
     get variables(): any;

package/lib/mjs/Webform.js

@@ -1534,17 +1534,20 @@ export default class Webform extends NestedDataComponent {
             return console.warn(message);
         }
     }
-    triggerCaptcha() {
+    triggerCaptcha(components = null) {
         if (!this || !this.components || this.options.preview) {
             return;
         }
         const captchaComponent = [];
-        eachComponent(this.components, (component) => {
+        eachComponent(components || this.components, (component) => {
             if (/^(re)?captcha$/.test(component.type) && component.component.eventType === 'formLoad') {
                 captchaComponent.push(component);
             }
         }, true);
         if (captchaComponent.length > 0) {
+            if (captchaComponent[0].component.provider === 'google' && components) {
+                return;
+            }
             if (this.parent) {
                 this.parent.subFormReady.then(() => {
                     captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
@@ -1553,7 +1556,6 @@ export default class Webform extends NestedDataComponent {
             else {
                 captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
             }
-            ;
         }
     }
     set nosubmit(value) {

package/lib/mjs/Wizard.js

@@ -594,6 +594,7 @@ export default class Wizard extends Webform {
             }
             this.redraw().then(() => {
                 this.checkData(this.submission.data);
+                this.triggerCaptcha(this.currentPanel.components);
                 const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
                 if (this.alert) {
                     this.showErrors(errors, true, true);

package/lib/mjs/WizardBuilder.d.ts

@@ -46,6 +46,5 @@ export default class WizardBuilder extends WebformBuilder {
         components: any[];
     };
     pasteComponent(component: any): void;
-    copyComponent(component: any): void;
 }
 import WebformBuilder from './WebformBuilder';

package/lib/mjs/WizardBuilder.js

@@ -255,30 +255,11 @@ export default class WizardBuilder extends WebformBuilder {
         if (component instanceof WizardBuilder) {
             return;
         }
-        if (!window.sessionStorage) {
-            return console.warn(this.t('sessionStorageSupportError'));
-        }
-        const isWizardPageCopied = window.sessionStorage.getItem('formio.isWizardPageCopied') === 'true' ? true : false;
-        if (isWizardPageCopied) {
-            const data = window.sessionStorage.getItem('formio.clipboard');
-            if (data) {
-                const schema = JSON.parse(data);
-                if (schema.type !== 'panel') {
-                    window.sessionStorage.setItem('formio.isWizardPageCopied', 'false');
-                    return super.pasteComponent(component);
-                }
-                this.addPage(schema);
-            }
+        if (this._form.components.find(comp => _.isEqual(component.component, comp))) {
+            this.addPage(component);
         }
         else {
             return super.pasteComponent(component);
         }
     }
-    copyComponent(component) {
-        super.copyComponent(component);
-        if (window.sessionStorage) {
-            const isWizardPageCopied = this._form.components.indexOf(comp => _.isEqual(component.component, comp)) !== -1;
-            window.sessionStorage.setItem('formio.isWizardPageCopied', isWizardPageCopied.toString());
-        }
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6026.7f60c92",
+  "version": "5.1.0-dev.6030.abc8cfc",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {