@formio/js 5.0.0-dev.5584.9c8ee6a → 5.0.0-dev.5586.9e84922

package/lib/cjs/Webform.js

@@ -291,12 +291,19 @@ class Webform extends NestedDataComponent_1.default {
         // Set language after everything is established.
         this.language = this.i18next.language;
         // See if we need to restore the draft from a user.
-        if (this.options.saveDraft && !this.options.skipDraftRestore) {
+        if (this.options.saveDraft) {
             this.formReady.then(() => {
-                const user = Formio_1.Formio.getUser();
-                // Only restore a draft if the submission isn't explicitly set.
-                if (user && !this.submissionSet) {
-                    this.restoreDraft(user._id);
+                if (!this.options.skipDraftRestore) {
+                    const user = Formio_1.Formio.getUser();
+                    // Only restore a draft if the submission isn't explicitly set.
+                    if (user && !this.submissionSet) {
+                        this.restoreDraft(user._id);
+                    }
+                }
+                else {
+                    // Enable drafts
+                    this.draftEnabled = true;
+                    this.savingDraft = false;
                 }
             });
         }

package/lib/cjs/components/checkbox/Checkbox.js

@@ -179,15 +179,8 @@ class CheckBoxComponent extends Field_1.default {
         return value;
     }
     setValue(value, flags = {}) {
-        if (this.setCheckedState(value) !== undefined ||
-            (!this.input && value !== undefined && (this.visible || this.conditionallyVisible() || !this.component.clearOnHide))) {
-            const changed = this.updateValue(value, flags);
-            if (this.isHtmlRenderMode() && flags && flags.fromSubmission && changed) {
-                this.redraw();
-            }
-            return changed;
-        }
-        return false;
+        this.setCheckedState(value);
+        return super.setValue(value, flags);
     }
     getValueAsString(value) {
         const { name: componentName, value: componentValue } = this.component;

package/lib/cjs/components/checkbox/fixtures/comp5.d.ts

@@ -0,0 +1,34 @@
+declare namespace _default {
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        validateWhenHidden: boolean;
+        key: string;
+        conditional: {
+            show: boolean;
+            conjunction: string;
+            conditions: {
+                component: string;
+                operator: string;
+            }[];
+        };
+        type: string;
+        input: boolean;
+        applyMaskOn?: undefined;
+    } | {
+        label: string;
+        applyMaskOn: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        validateWhenHidden?: undefined;
+        conditional?: undefined;
+    })[];
+}
+export default _default;

package/lib/cjs/components/checkbox/fixtures/comp5.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    title: '7595',
+    name: '7595',
+    path: '7595',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Checkbox',
+            tableView: false,
+            validateWhenHidden: false,
+            key: 'checkboxBefore',
+            conditional: {
+                show: true,
+                conjunction: 'all',
+                conditions: [
+                    {
+                        component: 'textField',
+                        operator: 'isNotEmpty'
+                    }
+                ]
+            },
+            type: 'checkbox',
+            input: true
+        },
+        {
+            label: 'Text Field',
+            applyMaskOn: 'change',
+            tableView: true,
+            key: 'textField',
+            type: 'textfield',
+            input: true
+        },
+        {
+            label: 'Checkbox',
+            tableView: false,
+            validateWhenHidden: false,
+            key: 'checkboxAfter',
+            conditional: {
+                show: true,
+                conjunction: 'all',
+                conditions: [
+                    {
+                        component: 'textField',
+                        operator: 'isNotEmpty'
+                    }
+                ]
+            },
+            type: 'checkbox',
+            input: true
+        },
+    ]
+};

package/lib/cjs/components/checkbox/fixtures/index.d.ts

@@ -2,5 +2,6 @@ import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
+import comp5 from './comp5';
 import customDefaultComponent from './customDefaultComponent';
-export { comp1, comp2, comp3, comp4, customDefaultComponent };
+export { comp1, comp2, comp3, comp4, comp5, customDefaultComponent };

package/lib/cjs/components/checkbox/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.customDefaultComponent = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.customDefaultComponent = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const customDefaultComponent_1 = __importDefault(require("./customDefaultComponent"));
@@ -14,3 +14,5 @@ const comp3_1 = __importDefault(require("./comp3"));
 exports.comp3 = comp3_1.default;
 const comp4_1 = __importDefault(require("./comp4"));
 exports.comp4 = comp4_1.default;
+const comp5_1 = __importDefault(require("./comp5"));
+exports.comp5 = comp5_1.default;

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

@@ -71,7 +71,7 @@ export default class RadioComponent extends ListComponent {
     detach(element: any): void;
     validateValueProperty(): boolean;
     validateValueAvailability(setting: any, value: any): boolean;
-    getValueAsString(value: any): any;
+    getValueAsString(value: any, options?: {}): any;
     setValueAt(index: any, value: any): void;
     loadItems(url: any, search: any, headers: any, options: any, method: any, body: any): void;
     loadItemsFromMetadata(): void;

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

@@ -226,17 +226,19 @@ class RadioComponent extends ListComponent_1.default {
         }
         return false;
     }
-    getValueAsString(value) {
+    getValueAsString(value, options = {}) {
         if (lodash_1.default.isObject(value)) {
             value = JSON.stringify(value);
         }
         else if (!lodash_1.default.isString(value)) {
             value = lodash_1.default.toString(value);
         }
-        if (this.component.dataSrc !== 'values') {
+        const isModalPreviewWithUrlDataSource = options.modalPreview && this.component.dataSrc === 'url';
+        if (this.component.dataSrc !== 'values' && !isModalPreviewWithUrlDataSource) {
             return value;
         }
-        const option = lodash_1.default.find(this.component.values, (v) => v.value === value);
+        const values = isModalPreviewWithUrlDataSource ? this.loadedOptions : this.component.values;
+        const option = lodash_1.default.find(values, (v) => v.value === value);
         if (!value) {
             return lodash_1.default.get(option, 'label', '');
         }

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

@@ -1470,6 +1470,10 @@ class SelectComponent extends ListComponent_1.default {
     asString(value, options = {}) {
         var _a;
         value = value !== null && value !== void 0 ? value : this.getValue();
+        if (options.modalPreview && this.selectData) {
+            const { label } = this.selectValueAndLabel(value);
+            return label;
+        }
         //need to convert values to strings to be able to compare values with available options that are strings
         const convertToString = (data, valueProperty) => {
             if (valueProperty) {

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

@@ -164,11 +164,14 @@ class SelectBoxesComponent extends Radio_1.default {
         }
         return changed;
     }
-    getValueAsString(value) {
+    getValueAsString(value, options = {}) {
         if (!value) {
             return '';
         }
         if (this.isSelectURL) {
+            if (options.modalPreview && this.loadedOptions) {
+                return this.loadedOptions.filter((option) => value[option.value]).map((option) => option.label).join(', ');
+            }
             return (0, lodash_1.default)(value).pickBy((val) => val).keys().join(', ');
         }
         return (0, lodash_1.default)(this.component.values || [])

package/lib/mjs/Webform.js

@@ -263,12 +263,19 @@ export default class Webform extends NestedDataComponent {
         // Set language after everything is established.
         this.language = this.i18next.language;
         // See if we need to restore the draft from a user.
-        if (this.options.saveDraft && !this.options.skipDraftRestore) {
+        if (this.options.saveDraft) {
             this.formReady.then(() => {
-                const user = Formio.getUser();
-                // Only restore a draft if the submission isn't explicitly set.
-                if (user && !this.submissionSet) {
-                    this.restoreDraft(user._id);
+                if (!this.options.skipDraftRestore) {
+                    const user = Formio.getUser();
+                    // Only restore a draft if the submission isn't explicitly set.
+                    if (user && !this.submissionSet) {
+                        this.restoreDraft(user._id);
+                    }
+                }
+                else {
+                    // Enable drafts
+                    this.draftEnabled = true;
+                    this.savingDraft = false;
                 }
             });
         }

package/lib/mjs/components/checkbox/Checkbox.js

@@ -178,15 +178,8 @@ export default class CheckBoxComponent extends Field {
         return value;
     }
     setValue(value, flags = {}) {
-        if (this.setCheckedState(value) !== undefined ||
-            (!this.input && value !== undefined && (this.visible || this.conditionallyVisible() || !this.component.clearOnHide))) {
-            const changed = this.updateValue(value, flags);
-            if (this.isHtmlRenderMode() && flags && flags.fromSubmission && changed) {
-                this.redraw();
-            }
-            return changed;
-        }
-        return false;
+        this.setCheckedState(value);
+        return super.setValue(value, flags);
     }
     getValueAsString(value) {
         const { name: componentName, value: componentValue } = this.component;

package/lib/mjs/components/checkbox/fixtures/comp5.d.ts

@@ -0,0 +1,34 @@
+declare namespace _default {
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        validateWhenHidden: boolean;
+        key: string;
+        conditional: {
+            show: boolean;
+            conjunction: string;
+            conditions: {
+                component: string;
+                operator: string;
+            }[];
+        };
+        type: string;
+        input: boolean;
+        applyMaskOn?: undefined;
+    } | {
+        label: string;
+        applyMaskOn: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        validateWhenHidden?: undefined;
+        conditional?: undefined;
+    })[];
+}
+export default _default;

package/lib/mjs/components/checkbox/fixtures/comp5.js

@@ -0,0 +1,53 @@
+export default {
+    title: '7595',
+    name: '7595',
+    path: '7595',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Checkbox',
+            tableView: false,
+            validateWhenHidden: false,
+            key: 'checkboxBefore',
+            conditional: {
+                show: true,
+                conjunction: 'all',
+                conditions: [
+                    {
+                        component: 'textField',
+                        operator: 'isNotEmpty'
+                    }
+                ]
+            },
+            type: 'checkbox',
+            input: true
+        },
+        {
+            label: 'Text Field',
+            applyMaskOn: 'change',
+            tableView: true,
+            key: 'textField',
+            type: 'textfield',
+            input: true
+        },
+        {
+            label: 'Checkbox',
+            tableView: false,
+            validateWhenHidden: false,
+            key: 'checkboxAfter',
+            conditional: {
+                show: true,
+                conjunction: 'all',
+                conditions: [
+                    {
+                        component: 'textField',
+                        operator: 'isNotEmpty'
+                    }
+                ]
+            },
+            type: 'checkbox',
+            input: true
+        },
+    ]
+};

package/lib/mjs/components/checkbox/fixtures/index.d.ts

@@ -2,5 +2,6 @@ import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
+import comp5 from './comp5';
 import customDefaultComponent from './customDefaultComponent';
-export { comp1, comp2, comp3, comp4, customDefaultComponent };
+export { comp1, comp2, comp3, comp4, comp5, customDefaultComponent };

package/lib/mjs/components/checkbox/fixtures/index.js

@@ -3,4 +3,5 @@ import customDefaultComponent from './customDefaultComponent';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
-export { comp1, comp2, comp3, comp4, customDefaultComponent };
+import comp5 from './comp5';
+export { comp1, comp2, comp3, comp4, comp5, customDefaultComponent };

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

@@ -71,7 +71,7 @@ export default class RadioComponent extends ListComponent {
     detach(element: any): void;
     validateValueProperty(): boolean;
     validateValueAvailability(setting: any, value: any): boolean;
-    getValueAsString(value: any): any;
+    getValueAsString(value: any, options?: {}): any;
     setValueAt(index: any, value: any): void;
     loadItems(url: any, search: any, headers: any, options: any, method: any, body: any): void;
     loadItemsFromMetadata(): void;

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

@@ -226,17 +226,19 @@ export default class RadioComponent extends ListComponent {
         }
         return false;
     }
-    getValueAsString(value) {
+    getValueAsString(value, options = {}) {
         if (_.isObject(value)) {
             value = JSON.stringify(value);
         }
         else if (!_.isString(value)) {
             value = _.toString(value);
         }
-        if (this.component.dataSrc !== 'values') {
+        const isModalPreviewWithUrlDataSource = options.modalPreview && this.component.dataSrc === 'url';
+        if (this.component.dataSrc !== 'values' && !isModalPreviewWithUrlDataSource) {
             return value;
         }
-        const option = _.find(this.component.values, (v) => v.value === value);
+        const values = isModalPreviewWithUrlDataSource ? this.loadedOptions : this.component.values;
+        const option = _.find(values, (v) => v.value === value);
         if (!value) {
             return _.get(option, 'label', '');
         }

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

@@ -1495,6 +1495,10 @@ export default class SelectComponent extends ListComponent {
     }
     asString(value, options = {}) {
         value = value ?? this.getValue();
+        if (options.modalPreview && this.selectData) {
+            const { label } = this.selectValueAndLabel(value);
+            return label;
+        }
         //need to convert values to strings to be able to compare values with available options that are strings
         const convertToString = (data, valueProperty) => {
             if (valueProperty) {

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

@@ -162,11 +162,14 @@ export default class SelectBoxesComponent extends RadioComponent {
         }
         return changed;
     }
-    getValueAsString(value) {
+    getValueAsString(value, options = {}) {
         if (!value) {
             return '';
         }
         if (this.isSelectURL) {
+            if (options.modalPreview && this.loadedOptions) {
+                return this.loadedOptions.filter((option) => value[option.value]).map((option) => option.label).join(', ');
+            }
             return _(value).pickBy((val) => val).keys().join(', ');
         }
         return _(this.component.values || [])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5584.9c8ee6a",
+  "version": "5.0.0-dev.5586.9e84922",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {