@formio/js 5.0.0-dev.5889.5851e22 → 5.0.0-dev.5890.76714be

package/dist/formio.utils.min.js.LICENSE.txt

@@ -20,6 +20,8 @@
 
 /*! @license DOMPurify 3.1.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.6/LICENSE */
 
+/*! @license DOMPurify 3.1.7 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.7/LICENSE */
+
 /*! formiojs v5.0.0-rc.59 | https://unpkg.com/formiojs@5.0.0-rc.59/LICENSE.txt */
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

package/lib/cjs/Webform.js

@@ -738,7 +738,8 @@ class Webform extends NestedDataComponent_1.default {
         this.emit(restoreDraft ? "restoreDraftError" : "saveDraftError", errDetails || errorMessage);
     }
     saveDraft() {
-        if (!this.draftEnabled) {
+        var _a;
+        if (!this.draftEnabled || ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.component.reference) === false) {
             return;
         }
         if (!this.formio) {

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

@@ -1893,14 +1893,41 @@ class Component extends Element_1.default {
      * @returns {boolean} - TRUE if the component is visible.
      */
     checkComponentConditions(data, flags, row) {
+        var _a, _b, _c;
         data = data || this.rootValue;
         flags = flags || {};
         row = row || this.data;
         if (!this.builderMode & !this.previewMode && this.fieldLogic(data, row)) {
             this.redraw();
         }
+        let pathCorrect = this.path;
+        if (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.type) !== 'datagrid') {
+            pathCorrect = this.path.replace(/\[[0-9]+\]/g, '');
+        }
         // Check advanced conditions
-        const visible = this.conditionallyVisible(data, row);
+        const processContext = {
+            component: this.component,
+            data,
+            row,
+            value: this.validationValue,
+            path: pathCorrect || this.component.key,
+            instance: this,
+            scope: { errors: [] },
+            form: this.root,
+            processors: [
+                process_1.conditionProcessInfo
+            ]
+        };
+        let visible = true;
+        if (this.builderMode || this.previewMode || !this.hasCondition()) {
+            visible = !this.component.hidden;
+        }
+        else {
+            (0, process_1.processOneSync)(processContext);
+            const componentPath = pathCorrect || this.component.key;
+            const componentCondition = (_c = (_b = processContext.scope) === null || _b === void 0 ? void 0 : _b.conditionals) === null || _c === void 0 ? void 0 : _c.find(x => x.path === componentPath);
+            visible = !(componentCondition === null || componentCondition === void 0 ? void 0 : componentCondition.conditionallyHidden);
+        }
         if (this.visible !== visible) {
             this.visible = visible;
         }

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

@@ -693,6 +693,9 @@ class NestedComponent extends Field_1.default {
         if (!instance) {
             return;
         }
+        if (!instance.component.path) {
+            instance.component.path = component.path;
+        }
         instance.checkComponentValidity(data, dirty, row, flags, scope.errors);
         if (instance.processOwnValidation) {
             scope.noRecurse = true;

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

@@ -312,12 +312,13 @@ class RadioComponent extends ListComponent_1.default {
             .then((response) => {
             this.loading = false;
             this.setItems(response);
-            this.optionsLoaded = true;
-            this.redraw();
         })
             .catch((err) => {
-            this.optionsLoaded = true;
             this.handleLoadingError(err);
+        })
+            .finally(() => {
+            this.optionsLoaded = true;
+            this.redraw();
         });
     }
     loadItemsFromMetadata() {
@@ -341,9 +342,8 @@ class RadioComponent extends ListComponent_1.default {
                 label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
             };
             listData.push(this.templateData[this.component.valueProperty ? valueAtProperty : i]);
-            if ((this.component.valueProperty || !this.isRadio) && (lodash_1.default.isUndefined(valueAtProperty) ||
-                (!this.isRadio && lodash_1.default.isObject(valueAtProperty)) ||
-                (!this.isRadio && lodash_1.default.isBoolean(valueAtProperty)))) {
+            const value = this.loadedOptions[i].value;
+            if (!this.isRadio && (lodash_1.default.isObject(value) || lodash_1.default.isBoolean(value) || lodash_1.default.isUndefined(value))) {
                 this.loadedOptions[i].invalid = true;
             }
         });

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

@@ -1239,7 +1239,7 @@ 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)) {
+        if (flags.resetValue && ((_b = this.root) === null || _b === void 0 ? void 0 : _b.submission) && !this.options.readOnly) {
             const submission = this.root.submission;
             if (!submission.metadata) {
                 submission.metadata = {};

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

@@ -257,6 +257,18 @@ class SelectBoxesComponent extends Radio_1.default {
         }
         return super.checkComponentValidity(data, dirty, rowData, options, errors);
     }
+    setCustomValidity(messages, dirty, external) {
+        if (this.options.building && lodash_1.default.find(messages, { ruleName: 'invalidValueProperty' })) {
+            setTimeout(() => {
+                this.root && (0, utils_1.getComponent)(this.root.components, 'valueProperty').setCustomValidity(messages, dirty);
+            }, 0);
+            return super.setCustomValidity(lodash_1.default.filter(messages, (message) => message.ruleName !== 'invalidValueProperty'), dirty, external);
+        }
+        else {
+            return super.setCustomValidity(messages, dirty, external);
+        }
+        ;
+    }
     validateValueAvailability(setting, value) {
         if (!(0, utils_1.boolValue)(setting) || !value) {
             return true;

package/lib/mjs/Webform.js

@@ -742,7 +742,7 @@ export default class Webform extends NestedDataComponent {
         this.emit(restoreDraft ? "restoreDraftError" : "saveDraftError", errDetails || errorMessage);
     }
     saveDraft() {
-        if (!this.draftEnabled) {
+        if (!this.draftEnabled || this.parent?.component.reference === false) {
             return;
         }
         if (!this.formio) {

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

@@ -3,7 +3,7 @@ import { conformToMask } from '@formio/vanilla-text-mask';
 import tippy from 'tippy.js';
 import _ from 'lodash';
 import isMobile from 'ismobilejs';
-import { processOne, processOneSync, validateProcessInfo } from '@formio/core/process';
+import { processOne, processOneSync, validateProcessInfo, conditionProcessInfo } from '@formio/core/process';
 import { Formio } from '../../../Formio';
 import * as FormioUtils from '../../../utils/utils';
 import { fastCloneDeep, boolValue, getComponentPath, isInsideScopingComponent, currentTimezone, getScriptPlugin } from '../../../utils/utils';
@@ -1862,8 +1862,34 @@ export default class Component extends Element {
         if (!this.builderMode & !this.previewMode && this.fieldLogic(data, row)) {
             this.redraw();
         }
+        let pathCorrect = this.path;
+        if (this.parent?.type !== 'datagrid') {
+            pathCorrect = this.path.replace(/\[[0-9]+\]/g, '');
+        }
         // Check advanced conditions
-        const visible = this.conditionallyVisible(data, row);
+        const processContext = {
+            component: this.component,
+            data,
+            row,
+            value: this.validationValue,
+            path: pathCorrect || this.component.key,
+            instance: this,
+            scope: { errors: [] },
+            form: this.root,
+            processors: [
+                conditionProcessInfo
+            ]
+        };
+        let visible = true;
+        if (this.builderMode || this.previewMode || !this.hasCondition()) {
+            visible = !this.component.hidden;
+        }
+        else {
+            processOneSync(processContext);
+            const componentPath = pathCorrect || this.component.key;
+            const componentCondition = processContext.scope?.conditionals?.find(x => x.path === componentPath);
+            visible = !componentCondition?.conditionallyHidden;
+        }
         if (this.visible !== visible) {
             this.visible = visible;
         }

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

@@ -688,6 +688,9 @@ export default class NestedComponent extends Field {
         if (!instance) {
             return;
         }
+        if (!instance.component.path) {
+            instance.component.path = component.path;
+        }
         instance.checkComponentValidity(data, dirty, row, flags, scope.errors);
         if (instance.processOwnValidation) {
             scope.noRecurse = true;

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

@@ -312,12 +312,13 @@ export default class RadioComponent extends ListComponent {
             .then((response) => {
             this.loading = false;
             this.setItems(response);
-            this.optionsLoaded = true;
-            this.redraw();
         })
             .catch((err) => {
-            this.optionsLoaded = true;
             this.handleLoadingError(err);
+        })
+            .finally(() => {
+            this.optionsLoaded = true;
+            this.redraw();
         });
     }
     loadItemsFromMetadata() {
@@ -341,9 +342,8 @@ export default class RadioComponent extends ListComponent {
                 label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
             };
             listData.push(this.templateData[this.component.valueProperty ? valueAtProperty : i]);
-            if ((this.component.valueProperty || !this.isRadio) && (_.isUndefined(valueAtProperty) ||
-                (!this.isRadio && _.isObject(valueAtProperty)) ||
-                (!this.isRadio && _.isBoolean(valueAtProperty)))) {
+            const value = this.loadedOptions[i].value;
+            if (!this.isRadio && (_.isObject(value) || _.isBoolean(value) || _.isUndefined(value))) {
                 this.loadedOptions[i].invalid = true;
             }
         });

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

@@ -1267,7 +1267,7 @@ export default class SelectComponent extends ListComponent {
             }
             _.set(submission.metadata.selectData, this.path, templateData);
         }
-        if (flags.resetValue && this.root?.submission) {
+        if (flags.resetValue && this.root?.submission && !this.options.readOnly) {
             const submission = this.root.submission;
             if (!submission.metadata) {
                 submission.metadata = {};

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

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { componentValueTypes, getComponentSavedTypes, boolValue } from '../../utils/utils';
+import { componentValueTypes, getComponentSavedTypes, boolValue, getComponent } from '../../utils/utils';
 import RadioComponent from '../radio/Radio';
 export default class SelectBoxesComponent extends RadioComponent {
     static schema(...extend) {
@@ -258,6 +258,18 @@ export default class SelectBoxesComponent extends RadioComponent {
         }
         return super.checkComponentValidity(data, dirty, rowData, options, errors);
     }
+    setCustomValidity(messages, dirty, external) {
+        if (this.options.building && _.find(messages, { ruleName: 'invalidValueProperty' })) {
+            setTimeout(() => {
+                this.root && getComponent(this.root.components, 'valueProperty').setCustomValidity(messages, dirty);
+            }, 0);
+            return super.setCustomValidity(_.filter(messages, (message) => message.ruleName !== 'invalidValueProperty'), dirty, external);
+        }
+        else {
+            return super.setCustomValidity(messages, dirty, external);
+        }
+        ;
+    }
     validateValueAvailability(setting, value) {
         if (!boolValue(setting) || !value) {
             return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5889.5851e22",
+  "version": "5.0.0-dev.5890.76714be",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -82,7 +82,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-dev.98.17ba6ea",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "v2.1.0-dev.174.9a3c6ec",
+    "@formio/core": "2.1.0-dev.183.b3387fc",
     "@formio/text-mask-addons": "^3.8.0-formio.3",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",