@formio/js 5.0.0-dev.5859.acbf6fa → 5.0.0-dev.5863.8f10146

package/lib/cjs/Wizard.js

@@ -916,7 +916,7 @@ class Wizard extends Webform_1.default {
         const components = !currentPageOnly || this.isLastPage()
             ? this.getComponents()
             : this.currentPage.components;
-        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, childErrors) && check, true);
+        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
         if (!this.isLastPage()) {

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

@@ -2962,14 +2962,12 @@ class Component extends Element_1.default {
         if (flags.silentCheck) {
             return [];
         }
+        let isDirty = this.dirty || flags.dirty;
         if (this.options.alwaysDirty) {
-            flags.dirty = true;
+            isDirty = true;
         }
-        if (flags.fromSubmission && this.hasValue(data)) {
-            flags.dirty = this.pristine && this.component.protected ? false : true;
-        }
-        this.setDirty(flags.dirty);
-        return this.setComponentValidity(errors, flags.dirty, flags.silentCheck, flags.fromSubmission);
+        this.setDirty(isDirty);
+        return this.setComponentValidity(errors, isDirty, flags.silentCheck, flags.fromSubmission);
     }
     /**
      * Perform a component validation.

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

@@ -50,6 +50,6 @@ exports.default = [
     },
     utils_1.default.javaScriptValue('Advanced Conditions', 'customConditional', 'conditional.json', 110, '<p>You must assign the <strong>show</strong> variable a boolean result.</p>' +
         '<p><strong>Note: Advanced Conditional logic will override the results of the Simple Conditional logic.</strong></p>' +
-        '<h5>Example</h5><pre>show = !!data.showMe;</pre>', '<p><a href="http://formio.github.io/formio.js/app/examples/conditions.html" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>')
+        '<h5>Example</h5><pre>show = !!data.showMe;</pre>', '<p><a href="https://help.form.io/userguide/form-building/logic-and-conditions" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>')
 ];
 /* eslint-enable quotes, max-len */

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

@@ -140,7 +140,7 @@ exports.default = [
         input: true
     },
     utils_1.default.javaScriptValue('Custom Default Value', 'customDefaultValue', 'customDefaultValue', 1000, '<p><h4>Example:</h4><pre>value = data.firstName + " " + data.lastName;</pre></p>', '<p><h4>Example:</h4><pre>{"cat": [{"var": "data.firstName"}, " ", {"var": "data.lastName"}]}</pre>'),
-    utils_1.default.javaScriptValue('Calculated Value', 'calculateValue', 'calculateValue', 1100, '<p><h4>Example:</h4><pre>value = data.a + data.b + data.c;</pre></p>', '<p><h4>Example:</h4><pre>{"+": [{"var": "data.a"}, {"var": "data.b"}, {"var": "data.c"}]}</pre><p><a href="http://formio.github.io/formio.js/app/examples/calculated.html" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>', '<tr><th>token</th><td>The decoded JWT token for the authenticated user.</td></tr>'),
+    utils_1.default.javaScriptValue('Calculated Value', 'calculateValue', 'calculateValue', 1100, '<p><h4>Example:</h4><pre>value = data.a + data.b + data.c;</pre></p>', '<p><h4>Example:</h4><pre>{"+": [{"var": "data.a"}, {"var": "data.b"}, {"var": "data.c"}]}</pre><p><a href="https://help.form.io/userguide/form-building/logic-and-conditions#calculated-values" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>', '<tr><th>token</th><td>The decoded JWT token for the authenticated user.</td></tr>'),
     {
         type: 'checkbox',
         input: true,

package/lib/cjs/components/_classes/component/editForm/utils.js

@@ -55,7 +55,7 @@ const EditFormUtils = {
                 '<tr><th>value</th><td>The current value of the component.</td></tr>' +
                 '<tr><th>moment</th><td>The moment.js library for date manipulation.</td></tr>' +
                 '<tr><th>_</th><td>An instance of <a href="https://lodash.com/docs/" target="_blank" rel="noopener noreferrer">Lodash</a>.</td></tr>' +
-                '<tr><th>utils</th><td>An instance of the <a href="http://formio.github.io/formio.js/docs/identifiers.html#utils" target="_blank" rel="noopener noreferrer">FormioUtils</a> object.</td></tr>' +
+                '<tr><th>utils</th><td>An instance of the <a href="https://help.form.io/developers/javascript-development/javascript-utilities" target="_blank" rel="noopener noreferrer">FormioUtils</a> object.</td></tr>' +
                 '<tr><th>util</th><td>An alias for "utils".</td></tr>' +
                 '</table><br/>'
             /* eslint-enable prefer-template */

package/lib/cjs/components/day/Day.d.ts

@@ -11,6 +11,7 @@ export default class DayComponent extends Field {
         operators: string[];
     };
     static savedValueTypes(schema: any): string[];
+    static oldEmptyValue: string;
     static get serverConditionSettings(): {
         operators: string[];
     };

package/lib/cjs/components/day/Day.js

@@ -104,6 +104,12 @@ class DayComponent extends Field_1.default {
         info.changeEvent = 'input';
         return info;
     }
+    isEmpty(value = this.dataValue) {
+        if (value === DayComponent.oldEmptyValue) {
+            return true;
+        }
+        return super.isEmpty(value);
+    }
     inputDefinition(name) {
         let min, max;
         if (name === 'day') {
@@ -337,6 +343,10 @@ class DayComponent extends Field_1.default {
         }
     }
     normalizeValue(value) {
+        // Adjust the value from old to new format
+        if (value === DayComponent.oldEmptyValue) {
+            value = '';
+        }
         if (!value || this.valueMask.test(value)) {
             return value;
         }
@@ -584,6 +594,9 @@ class DayComponent extends Field_1.default {
      * @returns {string|null} - The string value of the date.
      */
     getValueAsString(value) {
+        if (!value) {
+            return '';
+        }
         return this.getDate(value) || '';
     }
     focus(field) {
@@ -640,4 +653,6 @@ class DayComponent extends Field_1.default {
         return validationFormat;
     }
 }
+// Empty value used before 9.3.x
+DayComponent.oldEmptyValue = '00/00/0000';
 exports.default = DayComponent;

package/lib/cjs/components/editgrid/EditGrid.d.ts

@@ -89,8 +89,8 @@ export default class EditGridComponent extends NestedArrayComponent {
     hasOpenRows(): any;
     getAttachedData(data?: null): any;
     shouldValidateDraft(editRow: any): any;
-    shouldValidateRow(editRow: any, dirty: any): any;
-    validateRow(editRow: any, dirty: any, forceSilentCheck: any): any;
+    shouldValidateRow(editRow: any, dirty: any, fromSubmission: any): any;
+    validateRow(editRow: any, dirty: any, forceSilentCheck: any, fromSubmission: any): any;
     showRowErrorAlerts(editRow: any, errors: any): void;
     /**
      * @returns {boolean} - Return that this component processes its own validation.

package/lib/cjs/components/editgrid/EditGrid.js

@@ -13,7 +13,6 @@ const utils_1 = require("../../utils/utils");
 const EditRowState = {
     New: 'new',
     Editing: 'editing',
-    Saving: 'saving',
     Saved: 'saved',
     Viewing: 'viewing',
     Removed: 'removed',
@@ -809,10 +808,6 @@ class EditGridComponent extends NestedArrayComponent_1.default {
         if (!this.component.rowDrafts) {
             editRow.components.forEach((comp) => comp.setPristine(false));
         }
-        // Mark the row with a 'Saving' state to trigger validation for future row changes
-        if (editRow.state === EditRowState.New) {
-            editRow.state = EditRowState.Saving;
-        }
         const errors = this.validateRow(editRow, true);
         if (!this.component.rowDrafts) {
             if (errors.length) {
@@ -825,7 +820,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
                 this.root.focusedComponent = null;
             }
             switch (editRow.state) {
-                case EditRowState.Saving: {
+                case EditRowState.New: {
                     const newIndex = dataValue.length;
                     dataValue.push(editRow.data);
                     editRow.components.forEach(component => component.rowIndex = newIndex);
@@ -983,24 +978,25 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             !this.hasOpenRows()) ||
             ((_b = this.root) === null || _b === void 0 ? void 0 : _b.submitted);
     }
-    shouldValidateRow(editRow, dirty) {
+    shouldValidateRow(editRow, dirty, fromSubmission) {
         return this.shouldValidateDraft(editRow) ||
-            editRow.state === EditRowState.Saving ||
+            editRow.state === EditRowState.New ||
             editRow.state === EditRowState.Editing ||
             editRow.alerts ||
+            fromSubmission ||
             dirty;
     }
-    validateRow(editRow, dirty, forceSilentCheck) {
+    validateRow(editRow, dirty, forceSilentCheck, fromSubmission) {
         var _a;
         editRow.errors = [];
-        if (this.shouldValidateRow(editRow, dirty)) {
+        if (this.shouldValidateRow(editRow, dirty, fromSubmission)) {
             const silentCheck = (this.component.rowDrafts && !this.shouldValidateDraft(editRow)) || forceSilentCheck;
             const rootValue = (0, utils_1.fastCloneDeep)(this.rootValue);
             const editGridValue = lodash_1.default.get(rootValue, this.path, []);
             editGridValue[editRow.rowIndex] = editRow.data;
             lodash_1.default.set(rootValue, this.path, editGridValue);
             const validationProcessorProcess = (context) => this.validationProcessor(context, { dirty, silentCheck });
-            editRow.errors = (0, process_1.processSync)({
+            const errors = (0, process_1.processSync)({
                 components: (0, utils_1.fastCloneDeep)(this.component.components).map((component) => {
                     component.parentPath = `${this.path}[${editRow.rowIndex}]`;
                     return component;
@@ -1017,6 +1013,9 @@ class EditGridComponent extends NestedArrayComponent_1.default {
                     }
                 ]
             }).errors;
+            editRow.errors = (this.component.modal || this.component.rowDrafts)
+                ? errors
+                : errors.filter((err) => lodash_1.default.find(this.visibleErrors, ['component.id', err.component.id]));
         }
         // TODO: this is essentially running its own custom validation and should be moved into a validation rule
         if (this.component.validate && this.component.validate.row) {
@@ -1065,7 +1064,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
     }
     checkComponentValidity(data, dirty, row, options = {}, errors = []) {
         var _a, _b;
-        const { silentCheck } = options;
+        const { silentCheck, fromSubmission } = options;
         const superValid = super.checkComponentValidity(data, dirty, row, options, errors);
         // If super tells us that component invalid and there is no need to update alerts, just return false
         if (!superValid && (!this.alert && !this.hasOpenRows())) {
@@ -1075,7 +1074,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
         const allRowErrors = [];
         this.editRows.forEach((editRow, index) => {
             // Trigger all errors on the row.
-            const rowErrors = this.validateRow(editRow, dirty, silentCheck);
+            const rowErrors = this.validateRow(editRow, dirty, silentCheck, fromSubmission);
             errors.push(...rowErrors);
             allRowErrors.push(...rowErrors);
             if (this.rowRefs) {

package/lib/cjs/components/form/editForm/Form.edit.data.js

@@ -7,7 +7,7 @@ const utils_1 = __importDefault(require("../../_classes/component/editForm/utils
 /* eslint-disable max-len */
 exports.default = [
     utils_1.default.javaScriptValue('Custom Default Value', 'customDefaultValue', 'customDefaultValue', 120, '<p><h4>Example:</h4><pre>value = data.firstName + " " + data.lastName;</pre></p>', '<p><h4>Example:</h4><pre>{"cat": [{"var": "data.firstName"}, " ", {"var": "data.lastName"}]}</pre>'),
-    utils_1.default.javaScriptValue('Calculated Value', 'calculateValue', 'calculateValue', 130, '<p><h4>Example:</h4><pre>value = data.a + data.b + data.c;</pre></p>', '<p><h4>Example:</h4><pre>{"+": [{"var": "data.a"}, {"var": "data.b"}, {"var": "data.c"}]}</pre><p><a href="http://formio.github.io/formio.js/app/examples/calculated.html" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>'),
+    utils_1.default.javaScriptValue('Calculated Value', 'calculateValue', 'calculateValue', 130, '<p><h4>Example:</h4><pre>value = data.a + data.b + data.c;</pre></p>', '<p><h4>Example:</h4><pre>{"+": [{"var": "data.a"}, {"var": "data.b"}, {"var": "data.c"}]}</pre><p><a href="https://help.form.io/userguide/form-building/logic-and-conditions#calculated-values" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>'),
     {
         weight: 140,
         type: 'checkbox',

package/lib/cjs/components/radio/Radio.d.ts

@@ -21,6 +21,7 @@ export default class RadioComponent extends ListComponent {
     get isRadio(): boolean;
     get optionSelectedClass(): string;
     get listData(): any;
+    get selectMetadata(): any;
     templateData: {} | undefined;
     triggerUpdate: ((...args: any[]) => any) | undefined;
     itemsLoadedResolve: ((value: any) => void) | undefined;

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

@@ -109,6 +109,12 @@ class RadioComponent extends ListComponent_1.default {
         const listData = lodash_1.default.get(this.root, 'submission.metadata.listData', {});
         return lodash_1.default.get(listData, this.path);
     }
+    get selectMetadata() {
+        return super.selectData;
+    }
+    get selectData() {
+        return this.selectMetadata || this.component.selectData;
+    }
     init() {
         super.init();
         this.templateData = {};
@@ -244,12 +250,15 @@ class RadioComponent extends ListComponent_1.default {
         else if (!lodash_1.default.isString(value)) {
             value = lodash_1.default.toString(value);
         }
-        const isModalPreviewWithUrlDataSource = options.modalPreview && this.component.dataSrc === 'url';
-        if (this.component.dataSrc !== 'values' && !isModalPreviewWithUrlDataSource) {
+        const shouldUseSelectData = (options.modalPreview || this.inDataTable)
+            && this.component.dataSrc === 'url' && (this.loadedOptions.length || this.selectData);
+        if (this.component.dataSrc !== 'values' && !shouldUseSelectData) {
             return value;
         }
-        const values = isModalPreviewWithUrlDataSource ? this.loadedOptions : this.component.values;
-        const option = lodash_1.default.find(values, (v) => v.value === value);
+        const values = shouldUseSelectData ? this.loadedOptions : this.component.values;
+        const option = !(values === null || values === void 0 ? void 0 : values.length) && shouldUseSelectData ? {
+            label: this.itemTemplate(this.selectData),
+        } : lodash_1.default.find(values, (v) => v.value === value);
         if (!value) {
             return lodash_1.default.get(option, 'label', '');
         }

package/lib/cjs/components/select/Select.d.ts

@@ -131,7 +131,7 @@ export default class SelectComponent extends ListComponent {
     addCurrentChoices(values: any, items: any, keyValue: any): any;
     getValueAsString(data: any, options: any): any;
     normalizeSingleValue(value: any): any;
-    setMetadata(value: any): any;
+    setMetadata(value: any, flags?: {}): any;
     updateValue(value: any, flags: any): boolean;
     undoValueTyping(value: any): any;
     setValue(value: any, flags?: {}): boolean;

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

@@ -1204,8 +1204,8 @@ class SelectComponent extends ListComponent_1.default {
         }
         return super.normalizeValue(this.normalizeSingleValue(value));
     }
-    setMetadata(value) {
-        var _a;
+    setMetadata(value, flags = {}) {
+        var _a, _b;
         if (lodash_1.default.isNil(value)) {
             return;
         }
@@ -1239,15 +1239,22 @@ class SelectComponent extends ListComponent_1.default {
             }
             lodash_1.default.set(submission.metadata.selectData, this.path, templateData);
         }
+        if (flags.resetValue && ((_b = this.root) === null || _b === void 0 ? void 0 : _b.submission)) {
+            const submission = this.root.submission;
+            if (!submission.metadata) {
+                submission.metadata = {};
+            }
+            submission.metadata.selectData = {};
+        }
     }
     updateValue(value, flags) {
         const changed = super.updateValue(value, flags);
-        if (changed || !this.selectMetadata) {
+        if (changed || !this.selectMetadata || flags.resetValue) {
             if (this.component.multiple && Array.isArray(this.dataValue)) {
-                this.dataValue.forEach(singleValue => this.setMetadata(singleValue));
+                this.dataValue.forEach(singleValue => this.setMetadata(singleValue, flags));
             }
             else {
-                this.setMetadata(this.dataValue);
+                this.setMetadata(this.dataValue, flags);
             }
         }
         return changed;

package/lib/cjs/components/selectboxes/SelectBoxes.js

@@ -166,12 +166,19 @@ class SelectBoxesComponent extends Radio_1.default {
         return changed;
     }
     getValueAsString(value, options = {}) {
+        var _a, _b;
         if (!value) {
             return '';
         }
         if (this.isSelectURL) {
-            if (options.modalPreview && this.loadedOptions) {
-                return this.loadedOptions.filter((option) => value[option.value]).map((option) => option.label).join(', ');
+            if (options.modalPreview || this.options.readOnly || this.inDataTable) {
+                const checkedItems = lodash_1.default.keys(lodash_1.default.pickBy(value, (val) => val));
+                if (((_a = this.selectData) === null || _a === void 0 ? void 0 : _a.length) === checkedItems.length) {
+                    return this.selectData.map(item => this.itemTemplate(item)).join(', ');
+                }
+                else if ((_b = this.loadedOptions) === null || _b === void 0 ? void 0 : _b.length) {
+                    return this.loadedOptions.filter((option) => value[option.value]).map((option) => option.label).join(', ');
+                }
             }
             return (0, lodash_1.default)(value).pickBy((val) => val).keys().join(', ');
         }

package/lib/cjs/components/textarea/TextArea.d.ts

@@ -20,10 +20,10 @@ export default class TextAreaComponent extends TextFieldComponent {
     setReadOnlyValue(value: any, index: any): void;
     get isJsonValue(): any;
     /**
-   * Normalize values coming into updateValue. For example, depending on the configuration, string value `"true"` will be normalized to boolean `true`.
-   * @param {*} value - The value to normalize
-   * @returns {*} - Returns the normalized value
-   */
+     * Normalize values coming into updateValue. For example, depending on the configuration, string value `"true"` will be normalized to boolean `true`.
+     * @param {*} value - The value to normalize
+     * @returns {*} - Returns the normalized value
+     */
     normalizeValue(value: any): any;
     normalizeSingleValue(value: any): any;
     setConvertedValue(value: any, index: any): any;

package/lib/cjs/components/textarea/TextArea.js

@@ -310,10 +310,10 @@ class TextAreaComponent extends TextField_1.default {
         return this.component.as && this.component.as === 'json';
     }
     /**
-   * Normalize values coming into updateValue. For example, depending on the configuration, string value `"true"` will be normalized to boolean `true`.
-   * @param {*} value - The value to normalize
-   * @returns {*} - Returns the normalized value
-   */
+     * Normalize values coming into updateValue. For example, depending on the configuration, string value `"true"` will be normalized to boolean `true`.
+     * @param {*} value - The value to normalize
+     * @returns {*} - Returns the normalized value
+     */
     normalizeValue(value) {
         if (this.component.multiple && Array.isArray(value)) {
             return value.map((singleValue) => this.normalizeSingleValue(singleValue));

package/lib/cjs/components/time/Time.js

@@ -56,12 +56,6 @@ class TimeComponent extends TextField_1.default {
         }
         return value;
     }
-    get validationValue() {
-        if ((Array.isArray(this.rawData) && !this.rawData.length) || !this.rawData) {
-            return this.dataValue;
-        }
-        return this.rawData;
-    }
     get inputInfo() {
         const info = super.inputInfo;
         info.attr.type = this.component.inputType;

package/lib/cjs/utils/conditionOperators/IsEqualTo.js

@@ -27,15 +27,7 @@ class IsEqualTo extends ConditionOperator_1.default {
             if (conditionTriggerComponent
                 && (0, utils_1.isSelectResourceWithObjectValue)(conditionTriggerComponent.component)
                 && ((_b = conditionTriggerComponent.component) === null || _b === void 0 ? void 0 : _b.template)) {
-                if (!value || !lodash_1.default.isPlainObject(value)) {
-                    return false;
-                }
-                const { template, valueProperty } = conditionTriggerComponent.component;
-                if (valueProperty === 'data') {
-                    value = { data: value };
-                    comparedValue = { data: comparedValue };
-                }
-                return lodash_1.default.every((0, utils_1.getItemTemplateKeys)(template) || [], k => lodash_1.default.isEqual(lodash_1.default.get(value, k), lodash_1.default.get(comparedValue, k)));
+                return (0, utils_1.compareSelectResourceWithObjectTypeValues)(value, comparedValue, conditionTriggerComponent.component);
             }
         }
         //special check for select boxes

package/lib/cjs/utils/formUtils.d.ts

@@ -41,4 +41,7 @@ export const applyFormChanges: typeof Utils.applyFormChanges;
 export const findComponent: typeof Utils.findComponent;
 export const getEmptyValue: typeof Utils.getEmptyValue;
 export const isComponentDataEmpty: typeof Utils.isComponentDataEmpty;
+export const isSelectResourceWithObjectValue: typeof Utils.isSelectResourceWithObjectValue;
+export const compareSelectResourceWithObjectTypeValues: typeof Utils.compareSelectResourceWithObjectTypeValues;
+export const getItemTemplateKeys: typeof Utils.getItemTemplateKeys;
 import { Utils } from '@formio/core';

package/lib/cjs/utils/formUtils.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isComponentDataEmpty = exports.getEmptyValue = exports.findComponent = exports.applyFormChanges = exports.generateFormChange = exports.getStrings = exports.getValue = exports.escapeRegExCharacters = exports.formatAsCurrency = exports.parseFloatExt = exports.hasCondition = exports.removeComponent = exports.searchComponents = exports.getComponent = exports.matchComponent = exports.isLayoutComponent = exports.getComponentActualValue = exports.getComponentData = exports.eachComponentAsync = exports.eachComponent = exports.componentInfo = exports.getContextualRowData = exports.getContextualRowPath = exports.getComponentKey = exports.eachComponentData = exports.eachComponentDataAsync = exports.componentChildPath = exports.componentPath = exports.isComponentNestedDataType = exports.getComponentPath = exports.getComponentAbsolutePath = exports.getModelType = exports.MODEL_TYPES = exports.uniqueName = exports.guid = exports.flattenComponents = exports.findComponents = void 0;
+exports.getItemTemplateKeys = exports.compareSelectResourceWithObjectTypeValues = exports.isSelectResourceWithObjectValue = exports.isComponentDataEmpty = exports.getEmptyValue = exports.findComponent = exports.applyFormChanges = exports.generateFormChange = exports.getStrings = exports.getValue = exports.escapeRegExCharacters = exports.formatAsCurrency = exports.parseFloatExt = exports.hasCondition = exports.removeComponent = exports.searchComponents = exports.getComponent = exports.matchComponent = exports.isLayoutComponent = exports.getComponentActualValue = exports.getComponentData = exports.eachComponentAsync = exports.eachComponent = exports.componentInfo = exports.getContextualRowData = exports.getContextualRowPath = exports.getComponentKey = exports.eachComponentData = exports.eachComponentDataAsync = exports.componentChildPath = exports.componentPath = exports.isComponentNestedDataType = exports.getComponentPath = exports.getComponentAbsolutePath = exports.getModelType = exports.MODEL_TYPES = exports.uniqueName = exports.guid = exports.flattenComponents = exports.findComponents = void 0;
 const core_1 = require("@formio/core");
-const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty } = core_1.Utils;
+const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty, isSelectResourceWithObjectValue, compareSelectResourceWithObjectTypeValues, getItemTemplateKeys } = core_1.Utils;
 exports.flattenComponents = flattenComponents;
 exports.guid = guid;
 exports.uniqueName = uniqueName;
@@ -39,6 +39,9 @@ exports.applyFormChanges = applyFormChanges;
 exports.findComponent = findComponent;
 exports.getEmptyValue = getEmptyValue;
 exports.isComponentDataEmpty = isComponentDataEmpty;
+exports.isSelectResourceWithObjectValue = isSelectResourceWithObjectValue;
+exports.compareSelectResourceWithObjectTypeValues = compareSelectResourceWithObjectTypeValues;
+exports.getItemTemplateKeys = getItemTemplateKeys;
 /**
  * Deprecated version of findComponents. Renamed to searchComponents.
  * @param {import('@formio/core').Component[]} components - The components to find components within.

package/lib/cjs/utils/utils.d.ts

@@ -498,18 +498,6 @@ export function getFocusableElements(element: HTMLElement): NodeList<HTMLElement
  * @returns {Array<string>|null} - The saved types for the component
  */
 export function getComponentSavedTypes(fullSchema: import('@formio/core').Component): Array<string> | null;
-/**
- * Returns the template keys inside the template code.
- * @param {string} template - The template to get the keys from.
- * @returns {Array<string>} - The keys inside the template.
- */
-export function getItemTemplateKeys(template: string): Array<string>;
-/**
- * Returns if the component is a select resource with an object for its value.
- * @param {import('@formio/core').Component} comp - The component to check.
- * @returns {boolean} - TRUE if the component is a select resource with an object for its value; FALSE otherwise.
- */
-export function isSelectResourceWithObjectValue(comp?: import('@formio/core').Component): boolean;
 export * from "./formUtils";
 /**
  * Map values through unfold and return first non-nil value.
@@ -527,7 +515,6 @@ export namespace componentValueTypes {
     let any: string;
 }
 export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
-import jsonLogic from 'json-logic-js';
 import ConditionOperators from './conditionOperators';
 import { Evaluator } from './Evaluator';
 export const interpolate: typeof Evaluator.interpolate;

package/lib/cjs/utils/utils.js

@@ -19,7 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
-exports.isSelectResourceWithObjectValue = exports.getItemTemplateKeys = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
+exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 exports._ = lodash_1.default;
 const json_logic_js_1 = __importDefault(require("json-logic-js"));
@@ -1681,35 +1681,3 @@ const interpolateErrors = (component, errors, interpolateFn) => {
     });
 };
 exports.interpolateErrors = interpolateErrors;
-/**
- * Returns the template keys inside the template code.
- * @param {string} template - The template to get the keys from.
- * @returns {Array<string>} - The keys inside the template.
- */
-function getItemTemplateKeys(template) {
-    const templateKeys = [];
-    if (!template) {
-        return templateKeys;
-    }
-    const keys = template.match(/({{\s*(.*?)\s*}})/g);
-    if (keys) {
-        keys.forEach((key) => {
-            const propKey = key.match(/{{\s*item\.(.*?)\s*}}/);
-            if (propKey && propKey.length > 1) {
-                templateKeys.push(propKey[1]);
-            }
-        });
-    }
-    return templateKeys;
-}
-exports.getItemTemplateKeys = getItemTemplateKeys;
-/**
- * Returns if the component is a select resource with an object for its value.
- * @param {import('@formio/core').Component} comp - The component to check.
- * @returns {boolean} - TRUE if the component is a select resource with an object for its value; FALSE otherwise.
- */
-function isSelectResourceWithObjectValue(comp = {}) {
-    const { reference, dataSrc, valueProperty } = comp;
-    return reference || (dataSrc === 'resource' && (!valueProperty || valueProperty === 'data'));
-}
-exports.isSelectResourceWithObjectValue = isSelectResourceWithObjectValue;

package/lib/mjs/Wizard.js

@@ -903,7 +903,7 @@ export default class Wizard extends Webform {
         const components = !currentPageOnly || this.isLastPage()
             ? this.getComponents()
             : this.currentPage.components;
-        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, childErrors) && check, true);
+        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
         if (!this.isLastPage()) {

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

@@ -2926,14 +2926,12 @@ export default class Component extends Element {
         if (flags.silentCheck) {
             return [];
         }
+        let isDirty = this.dirty || flags.dirty;
         if (this.options.alwaysDirty) {
-            flags.dirty = true;
+            isDirty = true;
         }
-        if (flags.fromSubmission && this.hasValue(data)) {
-            flags.dirty = this.pristine && this.component.protected ? false : true;
-        }
-        this.setDirty(flags.dirty);
-        return this.setComponentValidity(errors, flags.dirty, flags.silentCheck, flags.fromSubmission);
+        this.setDirty(isDirty);
+        return this.setComponentValidity(errors, isDirty, flags.silentCheck, flags.fromSubmission);
     }
     /**
      * Perform a component validation.

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

@@ -45,6 +45,6 @@ export default [
     },
     EditFormUtils.javaScriptValue('Advanced Conditions', 'customConditional', 'conditional.json', 110, '<p>You must assign the <strong>show</strong> variable a boolean result.</p>' +
         '<p><strong>Note: Advanced Conditional logic will override the results of the Simple Conditional logic.</strong></p>' +
-        '<h5>Example</h5><pre>show = !!data.showMe;</pre>', '<p><a href="http://formio.github.io/formio.js/app/examples/conditions.html" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>')
+        '<h5>Example</h5><pre>show = !!data.showMe;</pre>', '<p><a href="https://help.form.io/userguide/form-building/logic-and-conditions" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>')
 ];
 /* eslint-enable quotes, max-len */

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

@@ -135,7 +135,7 @@ export default [
         input: true
     },
     EditFormUtils.javaScriptValue('Custom Default Value', 'customDefaultValue', 'customDefaultValue', 1000, '<p><h4>Example:</h4><pre>value = data.firstName + " " + data.lastName;</pre></p>', '<p><h4>Example:</h4><pre>{"cat": [{"var": "data.firstName"}, " ", {"var": "data.lastName"}]}</pre>'),
-    EditFormUtils.javaScriptValue('Calculated Value', 'calculateValue', 'calculateValue', 1100, '<p><h4>Example:</h4><pre>value = data.a + data.b + data.c;</pre></p>', '<p><h4>Example:</h4><pre>{"+": [{"var": "data.a"}, {"var": "data.b"}, {"var": "data.c"}]}</pre><p><a href="http://formio.github.io/formio.js/app/examples/calculated.html" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>', '<tr><th>token</th><td>The decoded JWT token for the authenticated user.</td></tr>'),
+    EditFormUtils.javaScriptValue('Calculated Value', 'calculateValue', 'calculateValue', 1100, '<p><h4>Example:</h4><pre>value = data.a + data.b + data.c;</pre></p>', '<p><h4>Example:</h4><pre>{"+": [{"var": "data.a"}, {"var": "data.b"}, {"var": "data.c"}]}</pre><p><a href="https://help.form.io/userguide/form-building/logic-and-conditions#calculated-values" target="_blank" rel="noopener noreferrer">Click here for an example</a></p>', '<tr><th>token</th><td>The decoded JWT token for the authenticated user.</td></tr>'),
     {
         type: 'checkbox',
         input: true,

package/lib/mjs/components/_classes/component/editForm/utils.js

@@ -50,7 +50,7 @@ const EditFormUtils = {
                 '<tr><th>value</th><td>The current value of the component.</td></tr>' +
                 '<tr><th>moment</th><td>The moment.js library for date manipulation.</td></tr>' +
                 '<tr><th>_</th><td>An instance of <a href="https://lodash.com/docs/" target="_blank" rel="noopener noreferrer">Lodash</a>.</td></tr>' +
-                '<tr><th>utils</th><td>An instance of the <a href="http://formio.github.io/formio.js/docs/identifiers.html#utils" target="_blank" rel="noopener noreferrer">FormioUtils</a> object.</td></tr>' +
+                '<tr><th>utils</th><td>An instance of the <a href="https://help.form.io/developers/javascript-development/javascript-utilities" target="_blank" rel="noopener noreferrer">FormioUtils</a> object.</td></tr>' +
                 '<tr><th>util</th><td>An alias for "utils".</td></tr>' +
                 '</table><br/>'
             /* eslint-enable prefer-template */

package/lib/mjs/components/day/Day.d.ts

@@ -11,6 +11,7 @@ export default class DayComponent extends Field {
         operators: string[];
     };
     static savedValueTypes(schema: any): string[];
+    static oldEmptyValue: string;
     static get serverConditionSettings(): {
         operators: string[];
     };