@formio/js 5.0.0-dev.5813.afa74f0 → 5.0.0-dev.5815.e20a0d6

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

@@ -237,10 +237,9 @@ export default class SelectComponent extends ListComponent {
     }
     selectValueAndLabel(data) {
         const value = this.getOptionValue((this.isEntireObjectDisplay() && !this.itemValue(data)) ? data : this.itemValue(data));
-        const readOnlyResourceLabelData = this.options.readOnly && (this.component.dataSrc === 'resource' || this.component.dataSrc === 'url') && this.selectData;
         return {
             value,
-            label: this.itemTemplate((this.isEntireObjectDisplay() && !_.isObject(data.data)) ? { data: data } : readOnlyResourceLabelData || data, value)
+            label: this.itemTemplate((this.isEntireObjectDisplay() && !_.isObject(data.data)) ? { data: data } : data, value)
         };
     }
     itemTemplate(data, value) {
@@ -257,8 +256,7 @@ export default class SelectComponent extends ListComponent {
             const value = (typeof itemLabel === 'string') ? this.t(itemLabel, { _userInput: true }) : itemLabel;
             return this.sanitize(value, this.shouldSanitizeValue);
         }
-        if (this.component.multiple
-            && _.isArray(this.dataValue) ? this.dataValue.find((val) => this.normalizeSingleValue(value) === val) : (this.dataValue === value)) {
+        if (this.component.multiple && _.isArray(this.dataValue) ? this.dataValue.find((val) => this.normalizeSingleValue(value) === val) : (this.dataValue === this.normalizeSingleValue(value))) {
             const selectData = this.selectData;
             if (selectData) {
                 const templateValue = this.component.reference && value?._id ? value._id.toString() : value;
@@ -1288,6 +1286,23 @@ export default class SelectComponent extends ListComponent {
         }
         return changed;
     }
+    undoValueTyping(value) {
+        let untypedValue = value;
+        if (this.component.multiple && Array.isArray(value)) {
+            untypedValue = value.map(v => {
+                if (typeof v === 'boolean' || typeof v === 'number') {
+                    return v.toString();
+                }
+                return v;
+            });
+        }
+        else {
+            if (typeof value === 'boolean' || typeof value === 'number') {
+                untypedValue = value.toString();
+            }
+        }
+        return untypedValue;
+    }
     setValue(value, flags = {}) {
         const previousValue = this.dataValue;
         const changed = this.updateValue(value, flags);
@@ -1298,19 +1313,7 @@ export default class SelectComponent extends ListComponent {
         const hasPreviousValue = !this.isEmpty(previousValue);
         const hasValue = !this.isEmpty(value);
         // Undo typing when searching to set the value.
-        if (this.component.multiple && Array.isArray(value)) {
-            value = value.map(value => {
-                if (typeof value === 'boolean' || typeof value === 'number') {
-                    return value.toString();
-                }
-                return value;
-            });
-        }
-        else {
-            if (typeof value === 'boolean' || typeof value === 'number') {
-                value = value.toString();
-            }
-        }
+        value = this.undoValueTyping(value);
         if (this.isHtmlRenderMode() && flags && flags.fromSubmission && changed) {
             this.itemsLoaded.then(() => {
                 this.redraw();
@@ -1508,9 +1511,9 @@ 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;
+        if (options.modalPreview) {
+            const template = this.itemTemplate(value, value);
+            return template;
         }
         //need to convert values to strings to be able to compare values with available options that are strings
         const convertToString = (data, valueProperty) => {

package/lib/mjs/utils/utils.d.ts

@@ -56,6 +56,14 @@ export function isMongoId(text: string): boolean;
  * @param {*} rowData - The contextual row data for the component.
  */
 export function checkCalculated(component: import('@formio/core').Component, submission: import('@formio/core').Submission, rowData: any): void;
+/**
+ *
+ * @param component
+ * @param condition
+ * @param row
+ * @param data
+ * @param instance
+ */
 export function checkSimpleConditional(component: any, condition: any, row: any, data: any, instance: any): boolean;
 /**
  * Returns a components normalized value.

package/lib/mjs/utils/utils.js

@@ -144,6 +144,11 @@ export function checkCalculated(component, submission, rowData) {
  * @param {import('../../src/components/_classes/component/Component').Component} instance - The instance of the component.
  * @returns {boolean} - TRUE if the condition is true; FALSE otherwise.
  */
+/**
+ *
+ * @param conditionPaths
+ * @param data
+ */
 function getConditionalPathsRecursive(conditionPaths, data) {
     let currentGlobalIndex = 0;
     const conditionalPathsArray = [];
@@ -182,6 +187,14 @@ function getConditionalPathsRecursive(conditionPaths, data) {
     getConditionalPaths(data);
     return conditionalPathsArray;
 }
+/**
+ *
+ * @param component
+ * @param condition
+ * @param row
+ * @param data
+ * @param instance
+ */
 export function checkSimpleConditional(component, condition, row, data, instance) {
     if (condition.when) {
         const value = getComponentActualValue(condition.when, data, row);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5813.afa74f0",
+  "version": "5.0.0-dev.5815.e20a0d6",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {