@formio/js 5.1.0-dev.6208.59bdd3f → 5.1.0-dev.6211.5d30602

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

@@ -17,8 +17,5 @@ export class DefaultEvaluator extends CoreEvaluator {
     template(template: any, hash: any): any;
     interpolate(rawTemplate: any, data: any, _options: any): any;
 }
-/**
- * @type {DefaultEvaluator}
- */
-export const Evaluator: DefaultEvaluator;
+export let Evaluator: DefaultEvaluator;
 import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/cjs/utils/Evaluator.js

@@ -60,32 +60,7 @@ class DefaultEvaluator extends core_1.DefaultEvaluator {
     }
 }
 exports.DefaultEvaluator = DefaultEvaluator;
-let currentEvaluator = new DefaultEvaluator();
-/**
- *Create evaluator object that forwards calls to current evaluator
- * to provide access to actual Evaluator instance via formioUtils
- */
-function createEvaluatorObject() {
-    return {
-        get cache() { return currentEvaluator.cache; },
-        set cache(value) { currentEvaluator.cache = value; },
-        get noeval() { return currentEvaluator.noeval; },
-        set noeval(value) { currentEvaluator.noeval = value; },
-        get protectedEval() { return currentEvaluator.protectedEval; },
-        set protectedEval(value) { currentEvaluator.protectedEval = value; },
-        get templateSettings() { return currentEvaluator.templateSettings; },
-        set templateSettings(value) { currentEvaluator.templateSettings = value; },
-        evaluator: (...args) => currentEvaluator.evaluator ? currentEvaluator.evaluator(...args) : undefined,
-        interpolate: (...args) => currentEvaluator.interpolate ? currentEvaluator.interpolate(...args) : undefined,
-        evaluate: (...args) => currentEvaluator.evaluate ? currentEvaluator.evaluate(...args) : undefined,
-        template: (...args) => currentEvaluator.template ? currentEvaluator.template(...args) : undefined,
-    };
-}
-// for compatibility with @formio/protected-eval
-/**
- * @type {DefaultEvaluator}
- */
-exports.Evaluator = createEvaluatorObject();
+exports.Evaluator = new DefaultEvaluator();
 // preserve the standalone interpolate function for backwards compatibility
 /**
  * For backwards compatibility we a standalone interpolate function. This merely calls the
@@ -94,7 +69,7 @@ exports.Evaluator = createEvaluatorObject();
  * @returns {any} the interpolation result.
  */
 function interpolate(...args) {
-    return currentEvaluator.interpolate(...args);
+    return exports.Evaluator.interpolate(...args);
 }
 exports.interpolate = interpolate;
 /**
@@ -103,8 +78,6 @@ exports.interpolate = interpolate;
  * @returns {void}
  */
 function registerEvaluator(override) {
-    currentEvaluator = override;
-    // Update the Evaluator object methods to point to new evaluator
-    Object.assign(exports.Evaluator, createEvaluatorObject());
+    exports.Evaluator = override;
 }
 exports.registerEvaluator = registerEvaluator;

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

@@ -2,8 +2,7 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    DefaultEvaluator: typeof DefaultEvaluator;
-    Evaluator: DefaultEvaluator;
+    Evaluator: import("./Evaluator").DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -166,7 +165,6 @@ declare const FormioUtils: {
 };
 import { Evaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
-import { DefaultEvaluator } from './Evaluator';
 import { interpolate } from './Evaluator';
 import moment from 'moment';
 export { FormioUtils as Utils, Evaluator, registerEvaluator };

package/lib/cjs/utils/index.js

@@ -38,8 +38,7 @@ Object.defineProperty(exports, "registerEvaluator", { enumerable: true, get: fun
 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), { DefaultEvaluator: Evaluator_1.DefaultEvaluator,
-    Evaluator: Evaluator_1.Evaluator,
+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,

package/lib/cjs/widgets/CalendarWidget.js

@@ -246,6 +246,9 @@ class CalendarWidget extends InputWidget_1.default {
         if (!this.calendar) {
             return super.getValue();
         }
+        if (this.settings.isManuallyOverriddenValue) {
+            return this.settings.manualInputValue;
+        }
         // Get the selected dates from the calendar widget.
         const dates = this.calendar.selectedDates;
         if (!dates || !dates.length) {
@@ -353,6 +356,15 @@ class CalendarWidget extends InputWidget_1.default {
                 this.calendar.updateValue(false);
             });
         }
+        // Move input attributes to altInput.
+        const labelledbyIds = this.calendar.input.getAttribute('aria-labelledby');
+        const isRequired = this.calendar.input.getAttribute('aria-required');
+        this.calendar.altInput.id = this._input.id;
+        this.calendar.altInput.setAttribute('aria-labelledby', labelledbyIds);
+        this.calendar.altInput.setAttribute('aria-required', isRequired);
+        this._input.removeAttribute('id');
+        this._input.removeAttribute('aria-labelledby');
+        this._input.removeAttribute('aria-required');
         const excludedFromMaskFormats = ['MMMM'];
         if (!this.settings.readOnly && !lodash_1.default.some(excludedFromMaskFormats, format => lodash_1.default.includes(this.settings.format, format))) {
             // Enforce the input mask of the format.

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

@@ -17,8 +17,5 @@ export class DefaultEvaluator extends CoreEvaluator {
     template(template: any, hash: any): any;
     interpolate(rawTemplate: any, data: any, _options: any): any;
 }
-/**
- * @type {DefaultEvaluator}
- */
-export const Evaluator: DefaultEvaluator;
+export let Evaluator: DefaultEvaluator;
 import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/mjs/utils/Evaluator.js

@@ -50,32 +50,7 @@ export class DefaultEvaluator extends CoreEvaluator {
         return template;
     }
 }
-let currentEvaluator = new DefaultEvaluator();
-/**
- *Create evaluator object that forwards calls to current evaluator
- * to provide access to actual Evaluator instance via formioUtils
- */
-function createEvaluatorObject() {
-    return {
-        get cache() { return currentEvaluator.cache; },
-        set cache(value) { currentEvaluator.cache = value; },
-        get noeval() { return currentEvaluator.noeval; },
-        set noeval(value) { currentEvaluator.noeval = value; },
-        get protectedEval() { return currentEvaluator.protectedEval; },
-        set protectedEval(value) { currentEvaluator.protectedEval = value; },
-        get templateSettings() { return currentEvaluator.templateSettings; },
-        set templateSettings(value) { currentEvaluator.templateSettings = value; },
-        evaluator: (...args) => currentEvaluator.evaluator ? currentEvaluator.evaluator(...args) : undefined,
-        interpolate: (...args) => currentEvaluator.interpolate ? currentEvaluator.interpolate(...args) : undefined,
-        evaluate: (...args) => currentEvaluator.evaluate ? currentEvaluator.evaluate(...args) : undefined,
-        template: (...args) => currentEvaluator.template ? currentEvaluator.template(...args) : undefined,
-    };
-}
-// for compatibility with @formio/protected-eval
-/**
- * @type {DefaultEvaluator}
- */
-export const Evaluator = createEvaluatorObject();
+export let Evaluator = new DefaultEvaluator();
 // preserve the standalone interpolate function for backwards compatibility
 /**
  * For backwards compatibility we a standalone interpolate function. This merely calls the
@@ -84,7 +59,7 @@ export const Evaluator = createEvaluatorObject();
  * @returns {any} the interpolation result.
  */
 export function interpolate(...args) {
-    return currentEvaluator.interpolate(...args);
+    return Evaluator.interpolate(...args);
 }
 /**
  * Set the evaluator to use for evaluating expressions.
@@ -92,7 +67,5 @@ export function interpolate(...args) {
  * @returns {void}
  */
 export function registerEvaluator(override) {
-    currentEvaluator = override;
-    // Update the Evaluator object methods to point to new evaluator
-    Object.assign(Evaluator, createEvaluatorObject());
+    Evaluator = override;
 }

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

@@ -2,8 +2,7 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    DefaultEvaluator: typeof DefaultEvaluator;
-    Evaluator: DefaultEvaluator;
+    Evaluator: import("./Evaluator").DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -166,7 +165,6 @@ declare const FormioUtils: {
 };
 import { Evaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
-import { DefaultEvaluator } from './Evaluator';
 import { interpolate } from './Evaluator';
 import moment from 'moment';
 export { FormioUtils as Utils, Evaluator, registerEvaluator };

package/lib/mjs/utils/index.js

@@ -1,13 +1,12 @@
 import * as utils from './utils';
 import * as formUtils from './formUtils';
-import { Evaluator, registerEvaluator, interpolate, DefaultEvaluator } from './Evaluator';
+import { Evaluator, registerEvaluator, interpolate } from './Evaluator';
 import ConditionOperators from './conditionOperators';
 import _ from 'lodash';
 import moment from 'moment';
 const FormioUtils = {
     ...utils,
     ...formUtils,
-    DefaultEvaluator,
     Evaluator,
     interpolate,
     ConditionOperators,

package/lib/mjs/widgets/CalendarWidget.js

@@ -238,6 +238,9 @@ export default class CalendarWidget extends InputWidget {
         if (!this.calendar) {
             return super.getValue();
         }
+        if (this.settings.isManuallyOverriddenValue) {
+            return this.settings.manualInputValue;
+        }
         // Get the selected dates from the calendar widget.
         const dates = this.calendar.selectedDates;
         if (!dates || !dates.length) {
@@ -344,6 +347,15 @@ export default class CalendarWidget extends InputWidget {
                 this.calendar.updateValue(false);
             });
         }
+        // Move input attributes to altInput.
+        const labelledbyIds = this.calendar.input.getAttribute('aria-labelledby');
+        const isRequired = this.calendar.input.getAttribute('aria-required');
+        this.calendar.altInput.id = this._input.id;
+        this.calendar.altInput.setAttribute('aria-labelledby', labelledbyIds);
+        this.calendar.altInput.setAttribute('aria-required', isRequired);
+        this._input.removeAttribute('id');
+        this._input.removeAttribute('aria-labelledby');
+        this._input.removeAttribute('aria-required');
         const excludedFromMaskFormats = ['MMMM'];
         if (!this.settings.readOnly && !_.some(excludedFromMaskFormats, format => _.includes(this.settings.format, format))) {
             // Enforce the input mask of the format.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6208.59bdd3f",
+  "version": "5.1.0-dev.6211.5d30602",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {