@formio/js 5.1.0-dev.6053.1bce8e0 → 5.1.0-dev.6054.a33ccd9

package/lib/cjs/components/_classes/component/Component.d.ts

@@ -129,16 +129,6 @@ declare class Component extends Element {
      * The reference attribute name for this component
      */
     _referenceAttributeName: string;
-    /**
-     * Sometimes the customDefaultValue does not set the "value" within the script, but is just a script to execute. This
-     * flag is used to determine if the customDefaultValue should be used to set the value of the component or not based on
-     * if there is a "value=" within the script.
-     */
-    shouldSetCustomDefault: any;
-    /**
-     * Same as customDefaultValue, but for calculateValue.
-     */
-    shouldSetCalculatedValue: any;
     triggerChange: (...args: any[]) => any;
     /**
      * Used to trigger a redraw event within this component.
@@ -896,7 +886,12 @@ declare class Component extends Element {
      */
     deleteValue(): void;
     getCustomDefaultValue(defaultValue: any): any;
-    get shouldAddDefaultValue(): any;
+    /**
+     * Returns if a component has a default value set.
+     * @returns {boolean} - TRUE if a default value is set.
+     */
+    get hasDefaultValue(): boolean;
+    get shouldAddDefaultValue(): boolean;
     get defaultValue(): any;
     /**
      * Get the input value of this component.
@@ -1070,6 +1065,7 @@ declare class Component extends Element {
      * @returns {void|boolean} - TRUE if no check should be performed on the component.
      */
     checkData(data?: any, flags?: any, row?: any): void | boolean;
+    checkingData: boolean | undefined;
     checkModal(errors?: any[], dirty?: boolean): void;
     get validationValue(): any;
     isEmpty(value?: any): any;

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

@@ -361,22 +361,6 @@ class Component extends Element_1.default {
          * The reference attribute name for this component
          */
         this._referenceAttributeName = 'ref';
-        /**
-         * Sometimes the customDefaultValue does not set the "value" within the script, but is just a script to execute. This
-         * flag is used to determine if the customDefaultValue should be used to set the value of the component or not based on
-         * if there is a "value=" within the script.
-         */
-        this.shouldSetCustomDefault = true;
-        if (this.component.customDefaultValue && (typeof this.component.customDefaultValue === 'string')) {
-            this.shouldSetCustomDefault = this.component.customDefaultValue.match(/value\s*=/);
-        }
-        /**
-         * Same as customDefaultValue, but for calculateValue.
-         */
-        this.shouldSetCalculatedValue = true;
-        if (this.component.calculateValue && (typeof this.component.calculateValue === 'string')) {
-            this.shouldSetCalculatedValue = this.component.calculateValue.match(/value\s*=/);
-        }
         /**
          * Used to trigger a new change in this component.
          * @type {Function} - Call to trigger a change in this component.
@@ -2552,15 +2536,27 @@ class Component extends Element_1.default {
     }
     getCustomDefaultValue(defaultValue) {
         if (this.component.customDefaultValue && !this.options.preview) {
-            const customDefaultValue = this.evaluate(this.component.customDefaultValue, { value: '' }, 'value');
-            if (this.shouldSetCustomDefault) {
-                defaultValue = customDefaultValue;
-            }
+            defaultValue = this.evaluate(this.component.customDefaultValue, { value: this.dataValue }, 'value');
         }
         return defaultValue;
     }
+    /**
+     * Returns if a component has a default value set.
+     * @returns {boolean} - TRUE if a default value is set.
+     */
+    get hasDefaultValue() {
+        return this.component.customDefaultValue || (this.component.hasOwnProperty('defaultValue') &&
+            (this.component.defaultValue !== null) &&
+            (this.component.defaultValue !== undefined));
+    }
     get shouldAddDefaultValue() {
-        return !this.options.noDefaults || (this.component.defaultValue && !this.isEmpty(this.component.defaultValue)) || this.component.customDefaultValue;
+        // It should add a default value if...
+        //  1.) Ensure they have not set "noDefaults". If that is true, then will always return false.  AND
+        //  2.) The component is pristine (user has not manually modified it).  AND
+        //  3.) There is a default value setting present and it is not NULL or UNDEFINED.
+        return !this.options.noDefaults && this.pristine && (this.hasDefaultValue ||
+            // Empty strings and booleans are allowed primitives whose defaults are automatically added.
+            (this.emptyValue === '' || (typeof this.emptyValue === 'boolean')));
     }
     get defaultValue() {
         let defaultValue = this.emptyValue;
@@ -2815,7 +2811,7 @@ class Component extends Element_1.default {
     }
     doValueCalculation(dataValue, data, row) {
         var _a;
-        const calculatedValue = this.evaluate(this.component.calculateValue, {
+        return this.evaluate(this.component.calculateValue, {
             value: dataValue,
             data,
             row: row || this.data,
@@ -2823,10 +2819,6 @@ class Component extends Element_1.default {
                 data: this.rootValue
             }
         }, 'value');
-        if (this.shouldSetCalculatedValue) {
-            return calculatedValue;
-        }
-        return dataValue;
     }
     /* eslint-disable max-statements */
     calculateComponentValue(data, flags, row) {
@@ -3159,6 +3151,14 @@ class Component extends Element_1.default {
         data = data || this.rootValue;
         flags = flags || {};
         row = row || this.data;
+        // Some components (for legacy reasons) have calls to "checkData" in inappropriate places such
+        // as setValue. Historically, this was bypassed by a series of cached states around the data model
+        // which caused its own problems. We need to ensure that premium and custom components do not fall into 
+        // an infinite loop by only checking this component once.
+        if (this.checkingData) {
+            return;
+        }
+        this.checkingData = true;
         // Needs for Nextgen Rules Engine
         this.resetCaches();
         // Do not trigger refresh if change was triggered on blur event since components with Refresh on Blur have their own listeners
@@ -3172,6 +3172,8 @@ class Component extends Element_1.default {
         if (this.id !== flags.triggeredComponentId) {
             this.calculateComponentValue(data, flags, row);
         }
+        // We are done checking data.
+        this.checkingData = false;
     }
     checkModal(errors = [], dirty = false) {
         const messages = errors.filter(error => !error.fromServer);

package/lib/cjs/components/_classes/nested/NestedComponent.js

@@ -821,7 +821,7 @@ class NestedComponent extends Field_1.default {
         else if (value && component.hasValue(value)) {
             return component.setValue(lodash_1.default.get(value, component.key), flags);
         }
-        else if ((!this.rootPristine || component.visible) && component.shouldAddDefaultValue) {
+        else if ((!this.rootPristine || component.visible) && (flags.resetValue || component.shouldAddDefaultValue)) {
             flags.noValidate = !flags.dirty;
             flags.resetValue = true;
             return component.setValue(component.defaultValue, flags);
@@ -831,6 +831,13 @@ class NestedComponent extends Field_1.default {
         if (!value) {
             return false;
         }
+        // If the value is equal to the empty value, then this means we need to reset the values.
+        if (lodash_1.default.isEqual(value, this.emptyValue)) {
+            // TO-DO: For a future major release, we need to investigate removing the need for the
+            // "resetValue" flag. This seems like a hack that is no longer necessary and the renderer
+            // may behave more deterministically without it.
+            flags.resetValue = true;
+        }
         return this.getComponents().reduce((changed, component) => {
             return this.setNestedValue(component, value, flags, changed) || changed;
         }, false);

package/lib/cjs/components/_classes/nesteddata/NestedDataComponent.d.ts

@@ -3,11 +3,9 @@ export default class NestedDataComponent extends NestedComponent {
     hasChanged(newValue: any, oldValue: any): boolean;
     get allowData(): boolean;
     get emptyValue(): {};
-    get shouldAddDefaultValue(): boolean;
     componentContext(): any;
     getValueAsString(value: any, options: any): string;
     getDataValueAsTable(value: any, options: any): string;
-    everyComponent(fn: any, options?: {}): void;
     /**
      * Get the value of this component.
      * @returns {any} - Return the value of this component.

package/lib/cjs/components/_classes/nesteddata/NestedDataComponent.js

@@ -88,17 +88,6 @@ class NestedDataComponent extends NestedComponent_1.default {
     `);
         return result;
     }
-    everyComponent(fn, options = {}) {
-        if (options === null || options === void 0 ? void 0 : options.email) {
-            if (options.fromRoot) {
-                delete options.fromRoot;
-            }
-            else {
-                return;
-            }
-        }
-        return super.everyComponent(fn, options);
-    }
     /**
      * Get the value of this component.
      * @returns {any} - Return the value of this component.

package/lib/cjs/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/cjs/components/file/editForm/File.edit.file.js

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

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

@@ -115,6 +115,10 @@ class FormComponent extends Component_1.default {
     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();
     }