@formio/js 5.1.0-dev.6040.debc859 → 5.1.0-dev.6042.6e62a7a

package/lib/mjs/components/file/editForm/File.edit.file.d.ts

@@ -16,6 +16,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -45,6 +46,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -91,6 +93,7 @@ declare const _default: ({
     data?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -120,6 +123,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -149,6 +153,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -160,6 +165,7 @@ declare const _default: ({
     tooltip: string;
     rows: number;
     editor: string;
+    as: string;
     input: boolean;
     weight: number;
     placeholder: string;
@@ -207,6 +213,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -227,6 +234,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -247,6 +255,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -276,6 +285,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -305,6 +315,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;
@@ -332,6 +343,7 @@ declare const _default: ({
     components?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
 } | {
     type: string;
     input: boolean;
@@ -353,6 +365,7 @@ declare const _default: ({
     tableView?: undefined;
     rows?: undefined;
     editor?: undefined;
+    as?: undefined;
     optionsLabelPosition?: undefined;
     inline?: undefined;
     defaultValue?: undefined;

package/lib/mjs/components/file/editForm/File.edit.file.js

@@ -115,6 +115,7 @@ export default [
         tooltip: 'Pass your custom xhr options(optional)',
         rows: 5,
         editor: 'ace',
+        as: 'json',
         input: true,
         weight: 15,
         placeholder: `{

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

@@ -98,7 +98,6 @@ export default class FormComponent extends Component {
      * @returns {void}
      */
     onSetSubFormValue(submission: object | null | undefined, flags: object | null | undefined): void;
-    areAllComponentsEmpty(data: any): boolean;
     updateSubFormVisibility(): void;
     /**
      * Determines if this form is a Nested Wizard

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

@@ -96,6 +96,9 @@ export default class FormComponent extends Component {
         }
         return this.createSubForm();
     }
+    shouldConditionallyClearOnPristine() {
+        return !this.hasSetValue && super.shouldConditionallyClearOnPristine();
+    }
     get dataReady() {
         return this.subForm?.dataReady || this.subFormReady || Promise.resolve();
     }
@@ -109,6 +112,10 @@ export default class FormComponent extends Component {
     get emptyValue() {
         return { data: {} };
     }
+    // In order for the subform values to set properly, we must always say that nested forms have a default value.
+    get hasDefaultValue() {
+        return true;
+    }
     get ready() {
         return this.subFormReady || Promise.resolve();
     }
@@ -282,11 +289,13 @@ export default class FormComponent extends Component {
                     }
                     this.subForm.attach(element);
                     this.valueChanged = this.hasSetValue;
-                    if (!this.valueChanged && this.dataValue.state !== 'submitted') {
-                        this.setDefaultValue();
-                    }
-                    else {
-                        this.restoreValue();
+                    if (!this.shouldConditionallyClear()) {
+                        if (!this.valueChanged && this.dataValue.state !== 'submitted') {
+                            this.setDefaultValue();
+                        }
+                        else {
+                            this.restoreValue();
+                        }
                     }
                 }
                 if (!this.builderMode && this.component.modalEdit) {
@@ -401,7 +410,7 @@ export default class FormComponent extends Component {
                 _.assign(componentsMap, formComponentsMap);
                 this.component.components = this.subForm.components.map((comp) => comp.component);
                 this.subForm.on('change', () => {
-                    if (this.subForm) {
+                    if (this.subForm && !this.shouldConditionallyClear()) {
                         this.dataValue = this.subForm.getValue();
                         this.triggerChange({
                             noEmit: true
@@ -441,7 +450,7 @@ export default class FormComponent extends Component {
      */
     loadSubForm(fromAttach, beforeSubmit) {
         const loadHiddenForm = beforeSubmit && !this.component.clearOnHide;
-        if (this.builderMode || (this.conditionallyHidden && !loadHiddenForm) || (this.isSubFormLazyLoad() && !fromAttach)) {
+        if (this.builderMode || (this.conditionallyHidden() && !loadHiddenForm) || (this.isSubFormLazyLoad() && !fromAttach)) {
             return Promise.resolve();
         }
         if (this.hasLoadedForm && !this.isRevisionChanged &&
@@ -513,7 +522,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 || !this.component.clearOnHide);
+        return this.subFormReady && (!this.component.hasOwnProperty('reference') || this.component.reference) && !this.shouldConditionallyClear();
     }
     /**
      * Returns the data for the subform.
@@ -664,20 +673,7 @@ export default class FormComponent extends Component {
         }
     }
     isEmpty(value = this.dataValue) {
-        return value === null || _.isEqual(value, this.emptyValue) || (this.areAllComponentsEmpty(value?.data) && !value?._id);
-    }
-    areAllComponentsEmpty(data) {
-        let res = true;
-        if (this.subForm) {
-            this.subForm.everyComponent((comp) => {
-                const componentValue = _.get(data, comp.key);
-                res &= comp.isEmpty(componentValue);
-            });
-        }
-        else {
-            res = false;
-        }
-        return res;
+        return value === null || _.isEqual(value, this.emptyValue);
     }
     getValue() {
         if (this.subForm) {

package/lib/mjs/components/hidden/editForm/Hidden.edit.display.js

@@ -3,6 +3,14 @@ export default [
         key: 'labelPosition',
         ignore: true
     },
+    {
+        key: 'labelWidth',
+        ignore: true
+    },
+    {
+        key: 'labelMargin',
+        ignore: true
+    },
     {
         key: 'placeholder',
         ignore: true

package/lib/mjs/components/html/HTML.js

@@ -53,8 +53,7 @@ export default class HTMLComponent extends Component {
         super.checkRefreshOn(changed);
         let visible;
         if (this.hasCondition()) {
-            this._conditionallyHidden = this.checkConditionallyHidden();
-            visible = !this.conditionallyHidden;
+            visible = !this.conditionallyHidden();
         }
         else {
             visible = !this.component.hidden;

package/lib/mjs/components/html/editForm/HTML.edit.display.js

@@ -3,6 +3,14 @@ export default [
         key: 'labelPosition',
         ignore: true
     },
+    {
+        key: 'labelWidth',
+        ignore: true
+    },
+    {
+        key: 'labelMargin',
+        ignore: true
+    },
     {
         key: 'placeholder',
         ignore: true

package/lib/mjs/components/number/editForm/Number.edit.display.js

@@ -11,6 +11,18 @@ export default [
         key: 'allowMultipleMasks',
         ignore: true
     },
+    {
+        key: 'inputMasks',
+        ignore: true
+    },
+    {
+        key: 'widget.type',
+        ignore: true
+    },
+    {
+        key: 'widget',
+        ignore: true
+    },
     {
         key: 'showWordCount',
         ignore: true,

package/lib/mjs/components/password/editForm/Password.edit.display.js

@@ -10,5 +10,17 @@ export default [
     {
         key: 'allowMultipleMasks',
         ignore: true
-    }
+    },
+    {
+        key: 'inputMasks',
+        ignore: true
+    },
+    {
+        key: 'widget.type',
+        ignore: true
+    },
+    {
+        key: 'widget',
+        ignore: true
+    },
 ];

package/lib/mjs/components/phonenumber/PhoneNumber.form.js

@@ -17,7 +17,15 @@ export default function (...extend) {
                 {
                     key: 'showCharCount',
                     ignore: true
-                }
+                },
+                {
+                    key: 'widget.type',
+                    ignore: true
+                },
+                {
+                    key: 'widget',
+                    ignore: true
+                },
             ]
         },
         {

package/lib/mjs/components/radio/Radio.js

@@ -365,7 +365,7 @@ export default class RadioComponent extends ListComponent {
             const value = this.dataValue;
             this.refs.wrapper.forEach((wrapper, index) => {
                 const input = this.refs.input[index];
-                const checked = (input.type === 'checkbox') ? value[input.value] || input.checked : (input.value.toString() === value.toString());
+                const checked = (value === undefined || value === null) ? false : (input.type === 'checkbox') ? value[input.value] || input.checked : (input.value.toString() === value.toString());
                 if (checked) {
                     //add class to container when selected
                     this.addClass(wrapper, this.optionSelectedClass);

package/lib/mjs/components/select/Select.js

@@ -1487,7 +1487,7 @@ export default class SelectComponent extends ListComponent {
     }
     asString(value, options = {}) {
         value = value ?? this.getValue();
-        if (options.modalPreview || this.inDataTable) {
+        if (options.modalPreview || this.inDataTable || options.email) {
             if (this.inDataTable) {
                 value = this.undoValueTyping(value);
             }

package/lib/mjs/components/select/editForm/Select.edit.data.d.ts

@@ -9,99 +9,15 @@ declare const _default: ({
         custom?: undefined;
     };
     type?: undefined;
+    as?: undefined;
+    editor?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;
     tooltip?: undefined;
-    conditional?: undefined;
-    as?: undefined;
-    editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
-    reorder?: undefined;
-    components?: undefined;
-    dataSrc?: undefined;
-    authenticate?: undefined;
-    template?: undefined;
-    valueProperty?: undefined;
-    clearOnHide?: undefined;
-    lazyLoad?: undefined;
-    skipMerge?: undefined;
-    refreshOn?: undefined;
-    onSetItems?: undefined;
-    onChange?: undefined;
-    placeholder?: undefined;
-    validate?: undefined;
-    delimiter?: undefined;
-    requireDecimal?: undefined;
-    encrypted?: undefined;
-    rows?: undefined;
-    mask?: undefined;
-    tableView?: undefined;
-    alwaysEnabled?: undefined;
-} | {
-    type: string;
-    weight: number;
-    input: boolean;
-    key: string;
-    label: string;
-    tooltip: string;
-    conditional: {
-        json: {
-            '===': (string | {
-                var: string;
-            })[];
-            and?: undefined;
-            in?: undefined;
-        };
-    };
-    data?: undefined;
-    as?: undefined;
-    editor?: undefined;
+    conditional?: undefined;
     defaultValue?: undefined;
-    description?: undefined;
-    reorder?: undefined;
-    components?: undefined;
-    dataSrc?: undefined;
-    authenticate?: undefined;
-    template?: undefined;
-    valueProperty?: undefined;
-    clearOnHide?: undefined;
-    lazyLoad?: undefined;
-    skipMerge?: undefined;
-    refreshOn?: undefined;
-    onSetItems?: undefined;
-    onChange?: undefined;
-    placeholder?: undefined;
-    validate?: undefined;
-    delimiter?: undefined;
-    requireDecimal?: undefined;
-    encrypted?: undefined;
-    rows?: undefined;
-    mask?: undefined;
-    tableView?: undefined;
-    alwaysEnabled?: undefined;
-} | {
-    type: string;
-    as: string;
-    editor: string;
-    weight: number;
-    input: boolean;
-    key: string;
-    label: string;
-    tooltip: string;
-    defaultValue: {};
-    conditional: {
-        json: {
-            '===': (string | {
-                var: string;
-            })[];
-            and?: undefined;
-            in?: undefined;
-        };
-    };
-    data?: undefined;
-    description?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -172,6 +88,7 @@ declare const _default: ({
     key: string;
     tooltip: string;
     weight: number;
+    defaultValue: boolean;
     conditional: {
         json: {
             and: ({
@@ -192,7 +109,6 @@ declare const _default: ({
     data?: undefined;
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
     reorder?: undefined;
     components?: undefined;
@@ -303,8 +219,8 @@ declare const _default: ({
     };
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     skipMerge?: undefined;
@@ -411,8 +327,8 @@ declare const _default: ({
     };
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     authenticate?: undefined;
@@ -443,11 +359,11 @@ declare const _default: ({
         url?: undefined;
         custom?: undefined;
     };
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    conditional?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     authenticate?: undefined;
@@ -475,11 +391,52 @@ declare const _default: ({
     placeholder: string;
     tooltip: string;
     data?: undefined;
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
+    description?: undefined;
+    conditional?: undefined;
     defaultValue?: undefined;
+    reorder?: undefined;
+    components?: undefined;
+    dataSrc?: undefined;
+    authenticate?: undefined;
+    template?: undefined;
+    valueProperty?: undefined;
+    clearOnHide?: undefined;
+    lazyLoad?: undefined;
+    skipMerge?: undefined;
+    refreshOn?: undefined;
+    onSetItems?: undefined;
+    onChange?: undefined;
+    validate?: undefined;
+    delimiter?: undefined;
+    requireDecimal?: undefined;
+    encrypted?: undefined;
+    rows?: undefined;
+    mask?: undefined;
+    tableView?: undefined;
+    alwaysEnabled?: undefined;
+} | {
+    type: string;
+    input: boolean;
+    key: string;
+    label: string;
+    tooltip: string;
+    weight: number;
+    conditional: {
+        json: {
+            '===': (string | {
+                var: string;
+            })[];
+            and?: undefined;
+            in?: undefined;
+        };
+    };
+    data?: undefined;
+    as?: undefined;
+    editor?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -492,6 +449,7 @@ declare const _default: ({
     refreshOn?: undefined;
     onSetItems?: undefined;
     onChange?: undefined;
+    placeholder?: undefined;
     validate?: undefined;
     delimiter?: undefined;
     requireDecimal?: undefined;
@@ -710,8 +668,8 @@ declare const _default: ({
     };
     data?: undefined;
     as?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -759,8 +717,8 @@ declare const _default: ({
     };
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     authenticate?: undefined;
@@ -831,10 +789,10 @@ declare const _default: ({
     defaultValue: boolean;
     tooltip: string;
     data?: undefined;
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
     description?: undefined;
+    conditional?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -927,10 +885,10 @@ declare const _default: ({
     weight: number;
     tooltip: string;
     data?: undefined;
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
     description?: undefined;
+    conditional?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -973,8 +931,8 @@ declare const _default: ({
     data?: undefined;
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1003,11 +961,11 @@ declare const _default: ({
     label: string;
     tooltip: string;
     data?: undefined;
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    conditional?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1040,8 +998,8 @@ declare const _default: ({
     tooltip: string;
     defaultValue: {};
     data?: undefined;
-    conditional?: undefined;
     description?: undefined;
+    conditional?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1069,15 +1027,15 @@ declare const _default: ({
     onChange(context: any): void;
     data?: undefined;
     type?: undefined;
+    as?: undefined;
+    editor?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;
     tooltip?: undefined;
+    description?: undefined;
     conditional?: undefined;
-    as?: undefined;
-    editor?: undefined;
     defaultValue?: undefined;
-    description?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1150,14 +1108,14 @@ declare const _default: ({
         };
     };
     data?: undefined;
+    as?: undefined;
+    editor?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;
     tooltip?: undefined;
-    as?: undefined;
-    editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1184,15 +1142,15 @@ declare const _default: ({
     onChange(context: any): void;
     data?: undefined;
     type?: undefined;
+    as?: undefined;
+    editor?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;
     tooltip?: undefined;
+    description?: undefined;
     conditional?: undefined;
-    as?: undefined;
-    editor?: undefined;
     defaultValue?: undefined;
-    description?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;