@formio/js 5.1.0-dev.6211.5d30602 → 5.1.0-dev.6214.89da41f

package/lib/cjs/Element.js

@@ -533,9 +533,9 @@ class Element {
         if (this.component.filter === string && !this.options.building) {
             const evalContext = this.evalContext(data);
             evalContext.data = lodash_1.default.mapValues(evalContext.data, (val) => lodash_1.default.isString(val) ? encodeURIComponent(val) : val);
-            return utils_1.default.Evaluator.interpolate(string, evalContext, options);
+            return utils_1.default.interpolate(string, evalContext, options);
         }
-        return utils_1.default.Evaluator.interpolate(string, this.evalContext(data), options);
+        return utils_1.default.interpolate(string, this.evalContext(data), options);
     }
     /**
      * Performs an evaluation using the evaluation context of this component.

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

@@ -2,7 +2,8 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    Evaluator: import("./Evaluator").DefaultEvaluator;
+    DefaultEvaluator: typeof DefaultEvaluator;
+    Evaluator: DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -165,6 +166,7 @@ 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,7 +38,8 @@ 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), { Evaluator: Evaluator_1.Evaluator,
+const FormioUtils = Object.assign(Object.assign(Object.assign({}, utils), formUtils), { DefaultEvaluator: Evaluator_1.DefaultEvaluator,
+    Evaluator: Evaluator_1.Evaluator,
     interpolate: Evaluator_1.interpolate,
     ConditionOperators: conditionOperators_1.default,
     _: lodash_1.default,

package/lib/cjs/widgets/CalendarWidget.js

@@ -246,9 +246,6 @@ 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) {
@@ -356,15 +353,6 @@ 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/Element.js

@@ -525,9 +525,9 @@ export default class Element {
         if (this.component.filter === string && !this.options.building) {
             const evalContext = this.evalContext(data);
             evalContext.data = _.mapValues(evalContext.data, (val) => _.isString(val) ? encodeURIComponent(val) : val);
-            return FormioUtils.Evaluator.interpolate(string, evalContext, options);
+            return FormioUtils.interpolate(string, evalContext, options);
         }
-        return FormioUtils.Evaluator.interpolate(string, this.evalContext(data), options);
+        return FormioUtils.interpolate(string, this.evalContext(data), options);
     }
     /**
      * Performs an evaluation using the evaluation context of this component.

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

@@ -2,7 +2,8 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    Evaluator: import("./Evaluator").DefaultEvaluator;
+    DefaultEvaluator: typeof DefaultEvaluator;
+    Evaluator: DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -165,6 +166,7 @@ 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,12 +1,13 @@
 import * as utils from './utils';
 import * as formUtils from './formUtils';
-import { Evaluator, registerEvaluator, interpolate } from './Evaluator';
+import { Evaluator, registerEvaluator, interpolate, DefaultEvaluator } 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,9 +238,6 @@ 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) {
@@ -347,15 +344,6 @@ 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.6211.5d30602",
+  "version": "5.1.0-dev.6214.89da41f",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {