Skip to content

Commit afdab11

Browse files
author
“Bastien
committed
Fix inconsistency for rules targeting another column than the current one
1 parent 914ddbc commit afdab11

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

Diff for: src/chart/table/TableChart.tsx

+11-4
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,20 @@ export const NeoTableChart = (props: ChartProps) => {
249249
let validRuleClass = '';
250250
for (const [index, rule] of styleRules.entries()) {
251251
let ruleClass = '';
252-
if (rule.targetField && rule.targetField === params.field) {
253-
ruleClass = `rule${evaluateSingleRuleOnDict({ [rule.field]: params.row[rule.field] }, rule, index, [e])}`;
254-
} else {
252+
// If the rule target is not the current cell
253+
if (rule.targetField) {
254+
if (rule.targetField === params.field) {
255+
ruleClass = `rule${evaluateSingleRuleOnDict({ [rule.field]: params.row[rule.field] }, rule, index, [
256+
e,
257+
])}`;
258+
}
259+
}
260+
// If the rule target is the current cell
261+
else if (rule.field === params.field) {
255262
ruleClass = `rule${evaluateSingleRuleOnDict({ [params.field]: params.value }, rule, index, [e])}`;
256263
}
257264
// If rule class is valid (rule-1 means rule check has failed)
258-
if (ruleClass !== 'rule-1') {
265+
if (ruleClass && ruleClass !== 'rule-1') {
259266
validRuleClass = ruleClass;
260267
break;
261268
}

0 commit comments

Comments
 (0)