@formio/js 5.1.0-dev.6058.189ce78 → 5.1.0-dev.6059.845a6e3

package/lib/mjs/utils/i18n.js

@@ -1,7 +1,5 @@
 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)) {
@@ -12,29 +10,14 @@ for (const lang in i18n.resources) {
  * This file is used to mimic the i18n library interface.
  */
 export class I18n {
-    static languages = i18Defaults;
-    languages = fastCloneDeep(I18n.languages || {});
-    defaultKeys = I18n.languages?.en || {};
+    languages = i18Defaults;
     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) {
+    setLanguages(languages) {
         if (languages.resources) {
             for (const lang in languages.resources) {
                 if (languages.resources.hasOwnProperty(lang)) {
@@ -61,9 +44,7 @@ export class I18n {
                 if (!this.languages[lang]) {
                     this.languages[lang] = {};
                 }
-                this.languages[lang] = noDefaultOverride
-                    ? { ...languages[lang], ...this.languages[lang] }
-                    : { ...this.languages[lang], ...languages[lang] };
+                this.languages[lang] = { ...this.languages[lang], ...languages[lang] };
             }
         }
     }
@@ -92,20 +73,12 @@ export class I18n {
         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) {
+        if (this.currentLanguage[text]) {
             const customTranslationFieldName = args[0]?.field;
             if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
                 args[0].field = this.currentLanguage[customTranslationFieldName];
             }
-            return Evaluator.interpolateString(currentTranslation, ...args);
+            return Evaluator.interpolateString(this.currentLanguage[text], ...args);
         }
         return Evaluator.interpolateString(text, ...args);
     }

package/lib/mjs/widgets/CalendarWidget.js

@@ -87,6 +87,8 @@ export default class CalendarWidget extends InputWidget {
         this.settings.disableWeekends ? this.settings.disable.push(this.disableWeekends) : '';
         this.settings.disableWeekdays ? this.settings.disable.push(this.disableWeekdays) : '';
         this.settings.disableFunction ? this.settings.disable.push(this.disableFunction) : '';
+        this.settings.wasDefaultValueChanged = false;
+        this.settings.defaultValue = '';
         this.settings.manualInputValue = '';
         this.settings.isManuallyOverriddenValue = false;
         this.settings.currentValue = '';
@@ -94,8 +96,14 @@ export default class CalendarWidget extends InputWidget {
         this.settings.dateFormat = convertFormatToFlatpickr(this.settings.dateFormat);
         this.settings.position = 'auto center';
         this.settings.onChange = () => {
-            if (this.settings.allowInput && this.settings.enableTime) {
-                this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
+            if (this.settings.allowInput) {
+                if (this.settings.isManuallyOverriddenValue && this.settings.enableTime) {
+                    this.calendar._input.value = this.settings.manualInputValue;
+                }
+                else {
+                    this.settings.manualInputValue = '';
+                }
+                this.settings.isManuallyOverriddenValue = false;
             }
             this.emit('update');
         };
@@ -104,15 +112,20 @@ export default class CalendarWidget extends InputWidget {
             this.hook('onCalendarClose');
             this.closedOn = Date.now();
             if (this.settings.allowInput && this.settings.enableTime) {
-                this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
+                this.calendar._input.value = this.settings.manualInputValue || this.calendar._input.value;
+                this.settings.isManuallyOverriddenValue = false;
                 this.emit('update');
             }
+            if (this.settings.wasDefaultValueChanged) {
+                this.calendar._input.value = this.settings.defaultValue;
+                this.settings.wasDefaultValueChanged = false;
+            }
             if (this.calendar) {
                 this.emit('blur');
             }
         };
         Formio.requireLibrary('flatpickr-css', 'flatpickr', [
-            { type: 'styles', src: `${Formio.cdn['flatpickr']}/flatpickr.min.css` }
+            { type: 'styles', src: `${Formio.cdn['flatpickr-formio']}/flatpickr.min.css` }
         ], true);
         if (this.component.shortcutButtons) {
             this.component.shortcutButtons = this.component.shortcutButtons.filter((btn) => btn.label && btn.onClick);
@@ -129,7 +142,7 @@ export default class CalendarWidget extends InputWidget {
             }
         })
             .then((ShortcutButtonsPlugin) => {
-            return Formio.requireLibrary('flatpickr', 'flatpickr', `${Formio.cdn['flatpickr']}/flatpickr.min.js`, true)
+            return Formio.requireLibrary('flatpickr', 'flatpickr', `${Formio.cdn['flatpickr-formio']}/flatpickr.min.js`, true)
                 .then((Flatpickr) => {
                 if (this.component.shortcutButtons?.length && ShortcutButtonsPlugin) {
                     this.initShortcutButtonsPlugin(ShortcutButtonsPlugin);
@@ -138,7 +151,7 @@ export default class CalendarWidget extends InputWidget {
                 if (this._input) {
                     const { locale } = this.settings;
                     if (locale && locale.length >= 2 && locale !== 'en') {
-                        return Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr.l10ns.${locale}`, `${Formio.cdn['flatpickr']}/l10n/${locale}.js`, true).then(() => this.initFlatpickr(Flatpickr));
+                        return Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr-${locale}`, `${Formio.cdn['flatpickr-formio']}/l10n/flatpickr-${locale}.js`, true).then(() => this.initFlatpickr(Flatpickr));
                     }
                     else {
                         this.initFlatpickr(Flatpickr);
@@ -336,28 +349,19 @@ export default class CalendarWidget extends InputWidget {
         this.calendar = new Flatpickr(this._input, { ...this.settings, disableMobile: true });
         this.addEventListener(this.calendar.altInput, 'input', (event) => {
             if (this.settings.allowInput && this.settings.currentValue !== event.target.value) {
-                if (event.target.mask) {
-                    event.target.mask.textMaskInputElement.update();
-                }
                 this.settings.manualInputValue = event.target.value;
-                this._input.value = this.settings.manualInputValue;
                 this.settings.isManuallyOverriddenValue = true;
                 this.settings.currentValue = event.target.value;
-                this.emit('update');
+            }
+            if (event.target.value === '' && this.calendar.selectedDates.length > 0) {
+                this.settings.wasDefaultValueChanged = true;
+                this.settings.defaultValue = event.target.value;
+                this.calendar.clear();
+            }
+            else {
+                this.settings.wasDefaultValueChanged = false;
             }
         });
-        if (this.calendar.daysContainer) {
-            this.calendar.daysContainer.addEventListener('click', () => {
-                this.settings.isManuallyOverriddenValue = false;
-                this.calendar.updateValue(false);
-            });
-        }
-        if (this.calendar.timeContainer) {
-            this.calendar.timeContainer.addEventListener('click', () => {
-                this.settings.isManuallyOverriddenValue = false;
-                this.calendar.updateValue(false);
-            });
-        }
         const excludedFromMaskFormats = ['MMMM'];
         if (!this.settings.readOnly && !_.some(excludedFromMaskFormats, format => _.includes(this.settings.format, format))) {
             // Enforce the input mask of the format.
@@ -383,10 +387,6 @@ export default class CalendarWidget extends InputWidget {
         }
         // Make sure we commit the value after a blur event occurs.
         this.addEventListener(this.calendar._input, 'blur', (event) => {
-            // If we have manually overridden the value then we shouldn't call setDate because this will fill the input mask
-            if (this.settings.isManuallyOverriddenValue) {
-                return;
-            }
             const activeElement = this.settings.shadowRoot ? this.settings.shadowRoot.activeElement : document.activeElement;
             const relatedTarget = event.relatedTarget ? event.relatedTarget : activeElement;
             if (!(isIEBrowser && !relatedTarget) && !this.isCalendarElement(relatedTarget)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6058.189ce78",
+  "version": "5.1.0-dev.6059.845a6e3",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -56,10 +56,9 @@
     "dopublish": "npm run build && npm run tag && npm publish",
     "lint": "eslint ./src --fix",
     "serve": "jekyll serve --config _config.yml,_config.dev.yml",
-    "test": "nyc --reporter=lcov --reporter=text --reporter=text-summary mocha test/unit/*.unit.js",
-    "test:updateRenders": "npm run lib && cross-env TZ=UTC node --require jsdom-global/register test/updateRenders.js",
-    "test:e2e": "NODE_OPTIONS=\"--max-old-space-size=4096\" karma start --verbose --single-run",
-    "show-coverage": "open coverage/lcov-report/index.html"
+    "test": "mocha 'test/unit/*.unit.js'",
+    "test:updateRenders": "npm run lib && TZ=UTC node --require jsdom-global/register test/updateRenders.js",
+    "test:e2e": "NODE_OPTIONS=\"--max-old-space-size=4096\" karma start --verbose --single-run"
   },
   "repository": {
     "type": "git",
@@ -80,21 +79,21 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "v3.0.0-dev.121.085d187",
-    "@formio/core": "v2.4.0-dev.2",
-    "@formio/text-mask-addons": "3.8.0-formio.4",
+    "@formio/bootstrap": "3.1.0-rc.4",
+    "@formio/choices.js": "^10.2.1",
+    "@formio/core": "2.4.0-rc.12",
+    "@formio/text-mask-addons": "^3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
     "autocompleter": "^8.0.4",
     "bootstrap": "^5.3.3",
     "browser-cookies": "^1.2.0",
     "browser-md5-file": "^1.1.1",
-    "choices.js": "^11.0.6",
-    "compare-versions": "^6.1.1",
+    "compare-versions": "^6.0.0-rc.2",
     "core-js": "^3.37.1",
     "dialog-polyfill": "^0.5.6",
     "dom-autoscroller": "^2.3.4",
-    "dompurify": "^3.1.6",
+    "dompurify": "^3.2.4",
     "downloadjs": "^1.4.7",
     "dragula": "^3.7.3",
     "eventemitter3": "^5.0.1",
@@ -103,7 +102,7 @@
     "idb": "^7.1.1",
     "inputmask": "^5.0.8",
     "ismobilejs": "^1.1.1",
-    "json-logic-js": "^2.0.5",
+    "json-logic-js": "^2.0.2",
     "jstimezonedetect": "^1.0.7",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
@@ -156,7 +155,6 @@
     "mocha": "^10.3.0",
     "mock-local-storage": "^1.1.24",
     "natives": "^1.1.6",
-    "nyc": "^17.0.0",
     "power-assert": "^1.6.1",
     "pre-commit": "^1.2.2",
     "pretty": "^2.0.0",
@@ -176,19 +174,5 @@
     "webpack-cli": "^5.1.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-stream": "^7.0.0"
-  },
-  "nyc": {
-    "check-coverage": true,
-    "statements": 63,
-    "branches": 63,
-    "functions": 61,
-    "lines": 64,
-    "include": [
-      "src/**/*.js"
-    ],
-    "exclude": [
-      "src/**/fixtures"
-    ],
-    "all": true
   }
 }