@formio/js 5.1.0-dev.6214.89da41f → 5.1.0-dev.6215.61ce056

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.interpolate(string, evalContext, options);
+            return utils_1.default.Evaluator.interpolate(string, evalContext, options);
         }
-        return utils_1.default.interpolate(string, this.evalContext(data), options);
+        return utils_1.default.Evaluator.interpolate(string, this.evalContext(data), options);
     }
     /**
      * Performs an evaluation using the evaluation context of this component.

package/lib/cjs/WebformBuilder.js

@@ -1206,6 +1206,7 @@ class WebformBuilder extends Component_1.default {
             submissionData = submissionData.componentJson || submissionData;
             if (submissionData.components && this.originalDefaultValue) {
                 submissionData.components = this.originalDefaultValue.components;
+                this.originalDefaultValue = null;
             }
             const fieldsToRemoveDoubleQuotes = ['label', 'tooltip'];
             this.replaceDoubleQuotes(submissionData, fieldsToRemoveDoubleQuotes);

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/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.interpolate(string, evalContext, options);
+            return FormioUtils.Evaluator.interpolate(string, evalContext, options);
         }
-        return FormioUtils.interpolate(string, this.evalContext(data), options);
+        return FormioUtils.Evaluator.interpolate(string, this.evalContext(data), options);
     }
     /**
      * Performs an evaluation using the evaluation context of this component.

package/lib/mjs/WebformBuilder.js

@@ -1188,6 +1188,7 @@ export default class WebformBuilder extends Component {
             submissionData = submissionData.componentJson || submissionData;
             if (submissionData.components && this.originalDefaultValue) {
                 submissionData.components = this.originalDefaultValue.components;
+                this.originalDefaultValue = null;
             }
             const fieldsToRemoveDoubleQuotes = ['label', 'tooltip'];
             this.replaceDoubleQuotes(submissionData, fieldsToRemoveDoubleQuotes);

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6214.89da41f",
+  "version": "5.1.0-dev.6215.61ce056",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {