@formio/js 5.1.0-dev.6017.d6efba0 → 5.1.0-dev.6021.879d00c

package/lib/cjs/Wizard.d.ts

@@ -106,7 +106,6 @@ declare class Wizard extends Webform {
     onChange(flags: any, changed: any, modified: any, changes: any): void;
     checkValidity(data: any, dirty: any, row: any, currentPageOnly: any, childErrors?: any[]): any;
     focusOnComponent(key: any): void | Promise<void>;
-    triggerButtonCaptcha(page: any): void;
 }
 declare namespace Wizard {
     let setBaseUrl: any;

package/lib/cjs/Wizard.js

@@ -669,7 +669,6 @@ class Wizard extends Webform_1.default {
     beforeSubmit() {
         const pages = this.getPages({ all: true });
         return Promise.all(pages.map((page) => {
-            this.triggerButtonCaptcha(page);
             page.options.beforeSubmit = true;
             return page.beforeSubmit();
         }));
@@ -942,22 +941,6 @@ class Wizard extends Webform_1.default {
         }
         return super.focusOnComponent(key);
     }
-    triggerButtonCaptcha(page) {
-        if (!page.components) {
-            return;
-        }
-        let captchaComponent;
-        page.eachComponent((component) => {
-            if (/^(re)?captcha$/.test(component.component.type) &&
-                component.component.eventType === 'buttonClick' &&
-                component.component.buttonKey === 'submit') {
-                captchaComponent = component;
-            }
-        });
-        if (captchaComponent) {
-            captchaComponent.verify(`submitClick`);
-        }
-    }
 }
 exports.default = Wizard;
 Wizard.setBaseUrl = Formio_1.Formio.setBaseUrl;

package/lib/cjs/components/_classes/component/Component.js

@@ -198,6 +198,7 @@ class Component extends Element_1.default {
             properties: {},
             allowMultipleMasks: false,
             addons: [],
+            serverOverride: {},
         }, ...sources);
     }
     /**

package/lib/cjs/components/_classes/component/editForm/Component.edit.data.d.ts

@@ -87,6 +87,9 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     type: string;
     label: string;
@@ -103,6 +106,9 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     weight: number;
     type: string;
@@ -125,6 +131,9 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     weight: number;
     type: string;
@@ -173,6 +182,9 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     type: string;
     input: boolean;
@@ -200,6 +212,9 @@ declare const _default: ({
     defaultValue?: undefined;
     values?: undefined;
     logic?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     weight: number;
     type: string;
@@ -216,5 +231,27 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
+} | {
+    type: string;
+    as: string;
+    editor: string;
+    weight: number;
+    input: boolean;
+    key: string;
+    label: string;
+    tooltip: string;
+    defaultValue: {};
+    description: string;
+    placeholder?: undefined;
+    inline?: undefined;
+    values?: undefined;
+    logic?: undefined;
+    dataSrc?: undefined;
+    valueProperty?: undefined;
+    data?: undefined;
+    conditional?: undefined;
 })[];
 export default _default;

package/lib/cjs/components/_classes/component/editForm/Component.edit.data.js

@@ -157,5 +157,16 @@ exports.default = [
         label: 'Allow Manual Override of Calculated Value',
         tooltip: 'When checked, this will allow the user to manually override the calculated value.'
     },
+    {
+        type: 'textarea',
+        as: 'json',
+        editor: 'ace',
+        weight: 1400,
+        input: true,
+        key: 'serverOverride',
+        label: 'Server Override',
+        tooltip: 'A JSON object containing the component settings that should be overriden when the form submission is processed on the server side.',
+        defaultValue: {},
+        description: '<b>Example</b>: { "clearOnHide": true }',
+    }
 ];
-/* eslint-enable max-len */

package/lib/cjs/components/form/Form.d.ts

@@ -45,16 +45,18 @@ export default class FormComponent extends Component {
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.
+     * @param {boolean} [beforeSubmit] - This function is being called from a `beforeSubmit` method.
      * @returns {*} - The subform instance.
      */
-    createSubForm(fromAttach?: boolean | undefined): any;
+    createSubForm(fromAttach?: boolean | undefined, beforeSubmit?: boolean | undefined): any;
     hideSubmitButton(component: any): void;
     /**
      * Load the subform.
      * @param {boolean} fromAttach - This function is being called from an `attach` method.
+     * @param {boolean} beforeSubmit - This function is being called from a `beforeSubmit` method.
      * @returns {Promise} - The promise that resolves when the subform is loaded.
      */
-    loadSubForm(fromAttach: boolean): Promise<any>;
+    loadSubForm(fromAttach: boolean, beforeSubmit: boolean): Promise<any>;
     subFormLoading: boolean | undefined;
     checkComponentConditions(data: any, flags: any, row: any): any;
     calculateValue(data: any, flags: any, row: any): any;

package/lib/cjs/components/form/Form.js

@@ -380,10 +380,11 @@ class FormComponent extends Component_1.default {
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.
+     * @param {boolean} [beforeSubmit] - This function is being called from a `beforeSubmit` method.
      * @returns {*} - The subform instance.
      */
-    createSubForm(fromAttach) {
-        this.subFormReady = this.loadSubForm(fromAttach).then((form) => {
+    createSubForm(fromAttach, beforeSubmit) {
+        this.subFormReady = this.loadSubForm(fromAttach, beforeSubmit).then((form) => {
             if (!form) {
                 return;
             }
@@ -440,11 +441,13 @@ class FormComponent extends Component_1.default {
     /**
      * Load the subform.
      * @param {boolean} fromAttach - This function is being called from an `attach` method.
+     * @param {boolean} beforeSubmit - This function is being called from a `beforeSubmit` method.
      * @returns {Promise} - The promise that resolves when the subform is loaded.
      */
-    loadSubForm(fromAttach) {
+    loadSubForm(fromAttach, beforeSubmit) {
         var _a, _b, _c, _d, _e;
-        if (this.builderMode || this.conditionallyHidden || (this.isSubFormLazyLoad() && !fromAttach)) {
+        const loadHiddenForm = beforeSubmit && !this.component.clearOnHide;
+        if (this.builderMode || (this.conditionallyHidden && !loadHiddenForm) || (this.isSubFormLazyLoad() && !fromAttach)) {
             return Promise.resolve();
         }
         if (this.hasLoadedForm && !this.isRevisionChanged &&
@@ -516,7 +519,7 @@ class FormComponent extends Component_1.default {
      * @returns {*|boolean} - TRUE if the subform should be submitted, FALSE if it should not.
      */
     get shouldSubmit() {
-        return this.subFormReady && (!this.component.hasOwnProperty('reference') || this.component.reference) && !this.conditionallyHidden;
+        return this.subFormReady && (!this.component.hasOwnProperty('reference') || this.component.reference) && (!this.conditionallyHidden || !this.component.clearOnHide);
     }
     /**
      * Returns the data for the subform.
@@ -587,8 +590,10 @@ class FormComponent extends Component_1.default {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }
-        if (this.isSubFormLazyLoad() && !this.subFormLoading) {
-            return this.createSubForm(true)
+        // we need to load a hidden form (when clearOnHide is disabled) in order to get and submit (if needed) its data
+        const loadHiddenForm = !this.subForm && !this.component.clearOnHide;
+        if ((this.isSubFormLazyLoad() || loadHiddenForm) && !this.subFormLoading) {
+            return this.createSubForm(true, true)
                 .then(this.submitSubForm(false))
                 .then(() => {
                 return this.dataValue;

package/lib/mjs/Wizard.d.ts

@@ -106,7 +106,6 @@ declare class Wizard extends Webform {
     onChange(flags: any, changed: any, modified: any, changes: any): void;
     checkValidity(data: any, dirty: any, row: any, currentPageOnly: any, childErrors?: any[]): any;
     focusOnComponent(key: any): void | Promise<void>;
-    triggerButtonCaptcha(page: any): void;
 }
 declare namespace Wizard {
     let setBaseUrl: any;

package/lib/mjs/Wizard.js

@@ -659,7 +659,6 @@ export default class Wizard extends Webform {
     beforeSubmit() {
         const pages = this.getPages({ all: true });
         return Promise.all(pages.map((page) => {
-            this.triggerButtonCaptcha(page);
             page.options.beforeSubmit = true;
             return page.beforeSubmit();
         }));
@@ -930,22 +929,6 @@ export default class Wizard extends Webform {
         }
         return super.focusOnComponent(key);
     }
-    triggerButtonCaptcha(page) {
-        if (!page.components) {
-            return;
-        }
-        let captchaComponent;
-        page.eachComponent((component) => {
-            if (/^(re)?captcha$/.test(component.component.type) &&
-                component.component.eventType === 'buttonClick' &&
-                component.component.buttonKey === 'submit') {
-                captchaComponent = component;
-            }
-        });
-        if (captchaComponent) {
-            captchaComponent.verify(`submitClick`);
-        }
-    }
 }
 Wizard.setBaseUrl = Formio.setBaseUrl;
 Wizard.setApiUrl = Formio.setApiUrl;

package/lib/mjs/components/_classes/component/Component.js

@@ -161,6 +161,7 @@ export default class Component extends Element {
             properties: {},
             allowMultipleMasks: false,
             addons: [],
+            serverOverride: {},
         }, ...sources);
     }
     /**

package/lib/mjs/components/_classes/component/editForm/Component.edit.data.d.ts

@@ -87,6 +87,9 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     type: string;
     label: string;
@@ -103,6 +106,9 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     weight: number;
     type: string;
@@ -125,6 +131,9 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     weight: number;
     type: string;
@@ -173,6 +182,9 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     type: string;
     input: boolean;
@@ -200,6 +212,9 @@ declare const _default: ({
     defaultValue?: undefined;
     values?: undefined;
     logic?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
 } | {
     weight: number;
     type: string;
@@ -216,5 +231,27 @@ declare const _default: ({
     valueProperty?: undefined;
     data?: undefined;
     conditional?: undefined;
+    as?: undefined;
+    editor?: undefined;
+    description?: undefined;
+} | {
+    type: string;
+    as: string;
+    editor: string;
+    weight: number;
+    input: boolean;
+    key: string;
+    label: string;
+    tooltip: string;
+    defaultValue: {};
+    description: string;
+    placeholder?: undefined;
+    inline?: undefined;
+    values?: undefined;
+    logic?: undefined;
+    dataSrc?: undefined;
+    valueProperty?: undefined;
+    data?: undefined;
+    conditional?: undefined;
 })[];
 export default _default;

package/lib/mjs/components/_classes/component/editForm/Component.edit.data.js

@@ -152,5 +152,16 @@ export default [
         label: 'Allow Manual Override of Calculated Value',
         tooltip: 'When checked, this will allow the user to manually override the calculated value.'
     },
+    {
+        type: 'textarea',
+        as: 'json',
+        editor: 'ace',
+        weight: 1400,
+        input: true,
+        key: 'serverOverride',
+        label: 'Server Override',
+        tooltip: 'A JSON object containing the component settings that should be overriden when the form submission is processed on the server side.',
+        defaultValue: {},
+        description: '<b>Example</b>: { "clearOnHide": true }',
+    }
 ];
-/* eslint-enable max-len */

package/lib/mjs/components/form/Form.d.ts

@@ -45,16 +45,18 @@ export default class FormComponent extends Component {
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.
+     * @param {boolean} [beforeSubmit] - This function is being called from a `beforeSubmit` method.
      * @returns {*} - The subform instance.
      */
-    createSubForm(fromAttach?: boolean | undefined): any;
+    createSubForm(fromAttach?: boolean | undefined, beforeSubmit?: boolean | undefined): any;
     hideSubmitButton(component: any): void;
     /**
      * Load the subform.
      * @param {boolean} fromAttach - This function is being called from an `attach` method.
+     * @param {boolean} beforeSubmit - This function is being called from a `beforeSubmit` method.
      * @returns {Promise} - The promise that resolves when the subform is loaded.
      */
-    loadSubForm(fromAttach: boolean): Promise<any>;
+    loadSubForm(fromAttach: boolean, beforeSubmit: boolean): Promise<any>;
     subFormLoading: boolean | undefined;
     checkComponentConditions(data: any, flags: any, row: any): any;
     calculateValue(data: any, flags: any, row: any): any;

package/lib/mjs/components/form/Form.js

@@ -375,10 +375,11 @@ export default class FormComponent extends Component {
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.
+     * @param {boolean} [beforeSubmit] - This function is being called from a `beforeSubmit` method.
      * @returns {*} - The subform instance.
      */
-    createSubForm(fromAttach) {
-        this.subFormReady = this.loadSubForm(fromAttach).then((form) => {
+    createSubForm(fromAttach, beforeSubmit) {
+        this.subFormReady = this.loadSubForm(fromAttach, beforeSubmit).then((form) => {
             if (!form) {
                 return;
             }
@@ -435,10 +436,12 @@ export default class FormComponent extends Component {
     /**
      * Load the subform.
      * @param {boolean} fromAttach - This function is being called from an `attach` method.
+     * @param {boolean} beforeSubmit - This function is being called from a `beforeSubmit` method.
      * @returns {Promise} - The promise that resolves when the subform is loaded.
      */
-    loadSubForm(fromAttach) {
-        if (this.builderMode || this.conditionallyHidden || (this.isSubFormLazyLoad() && !fromAttach)) {
+    loadSubForm(fromAttach, beforeSubmit) {
+        const loadHiddenForm = beforeSubmit && !this.component.clearOnHide;
+        if (this.builderMode || (this.conditionallyHidden && !loadHiddenForm) || (this.isSubFormLazyLoad() && !fromAttach)) {
             return Promise.resolve();
         }
         if (this.hasLoadedForm && !this.isRevisionChanged &&
@@ -510,7 +513,7 @@ export default class FormComponent extends Component {
      * @returns {*|boolean} - TRUE if the subform should be submitted, FALSE if it should not.
      */
     get shouldSubmit() {
-        return this.subFormReady && (!this.component.hasOwnProperty('reference') || this.component.reference) && !this.conditionallyHidden;
+        return this.subFormReady && (!this.component.hasOwnProperty('reference') || this.component.reference) && (!this.conditionallyHidden || !this.component.clearOnHide);
     }
     /**
      * Returns the data for the subform.
@@ -580,8 +583,10 @@ export default class FormComponent extends Component {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }
-        if (this.isSubFormLazyLoad() && !this.subFormLoading) {
-            return this.createSubForm(true)
+        // we need to load a hidden form (when clearOnHide is disabled) in order to get and submit (if needed) its data
+        const loadHiddenForm = !this.subForm && !this.component.clearOnHide;
+        if ((this.isSubFormLazyLoad() || loadHiddenForm) && !this.subFormLoading) {
+            return this.createSubForm(true, true)
                 .then(this.submitSubForm(false))
                 .then(() => {
                 return this.dataValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6017.d6efba0",
+  "version": "5.1.0-dev.6021.879d00c",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {