@formio/js 5.1.0-dev.6108.401a61f → 5.1.0-dev.6112.06b0f26

package/lib/cjs/utils/index.js

@@ -22,11 +22,31 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Utils = void 0;
-const FormioUtils = __importStar(require("./utils"));
+exports.registerEvaluator = exports.Evaluator = exports.Utils = void 0;
+const utils = __importStar(require("./utils"));
+const formUtils = __importStar(require("./formUtils"));
+const Evaluator_1 = require("./Evaluator");
+Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
+Object.defineProperty(exports, "registerEvaluator", { enumerable: true, get: function () { return Evaluator_1.registerEvaluator; } });
+const conditionOperators_1 = __importDefault(require("./conditionOperators"));
+const lodash_1 = __importDefault(require("lodash"));
+const moment_1 = __importDefault(require("moment"));
+const FormioUtils = Object.assign(Object.assign(Object.assign({}, utils), formUtils), { Evaluator: Evaluator_1.Evaluator,
+    interpolate: Evaluator_1.interpolate,
+    ConditionOperators: conditionOperators_1.default,
+    _: lodash_1.default,
+    moment: moment_1.default });
 exports.Utils = FormioUtils;
 if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;
 }
+__exportStar(require("./utils"), exports);
+__exportStar(require("./formUtils"), exports);
 exports.default = FormioUtils;

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|Date)} - The translated date.
+ * @returns {(null|dayjs.Dayjs)} - The translated date.
  */
-export function getDateSetting(date: string | Date): (null | Date);
+export function getDateSetting(date: string | Date): (null | dayjs.Dayjs);
 /**
  * Returns true if the date is a valid date. False otherwise.
  * @param {Date|string} date - The date to check for validity.
@@ -182,56 +182,45 @@ 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} - The offset date.
+ * @returns {{date: Date, abbr: string}} - The offset date.
  */
-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;
+export function offsetDate(date: Date, timezone: string): {
+    date: Date;
+    abbr: string;
+};
 /**
- * Returns if we should load the zones.
+ * Returns if we should handle a timezone difference.
  * @param {string} timezone - The timezone to check if we should load the zones.
- * @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.
+ * @returns {boolean} - TRUE if we should handle timezones; FALSE otherwise.
  */
-export function loadZones(url: string, timezone: string): Promise<any> | any;
+export function shouldHandleTimezone(timezone: string): boolean;
 /**
- * Get the moment date object for translating dates with timezones.
- * @param {string|Date} value - The value to convert into a moment date.
+ * Get the Dayjs date object for translating dates with timezones.
+ * @param {string|Date} value - The value to convert into a dayjs 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.
+ * @returns {dayjs.Dayjs} - The dayjs date object.
  */
-export function momentDate(value: string | Date, format: string, timezone: string, options: object): Date;
+export function dayjsDate(value: string | Date, format: string, timezone: string, options: object): dayjs.Dayjs;
 /**
  * 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(timezonesUrl: string, value: string | Date, format: string, timezone: string, flatPickrInputFormat: string): string;
+export function formatDate(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(timezonesUrl: string, formatFn: Function, date: Date | string, format: string, timezone: string): string;
+export function formatOffset(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.
@@ -249,7 +238,7 @@ export function convertFormatToFlatpickr(format: string): string;
  * @param {string} format - The format to convert.
  * @returns {string} - The converted format.
  */
-export function convertFormatToMoment(format: string): string;
+export function convertFormatToDayjs(format: string): string;
 /**
  * Convert the format from the angular-datepicker module to mask format.
  * @param {string} format - The format to convert.
@@ -414,15 +403,15 @@ export function fastCloneDeep(obj: any): any;
 /**
  * Returns if the component is an input component.
  * @param {import('@formio/core').Component} componentJson - The JSON of a component.
- * @returns {bool} - TRUE if the component is an input component; FALSE otherwise.
+ * @returns {boolean} - TRUE if the component is an input component; FALSE otherwise.
  */
-export function isInputComponent(componentJson: import('@formio/core').Component): bool;
+export function isInputComponent(componentJson: import('@formio/core').Component): boolean;
 /**
  * Takes a component path, and returns a component path array.
  * @param {string} pathStr - The path string to convert to an array.
- * @returns {Arryay<number>} - The array of paths.
+ * @returns {Array<string>} - The array of paths.
  */
-export function getArrayFromComponentPath(pathStr: string): Arryay<number>;
+export function getArrayFromComponentPath(pathStr: string): Array<string>;
 /**
  * Returns true if the component is a child of the parent.
  * @param {any} child - The child component to check.
@@ -499,7 +488,6 @@ export function getComponentSavedTypes(fullSchema: import('@formio/core').Compon
  * @returns {boolean} if value has encoded timezone
  */
 export function hasEncodedTimezone(value: string): boolean;
-export * from "./formUtils";
 /**
  * Map values through unfold and return first non-nil value.
  * @param {Array<T>} collection - The collection to map through unfold.;
@@ -516,7 +504,4 @@ export namespace componentValueTypes {
     let any: string;
 }
 export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
-import ConditionOperators from './conditionOperators';
-import { Evaluator } from './Evaluator';
-export const interpolate: typeof Evaluator.interpolate;
-export { jsonLogic, ConditionOperators, moment, Evaluator, _ };
+import dayjs from "dayjs";

package/lib/cjs/utils/utils.js

@@ -1,57 +1,26 @@
 "use strict";
-/* global jQuery */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = 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 = void 0;
+exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = 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.fastCloneDeep = exports.sanitize = void 0;
+/* global jQuery */
 const lodash_1 = __importDefault(require("lodash"));
-exports._ = lodash_1.default;
-const json_logic_js_1 = __importDefault(require("json-logic-js"));
-exports.jsonLogic = json_logic_js_1.default;
 const moment_timezone_1 = __importDefault(require("moment-timezone/moment-timezone"));
-exports.moment = moment_timezone_1.default;
 const jstimezonedetect_1 = __importDefault(require("jstimezonedetect"));
-const operators_1 = require("./jsonlogic/operators");
 const dompurify_1 = __importDefault(require("dompurify"));
+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"));
+const core_1 = require("@formio/core");
 const formUtils_1 = require("./formUtils");
 const Evaluator_1 = require("./Evaluator");
-Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
 const conditionOperators_1 = __importDefault(require("./conditionOperators"));
