@formio/js 5.2.1-dev.6186.ffe4f6c → 5.2.1-dev.6228.7172789

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

@@ -73,10 +73,10 @@ export default class EditGridComponent extends NestedArrayComponent {
         rowIndex: any;
     } | undefined;
     emptyRow: any;
-    addRowModal(rowIndex: any): Promise<any>;
+    addRowModal(rowIndex: any): Promise<void> | Promise<any[]>;
     alert: Alert | null | undefined;
     showDialog(rowIndex: any): Promise<any>;
-    editRow(rowIndex: any): Promise<any>;
+    editRow(rowIndex: any): Promise<void> | Promise<any[]>;
     clearErrors(rowIndex: any): void;
     cancelRow(rowIndex: any): void;
     saveRow(rowIndex: any, modified: any): boolean | undefined;

package/lib/mjs/components/form/Form.d.ts

@@ -29,7 +29,7 @@ export default class FormComponent extends Component {
      * Prints out the value of form components as a datagrid value.
      */
     getValueAsString(value: any, options: any): any;
-    attach(element: any): Promise<void>;
+    attach(element: any): Promise<any>;
     get hasLoadedForm(): any;
     get isRevisionChanged(): any;
     get subFormData(): any;
@@ -42,6 +42,7 @@ export default class FormComponent extends Component {
     everyComponent(...args: any[]): any;
     setSubFormDisabled(subForm: any): void;
     updateSubWizards(subForm: any): void;
+    setComponentsMap(): void;
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.

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

@@ -286,29 +286,35 @@ export default class FormComponent extends Component {
                     return;
                 }
                 this.setContent(element, this.render());
+                const postAttach = () => {
+                    if (!this.builderMode && this.component.modalEdit) {
+                        const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
+                        const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
+                        this.componentModal = new ComponentModal(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
+                        this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
+                        this.setOpenModalElement();
+                    }
+                    this.calculateValue();
+                };
                 if (this.subForm) {
                     if (this.isNestedWizard) {
                         element = this.root.element;
                     }
-                    this.subForm.attach(element);
-                    this.valueChanged = this.hasSetValue;
-                    if (!this.shouldConditionallyClear()) {
-                        if (!this.valueChanged && this.dataValue.state !== 'submitted') {
-                            this.setDefaultValue();
-                        }
-                        else {
-                            this.restoreValue();
+                    return this.subForm.attach(element).then(() => {
+                        this.valueChanged = this.hasSetValue;
+                        if (!this.shouldConditionallyClear()) {
+                            if (!this.valueChanged && this.dataValue.state !== 'submitted') {
+                                this.setDefaultValue();
+                            }
+                            else {
+                                this.restoreValue();
+                            }
                         }
-                    }
-                }
-                if (!this.builderMode && this.component.modalEdit) {
-                    const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
-                    const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
-                    this.componentModal = new ComponentModal(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
-                    this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
-                    this.setOpenModalElement();
+                        postAttach();
+                        this.setComponentsMap();
+                    });
                 }
-                this.calculateValue();
+                postAttach();
             });
         });
     }
@@ -384,6 +390,14 @@ export default class FormComponent extends Component {
             this.emit('subWizardsUpdated', subForm);
         }
     }
+    setComponentsMap() {
+        if (!this.subForm) {
+            return;
+        }
+        const componentsMap = this.componentsMap;
+        const formComponentsMap = this.subForm.componentsMap;
+        _.assign(componentsMap, formComponentsMap);
+    }
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.
@@ -408,9 +422,7 @@ export default class FormComponent extends Component {
                 this.subForm = instance;
                 this.subForm.currentForm = this;
                 this.subForm.parentVisible = this.visible;
-                const componentsMap = this.componentsMap;
-                const formComponentsMap = this.subForm.componentsMap;
-                _.assign(componentsMap, formComponentsMap);
+                this.setComponentsMap();
                 this.component.components = this.subForm._form?.components;
                 this.component.display = this.subForm._form?.display;
                 this.subForm.on('change', () => {

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

@@ -142,7 +142,7 @@ export default class RadioComponent extends ListComponent {
         });
         this.optionsLoaded = !this.component.dataSrc || this.component.dataSrc === 'values';
         this.loadedOptions = [];
-        if (!this.visible) {
+        if (!this.visible || this.optionsLoaded) {
             this.itemsLoadedResolve();
         }
         // Get the template keys for this radio component.

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

@@ -1153,7 +1153,7 @@ export default class SelectComponent extends ListComponent {
         }
         // Choices will return undefined if nothing is selected. We really want '' to be empty.
         if (value === undefined || value === null) {
-            value = '';
+            value = this.emptyValue;
         }
         return value;
     }

package/lib/mjs/components/tags/Tags.js

@@ -158,6 +158,13 @@ export default class TagsComponent extends Input {
             this.refs.input[0].parentNode.lastChild.focus();
         }
     }
+    getValue() {
+        if (this.choices) {
+            const value = this.choices.getValue(true);
+            return value.join(`${this.delimiter}`);
+        }
+        return super.getValue();
+    }
     getValueAsString(value) {
         if (!value) {
             return '';

package/lib/mjs/formio.form.d.ts

@@ -23,4 +23,5 @@ import { Formio } from './Formio';
 import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
-export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform };
+import { DefaultEvaluator } from './utils';
+export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform, DefaultEvaluator };

package/lib/mjs/formio.form.js

@@ -11,7 +11,7 @@ import Utils from './utils';
 import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
-import { Evaluator, registerEvaluator } from './utils';
+import { Evaluator, registerEvaluator, DefaultEvaluator } from './utils';
 Formio.loadModules = (path = `${Formio.getApiUrl()}/externalModules.js`, name = 'externalModules') => {
     Formio.requireLibrary(name, name, path, true)
         .then((modules) => {
@@ -126,4 +126,4 @@ export function useModule(defaultFn = null) {
 Formio.use = useModule();
 export { Formio as FormioCore } from './Formio';
 // Export the components.
-export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform };
+export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform, DefaultEvaluator };

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

@@ -2,7 +2,7 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    Evaluator: import("./Evaluator").DefaultEvaluator;
+    Evaluator: DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -163,6 +163,7 @@ declare const FormioUtils: {
 };
 import { Evaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
+import { DefaultEvaluator } from './Evaluator';
 import { interpolate } from './Evaluator';
 import moment from 'moment';
-export { FormioUtils as Utils, Evaluator, registerEvaluator };
+export { FormioUtils as Utils, Evaluator, registerEvaluator, DefaultEvaluator };

package/lib/mjs/utils/index.js

@@ -1,6 +1,6 @@
 import * as utils from './utils';
 import * as formUtils from './formUtils';
-import { Evaluator, registerEvaluator, interpolate } from './Evaluator';
+import { Evaluator, registerEvaluator, interpolate, DefaultEvaluator } from './Evaluator';
 import ConditionOperators from './conditionOperators';
 import _ from 'lodash';
 import moment from 'moment';
@@ -17,7 +17,7 @@ if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;
 }
 export { FormioUtils as Utils };
-export { Evaluator, registerEvaluator };
+export { Evaluator, registerEvaluator, DefaultEvaluator };
 export * from './utils';
 export * from './formUtils';
 export default FormioUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.2.1-dev.6186.ffe4f6c",
+  "version": "5.2.1-dev.6228.7172789",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -79,8 +79,8 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "3.1.2-rc.1",
-    "@formio/core": "2.5.1-rc.5",
+    "@formio/bootstrap": "3.1.2-rc.3",
+    "@formio/core": "2.5.1-rc.8",
     "@formio/text-mask-addons": "^3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",