@formio/js 5.0.2-rc.1 → 5.0.2-rc.3

package/dist/formio.utils.min.js.LICENSE.txt

@@ -20,7 +20,7 @@
 
 /*! @license DOMPurify 3.1.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.6/LICENSE */
 
-/*! formiojs v5.0.2-rc.1 | https://unpkg.com/formiojs@5.0.2-rc.1/LICENSE.txt */
+/*! formiojs v5.0.2-rc.3 | https://unpkg.com/formiojs@5.0.2-rc.3/LICENSE.txt */
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 

package/lib/cjs/Embed.js

@@ -418,7 +418,7 @@ Formio.formioReady = new Promise((ready, reject) => {
     _a._formioReady = ready;
     _a._formioReadyReject = reject;
 });
-Formio.version = '5.0.2-rc.1';
+Formio.version = '5.0.2-rc.3';
 // Create a report.
 Formio.Report = {
     create: (element, submission, options = {}) => __awaiter(void 0, void 0, void 0, function* () {

package/lib/cjs/Formio.js

@@ -11,7 +11,7 @@ const CDN_1 = __importDefault(require("./CDN"));
 const providers_1 = __importDefault(require("./providers"));
 sdk_1.Formio.cdn = new CDN_1.default();
 sdk_1.Formio.Providers = providers_1.default;
-sdk_1.Formio.version = '5.0.2-rc.1';
+sdk_1.Formio.version = '5.0.2-rc.3';
 CDN_1.default.defaultCDN = sdk_1.Formio.version.includes('rc') ? 'https://cdn.test-form.io' : 'https://cdn.form.io';
 const isNil = (val) => val === null || val === undefined;
 sdk_1.Formio.prototype.uploadFile = function (storage, file, fileName, dir, progressCallback, url, options, fileKey, groupPermissions, groupId, uploadStartCallback, abortCallback, multipartOptions) {

package/lib/cjs/utils/utils.js

@@ -34,6 +34,7 @@ const Evaluator_1 = require("./Evaluator");
 Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
 const conditionOperators_1 = __importDefault(require("./conditionOperators"));
 exports.ConditionOperators = conditionOperators_1.default;
+const core_1 = require("@formio/core");
 const interpolate = Evaluator_1.Evaluator.interpolate;
 exports.interpolate = interpolate;
 __exportStar(require("./formUtils"), exports);
@@ -282,7 +283,7 @@ function checkSimpleConditional(component, condition, row, data, instance) {
             default:
                 result = lodash_1.default.every(conditionsResult.flat(), res => !!res);
         }
-        return show ? result : !result;
+        return (0, core_1.convertShowToBoolean)(show) ? result : !result;
     }
 }
 exports.checkSimpleConditional = checkSimpleConditional;
@@ -295,12 +296,12 @@ exports.checkSimpleConditional = checkSimpleConditional;
  */
 function getComponentActualValue(compPath, data, row) {
     let value = null;
-    if (row) {
-        value = (0, formUtils_1.getValue)({ data: row }, compPath);
-    }
-    if (data && lodash_1.default.isNil(value)) {
+    if (data) {
         value = (0, formUtils_1.getValue)({ data }, compPath);
     }
+    if (row && lodash_1.default.isNil(value)) {
+        value = (0, formUtils_1.getValue)({ data: row }, compPath);
+    }
     // FOR-400 - Fix issue where falsey values were being evaluated as show=true
     if (lodash_1.default.isNil(value) || (lodash_1.default.isObject(value) && lodash_1.default.isEmpty(value))) {
         value = '';

package/lib/mjs/Embed.js

@@ -14,7 +14,7 @@ export class Formio {
         Formio._formioReady = ready;
         Formio._formioReadyReject = reject;
     });
-    static version = '5.0.2-rc.1';
+    static version = '5.0.2-rc.3';
     static setLicense(license, norecurse = false) {
         Formio.license = license;
         if (!norecurse && Formio.FormioClass) {

package/lib/mjs/Formio.js

@@ -4,7 +4,7 @@ import CDN from './CDN';
 import Providers from './providers';
 FormioCore.cdn = new CDN();
 FormioCore.Providers = Providers;
-FormioCore.version = '5.0.2-rc.1';
+FormioCore.version = '5.0.2-rc.3';
 CDN.defaultCDN = FormioCore.version.includes('rc') ? 'https://cdn.test-form.io' : 'https://cdn.form.io';
 const isNil = (val) => val === null || val === undefined;
 FormioCore.prototype.uploadFile = function (storage, file, fileName, dir, progressCallback, url, options, fileKey, groupPermissions, groupId, uploadStartCallback, abortCallback, multipartOptions) {

package/lib/mjs/utils/utils.js

@@ -8,6 +8,7 @@ import dompurify from 'dompurify';
 import { getValue } from './formUtils';
 import { Evaluator } from './Evaluator';
 import ConditionOperators from './conditionOperators';
+import { convertShowToBoolean } from '@formio/core';
 const interpolate = Evaluator.interpolate;
 export * from './formUtils';
 // Configure JsonLogic
@@ -247,7 +248,7 @@ export function checkSimpleConditional(component, condition, row, data, instance
             default:
                 result = _.every(conditionsResult.flat(), res => !!res);
         }
-        return show ? result : !result;
+        return convertShowToBoolean(show) ? result : !result;
     }
 }
 /**
@@ -259,12 +260,12 @@ export function checkSimpleConditional(component, condition, row, data, instance
  */
 export function getComponentActualValue(compPath, data, row) {
     let value = null;
-    if (row) {
-        value = getValue({ data: row }, compPath);
-    }
-    if (data && _.isNil(value)) {
+    if (data) {
         value = getValue({ data }, compPath);
     }
+    if (row && _.isNil(value)) {
+        value = getValue({ data: row }, compPath);
+    }
     // FOR-400 - Fix issue where falsey values were being evaluated as show=true
     if (_.isNil(value) || (_.isObject(value) && _.isEmpty(value))) {
         value = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.2-rc.1",
+  "version": "5.0.2-rc.3",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.2-rc.1",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.3.2",
+    "@formio/core": "2.3.3-rc.1",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",