@crystaldesign/diva-backoffice 26.5.0-beta.10 → 26.5.0-beta.12

package/build/esm/index.js

@@ -27741,21 +27741,47 @@ function StringCell (_ref) {
     });
   }
 }
+function matchesColorCondition(record, value, operation, field, onValue) {
+  if (onValue === undefined) {
+    return false;
+  }
+  var currentValue = field ? record === null || record === void 0 ? void 0 : record[field] : value;
+  if (operation === 'ct') {
+    var _JSON$stringify$inclu, _JSON$stringify;
+    return (_JSON$stringify$inclu = (_JSON$stringify = JSON.stringify(currentValue)) === null || _JSON$stringify === void 0 ? void 0 : _JSON$stringify.includes(String(onValue))) !== null && _JSON$stringify$inclu !== void 0 ? _JSON$stringify$inclu : false;
+  }
+  return currentValue === onValue;
+}
 function getColor(column, record, value) {
   if (column.color && record) {
     var _iterator = _createForOfIteratorHelper$b(column.color),
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _col$fields;
         var col = _step.value;
-        for (var idx = 0; idx < col.onValues.length; idx++) {
-          var _col$fields, _col$operations, _col$onValues, _JSON$stringify;
-          var field = (_col$fields = col.fields) === null || _col$fields === void 0 ? void 0 : _col$fields[idx];
-          var operation = (_col$operations = col.operations) === null || _col$operations === void 0 ? void 0 : _col$operations[0];
-          var onValue = (_col$onValues = col.onValues) === null || _col$onValues === void 0 ? void 0 : _col$onValues[idx];
-          if (!field && operation === 'eq' && onValue === value) {
+        if ((_col$fields = col.fields) !== null && _col$fields !== void 0 && _col$fields.length) {
+          var hasAllMatches = true;
+          for (var idx = 0; idx < col.fields.length; idx++) {
+            var _ref2, _col$operations$idx, _col$operations, _col$operations2, _col$onValues;
+            var field = col.fields[idx];
+            var operation = (_ref2 = (_col$operations$idx = (_col$operations = col.operations) === null || _col$operations === void 0 ? void 0 : _col$operations[idx]) !== null && _col$operations$idx !== void 0 ? _col$operations$idx : (_col$operations2 = col.operations) === null || _col$operations2 === void 0 ? void 0 : _col$operations2[0]) !== null && _ref2 !== void 0 ? _ref2 : 'eq';
+            var onValue = (_col$onValues = col.onValues) === null || _col$onValues === void 0 ? void 0 : _col$onValues[idx];
+            if (!field || !matchesColorCondition(record, value, operation, field, onValue)) {
+              hasAllMatches = false;
+              break;
+            }
+          }
+          if (hasAllMatches) {
             return col.color;
-          } else if (field && operation === 'ct' && (_JSON$stringify = JSON.stringify(record[field])) !== null && _JSON$stringify !== void 0 && _JSON$stringify.includes(onValue)) {
+          }
+          continue;
+        }
+        for (var _idx = 0; _idx < col.onValues.length; _idx++) {
+          var _ref3, _col$operations$_idx, _col$operations3, _col$operations4, _col$onValues2;
+          var _operation = (_ref3 = (_col$operations$_idx = (_col$operations3 = col.operations) === null || _col$operations3 === void 0 ? void 0 : _col$operations3[_idx]) !== null && _col$operations$_idx !== void 0 ? _col$operations$_idx : (_col$operations4 = col.operations) === null || _col$operations4 === void 0 ? void 0 : _col$operations4[0]) !== null && _ref3 !== void 0 ? _ref3 : 'eq';
+          var _onValue = (_col$onValues2 = col.onValues) === null || _col$onValues2 === void 0 ? void 0 : _col$onValues2[_idx];
+          if (matchesColorCondition(record, value, _operation, undefined, _onValue)) {
             return col.color;
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "26.5.0-beta.10",
+  "version": "26.5.0-beta.12",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,13 +15,13 @@
   "dependencies": {
     "@ant-design/icons": "6.1.0",
     "@babel/runtime": "7.24.7",
-    "@crystaldesign/content-box": "26.5.0-beta.10",
-    "@crystaldesign/content-item": "26.5.0-beta.10",
-    "@crystaldesign/diva-core": "26.5.0-beta.10",
-    "@crystaldesign/diva-utils": "26.5.0-beta.10",
-    "@crystaldesign/media-upload": "26.5.0-beta.10",
-    "@crystaldesign/rtf-editor": "26.5.0-beta.10",
-    "@crystaldesign/spreadsheet": "26.5.0-beta.10",
+    "@crystaldesign/content-box": "26.5.0-beta.12",
+    "@crystaldesign/content-item": "26.5.0-beta.12",
+    "@crystaldesign/diva-core": "26.5.0-beta.12",
+    "@crystaldesign/diva-utils": "26.5.0-beta.12",
+    "@crystaldesign/media-upload": "26.5.0-beta.12",
+    "@crystaldesign/rtf-editor": "26.5.0-beta.12",
+    "@crystaldesign/spreadsheet": "26.5.0-beta.12",
     "@google/model-viewer": "3.5.0",
     "ag-charts-community": "^10.1.0",
     "ag-charts-react": "^10.1.0",
@@ -52,5 +52,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "60d7faa2bc98e756c78081657626ab7a090688e4"
+  "gitHead": "fdca8b6238ce9d8d6b21b66eb5b71e7ab18c4472"
 }