-exports.ConditionOperators = conditionOperators_1.default;
-const core_1 = require("@formio/core");
-const interpolate = Evaluator_1.Evaluator.interpolate;
-exports.interpolate = interpolate;
-__exportStar(require("./formUtils"), exports);
-// Configure JsonLogic
-operators_1.lodashOperators.forEach((name) => json_logic_js_1.default.add_operation(`_${name}`, lodash_1.default[name]));
-// Retrieve Any Date
-json_logic_js_1.default.add_operation('getDate', (date) => {
-    return (0, moment_timezone_1.default)(date).toISOString();
-});
-// Set Relative Minimum Date
-json_logic_js_1.default.add_operation('relativeMinDate', (relativeMinDate) => {
-    return (0, moment_timezone_1.default)().subtract(relativeMinDate, 'days').toISOString();
-});
-// Set Relative Maximum Date
-json_logic_js_1.default.add_operation('relativeMaxDate', (relativeMaxDate) => {
-    return (0, moment_timezone_1.default)().add(relativeMaxDate, 'days').toISOString();
-});
+dayjs_1.default.extend(timezone_1.default);
+dayjs_1.default.extend(advancedFormat_1.default);
+dayjs_1.default.extend(utc_1.default);
 /**
  * Evaluate a method.
  * @param {Function|string|object} func - The function to evaluate.
@@ -240,13 +209,20 @@ function checkSimpleConditional(component, condition, row, data, instance) {
             return true;
         }
         const conditionsResult = lodash_1.default.map(conditions, (cond) => {
-            var _a, _b;
             const { value: comparedValue, operator, component: conditionComponentPath } = cond;
             if (!conditionComponentPath) {
                 return true;
             }
             const splittedConditionPath = conditionComponentPath.split('.');
-            const conditionalPaths = ((_a = instance === null || instance === void 0 ? void 0 : instance.parent) === null || _a === void 0 ? void 0 : _a.type) === 'datagrid' || ((_b = instance === null || instance === void 0 ? void 0 : instance.parent) === null || _b === void 0 ? void 0 : _b.type) === 'editgrid' ? [] : getConditionalPathsRecursive(splittedConditionPath, data);
+            const checkParentTypeInTree = (instance, componentType) => {
+                if (!(instance === null || instance === void 0 ? void 0 : instance.parent)) {
+                    return false;
+                }
+                return (instance === null || instance === void 0 ? void 0 : instance.parent.type) === componentType || checkParentTypeInTree(instance.parent, componentType);
+            };
+            const conditionalPaths = checkParentTypeInTree(instance, 'datagrid') || checkParentTypeInTree(instance, 'editgrid')
+                ? []
+                : getConditionalPathsRecursive(splittedConditionPath, data);
             if (conditionalPaths.length > 0) {
                 return conditionalPaths.map((path) => {
                     const value = getComponentActualValue(path, data, row);
@@ -335,7 +311,7 @@ exports.checkCustomConditional = checkCustomConditional;
  */
 function checkJsonConditional(component, json, row, data, form, onError) {
     try {
-        return json_logic_js_1.default.apply(json, {
+        return core_1.jsonLogic.apply(json, {
             data,
             row,
             form,
@@ -365,7 +341,7 @@ function getRow(component, row, instance, conditional) {
     }
     const dataParent = getDataParentComponent(instance);
     if (dataParent) {
-        const parentPath = (_a = dataParent.paths) === null || _a === void 0 ? void 0 : _a.localDataPath;
+        const parentPath = (_a = dataParent.paths) === null || _a === void 0 ? void 0 : _a.localPath;
         const isTriggerCondtionComponentPath = condition.when || !condition.conditions
             ? (_b = condition.when) === null || _b === void 0 ? void 0 : _b.startsWith((_c = dataParent.paths) === null || _c === void 0 ? void 0 : _c.localPath)
             : lodash_1.default.some(condition.conditions, cond => { var _a; return cond.component.startsWith((_a = dataParent.paths) === null || _a === void 0 ? void 0 : _a.localPath); });
@@ -553,7 +529,7 @@ exports.guid = guid;
 /**
  * Return a translated date setting.
  * @param {string|Date} date - The date to translate.
- * @returns {(null|Date)} - The translated date.
+ * @returns {(null|dayjs.Dayjs)} - The translated date.
  */
 function getDateSetting(date) {
     if (lodash_1.default.isNil(date) || lodash_1.default.isNaN(date) || date === '') {
@@ -573,13 +549,13 @@ function getDateSetting(date) {
     try {
         const value = Evaluator_1.Evaluator.evaluator(`return ${date};`, 'moment')(moment_timezone_1.default);
         if (typeof value === 'string') {
-            dateSetting = (0, moment_timezone_1.default)(value);
+            dateSetting = (0, dayjs_1.default)(value);
         }
         else if (typeof value.toDate === 'function') {
-            dateSetting = (0, moment_timezone_1.default)(value.toDate().toUTCString());
+            dateSetting = (0, dayjs_1.default)(value.toDate().toUTCString());
         }
         else if (value instanceof Date) {
-            dateSetting = (0, moment_timezone_1.default)(value);
+            dateSetting = (0, dayjs_1.default)(value);
         }
     }
     catch (e) {
@@ -609,18 +585,18 @@ exports.isValidDate = isValidDate;
  * @returns {string} - The current timezone.
  */
 function currentTimezone() {
-    if (moment_timezone_1.default.currentTimezone) {
-        return moment_timezone_1.default.currentTimezone;
+    if (dayjs_1.default.currentTimezone) {
+        return dayjs_1.default.currentTimezone;
     }
-    moment_timezone_1.default.currentTimezone = jstimezonedetect_1.default.determine().name();
-    return moment_timezone_1.default.currentTimezone;
+    dayjs_1.default.currentTimezone = jstimezonedetect_1.default.determine().name();
+    return dayjs_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} - The offset date.
+ * @returns {{date: Date, abbr: string}} - The offset date.
  */
 function offsetDate(date, timezone) {
     if (timezone === 'UTC') {
@@ -629,7 +605,7 @@ function offsetDate(date, timezone) {
             abbr: 'UTC'
         };
     }
-    const dateMoment = (0, moment_timezone_1.default)(date).tz(timezone);
+    const dateMoment = (0, dayjs_1.default)(date).tz(timezone);
     return {
         date: new Date(date.getTime() + ((dateMoment.utcOffset() + date.getTimezoneOffset()) * 60000)),
         abbr: dateMoment.format('z')
@@ -637,132 +613,85 @@ function offsetDate(date, timezone) {
 }
 exports.offsetDate = offsetDate;
 /**
- * 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.
+ * Returns if we should handle a timezone difference.
  * @param {string} timezone - The timezone to check if we should load the zones.
- * @returns {boolean} - TRUE if we should load the zones; FALSE otherwise.
+ * @returns {boolean} - TRUE if we should handle timezones; FALSE otherwise.
  */
-function shouldLoadZones(timezone) {
-    if (timezone === currentTimezone() || timezone === 'UTC') {
-        return false;
-    }
-    return true;
+function shouldHandleTimezone(timezone) {
+    return !(timezone === currentTimezone() || timezone === 'UTC');
 }
-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.loadZones = loadZones;
+exports.shouldHandleTimezone = shouldHandleTimezone;
 /**
- * Get the moment date object for translating dates with timezones.
- * @param {string|Date} value - The value to convert into a moment date.
+ * Get the Dayjs date object for translating dates with timezones.
+ * @param {string|Date} value - The value to convert into a dayjs 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.
+ * @returns {dayjs.Dayjs} - The dayjs date object.
  */
-function momentDate(value, format, timezone, options) {
-    const momentDate = (0, moment_timezone_1.default)(value);
+function dayjsDate(value, format, timezone, options) {
+    const dayjsDate = (0, dayjs_1.default)(value);
     if (!timezone) {
-        return momentDate;
+        return dayjsDate;
     }
     if (timezone === 'UTC') {
         timezone = 'Etc/UTC';
     }
-    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);
+    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);
     }
-    return momentDate;
+    return dayjsDate;
 }
-exports.momentDate = momentDate;
+exports.dayjsDate = dayjsDate;
 /**
  * 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(timezonesUrl, value, format, timezone, flatPickrInputFormat) {
-    const momentDate = (0, moment_timezone_1.default)(value, flatPickrInputFormat || undefined);
+function formatDate(value, format, timezone, flatPickrInputFormat) {
+    const dayjsDate = (0, dayjs_1.default)(value, flatPickrInputFormat || undefined);
     if (timezone === currentTimezone()) {
         // See if our format contains a "z" timezone character.
         if (format.match(/\s(z$|z\s)/)) {
-            loadZones(timezonesUrl);
-            if (moment_timezone_1.default.zonesLoaded) {
-                return momentDate.tz(timezone).format(convertFormatToMoment(format));
+            if (shouldHandleTimezone(timezone)) {
+                return dayjsDate.tz(timezone).format(convertFormatToDayjs(format));
             }
             else {
-                return momentDate.format(convertFormatToMoment(format.replace(/\s(z$|z\s)/, '')));
+                return dayjsDate.format(convertFormatToDayjs(format.replace(/\s(z$|z\s)/, '')));
             }
         }
         // Return the standard format.
-        return momentDate.format(convertFormatToMoment(format));
+        return dayjsDate.format(convertFormatToDayjs(format));
     }
     if (timezone === 'UTC') {
-        const offset = offsetDate(momentDate.toDate(), 'UTC');
-        return `${(0, moment_timezone_1.default)(offset.date).format(convertFormatToMoment(format))} UTC`;
+        const offset = offsetDate(dayjsDate.toDate(), 'UTC');
+        return `${(0, dayjs_1.default)(offset.date).format(convertFormatToDayjs(format))} UTC`;
     }
-    // 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));
+    if (shouldHandleTimezone(timezone)) {
+        return dayjsDate.tz(timezone).format(`${convertFormatToDayjs(format)} z`);
     }
+    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(timezonesUrl, formatFn, date, format, timezone) {
+function formatOffset(formatFn, date, format, timezone) {
     if (timezone === currentTimezone()) {
         return formatFn(date, format);
     }
     if (timezone === 'UTC') {
         return `${formatFn(offsetDate(date, 'UTC').date, format)} UTC`;
     }
-    // Load the zones since we need timezone information.
-    loadZones(timezonesUrl);
-    if (moment_timezone_1.default.zonesLoaded) {
+    if (shouldHandleTimezone(timezone)) {
         const offset = offsetDate(date, timezone);
         return `${formatFn(offset.date, format)} ${offset.abbr}`;
     }
@@ -822,7 +751,7 @@ exports.convertFormatToFlatpickr = convertFormatToFlatpickr;
  * @param {string} format - The format to convert.
  * @returns {string} - The converted format.
  */
-function convertFormatToMoment(format) {
+function convertFormatToDayjs(format) {
     return format
         // Year conversion.
         .replace(/y/g, 'Y')
@@ -835,7 +764,7 @@ function convertFormatToMoment(format) {
         // Unix Timestamp
         .replace(/U/g, 'X');
 }
-exports.convertFormatToMoment = convertFormatToMoment;
+exports.convertFormatToDayjs = convertFormatToDayjs;
 /**
  * Convert the format from the angular-datepicker module to mask format.
  * @param {string} format - The format to convert.
@@ -1395,7 +1324,7 @@ exports.fastCloneDeep = fastCloneDeep;
 /**
  * Returns if the component is an input component.
  * @param {import('@formio/core').Component} componentJson - The JSON of a component.
- * @returns {bool} - TRUE if the component is an input component; FALSE otherwise.
+ * @returns {boolean} - TRUE if the component is an input component; FALSE otherwise.
  */
 function isInputComponent(componentJson) {
     if (componentJson.input === false || componentJson.input === true) {
@@ -1420,7 +1349,7 @@ exports.isInputComponent = isInputComponent;
 /**
  * Takes a component path, and returns a component path array.
  * @param {string} pathStr - The path string to convert to an array.
- * @returns {Arryay<number>} - The array of paths.
+ * @returns {Array<string>} - The array of paths.
  */
 function getArrayFromComponentPath(pathStr) {
     if (!pathStr || !lodash_1.default.isString(pathStr)) {

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

@@ -22,13 +22,6 @@ 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;
@@ -84,7 +77,7 @@ export default class CalendarWidget extends InputWidget {
      * @returns {void}
      */
     setValue(value: any): void;
-    getValueAsString(value: any, format: any): string;
+    getValueAsString(value: any, format?: string): string;
     setErrorClasses(hasErrors: any): void;
     isCalendarElement(element: any): any;
     initFlatpickr(Flatpickr: any): void;