@formio/js 5.1.0-dev.6109.79f22ad → 5.1.0-dev.6112.06b0f26

package/lib/mjs/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;

package/lib/mjs/widgets/CalendarWidget.js

@@ -1,8 +1,8 @@
-import { Formio } from '../Formio';
-import InputWidget from './InputWidget';
-import { convertFormatToFlatpickr, convertFormatToMask, convertFormatToMoment, formatDate, formatOffset, getBrowserInfo, getDateSetting, getLocaleDateFormatInfo, momentDate, zonesLoaded, shouldLoadZones, loadZones, hasEncodedTimezone, } from '../utils/utils';
 import moment from 'moment';
 import _ from 'lodash';
+import { Formio } from '../Formio';
+import InputWidget from './InputWidget';
+import { convertFormatToFlatpickr, convertFormatToMask, convertFormatToDayjs, formatDate, formatOffset, getBrowserInfo, getDateSetting, getLocaleDateFormatInfo, hasEncodedTimezone, dayjsDate } from '../utils';
 const DEFAULT_FORMAT = 'yyyy-MM-dd hh:mm a';
 const ISO_8601_FORMAT = 'yyyy-MM-ddTHH:mm:ssZ';
 const isIEBrowser = getBrowserInfo().ie;
@@ -46,29 +46,6 @@ 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);
@@ -79,7 +56,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 = convertFormatToMoment(this.valueFormat);
+        this.valueMomentFormat = convertFormatToDayjs(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);
@@ -241,9 +218,9 @@ export default class CalendarWidget extends InputWidget {
      */
     getDateValue(date, format, useTimezone) {
         if (useTimezone) {
-            return momentDate(date, this.valueFormat, this.timezone).format(convertFormatToMoment(format));
+            return dayjsDate(date, this.valueFormat, this.timezone).format(convertFormatToDayjs(format));
         }
-        return moment(date).format(convertFormatToMoment(format));
+        return moment(date).format(convertFormatToDayjs(format));
     }
     /**
      * Return the value of the selected date.
@@ -275,18 +252,15 @@ export default class CalendarWidget extends InputWidget {
     setValue(value) {
         const saveAsText = (this.settings.saveAs === 'text');
         if (!this.calendar) {
-            value = value ? formatDate(this.timezonesUrl, value, convertFormatToMoment(this.settings.format), this.timezone, convertFormatToMoment(this.valueMomentFormat)) : value;
+            value = value ? formatDate(value, convertFormatToDayjs(this.settings.format), this.timezone, convertFormatToDayjs(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
         // the timezone offset
-        if (this.component.type === 'textfield' && !hasEncodedTimezone(value)) {
-            this.settings.skipOffset = true;
-        }
-        const zonesLoading = this.loadZones();
+        this.settings.skipOffset = this.component.type === 'textfield' && !hasEncodedTimezone(value);
         if (value) {
-            if (!saveAsText && this.settings.readOnly && !zonesLoading) {
-                this.calendar.setDate(momentDate(value, this.valueFormat, this.timezone).format(), false);
+            if (!saveAsText && this.settings.readOnly) {
+                this.calendar.setDate(dayjsDate(value, this.valueFormat, this.timezone).format(), false);
             }
             else if (this.isValueISO8601(value)) {
                 this.calendar.setDate(value, false);
@@ -299,13 +273,13 @@ export default class CalendarWidget extends InputWidget {
             this.calendar.clear(false);
         }
     }
-    getValueAsString(value, format) {
+    getValueAsString(value, format = '') {
         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, convertFormatToMoment(valueFormat)).format(convertFormatToMoment(valueFormat));
+            return moment(value, convertFormatToDayjs(valueFormat)).format(convertFormatToDayjs(valueFormat));
         }
-        return formatDate(this.timezonesUrl, value, inputFormat, this.timezone, convertFormatToMoment(valueFormat));
+        return formatDate(value, inputFormat, this.timezone, convertFormatToDayjs(valueFormat));
     }
     setErrorClasses(hasErrors) {
         if (!this.input) {
@@ -396,7 +370,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, convertFormatToMoment(this.valueFormat)).toDate() : inputValue;
+                const dateValue = inputValue ? moment(this.calendar.input.value, convertFormatToDayjs(this.valueFormat)).toDate() : inputValue;
                 this.calendar.setDate(dateValue, true, this.settings.altFormat);
             }
             else if (!this.calendar.input.value && this.calendar.config.noCalendar) {
@@ -448,14 +422,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.loadZones() || this.settings.skipOffset) {
+                if (!this.settings.enableTime || this.settings.skipOffset) {
                     return Flatpickr.formatDate(date, format);
                 }
                 const currentValue = new Date(this.getValue());
                 if (currentValue.toString() === date.toString()) {
-                    return formatOffset(this.timezonesUrl, Flatpickr.formatDate.bind(Flatpickr), new Date(this.componentValue), format, this.timezone);
+                    return formatOffset(Flatpickr.formatDate.bind(Flatpickr), new Date(this.componentValue), format, this.timezone);
                 }
-                return formatOffset(this.timezonesUrl, Flatpickr.formatDate.bind(Flatpickr), date, format, this.timezone);
+                return formatOffset(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.6109.79f22ad",
+  "version": "5.1.0-dev.6112.06b0f26",
   "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.267.2866472",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
@@ -92,6 +92,7 @@
     "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.2.5",
@@ -175,7 +176,8 @@
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.1",
     "webpack-node-externals": "^3.0.0",
-    "webpack-stream": "^7.0.0"
+    "webpack-stream": "^7.0.0",
+    "zx": "^8.5.4"
   },
   "nyc": {
     "check-coverage": true,

package/lib/cjs/i18n.d.ts

@@ -1,13 +0,0 @@
-declare namespace _default {
-    let lng: string;
-    let nsSeparator: string;
-    let keySeparator: string;
-    let pluralSeparator: string;
-    let contextSeparator: string;
-    namespace resources {
-        namespace en {
-            let translation: any;
-        }
-    }
-}
-export default _default;

package/lib/cjs/i18n.js

@@ -1,19 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const en_1 = __importDefault(require("./translations/en"));
-const utils_1 = require("./utils/utils");
-exports.default = {
-    lng: 'en',
-    nsSeparator: '::',
-    keySeparator: '.|.',
-    pluralSeparator: '._.',
-    contextSeparator: '._.',
-    resources: {
-        en: {
-            translation: (0, utils_1.fastCloneDeep)(en_1.default)
-        }
-    }
-};

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

@@ -1,19 +0,0 @@
-/**
- * This file is used to mimic the i18n library interface.
- */
-export class I18n {
-    static languages: {};
-    static setDefaultTranslations(languages: any): void;
-    static init(languages?: {}): I18n;
-    static createInstance(): I18n;
-    constructor(languages?: {});
-    languages: any;
-    defaultKeys: any;
-    language: string;
-    currentLanguage: any;
-    setLanguages(languages: any, noDefaultOverride: any): void;
-    dir(lang?: string): "rtl" | "ltr";
-    changeLanguage(language: any, ready?: null): void;
-    addResourceBundle(language: any, type: any, strings: any): void;
-    t(text: any, ...args: any[]): any;
-}

package/lib/cjs/utils/i18n.js

@@ -1,120 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.I18n = void 0;
-const utils_1 = require("@formio/core/utils");
-const i18n_1 = __importDefault(require("../i18n"));
-const lodash_1 = require("lodash");
-const core_1 = require("@formio/core");
-const i18Defaults = {};
-for (const lang in i18n_1.default.resources) {
-    if (i18n_1.default.resources.hasOwnProperty(lang)) {
-        i18Defaults[lang] = i18n_1.default.resources[lang].translation;
-    }
-}
-/**
- * This file is used to mimic the i18n library interface.
- */
-class I18n {
-    constructor(languages = {}) {
-        var _a;
-        this.languages = (0, core_1.fastCloneDeep)(I18n.languages || {});
-        this.defaultKeys = ((_a = I18n.languages) === null || _a === void 0 ? void 0 : _a.en) || {};
-        this.language = 'en';
-        this.currentLanguage = i18Defaults.en;
-        this.setLanguages(languages);
-        this.changeLanguage(this.language);
-    }
-    static setDefaultTranslations(languages) {
-        if ((0, lodash_1.isEmpty)(languages)) {
-            return;
-        }
-        for (const lang in languages) {
-            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
-                if (!this.languages[lang]) {
-                    this.languages[lang] = {};
-                }
-                this.languages[lang] = Object.assign(Object.assign({}, languages[lang]), this.languages[lang]);
-            }
-        }
-    }
-    setLanguages(languages, noDefaultOverride) {
-        if (languages.resources) {
-            for (const lang in languages.resources) {
-                if (languages.resources.hasOwnProperty(lang)) {
-                    languages[lang] = languages.resources[lang].translation;
-                }
-            }
-            delete languages.resources;
-        }
-        if (languages.lng) {
-            languages.language = languages.lng;
-            delete languages.lng;
-        }
-        // Do not use these configurations.
-        delete languages.nsSeparator;
-        delete languages.keySeparator;
-        delete languages.pluralSeparator;
-        delete languages.contextSeparator;
-        // Now establish the languages default.
-        if (languages.language) {
-            this.language = languages.language;
-        }
-        for (const lang in languages) {
-            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
-                if (!this.languages[lang]) {
-                    this.languages[lang] = {};
-                }
-                this.languages[lang] = noDefaultOverride
-                    ? Object.assign(Object.assign({}, languages[lang]), this.languages[lang]) : Object.assign(Object.assign({}, this.languages[lang]), languages[lang]);
-            }
-        }
-    }
-    static init(languages = {}) {
-        return new I18n(languages);
-    }
-    dir(lang = '') {
-        lang = lang || this.language;
-        const rtls = ['ar', 'he', 'fa', 'ps', 'ur'];
-        return rtls.includes(lang) ? 'rtl' : 'ltr';
-    }
-    static createInstance() {
-        return new I18n();
-    }
-    changeLanguage(language, ready = null) {
-        if (!this.languages[language]) {
-            language = 'en';
-        }
-        this.language = language;
-        this.currentLanguage = this.languages[language] ? this.languages[language] : {};
-        if (ready) {
-            ready();
-        }
-    }
-    addResourceBundle(language, type, strings) {
-        this.languages[language] = strings;
-    }
-    t(text, ...args) {
-        var _a;
-        let currentTranslation = this.currentLanguage[text];
-        // provide compatibility with cases where the entire phrase is used as a key
-        // get the phrase that is possibly being used as a key
-        const defaultKey = this.defaultKeys[text];
-        if (defaultKey && this.currentLanguage[defaultKey]) {
-            // get translation using the phrase as a key
-            currentTranslation = this.currentLanguage[defaultKey];
-        }
-        if (currentTranslation) {
-            const customTranslationFieldName = (_a = args[0]) === null || _a === void 0 ? void 0 : _a.field;
-            if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
-                args[0].field = this.currentLanguage[customTranslationFieldName];
-            }
-            return utils_1.Evaluator.interpolateString(currentTranslation, ...args);
-        }
-        return utils_1.Evaluator.interpolateString(text, ...args);
-    }
-}
-exports.I18n = I18n;
-I18n.languages = i18Defaults;

package/lib/mjs/i18n.d.ts

@@ -1,13 +0,0 @@
-declare namespace _default {
-    let lng: string;
-    let nsSeparator: string;
-    let keySeparator: string;
-    let pluralSeparator: string;
-    let contextSeparator: string;
-    namespace resources {
-        namespace en {
-            let translation: any;
-        }
-    }
-}
-export default _default;

package/lib/mjs/i18n.js

@@ -1,14 +0,0 @@
-import enTranslation from './translations/en';
-import { fastCloneDeep } from './utils/utils';
-export default {
-    lng: 'en',
-    nsSeparator: '::',
-    keySeparator: '.|.',
-    pluralSeparator: '._.',
-    contextSeparator: '._.',
-    resources: {
-        en: {
-            translation: fastCloneDeep(enTranslation)
-        }
-    }
-};

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

@@ -1,19 +0,0 @@
-/**
- * This file is used to mimic the i18n library interface.
- */
-export class I18n {
-    static languages: {};
-    static setDefaultTranslations(languages: any): void;
-    static init(languages?: {}): I18n;
-    static createInstance(): I18n;
-    constructor(languages?: {});
-    languages: any;
-    defaultKeys: any;
-    language: string;
-    currentLanguage: any;
-    setLanguages(languages: any, noDefaultOverride: any): void;
-    dir(lang?: string): "rtl" | "ltr";
-    changeLanguage(language: any, ready?: null): void;
-    addResourceBundle(language: any, type: any, strings: any): void;
-    t(text: any, ...args: any[]): any;
-}

package/lib/mjs/utils/i18n.js

@@ -1,112 +0,0 @@
-import { Evaluator } from '@formio/core/utils';
-import i18n from '../i18n';
-import { isEmpty } from 'lodash';
-import { fastCloneDeep } from '@formio/core';
-const i18Defaults = {};
-for (const lang in i18n.resources) {
-    if (i18n.resources.hasOwnProperty(lang)) {
-        i18Defaults[lang] = i18n.resources[lang].translation;
-    }
-}
-/**
- * This file is used to mimic the i18n library interface.
- */
-export class I18n {
-    static languages = i18Defaults;
-    languages = fastCloneDeep(I18n.languages || {});
-    defaultKeys = I18n.languages?.en || {};
-    language = 'en';
-    currentLanguage = i18Defaults.en;
-    constructor(languages = {}) {
-        this.setLanguages(languages);
-        this.changeLanguage(this.language);
-    }
-    static setDefaultTranslations(languages) {
-        if (isEmpty(languages)) {
-            return;
-        }
-        for (const lang in languages) {
-            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
-                if (!this.languages[lang]) {
-                    this.languages[lang] = {};
-                }
-                this.languages[lang] = { ...languages[lang], ...this.languages[lang], };
-            }
-        }
-    }
-    setLanguages(languages, noDefaultOverride) {
-        if (languages.resources) {
-            for (const lang in languages.resources) {
-                if (languages.resources.hasOwnProperty(lang)) {
-                    languages[lang] = languages.resources[lang].translation;
-                }
-            }
-            delete languages.resources;
-        }
-        if (languages.lng) {
-            languages.language = languages.lng;
-            delete languages.lng;
-        }
-        // Do not use these configurations.
-        delete languages.nsSeparator;
-        delete languages.keySeparator;
-        delete languages.pluralSeparator;
-        delete languages.contextSeparator;
-        // Now establish the languages default.
-        if (languages.language) {
-            this.language = languages.language;
-        }
-        for (const lang in languages) {
-            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
-                if (!this.languages[lang]) {
-                    this.languages[lang] = {};
-                }
-                this.languages[lang] = noDefaultOverride
-                    ? { ...languages[lang], ...this.languages[lang] }
-                    : { ...this.languages[lang], ...languages[lang] };
-            }
-        }
-    }
-    static init(languages = {}) {
-        return new I18n(languages);
-    }
-    dir(lang = '') {
-        lang = lang || this.language;
-        const rtls = ['ar', 'he', 'fa', 'ps', 'ur'];
-        return rtls.includes(lang) ? 'rtl' : 'ltr';
-    }
-    static createInstance() {
-        return new I18n();
-    }
-    changeLanguage(language, ready = null) {
-        if (!this.languages[language]) {
-            language = 'en';
-        }
-        this.language = language;
-        this.currentLanguage = this.languages[language] ? this.languages[language] : {};
-        if (ready) {
-            ready();
-        }
-    }
-    addResourceBundle(language, type, strings) {
-        this.languages[language] = strings;
-    }
-    t(text, ...args) {
-        let currentTranslation = this.currentLanguage[text];
-        // provide compatibility with cases where the entire phrase is used as a key
-        // get the phrase that is possibly being used as a key
-        const defaultKey = this.defaultKeys[text];
-        if (defaultKey && this.currentLanguage[defaultKey]) {
-            // get translation using the phrase as a key
-            currentTranslation = this.currentLanguage[defaultKey];
-        }
-        if (currentTranslation) {
-            const customTranslationFieldName = args[0]?.field;
-            if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
-                args[0].field = this.currentLanguage[customTranslationFieldName];
-            }
-            return Evaluator.interpolateString(currentTranslation, ...args);
-        }
-        return Evaluator.interpolateString(text, ...args);
-    }
-}