@formio/js 5.1.0-dev.6094.c49181e → 5.1.0-dev.6101.0682abe

package/lib/cjs/Webform.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
+const moment_1 = __importDefault(require("moment"));
 const compare_versions_1 = require("compare-versions");
 const EventEmitter_1 = __importDefault(require("./EventEmitter"));
 const i18n_1 = __importDefault(require("./i18n"));
@@ -12,7 +13,6 @@ const Components_1 = __importDefault(require("./components/Components"));
 const NestedDataComponent_1 = __importDefault(require("./components/_classes/nesteddata/NestedDataComponent"));
 const utils_1 = require("./utils/utils");
 const formUtils_1 = require("./utils/formUtils");
-const dayjs_1 = __importDefault(require("dayjs"));
 // We need this here because dragula pulls in CustomEvent class that requires global to exist.
 if (typeof window !== 'undefined' && typeof window.global === 'undefined') {
     window.global = window;
@@ -1314,7 +1314,7 @@ class Webform extends NestedDataComponent_1.default {
         submission.metadata = submission.metadata || {};
         lodash_1.default.defaults(submission.metadata, {
             timezone: lodash_1.default.get(this, '_submission.metadata.timezone', (0, utils_1.currentTimezone)()),
-            offset: parseInt(lodash_1.default.get(this, '_submission.metadata.offset', (0, dayjs_1.default)().utcOffset()), 10),
+            offset: parseInt(lodash_1.default.get(this, '_submission.metadata.offset', (0, moment_1.default)().utcOffset()), 10),
             origin: document.location.origin,
             referrer: document.referrer,
             browserName: navigator.appName,

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

@@ -17,7 +17,7 @@ export default class DateTimeComponent extends Input {
     };
     static savedValueTypes(schema: any): string[];
     get emptyValue(): string;
-    get dayjsFormat(): string;
+    get momentFormat(): string;
     createWrapper(): boolean;
     checkValidity(data: any, dirty: any, rowData: any): boolean;
     getValueAsString(value: any, options: any): any;

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const dayjs_1 = __importDefault(require("dayjs"));
+const moment_1 = __importDefault(require("moment"));
 const utils_1 = __importDefault(require("../../utils"));
 const utils_2 = require("../../utils/utils");
 const Input_1 = __importDefault(require("../_classes/input/Input"));
@@ -123,8 +123,8 @@ class DateTimeComponent extends Input_1.default {
     get emptyValue() {
         return '';
     }
-    get dayjsFormat() {
-        return utils_1.default.convertFormatToDayjs(this.component.format);
+    get momentFormat() {
+        return utils_1.default.convertFormatToMoment(this.component.format);
     }
     isEmpty(value = this.dataValue) {
         if (value && (value.toString() === 'Invalid Date')) {
@@ -133,14 +133,12 @@ class DateTimeComponent extends Input_1.default {
         return super.isEmpty(value);
     }
     formatValue(input) {
-        if ((0, dayjs_1.default)(input).isValid()) {
-            return dayjs_1.default.utc(input).toISOString();
-        }
-        return input;
+        const result = moment_1.default.utc(input).toISOString();
+        return result === 'Invalid date' ? input : result;
     }
     isEqual(valueA, valueB = this.dataValue) {
         return (this.isEmpty(valueA) && this.isEmpty(valueB))
-            || dayjs_1.default.utc(valueA).format(this.dayjsFormat) === dayjs_1.default.utc(valueB).format(this.dayjsFormat);
+            || moment_1.default.utc(valueA).format(this.momentFormat) === moment_1.default.utc(valueB).format(this.momentFormat);
     }
     createWrapper() {
         return false;
@@ -156,19 +154,19 @@ class DateTimeComponent extends Input_1.default {
         return super.checkValidity(data, dirty, rowData);
     }
     getValueAsString(value, options) {
-        let format = utils_1.default.convertFormatToDayjs(this.component.format);
+        let format = utils_1.default.convertFormatToMoment(this.component.format);
+        format += format.match(/z$/) ? '' : ' z';
         const timezone = this.timezone;
         if (value && !this.attached && timezone) {
-            format += format.match(/z$/) ? '' : ' z';
             if (Array.isArray(value) && this.component.multiple) {
-                return value.map(item => lodash_1.default.trim(utils_1.default.dayjsDate(item, format, timezone, options).format(format))).join(', ');
+                return value.map(item => lodash_1.default.trim(utils_1.default.momentDate(item, format, timezone, options).format(format))).join(', ');
             }
-            return lodash_1.default.trim(utils_1.default.dayjsDate(value, format, timezone, options).format(format));
+            return lodash_1.default.trim(utils_1.default.momentDate(value, format, timezone, options).format(format));
         }
         if (Array.isArray(value) && this.component.multiple) {
-            return value.map(item => lodash_1.default.trim((0, dayjs_1.default)(item).format(format))).join(', ');
+            return value.map(item => lodash_1.default.trim((0, moment_1.default)(item).format(format))).join(', ');
         }
-        return (value ? lodash_1.default.trim((0, dayjs_1.default)(value).format(format)) : value) || '';
+        return (value ? lodash_1.default.trim((0, moment_1.default)(value).format(format)) : value) || '';
     }
 }
 exports.default = DateTimeComponent;

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

@@ -164,9 +164,9 @@ export function guid(): string;
 /**
  * Return a translated date setting.
  * @param {string|Date} date - The date to translate.
- * @returns {(null|dayjs.Dayjs)} - The translated date.
+ * @returns {(null|Date)} - The translated date.
  */
-export function getDateSetting(date: string | Date): (null | dayjs.Dayjs);
+export function getDateSetting(date: string | Date): (null | Date);
 /**
  * Returns true if the date is a valid date. False otherwise.
  * @param {Date|string} date - The date to check for validity.
@@ -182,45 +182,56 @@ export function currentTimezone(): string;
  * Get an offset date provided a date object and timezone object.
  * @param {Date} date - The date to offset.
  * @param {string} timezone - The timezone to offset the date to.
- * @returns {{date: Date, abbr: string}} - The offset date.
+ * @returns {Date} - The offset date.
  */
-export function offsetDate(date: Date, timezone: string): {
-    date: Date;
-    abbr: string;
-};
+export function offsetDate(date: Date, timezone: string): Date;
+/**
+ * Returns if the zones are loaded.
+ * @returns {boolean} - TRUE if the zones are loaded; FALSE otherwise.
+ */
+export function zonesLoaded(): boolean;
 /**
- * Returns if we should handle a timezone difference.
+ * Returns if we should load the zones.
  * @param {string} timezone - The timezone to check if we should load the zones.
- * @returns {boolean} - TRUE if we should handle timezones; FALSE otherwise.
+ * @returns {boolean} - TRUE if we should load the zones; FALSE otherwise.
+ */
+export function shouldLoadZones(timezone: string): boolean;
+/**
+ * Externally load the timezone data.
+ * @param {string} url - The URL to load the timezone data from.
+ * @param {string} timezone - The timezone to load.
+ * @returns {Promise<any> | *} - Resolves when the zones for this timezone are loaded.
  */
-export function shouldHandleTimezone(timezone: string): boolean;
+export function loadZones(url: string, timezone: string): Promise<any> | any;
 /**
- * Get the Dayjs date object for translating dates with timezones.
- * @param {string|Date} value - The value to convert into a dayjs date.
+ * Get the moment date object for translating dates with timezones.
+ * @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 {dayjs.Dayjs} - The dayjs date object.
+ * @returns {Date} - The moment date object.
  */
-export function dayjsDate(value: string | Date, format: string, timezone: string, options: object): dayjs.Dayjs;
+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.
  * @param {string|Date} value - The value to format.
  * @param {string} format - The format to format the date to.
  * @param {string} timezone - The timezone to format the date to.
  * @param {string} flatPickrInputFormat - The format to use for flatpickr input.
  * @returns {string} - The formatted date.
  */
-export function formatDate(value: string | Date, format: string, timezone: string, flatPickrInputFormat: string): string;
+export function formatDate(timezonesUrl: string, value: string | Date, format: string, timezone: string, flatPickrInputFormat: string): string;
 /**
  * Pass a format function to format within a timezone.
+ * @param {string} timezonesUrl - The URL to load the timezone data from.
  * @param {Function} formatFn - The format function to use.
  * @param {Date|string} date - The date to format.
  * @param {string} format - The format to format the date to.
  * @param {string} timezone - The timezone to format the date to.
  * @returns {string} - The formatted date.
  */
-export function formatOffset(formatFn: Function, date: Date | string, format: string, timezone: string): string;
+export function formatOffset(timezonesUrl: string, formatFn: Function, date: Date | string, format: string, timezone: string): string;
 /**
  * Returns the local date format information.
  * @param {Intl.LocalesArgument} locale - The locale to get the date format for.
@@ -238,7 +249,7 @@ export function convertFormatToFlatpickr(format: string): string;
  * @param {string} format - The format to convert.
  * @returns {string} - The converted format.
  */
-export function convertFormatToDayjs(format: string): string;
+export function convertFormatToMoment(format: string): string;
 /**
  * Convert the format from the angular-datepicker module to mask format.
  * @param {string} format - The format to convert.
@@ -505,7 +516,6 @@ export namespace componentValueTypes {
     let any: string;
 }
 export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
-import dayjs from "dayjs";
 import ConditionOperators from './conditionOperators';
 import { Evaluator } from './Evaluator';
 export const interpolate: typeof Evaluator.interpolate;

package/lib/cjs/utils/utils.js

@@ -18,8 +18,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.observeOverload = exports.withSwitch = exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToDayjs = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.dayjsDate = exports.shouldHandleTimezone = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
-exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = void 0;
+exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
+exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 exports._ = lodash_1.default;
 const json_logic_js_1 = __importDefault(require("json-logic-js"));
@@ -35,13 +35,6 @@ Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function ()
 const conditionOperators_1 = __importDefault(require("./conditionOperators"));
 exports.ConditionOperators = conditionOperators_1.default;
 const core_1 = require("@formio/core");
-const dayjs_1 = __importDefault(require("dayjs"));
-const utc_1 = __importDefault(require("dayjs/plugin/utc"));
-const timezone_1 = __importDefault(require("dayjs/plugin/timezone"));
-const advancedFormat_1 = __importDefault(require("dayjs/plugin/advancedFormat"));
-dayjs_1.default.extend(timezone_1.default);
-dayjs_1.default.extend(advancedFormat_1.default);
-dayjs_1.default.extend(utc_1.default);
 const interpolate = Evaluator_1.Evaluator.interpolate;
 exports.interpolate = interpolate;
 __exportStar(require("./formUtils"), exports);
@@ -560,7 +553,7 @@ exports.guid = guid;
 /**
  * Return a translated date setting.
  * @param {string|Date} date - The date to translate.
- * @returns {(null|dayjs.Dayjs)} - The translated date.
+ * @returns {(null|Date)} - The translated date.
  */
 function getDateSetting(date) {
     if (lodash_1.default.isNil(date) || lodash_1.default.isNaN(date) || date === '') {
@@ -580,13 +573,13 @@ function getDateSetting(date) {
     try {
         const value = Evaluator_1.Evaluator.evaluator(`return ${date};`, 'moment')(moment_timezone_1.default);
         if (typeof value === 'string') {
-            dateSetting = (0, dayjs_1.default)(value);
+            dateSetting = (0, moment_timezone_1.default)(value);
         }
         else if (typeof value.toDate === 'function') {
-            dateSetting = (0, dayjs_1.default)(value.toDate().toUTCString());
+            dateSetting = (0, moment_timezone_1.default)(value.toDate().toUTCString());
         }
         else if (value instanceof Date) {
-            dateSetting = (0, dayjs_1.default)(value);
+            dateSetting = (0, moment_timezone_1.default)(value);
         }
     }
     catch (e) {
@@ -616,18 +609,18 @@ exports.isValidDate = isValidDate;
  * @returns {string} - The current timezone.
  */
 function currentTimezone() {
-    if (dayjs_1.default.currentTimezone) {
-        return dayjs_1.default.currentTimezone;
+    if (moment_timezone_1.default.currentTimezone) {
+        return moment_timezone_1.default.currentTimezone;
     }
-    dayjs_1.default.currentTimezone = jstimezonedetect_1.default.determine().name();
-    return dayjs_1.default.currentTimezone;
+    moment_timezone_1.default.currentTimezone = jstimezonedetect_1.default.determine().name();
+    return moment_timezone_1.default.currentTimezone;
 }
 exports.currentTimezone = currentTimezone;
 /**
  * Get an offset date provided a date object and timezone object.
  * @param {Date} date - The date to offset.
  * @param {string} timezone - The timezone to offset the date to.
- * @returns {{date: Date, abbr: string}} - The offset date.
+ * @returns {Date} - The offset date.
  */
 function offsetDate(date, timezone) {
     if (timezone === 'UTC') {
@@ -636,7 +629,7 @@ function offsetDate(date, timezone) {
             abbr: 'UTC'
         };
     }
-    const dateMoment = (0, dayjs_1.default)(date).tz(timezone);
+    const dateMoment = (0, moment_timezone_1.default)(date).tz(timezone);
     return {
         date: new Date(date.getTime() + ((dateMoment.utcOffset() + date.getTimezoneOffset()) * 60000)),
         abbr: dateMoment.format('z')
@@ -644,85 +637,132 @@ function offsetDate(date, timezone) {
 }
 exports.offsetDate = offsetDate;
 /**
- * Returns if we should handle a timezone difference.
+ * Returns if the zones are loaded.
+ * @returns {boolean} - TRUE if the zones are loaded; FALSE otherwise.
+ */
+function zonesLoaded() {
+    return moment_timezone_1.default.zonesLoaded;
+}
+exports.zonesLoaded = zonesLoaded;
+/**
+ * Returns if we should load the zones.
  * @param {string} timezone - The timezone to check if we should load the zones.
- * @returns {boolean} - TRUE if we should handle timezones; FALSE otherwise.
+ * @returns {boolean} - TRUE if we should load the zones; FALSE otherwise.
  */
-function shouldHandleTimezone(timezone) {
-    return !(timezone === currentTimezone() || timezone === 'UTC');
+function shouldLoadZones(timezone) {
+    if (timezone === currentTimezone() || timezone === 'UTC') {
+        return false;
+    }
+    return true;
+}
+exports.shouldLoadZones = shouldLoadZones;
+/**
+ * Externally load the timezone data.
+ * @param {string} url - The URL to load the timezone data from.
+ * @param {string} timezone - The timezone to load.
+ * @returns {Promise<any> | *} - Resolves when the zones for this timezone are loaded.
+ */
+function loadZones(url, timezone) {
+    if (timezone && !shouldLoadZones(timezone)) {
+        // Return non-resolving promise.
+        return new Promise(lodash_1.default.noop);
+    }
+    if (moment_timezone_1.default.zonesPromise) {
+        return moment_timezone_1.default.zonesPromise;
+    }
+    return moment_timezone_1.default.zonesPromise = fetch(url)
+        .then(resp => resp.json().then(zones => {
+        moment_timezone_1.default.tz.load(zones);
+        moment_timezone_1.default.zonesLoaded = true;
+        // Trigger a global event that the timezones have finished loading.
+        if (document && document.createEvent && document.body && document.body.dispatchEvent) {
+            var event = document.createEvent('Event');
+            event.initEvent('zonesLoaded', true, true);
+            document.body.dispatchEvent(event);
+        }
+    }));
 }
-exports.shouldHandleTimezone = shouldHandleTimezone;
+exports.loadZones = loadZones;
 /**
- * Get the Dayjs date object for translating dates with timezones.
- * @param {string|Date} value - The value to convert into a dayjs date.
+ * Get the moment date object for translating dates with timezones.
+ * @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 {dayjs.Dayjs} - The dayjs date object.
+ * @returns {Date} - The moment date object.
  */
-function dayjsDate(value, format, timezone, options) {
-    const dayjsDate = (0, dayjs_1.default)(value);
+function momentDate(value, format, timezone, options) {
+    const momentDate = (0, moment_timezone_1.default)(value);
     if (!timezone) {
-        return dayjsDate;
+        return momentDate;
     }
     if (timezone === 'UTC') {
         timezone = 'Etc/UTC';
     }
-    if ((timezone !== currentTimezone() || (format && format.match(/\s(z$|z\s)/))) && (shouldHandleTimezone(timezone) || (options === null || options === void 0 ? void 0 : options.email))) {
-        return dayjsDate.tz(timezone);
+    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 dayjsDate;
+    return momentDate;
 }
-exports.dayjsDate = dayjsDate;
+exports.momentDate = momentDate;
 /**
  * Format a date provided a value, format, and timezone object.
+ * @param {string} timezonesUrl - The URL to load the timezone data from.
  * @param {string|Date} value - The value to format.
  * @param {string} format - The format to format the date to.
  * @param {string} timezone - The timezone to format the date to.
  * @param {string} flatPickrInputFormat - The format to use for flatpickr input.
  * @returns {string} - The formatted date.
  */
-function formatDate(value, format, timezone, flatPickrInputFormat) {
-    const dayjsDate = (0, dayjs_1.default)(value, flatPickrInputFormat || undefined);
+function formatDate(timezonesUrl, value, format, timezone, flatPickrInputFormat) {
+    const momentDate = (0, moment_timezone_1.default)(value, flatPickrInputFormat || undefined);
     if (timezone === currentTimezone()) {
         // See if our format contains a "z" timezone character.
         if (format.match(/\s(z$|z\s)/)) {
-            if (shouldHandleTimezone(timezone)) {
-                return dayjsDate.tz(timezone).format(convertFormatToDayjs(format));
+            loadZones(timezonesUrl);
+            if (moment_timezone_1.default.zonesLoaded) {
+                return momentDate.tz(timezone).format(convertFormatToMoment(format));
             }
             else {
-                return dayjsDate.format(convertFormatToDayjs(format.replace(/\s(z$|z\s)/, '')));
+                return momentDate.format(convertFormatToMoment(format.replace(/\s(z$|z\s)/, '')));
             }
         }
         // Return the standard format.
-        return dayjsDate.format(convertFormatToDayjs(format));
+        return momentDate.format(convertFormatToMoment(format));
     }
     if (timezone === 'UTC') {
-        const offset = offsetDate(dayjsDate.toDate(), 'UTC');
-        return `${(0, dayjs_1.default)(offset.date).format(convertFormatToDayjs(format))} UTC`;
+        const offset = offsetDate(momentDate.toDate(), 'UTC');
+        return `${(0, moment_timezone_1.default)(offset.date).format(convertFormatToMoment(format))} UTC`;
     }
-    if (shouldHandleTimezone(timezone)) {
-        return dayjsDate.tz(timezone).format(`${convertFormatToDayjs(format)} z`);
+    // Load the zones since we need timezone information.
+    loadZones(timezonesUrl);
+    if (moment_timezone_1.default.zonesLoaded && timezone) {
+        return momentDate.tz(timezone).format(`${convertFormatToMoment(format)} z`);
+    }
+    else {
+        return momentDate.format(convertFormatToMoment(format));
     }
-    return dayjsDate.format(convertFormatToDayjs(format));
 }
 exports.formatDate = formatDate;
 /**
  * Pass a format function to format within a timezone.
+ * @param {string} timezonesUrl - The URL to load the timezone data from.
  * @param {Function} formatFn - The format function to use.
  * @param {Date|string} date - The date to format.
  * @param {string} format - The format to format the date to.
  * @param {string} timezone - The timezone to format the date to.
  * @returns {string} - The formatted date.
  */
-function formatOffset(formatFn, date, format, timezone) {
+function formatOffset(timezonesUrl, formatFn, date, format, timezone) {
     if (timezone === currentTimezone()) {
         return formatFn(date, format);
     }
     if (timezone === 'UTC') {
         return `${formatFn(offsetDate(date, 'UTC').date, format)} UTC`;
     }
-    if (shouldHandleTimezone(timezone)) {
+    // Load the zones since we need timezone information.
+    loadZones(timezonesUrl);
+    if (moment_timezone_1.default.zonesLoaded) {
         const offset = offsetDate(date, timezone);
         return `${formatFn(offset.date, format)} ${offset.abbr}`;
     }
@@ -782,7 +822,7 @@ exports.convertFormatToFlatpickr = convertFormatToFlatpickr;
  * @param {string} format - The format to convert.
  * @returns {string} - The converted format.
  */
-function convertFormatToDayjs(format) {
+function convertFormatToMoment(format) {
     return format
         // Year conversion.
         .replace(/y/g, 'Y')
@@ -795,7 +835,7 @@ function convertFormatToDayjs(format) {
         // Unix Timestamp
         .replace(/U/g, 'X');
 }
-exports.convertFormatToDayjs = convertFormatToDayjs;
+exports.convertFormatToMoment = convertFormatToMoment;
 /**
  * Convert the format from the angular-datepicker module to mask format.
  * @param {string} format - The format to convert.

package/lib/cjs/widgets/CalendarWidget.d.ts

@@ -22,6 +22,13 @@ export default class CalendarWidget extends InputWidget {
         minDate: string;
         maxDate: string;
     };
+    zoneLoading: boolean;
+    timezonesUrl: string;
+    /**
+     * Load the timezones.
+     * @returns {boolean} TRUE if the zones are loading, FALSE otherwise.
+     */
+    loadZones(): boolean;
     attach(input: any): Promise<any>;
     defaultFormat: {
         date: string;

package/lib/cjs/widgets/CalendarWidget.js

@@ -51,6 +51,29 @@ class CalendarWidget extends InputWidget_1.default {
         else if (this.settings.time_24hr) {
             this.settings.format = this.settings.format.replace(/hh:mm a$/g, 'HH:mm');
         }
+        this.zoneLoading = false;
+        this.timezonesUrl = `${Formio_1.Formio.cdn['moment-timezone']}/data/packed/latest.json`;
+    }
+    /**
+     * Load the timezones.
+     * @returns {boolean} TRUE if the zones are loading, FALSE otherwise.
+     */
+    loadZones() {
+        const timezone = this.timezone;
+        if (this.zoneLoading) {
+            return true;
+        }
+        if (!(0, utils_1.zonesLoaded)() && (0, utils_1.shouldLoadZones)(timezone)) {
+            this.zoneLoading = true;
+            (0, utils_1.loadZones)(this.timezonesUrl, timezone).then(() => {
+                this.zoneLoading = false;
+                this.emit('redraw');
+            });
+            // Return zones are loading.
+            return true;
+        }
+        // Zones are already loaded.
+        return false;
     }
     attach(input) {
         var _a;
@@ -62,7 +85,7 @@ class CalendarWidget extends InputWidget_1.default {
         };
         this.closedOn = 0;
         this.valueFormat = (this.settings.saveAs === 'date') ? ISO_8601_FORMAT : this.settings.dateFormat || ISO_8601_FORMAT;
-        this.valueMomentFormat = (0, utils_1.convertFormatToDayjs)(this.valueFormat);
+        this.valueMomentFormat = (0, utils_1.convertFormatToMoment)(this.valueFormat);
         const isReadOnly = this.settings.readOnly;
         this.settings.minDate = isReadOnly ? null : (0, utils_1.getDateSetting)(this.settings.minDate);
         this.settings.maxDate = isReadOnly ? null : (0, utils_1.getDateSetting)(this.settings.maxDate);
@@ -226,9 +249,9 @@ class CalendarWidget extends InputWidget_1.default {
      */
     getDateValue(date, format, useTimezone) {
         if (useTimezone) {
-            return (0, utils_1.dayjsDate)(date, this.valueFormat, this.timezone).format((0, utils_1.convertFormatToDayjs)(format));
+            return (0, utils_1.momentDate)(date, this.valueFormat, this.timezone).format((0, utils_1.convertFormatToMoment)(format));
         }
-        return (0, moment_1.default)(date).format((0, utils_1.convertFormatToDayjs)(format));
+        return (0, moment_1.default)(date).format((0, utils_1.convertFormatToMoment)(format));
     }
     /**
      * Return the value of the selected date.
@@ -260,7 +283,7 @@ class CalendarWidget extends InputWidget_1.default {
     setValue(value) {
         const saveAsText = (this.settings.saveAs === 'text');
         if (!this.calendar) {
-            value = value ? (0, utils_1.formatDate)(value, (0, utils_1.convertFormatToDayjs)(this.settings.format), this.timezone, (0, utils_1.convertFormatToDayjs)(this.valueMomentFormat)) : value;
+            value = value ? (0, utils_1.formatDate)(this.timezonesUrl, value, (0, utils_1.convertFormatToMoment)(this.settings.format), this.timezone, (0, utils_1.convertFormatToMoment)(this.valueMomentFormat)) : value;
             return super.setValue(value);
         }
         // If the component is a textfield that does not have timezone information included in the string value then skip
@@ -268,9 +291,10 @@ class CalendarWidget extends InputWidget_1.default {
         if (this.component.type === 'textfield' && !(0, utils_1.hasEncodedTimezone)(value)) {
             this.settings.skipOffset = true;
         }
+        const zonesLoading = this.loadZones();
         if (value) {
-            if (!saveAsText && this.settings.readOnly) {
-                this.calendar.setDate((0, utils_1.dayjsDate)(value, this.valueFormat, this.timezone).format(), false);
+            if (!saveAsText && this.settings.readOnly && !zonesLoading) {
+                this.calendar.setDate((0, utils_1.momentDate)(value, this.valueFormat, this.timezone).format(), false);
             }
             else if (this.isValueISO8601(value)) {
                 this.calendar.setDate(value, false);
@@ -287,9 +311,9 @@ class CalendarWidget extends InputWidget_1.default {
         const inputFormat = format || this.dateFormat;
         const valueFormat = this.calendar ? this.valueFormat : this.settings.dateFormat;
         if (this.settings.saveAs === 'text' && this.componentInstance.parent && !this.settings.readOnly) {
-            return (0, moment_1.default)(value, (0, utils_1.convertFormatToDayjs)(valueFormat)).format((0, utils_1.convertFormatToDayjs)(valueFormat));
+            return (0, moment_1.default)(value, (0, utils_1.convertFormatToMoment)(valueFormat)).format((0, utils_1.convertFormatToMoment)(valueFormat));
         }
-        return (0, utils_1.formatDate)(value, inputFormat, this.timezone, (0, utils_1.convertFormatToDayjs)(valueFormat));
+        return (0, utils_1.formatDate)(this.timezonesUrl, value, inputFormat, this.timezone, (0, utils_1.convertFormatToMoment)(valueFormat));
     }
     setErrorClasses(hasErrors) {
         if (!this.input) {
@@ -382,7 +406,7 @@ class CalendarWidget extends InputWidget_1.default {
             const relatedTarget = event.relatedTarget ? event.relatedTarget : activeElement;
             if (!(isIEBrowser && !relatedTarget) && !this.isCalendarElement(relatedTarget)) {
                 const inputValue = this.calendar.input.value;
-                const dateValue = inputValue ? (0, moment_1.default)(this.calendar.input.value, (0, utils_1.convertFormatToDayjs)(this.valueFormat)).toDate() : inputValue;
+                const dateValue = inputValue ? (0, moment_1.default)(this.calendar.input.value, (0, utils_1.convertFormatToMoment)(this.valueFormat)).toDate() : inputValue;
                 this.calendar.setDate(dateValue, true, this.settings.altFormat);
             }
             else if (!this.calendar.input.value && this.calendar.config.noCalendar) {
@@ -434,14 +458,14 @@ class CalendarWidget extends InputWidget_1.default {
         return (date, format) => {
             // Only format this if this is the altFormat and the form is readOnly.
             if (this.settings.readOnly && (format === this.settings.altFormat)) {
-                if (!this.settings.enableTime || this.settings.skipOffset) {
+                if (!this.settings.enableTime || this.loadZones() || this.settings.skipOffset) {
                     return Flatpickr.formatDate(date, format);
                 }
                 const currentValue = new Date(this.getValue());
                 if (currentValue.toString() === date.toString()) {
-                    return (0, utils_1.formatOffset)(Flatpickr.formatDate.bind(Flatpickr), new Date(this.componentValue), format, this.timezone);
+                    return (0, utils_1.formatOffset)(this.timezonesUrl, Flatpickr.formatDate.bind(Flatpickr), new Date(this.componentValue), format, this.timezone);
                 }
-                return (0, utils_1.formatOffset)(Flatpickr.formatDate.bind(Flatpickr), date, format, this.timezone);
+                return (0, utils_1.formatOffset)(this.timezonesUrl, Flatpickr.formatDate.bind(Flatpickr), date, format, this.timezone);
             }
             return Flatpickr.formatDate(date, format);
         };

package/lib/mjs/Webform.js

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import moment from 'moment';
 import { compareVersions } from 'compare-versions';
 import EventEmitter from './EventEmitter';
 import i18nDefaults from './i18n';
@@ -7,7 +8,6 @@ import Components from './components/Components';
 import NestedDataComponent from './components/_classes/nesteddata/NestedDataComponent';
 import { fastCloneDeep, currentTimezone, unescapeHTML, getStringFromComponentPath, convertStringToHTMLElement, getArrayFromComponentPath, } from './utils/utils';
 import { eachComponent } from './utils/formUtils';
-import dayjs from "dayjs";
 // We need this here because dragula pulls in CustomEvent class that requires global to exist.
 if (typeof window !== 'undefined' && typeof window.global === 'undefined') {
     window.global = window;
@@ -1317,7 +1317,7 @@ export default class Webform extends NestedDataComponent {
         submission.metadata = submission.metadata || {};
         _.defaults(submission.metadata, {
             timezone: _.get(this, '_submission.metadata.timezone', currentTimezone()),
-            offset: parseInt(_.get(this, '_submission.metadata.offset', dayjs().utcOffset()), 10),
+            offset: parseInt(_.get(this, '_submission.metadata.offset', moment().utcOffset()), 10),
             origin: document.location.origin,
             referrer: document.referrer,
             browserName: navigator.appName,

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

@@ -17,7 +17,7 @@ export default class DateTimeComponent extends Input {
     };
     static savedValueTypes(schema: any): string[];
     get emptyValue(): string;
-    get dayjsFormat(): string;
+    get momentFormat(): string;
     createWrapper(): boolean;
     checkValidity(data: any, dirty: any, rowData: any): boolean;
     getValueAsString(value: any, options: any): any;