@formio/js 5.1.0-rc.2 → 5.1.0-rc.21

package/lib/cjs/providers/address/GoogleAddressProvider.js

@@ -8,6 +8,9 @@ exports.GoogleAddressProvider = void 0;
 const Formio_1 = require("../../Formio");
 const lodash_1 = __importDefault(require("lodash"));
 const AddressProvider_1 = require("./AddressProvider");
+const GOOGLE_MAPS_BASE_URL = 'https://maps.googleapis.com';
+const GOOGLE_MAPS_JS_URL = `${GOOGLE_MAPS_BASE_URL}/maps/api/js`;
+const GOOGLE_MAPS_JS_WITH_PARAMS_URL = `${GOOGLE_MAPS_JS_URL}?v=quarterly&libraries=places&loading=async&callback=googleMapsCallback`;
 /**
  * @typedef {object} AutocompleteOptions
  * @property {string[]} fields - The fields to include in the autocomplete response.
@@ -55,10 +58,11 @@ class GoogleAddressProvider extends AddressProvider_1.AddressProvider {
         var _a;
         super(options);
         this.setAutocompleteOptions();
-        let src = 'https://maps.googleapis.com/maps/api/js?v=quarterly&libraries=places&loading=async&callback=googleMapsCallback';
+        let src = GOOGLE_MAPS_JS_WITH_PARAMS_URL;
         if ((_a = options.params) === null || _a === void 0 ? void 0 : _a.key) {
             src += `&key=${options.params.key}`;
         }
+        this.tryRemoveLibrary(options);
         Formio_1.Formio.requireLibrary(this.getLibraryName(), 'google.maps.places', src);
     }
     /**
@@ -185,5 +189,23 @@ class GoogleAddressProvider extends AddressProvider_1.AddressProvider {
             : this.alternativeDisplayValueProperty;
         return lodash_1.default.get(address, displayedProperty, '');
     }
+    /**
+     * Tries to remove the library if api key for loaded script is different.
+     * @param {ProviderOptions} options - The options for the provider.
+     */
+    tryRemoveLibrary(options = {}) {
+        var _a, _b, _c;
+        if (!Formio_1.Formio.libraries[this.getLibraryName()]) {
+            return;
+        }
+        const existingScript = document.querySelector(`script[src^="${GOOGLE_MAPS_JS_URL}"]`);
+        if (existingScript && ((_a = options.params) === null || _a === void 0 ? void 0 : _a.key) && !existingScript.attributes.src.value.endsWith(options.params.key)) {
+            const googleMapsScripts = (_b = document.querySelectorAll(`script[src^="${GOOGLE_MAPS_BASE_URL}"]`)) !== null && _b !== void 0 ? _b : [];
+            googleMapsScripts.forEach(script => script.parentNode.removeChild(script));
+            delete Formio_1.Formio.libraries[this.getLibraryName()];
+            (_c = global === null || global === void 0 ? void 0 : global.google) === null || _c === void 0 ? true : delete _c.maps;
+            delete global[`${this.getLibraryName()}Callback`];
+        }
+    }
 }
 exports.GoogleAddressProvider = GoogleAddressProvider;

package/lib/cjs/translations/en.js

@@ -26,8 +26,8 @@ exports.default = {
     maxWords: '{{field}} must have no more than {{length}} words.',
     min: '{{field}} cannot be less than {{min}}.',
     max: '{{field}} cannot be greater than {{max}}.',
-    maxDate: '{{field}} should not contain date after {{- maxDate}}',
-    minDate: '{{field}} should not contain date before {{- minDate}}',
+    maxDate: '{{field}} should not contain date after {{maxDate}}',
+    minDate: '{{field}} should not contain date before {{minDate}}',
     maxYear: '{{field}} should not contain year greater than {{maxYear}}',
     minYear: '{{field}} should not contain year less than {{minYear}}',
     minSelectedCount: 'You must select at least {{minCount}} items',

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

@@ -26,8 +26,8 @@ export const getBestMatch: typeof Utils.getBestMatch;
 export const getComponentFromPath: typeof Utils.getComponentFromPath;
 export const getComponentValue: typeof Utils.getComponentValue;
 export const findComponents: typeof Utils.findComponents;
-export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => Promise<void>;
-export const eachComponentData: (components: Component[], data: DataObject, fn: EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: any, parentPaths?: any) => void;
+export const eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => Promise<void>;
+export const eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => void;
 export const getComponentKey: typeof Utils.getComponentKey;
 export const getContextualRowPath: typeof Utils.getContextualRowPath;
 export const getContextualRowData: typeof Utils.getContextualRowData;

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

@@ -208,9 +208,10 @@ export function loadZones(url: string, timezone: string): Promise<any> | any;
  * @param {string|Date} value - The value to convert into a moment date.
  * @param {string} format - The format to convert the date to.
  * @param {string} timezone - The timezone to convert the date to.
+ * @param {object} options - The options object
  * @returns {Date} - The moment date object.
  */
-export function momentDate(value: string | Date, format: string, timezone: string): Date;
+export function momentDate(value: string | Date, format: string, timezone: string, options: object): Date;
 /**
  * Format a date provided a value, format, and timezone object.
  * @param {string} timezonesUrl - The URL to load the timezone data from.

package/lib/cjs/utils/utils.js

@@ -687,9 +687,10 @@ exports.loadZones = loadZones;
  * @param {string|Date} value - The value to convert into a moment date.
  * @param {string} format - The format to convert the date to.
  * @param {string} timezone - The timezone to convert the date to.
+ * @param {object} options - The options object
  * @returns {Date} - The moment date object.
  */
-function momentDate(value, format, timezone) {
+function momentDate(value, format, timezone, options) {
     const momentDate = (0, moment_timezone_1.default)(value);
     if (!timezone) {
         return momentDate;
@@ -697,7 +698,7 @@ function momentDate(value, format, timezone) {
     if (timezone === 'UTC') {
         timezone = 'Etc/UTC';
     }
-    if ((timezone !== currentTimezone() || (format && format.match(/\s(z$|z\s)/))) && moment_timezone_1.default.zonesLoaded) {
+    if ((timezone !== currentTimezone() || (format && format.match(/\s(z$|z\s)/))) && (moment_timezone_1.default.zonesLoaded || (options === null || options === void 0 ? void 0 : options.email))) {
         return momentDate.tz(timezone);
     }
     return momentDate;

package/lib/mjs/Embed.js

@@ -14,7 +14,7 @@ export class Formio {
         Formio._formioReady = ready;
         Formio._formioReadyReject = reject;
     });
-    static version = 'FORMIO_VERSION';
+    static version = '5.1.0-rc.21';
     static setLicense(license, norecurse = false) {
         Formio.license = license;
         if (!norecurse && Formio.FormioClass) {

package/lib/mjs/Formio.js

@@ -4,7 +4,7 @@ import CDN from './CDN';
 import Providers from './providers';
 FormioCore.cdn = new CDN();
 FormioCore.Providers = Providers;
-FormioCore.version = 'FORMIO_VERSION';
+FormioCore.version = '5.1.0-rc.21';
 CDN.defaultCDN = FormioCore.version.includes('rc') ? 'https://cdn.test-form.io' : 'https://cdn.form.io';
 const isNil = (val) => val === null || val === undefined;
 FormioCore.prototype.uploadFile = function (storage, file, fileName, dir, progressCallback, url, options, fileKey, groupPermissions, groupId, uploadStartCallback, abortCallback, multipartOptions) {

package/lib/mjs/PDFBuilder.js

@@ -294,7 +294,7 @@ export default class PDFBuilder extends WebformBuilder {
                     height: schema.height,
                     width: schema.width
                 };
-                if (!this.options.noNewEdit && !component.component.noNewEdit) {
+                if (!this.options.noNewEdit && !component.component.noNewEdit && this.hasEditTabs(component.type)) {
                     this.editComponent(component.component, this.getParentContainer(component), isNew);
                 }
                 this.emit('updateComponent', component.component);
@@ -318,7 +318,7 @@ export default class PDFBuilder extends WebformBuilder {
         });
         this.webform.on('iframe-componentClick', schema => {
             const component = this.webform.getComponentById(schema.id);
-            if (component) {
+            if (component && this.hasEditTabs(component.type)) {
                 this.editComponent(component.component, this.getParentContainer(component));
             }
         }, true);

package/lib/mjs/Webform.d.ts

@@ -363,7 +363,7 @@ declare class Webform extends NestedDataComponent {
     executeFormController(): false | undefined;
     build(element: any): Promise<any>;
     getClassName(): string;
-    render(): import("./components/_classes/field/Field").default;
+    render(): string;
     redraw(): Promise<void> | Promise<boolean>;
     attach(element: any): Promise<boolean>;
     hasRequiredFields(): boolean;
@@ -452,7 +452,7 @@ declare class Webform extends NestedDataComponent {
      */
     submit(before?: boolean, options?: any): Promise<any>;
     submitUrl(URL: any, headers: any): void;
-    triggerCaptcha(): void;
+    triggerCaptcha(components?: null): void;
     _nosubmit: any;
     get conditions(): any;
     get variables(): any;

package/lib/mjs/Webform.js

@@ -1528,17 +1528,20 @@ export default class Webform extends NestedDataComponent {
             return console.warn("You should add a URL to this button.");
         }
     }
-    triggerCaptcha() {
+    triggerCaptcha(components = null) {
         if (!this || !this.components) {
             return;
         }
         const captchaComponent = [];
-        this.eachComponent((component) => {
+        eachComponent(components || this.components, (component) => {
             if (/^(re)?captcha$/.test(component.type) && component.component.eventType === 'formLoad') {
                 captchaComponent.push(component);
             }
-        });
+        }, true);
         if (captchaComponent.length > 0) {
+            if (captchaComponent[0].component.provider === 'google' && components) {
+                return;
+            }
             captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
         }
     }

package/lib/mjs/WebformBuilder.d.ts

@@ -123,6 +123,7 @@ export default class WebformBuilder extends Component {
     addBuilderGroup(name: any, group: any): void;
     updateBuilderGroup(name: any, group: any): void;
     generateKey(info: any): any;
+    hasEditTabs(type: any): boolean;
 }
 import Component from './components/_classes/component/Component';
 import Webform from './Webform';

package/lib/mjs/WebformBuilder.js

@@ -115,7 +115,9 @@ export default class WebformBuilder extends Component {
                 html,
                 disableBuilderActions: self?.component?.disableBuilderActions,
                 childComponent: component,
-                design: self?.options?.design
+                design: self?.options?.design,
+                editJson: self?.options?.editJson,
+                editComponent: this.hasEditTabs(component.type)
             });
         };
         this.options.hooks.renderComponents = (html, { components, self }) => {
@@ -852,7 +854,11 @@ export default class WebformBuilder extends Component {
             parent.addChildComponent(info, element, target, source, sibling);
         }
         const componentInDataGrid = parent.type === 'datagrid';
-        if (isNew && !this.options.noNewEdit && !info.noNewEdit && !(this.options.design && info.type === 'reviewpage')) {
+        if (isNew
+            && !this.options.noNewEdit
+            && !info.noNewEdit
+            && this.hasEditTabs(info.type)
+            && !(this.options.design && info.type === 'reviewpage')) {
             this.editComponent(info, target, isNew, null, null, { inDataGrid: componentInDataGrid });
         }
         // Only rebuild the parts needing to be rebuilt.
@@ -1630,4 +1636,9 @@ export default class WebformBuilder extends Component {
             info.placeholder ||
             info.type);
     }
+    hasEditTabs(type) {
+        const editTabs = getComponent(Components.components[type].editForm().components, 'tabs', true).components;
+        const hiddenEditTabs = _.filter(_.get(this.options, `editForm.${type}`, []), 'ignore');
+        return _.intersectionBy(editTabs, hiddenEditTabs, 'key').length !== editTabs.length;
+    }
 }

package/lib/mjs/Wizard.js

@@ -594,6 +594,7 @@ export default class Wizard extends Webform {
             }
             this.redraw().then(() => {
                 this.checkData(this.submission.data);
+                this.triggerCaptcha(this.currentPanel.components);
                 const errors = this.submitted ? this.validate(this.localData, { dirty: true }) : this.validateCurrentPage();
                 if (this.alert) {
                     this.showErrors(errors, true, true);
@@ -657,7 +658,7 @@ export default class Wizard extends Webform {
         return this.page - 1;
     }
     beforeSubmit() {
-        const pages = this.getPages();
+        const pages = this.getPages({ all: true });
         return Promise.all(pages.map((page) => {
             page.options.beforeSubmit = true;
             return page.beforeSubmit();

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

@@ -1263,7 +1263,7 @@ export default class Component extends Element {
     detach() {
         // First iterate through each ref and delete the component so there are no dangling component references.
         _.each(this.refs, (ref) => {
-            if (typeof ref === NodeList) {
+            if (ref instanceof NodeList) {
                 ref.forEach((elem) => {
                     delete elem.component;
                 });
@@ -1913,15 +1913,21 @@ export default class Component extends Element {
         }
         // Check advanced conditions (and cache the result)
         const isConditionallyHidden = this.checkConditionallyHidden(data, row) || this._parentConditionallyHidden;
+        let shouldClear = false;
         if (isConditionallyHidden !== this._conditionallyHidden) {
             this._conditionallyHidden = isConditionallyHidden;
-            this.clearOnHide();
+            shouldClear = true;
         }
         // Check visibility
         const visible = (this.hasCondition() ? !this.conditionallyHidden : !this.component.hidden);
         if (this.visible !== visible) {
             this.visible = visible;
         }
+        // Wait for visibility to update for nested components, so the component state is up-to-date when
+        // calling clearOnHide
+        if (shouldClear) {
+            this.clearOnHide();
+        }
         return visible;
     }
     /**

package/lib/mjs/components/_classes/field/Field.d.ts

@@ -1,9 +1,9 @@
 export default class Field extends Component {
     /**
      * @param {object} element - The component to create.
-     * @returns {Field} - The created field.
+     * @returns {string} - The rendered HTML string of a component
      */
-    render(element: object): Field;
+    render(element: object): string;
     /**
     /* Saves current caret position to restore it after the component is redrawn
      * @param {HTMLElement} element - The element to save the caret position for.

package/lib/mjs/components/_classes/field/Field.js

@@ -6,7 +6,7 @@ import Component from '../component/Component';
 export default class Field extends Component {
     /**
      * @param {object} element - The component to create.
-     * @returns {Field} - The created field.
+     * @returns {string} - The rendered HTML string of a component
      */
     render(element) {
         if (this.noField) {

package/lib/mjs/components/_classes/nested/NestedComponent.d.ts

@@ -146,7 +146,7 @@ export default class NestedComponent extends Field {
      */
     addComponent(component: import('@formio/core').Component, data?: object, before?: HTMLElement, noAdd?: boolean | undefined): any;
     beforeFocus(): void;
-    render(children: any): Field;
+    render(children: any): string;
     renderComponents(components: any): any;
     attach(element: any): Promise<[void, void]>;
     /**

package/lib/mjs/components/_classes/nested/fixtures/comp4.d.ts

@@ -1,4 +1,14 @@
 declare namespace _default {
-    let components: any[];
+    let components: {
+        label: string;
+        inputType: string;
+        tableView: boolean;
+        defaultValue: boolean;
+        key: string;
+        type: string;
+        name: string;
+        value: string;
+        input: boolean;
+    }[];
 }
 export default _default;

package/lib/mjs/components/_classes/nested/fixtures/comp4.js

@@ -1,4 +1,4 @@
-import comp from '../checkbox/comp2';
+import comp from '../../../checkbox/fixtures/comp2';
 export default {
     components: [
         { ...comp },

package/lib/mjs/components/_classes/nesteddata/NestedDataComponent.d.ts

@@ -3,6 +3,7 @@ export default class NestedDataComponent extends NestedComponent {
     hasChanged(newValue: any, oldValue: any): boolean;
     get allowData(): boolean;
     get emptyValue(): {};
+    get shouldAddDefaultValue(): boolean;
     componentContext(): any;
     getValueAsString(value: any, options: any): string;
     getDataValueAsTable(value: any, options: any): string;

package/lib/mjs/components/_classes/nesteddata/NestedDataComponent.js

@@ -22,6 +22,9 @@ export default class NestedDataComponent extends NestedComponent {
     get emptyValue() {
         return {};
     }
+    get shouldAddDefaultValue() {
+        return !this.options.noDefaults || !this.options.server;
+    }
     componentContext() {
         return this.dataValue;
     }

package/lib/mjs/components/address/Address.d.ts

@@ -60,7 +60,7 @@ export default class AddressComponent extends ContainerComponent {
     renderElement(value: any): any;
     renderRow(value: any, index: any): any;
     renderGrid(): any;
-    render(): Field;
+    render(): string;
     onSelectAddress(address: any, element: any, index: any): void;
     addRow(): void;
     attach(element: any): Promise<void>;
@@ -71,4 +71,3 @@ export default class AddressComponent extends ContainerComponent {
     getValueAsString(value: any, options: any): any;
 }
 import ContainerComponent from '../container/Container';
-import Field from '../_classes/field/Field';

package/lib/mjs/components/address/Address.js

@@ -214,7 +214,7 @@ export default class AddressComponent extends ContainerComponent {
         super.dataValue = value;
     }
     get dataValue() {
-        const resultValue = _.get(this._data, this.component.path);
+        const resultValue = _.get(this._data, this.path);
         if (!_.isArray(resultValue) && this.component.multiple) {
             return [resultValue];
         }

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

@@ -0,0 +1,46 @@
+declare namespace _default {
+    let type: string;
+    let display: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        multiple: boolean;
+        provider: string;
+        validateWhenHidden: boolean;
+        key: string;
+        providerOptions: {
+            params: {
+                autocompleteOptions: {};
+            };
+        };
+        type: string;
+        input: boolean;
+        components: {
+            label: string;
+            tableView: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+            customConditional: string;
+        }[];
+        defaultValue: {}[];
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        multiple?: undefined;
+        provider?: undefined;
+        validateWhenHidden?: undefined;
+        providerOptions?: undefined;
+        components?: undefined;
+        defaultValue?: undefined;
+    })[];
+}
+export default _default;

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

@@ -0,0 +1,85 @@
+export default {
+    type: 'form',
+    display: 'form',
+    title: 'FIO-9527',
+    name: 'fio9527',
+    path: 'fio9527',
+    components: [
+        {
+            label: 'Address',
+            tableView: false,
+            multiple: true,
+            provider: 'nominatim',
+            validateWhenHidden: false,
+            key: 'address',
+            providerOptions: {
+                params: {
+                    autocompleteOptions: {}
+                }
+            },
+            type: 'address',
+            input: true,
+            components: [
+                {
+                    label: 'Address 1',
+                    tableView: false,
+                    key: 'address1',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'Address 2',
+                    tableView: false,
+                    key: 'address2',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'City',
+                    tableView: false,
+                    key: 'city',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'State',
+                    tableView: false,
+                    key: 'state',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'Country',
+                    tableView: false,
+                    key: 'country',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                },
+                {
+                    label: 'Zip Code',
+                    tableView: false,
+                    key: 'zip',
+                    type: 'textfield',
+                    input: true,
+                    customConditional: "show = _.get(instance, 'parent.manualMode', false);"
+                }
+            ],
+            defaultValue: [
+                {}
+            ]
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false
+        }
+    ]
+};

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

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

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

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

package/lib/mjs/components/button/Button.d.ts

@@ -21,7 +21,7 @@ export default class ButtonComponent extends Field {
     get clicked(): any;
     get defaultValue(): boolean;
     get oauthConfig(): any;
-    render(): Field;
+    render(): string;
     attachButton(): void;
     hasError: boolean | undefined;
     isDisabledOnInvalid: any;

package/lib/mjs/components/checkbox/Checkbox.d.ts

@@ -39,7 +39,7 @@ export default class CheckBoxComponent extends Field {
     get labelInfo(): {
         hidden: boolean;
     };
-    render(): Field;
+    render(): string;
     attach(element: any): Promise<void>;
     input: any;
     detach(element: any): void;

package/lib/mjs/components/columns/Columns.d.ts

@@ -14,7 +14,7 @@ export default class ColumnsComponent extends NestedComponent {
     get columnKey(): string;
     columns: any[] | undefined;
     labelIsHidden(): boolean;
-    render(): import("../_classes/field/Field").default;
+    render(): string;
     justifyColumn(items: any, index: any): boolean;
     justify(): any;
     get gridSize(): number;

package/lib/mjs/components/datagrid/DataGrid.d.ts

@@ -54,7 +54,7 @@ export default class DataGridComponent extends NestedArrayComponent {
     hasTopSubmit(): any;
     hasBottomSubmit(): any;
     get canAddColumn(): boolean;
-    render(): import("../_classes/field/Field").default;
+    render(): string;
     getRows(): {}[];
     getColumns(): any[];
     hasHeader(): any;

package/lib/mjs/components/datagrid/DataGrid.js

@@ -393,7 +393,7 @@ export default class DataGridComponent extends NestedArrayComponent {
             row
         });
         this.checkConditions();
-        this.triggerChange();
+        this.triggerChange({ modified: true });
         this.redraw().then(() => {
             this.focusOnNewRowElement(this.rows[index]);
         });
@@ -472,6 +472,9 @@ export default class DataGridComponent extends NestedArrayComponent {
             options.name += `[${rowIndex}]`;
             options.row = `${rowIndex}-${colIndex}`;
             options.rowIndex = rowIndex;
+            options.onChange = (flags, changed, modified) => {
+                this.triggerChange({ modified });
+            };
             let columnComponent;
             if (this.builderMode) {
                 col.id = col.id + rowIndex;

package/lib/mjs/components/datetime/DateTime.d.ts

@@ -20,6 +20,6 @@ export default class DateTimeComponent extends Input {
     get momentFormat(): string;
     createWrapper(): boolean;
     checkValidity(data: any, dirty: any, rowData: any): boolean;
-    getValueAsString(value: any): any;
+    getValueAsString(value: any, options: any): any;
 }
 import Input from '../_classes/input/Input';

package/lib/mjs/components/datetime/DateTime.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import moment from 'moment';
 import FormioUtils from '../../utils';
-import { componentValueTypes, getComponentSavedTypes } from '../../utils/utils';
+import { componentValueTypes, fastCloneDeep, getComponentSavedTypes } from '../../utils/utils';
 import Input from '../_classes/input/Input';
 export default class DateTimeComponent extends Input {
     static schema(...extend) {
@@ -127,6 +127,10 @@ export default class DateTimeComponent extends Input {
             maxDate: _.get(this.component, 'datePicker.maxDate'),
             ...customOptions,
         };
+        // update originalComponent to include widget and other updated settings
+        // it is done here since these settings depend on properties present after the component is initialized
+        // originalComponent is used to restore the component (and widget) after evaluating field logic
+        this.originalComponent = fastCloneDeep(this.component);
         /* eslint-enable camelcase */
     }
     get defaultSchema() {
@@ -173,15 +177,15 @@ export default class DateTimeComponent extends Input {
         }
         return super.checkValidity(data, dirty, rowData);
     }
-    getValueAsString(value) {
+    getValueAsString(value, options) {
         let format = FormioUtils.convertFormatToMoment(this.component.format);
         format += format.match(/z$/) ? '' : ' z';
         const timezone = this.timezone;
         if (value && !this.attached && timezone) {
             if (Array.isArray(value) && this.component.multiple) {
-                return value.map(item => _.trim(FormioUtils.momentDate(item, format, timezone).format(format))).join(', ');
+                return value.map(item => _.trim(FormioUtils.momentDate(item, format, timezone, options).format(format))).join(', ');
             }
-            return _.trim(FormioUtils.momentDate(value, format, timezone).format(format));
+            return _.trim(FormioUtils.momentDate(value, format, timezone, options).format(format));
         }
         if (Array.isArray(value) && this.component.multiple) {
             return value.map(item => _.trim(moment(item).format(format))).join(', ');