@formio/js 5.1.0-dev.6094.c49181e → 5.1.0-dev.6102.8eddaab

package/lib/mjs/utils/utils.js

@@ -1,38 +1,12 @@
 /* global jQuery */
 import _ from 'lodash';
-import jsonLogic from 'json-logic-js';
 import moment from 'moment-timezone/moment-timezone';
 import jtz from 'jstimezonedetect';
-import { lodashOperators } from './jsonlogic/operators';
 import dompurify from 'dompurify';
 import { getValue } from './formUtils';
 import { Evaluator } from './Evaluator';
 import ConditionOperators from './conditionOperators';
-import { convertShowToBoolean } from '@formio/core';
-import dayjs from "dayjs";
-import utc from 'dayjs/plugin/utc';
-import timezone from 'dayjs/plugin/timezone';
-import advancedFormat from 'dayjs/plugin/advancedFormat';
-dayjs.extend(timezone);
-dayjs.extend(advancedFormat);
-dayjs.extend(utc);
-const interpolate = Evaluator.interpolate;
-export * from './formUtils';
-// Configure JsonLogic
-lodashOperators.forEach((name) => jsonLogic.add_operation(`_${name}`, _[name]));
-// Retrieve Any Date
-jsonLogic.add_operation('getDate', (date) => {
-    return moment(date).toISOString();
-});
-// Set Relative Minimum Date
-jsonLogic.add_operation('relativeMinDate', (relativeMinDate) => {
-    return moment().subtract(relativeMinDate, 'days').toISOString();
-});
-// Set Relative Maximum Date
-jsonLogic.add_operation('relativeMaxDate', (relativeMaxDate) => {
-    return moment().add(relativeMaxDate, 'days').toISOString();
-});
-export { jsonLogic, ConditionOperators, moment };
+import { jsonLogic, convertShowToBoolean } from '@formio/core';
 /**
  * Evaluate a method.
  * @param {Function|string|object} func - The function to evaluate.
@@ -512,7 +486,7 @@ export function 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.
  */
 export function getDateSetting(date) {
     if (_.isNil(date) || _.isNaN(date) || date === '') {
@@ -532,13 +506,13 @@ export function getDateSetting(date) {
     try {
         const value = Evaluator.evaluator(`return ${date};`, 'moment')(moment);
         if (typeof value === 'string') {
-            dateSetting = dayjs(value);
+            dateSetting = moment(value);
         }
         else if (typeof value.toDate === 'function') {
-            dateSetting = dayjs(value.toDate().toUTCString());
+            dateSetting = moment(value.toDate().toUTCString());
         }
         else if (value instanceof Date) {
-            dateSetting = dayjs(value);
+            dateSetting = moment(value);
         }
     }
     catch (e) {
@@ -566,17 +540,17 @@ export function isValidDate(date) {
  * @returns {string} - The current timezone.
  */
 export function currentTimezone() {
-    if (dayjs.currentTimezone) {
-        return dayjs.currentTimezone;
+    if (moment.currentTimezone) {
+        return moment.currentTimezone;
     }
-    dayjs.currentTimezone = jtz.determine().name();
-    return dayjs.currentTimezone;
+    moment.currentTimezone = jtz.determine().name();
+    return moment.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.
  */
 export function offsetDate(date, timezone) {
     if (timezone === 'UTC') {
@@ -585,89 +559,134 @@ export function offsetDate(date, timezone) {
             abbr: 'UTC'
         };
     }
-    const dateMoment = dayjs(date).tz(timezone);
+    const dateMoment = moment(date).tz(timezone);
     return {
         date: new Date(date.getTime() + ((dateMoment.utcOffset() + date.getTimezoneOffset()) * 60000)),
         abbr: dateMoment.format('z')
     };
 }
 /**
- * Returns if we should handle a timezone difference.
+ * Returns if the zones are loaded.
+ * @returns {boolean} - TRUE if the zones are loaded; FALSE otherwise.
+ */
+export function zonesLoaded() {
+    return moment.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.
  */
-export function shouldHandleTimezone(timezone) {
-    return !(timezone === currentTimezone() || timezone === 'UTC');
+export function shouldLoadZones(timezone) {
+    if (timezone === currentTimezone() || timezone === 'UTC') {
+        return false;
+    }
+    return true;
 }
 /**
- * Get the Dayjs date object for translating dates with timezones.
- * @param {string|Date} value - The value to convert into a dayjs date.
+ * 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 loadZones(url, timezone) {
+    if (timezone && !shouldLoadZones(timezone)) {
+        // Return non-resolving promise.
+        return new Promise(_.noop);
+    }
+    if (moment.zonesPromise) {
+        return moment.zonesPromise;
+    }
+    return moment.zonesPromise = fetch(url)
+        .then(resp => resp.json().then(zones => {
+        moment.tz.load(zones);
+        moment.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);
+        }
+    }));
+}
+/**
+ * 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, format, timezone, options) {
-    const dayjsDate = dayjs(value);
+export function momentDate(value, format, timezone, options) {
+    const momentDate = moment(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?.email)) {
-        return dayjsDate.tz(timezone);
+    if ((timezone !== currentTimezone() || (format && format.match(/\s(z$|z\s)/))) && (moment.zonesLoaded || options?.email)) {
+        return momentDate.tz(timezone);
     }
-    return dayjsDate;
+    return 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.
  */
-export function formatDate(value, format, timezone, flatPickrInputFormat) {
-    const dayjsDate = dayjs(value, flatPickrInputFormat || undefined);
+export function formatDate(timezonesUrl, value, format, timezone, flatPickrInputFormat) {
+    const momentDate = moment(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.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 `${dayjs(offset.date).format(convertFormatToDayjs(format))} UTC`;
+        const offset = offsetDate(momentDate.toDate(), 'UTC');
+        return `${moment(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.zonesLoaded && timezone) {
+        return momentDate.tz(timezone).format(`${convertFormatToMoment(format)} z`);
+    }
+    else {
+        return momentDate.format(convertFormatToMoment(format));
     }
-    return dayjsDate.format(convertFormatToDayjs(format));
 }
 /**
  * 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, date, format, timezone) {
+export 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.zonesLoaded) {
         const offset = offsetDate(date, timezone);
         return `${formatFn(offset.date, format)} ${offset.abbr}`;
     }
@@ -724,7 +743,7 @@ export function convertFormatToFlatpickr(format) {
  * @param {string} format - The format to convert.
  * @returns {string} - The converted format.
  */
-export function convertFormatToDayjs(format) {
+export function convertFormatToMoment(format) {
     return format
         // Year conversion.
         .replace(/y/g, 'Y')
@@ -1273,7 +1292,6 @@ export function sanitize(string, options) {
 export function fastCloneDeep(obj) {
     return obj ? JSON.parse(JSON.stringify(obj)) : obj;
 }
-export { Evaluator, interpolate };
 /**
  * Returns if the component is an input component.
  * @param {import('@formio/core').Component} componentJson - The JSON of a component.
@@ -1475,8 +1493,6 @@ export function getFocusableElements(element) {
     textarea:not([disabled]), button:not([disabled]), [href]`;
     return element.querySelectorAll(focusableSelector);
 }
-// Export lodash to save space with other libraries.
-export { _ };
 export const componentValueTypes = {
     number: 'number',
     string: 'string',

package/lib/mjs/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/mjs/widgets/CalendarWidget.js

@@ -1,6 +1,6 @@
 import { Formio } from '../Formio';
 import InputWidget from './InputWidget';
-import { convertFormatToFlatpickr, convertFormatToMask, convertFormatToDayjs, formatDate, formatOffset, getBrowserInfo, getDateSetting, getLocaleDateFormatInfo, dayjsDate, hasEncodedTimezone, } from '../utils/utils';
+import { convertFormatToFlatpickr, convertFormatToMask, convertFormatToMoment, formatDate, formatOffset, getBrowserInfo, getDateSetting, getLocaleDateFormatInfo, momentDate, zonesLoaded, shouldLoadZones, loadZones, hasEncodedTimezone, } from '../utils';
 import moment from 'moment';
 import _ from 'lodash';
 const DEFAULT_FORMAT = 'yyyy-MM-dd hh:mm a';
@@ -46,6 +46,29 @@ export default class CalendarWidget extends InputWidget {
         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.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 (!zonesLoaded() && shouldLoadZones(timezone)) {
+            this.zoneLoading = true;
+            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) {
         const superAttach = super.attach(input);
@@ -56,7 +79,7 @@ export default class CalendarWidget extends InputWidget {
         };
         this.closedOn = 0;
         this.valueFormat = (this.settings.saveAs === 'date') ? ISO_8601_FORMAT : this.settings.dateFormat || ISO_8601_FORMAT;
-        this.valueMomentFormat = convertFormatToDayjs(this.valueFormat);
+        this.valueMomentFormat = convertFormatToMoment(this.valueFormat);
         const isReadOnly = this.settings.readOnly;
         this.settings.minDate = isReadOnly ? null : getDateSetting(this.settings.minDate);
         this.settings.maxDate = isReadOnly ? null : getDateSetting(this.settings.maxDate);
@@ -218,9 +241,9 @@ export default class CalendarWidget extends InputWidget {
      */
     getDateValue(date, format, useTimezone) {
         if (useTimezone) {
-            return dayjsDate(date, this.valueFormat, this.timezone).format(convertFormatToDayjs(format));
+            return momentDate(date, this.valueFormat, this.timezone).format(convertFormatToMoment(format));
         }
-        return moment(date).format(convertFormatToDayjs(format));
+        return moment(date).format(convertFormatToMoment(format));
     }
     /**
      * Return the value of the selected date.
@@ -252,7 +275,7 @@ export default class CalendarWidget extends InputWidget {
     setValue(value) {
         const saveAsText = (this.settings.saveAs === 'text');
         if (!this.calendar) {
-            value = value ? formatDate(value, convertFormatToDayjs(this.settings.format), this.timezone, convertFormatToDayjs(this.valueMomentFormat)) : value;
+            value = value ? formatDate(this.timezonesUrl, value, convertFormatToMoment(this.settings.format), this.timezone, 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
@@ -260,9 +283,10 @@ export default class CalendarWidget extends InputWidget {
         if (this.component.type === 'textfield' && !hasEncodedTimezone(value)) {
             this.settings.skipOffset = true;
         }
+        const zonesLoading = this.loadZones();
         if (value) {
-            if (!saveAsText && this.settings.readOnly) {
-                this.calendar.setDate(dayjsDate(value, this.valueFormat, this.timezone).format(), false);
+            if (!saveAsText && this.settings.readOnly && !zonesLoading) {
+                this.calendar.setDate(momentDate(value, this.valueFormat, this.timezone).format(), false);
             }
             else if (this.isValueISO8601(value)) {
                 this.calendar.setDate(value, false);
@@ -279,9 +303,9 @@ export default class CalendarWidget extends InputWidget {
         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 moment(value, convertFormatToDayjs(valueFormat)).format(convertFormatToDayjs(valueFormat));
+            return moment(value, convertFormatToMoment(valueFormat)).format(convertFormatToMoment(valueFormat));
         }
-        return formatDate(value, inputFormat, this.timezone, convertFormatToDayjs(valueFormat));
+        return formatDate(this.timezonesUrl, value, inputFormat, this.timezone, convertFormatToMoment(valueFormat));
     }
     setErrorClasses(hasErrors) {
         if (!this.input) {
@@ -372,7 +396,7 @@ export default class CalendarWidget extends InputWidget {
             const relatedTarget = event.relatedTarget ? event.relatedTarget : activeElement;
             if (!(isIEBrowser && !relatedTarget) && !this.isCalendarElement(relatedTarget)) {
                 const inputValue = this.calendar.input.value;
-                const dateValue = inputValue ? moment(this.calendar.input.value, convertFormatToDayjs(this.valueFormat)).toDate() : inputValue;
+                const dateValue = inputValue ? moment(this.calendar.input.value, convertFormatToMoment(this.valueFormat)).toDate() : inputValue;
                 this.calendar.setDate(dateValue, true, this.settings.altFormat);
             }
             else if (!this.calendar.input.value && this.calendar.config.noCalendar) {
@@ -424,14 +448,14 @@ export default class CalendarWidget extends InputWidget {
         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 formatOffset(Flatpickr.formatDate.bind(Flatpickr), new Date(this.componentValue), format, this.timezone);
+                    return formatOffset(this.timezonesUrl, Flatpickr.formatDate.bind(Flatpickr), new Date(this.componentValue), format, this.timezone);
                 }
-                return formatOffset(Flatpickr.formatDate.bind(Flatpickr), date, format, this.timezone);
+                return formatOffset(this.timezonesUrl, Flatpickr.formatDate.bind(Flatpickr), date, format, this.timezone);
             }
             return Flatpickr.formatDate(date, format);
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6094.c49181e",
+  "version": "5.1.0-dev.6102.8eddaab",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
     "@formio/bootstrap": "v3.0.0-dev.121.085d187",
-    "@formio/core": "v2.4.0-dev.232.d91b1e4",
+    "@formio/core": "2.4.0-dev.245.3d53057",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
@@ -92,7 +92,6 @@
     "choices.js": "^11.0.6",
     "compare-versions": "^6.1.1",
     "core-js": "^3.37.1",
-    "dayjs": "^1.11.13",
     "dialog-polyfill": "^0.5.6",
     "dom-autoscroller": "^2.3.4",
     "dompurify": "^3.1.6",