@rowsncolumns/spreadsheet 10.5.17 → 10.6.4

package/dist/cjs/hooks/use-conditional-formatting.js

@@ -6,13 +6,15 @@ var grid_1 = require("@rowsncolumns/grid");
 var utils_1 = require("@rowsncolumns/utils");
 var isNil_1 = tslib_1.__importDefault(require("lodash/isNil"));
 var react_1 = require("react");
-var cf_overlays_1 = require("../api/cf-overlays");
+var cf_data_bar_1 = require("../api/cf-data-bar");
 var cf_engine_1 = require("../api/cf-engine");
+var cf_overlays_1 = require("../api/cf-overlays");
+var cf_priority_1 = require("../api/cf-priority");
 var cf_window_1 = require("../api/cf-window");
 var heatmap_1 = require("../api/heatmap");
 var validation_1 = require("../api/validation");
-var themes_1 = require("../themes");
 var config_1 = require("../config");
+var themes_1 = require("../themes");
 /**
  * Merge a lower-priority rule's format under an already-applied one, per
  * property (Excel's stacking): every property the higher-priority format
@@ -52,8 +54,28 @@ var definedEntries = function (obj) {
     }
     return out;
 };
+/** The k-th value a top/bottom-N rule ranks against, from full-range statistics. */
+var fullRangeRankValue = function (stats, rule) {
+    var _a;
+    var top = rule.type === "TOP";
+    if (stats.sorted) {
+        var n = stats.sorted.length;
+        if (!n)
+            return undefined;
+        var k = Math.min(n, Math.max(1, rule.isPercent ? Math.ceil((rule.rank / 100) * n) : rule.rank));
+        return top ? stats.sorted[n - k] : stats.sorted[k - 1];
+    }
+    var value = (_a = stats.rankValue) === null || _a === void 0 ? void 0 : _a.call(stats, rule.rank, top, !!rule.isPercent);
+    return value !== undefined && Number.isFinite(value) ? value : undefined;
+};
 var useConditionalFormatting = function (_a) {
-    var sheetId = _a.sheetId, theme = _a.theme, conditionalFormats = _a.conditionalFormats, locale = _a.locale, getValidationValue = _a.getValidationValue, isNumberValue = _a.isNumberValue, getSheetRowCount = _a.getSheetRowCount, getSheetColumnCount = _a.getSheetColumnCount, evaluationWindow = _a.window, getConditionalFormatResult = _a.getConditionalFormatResult;
+    var sheetId = _a.sheetId, theme = _a.theme, conditionalFormats = _a.conditionalFormats, locale = _a.locale, getValidationValue = _a.getValidationValue, isNumberValue = _a.isNumberValue, getSheetRowCount = _a.getSheetRowCount, getSheetColumnCount = _a.getSheetColumnCount, evaluationWindow = _a.window, getConditionalFormatResult = _a.getConditionalFormatResult, getConditionalFormatRuleStats = _a.getConditionalFormatRuleStats;
+    // Whole-range statistics of windowed rules, keyed by rule id. An entry is
+    // reused while the rule object and the data getters are unchanged —
+    // scrolling (a new window) re-runs the memo below without re-scanning the
+    // full range, and any edit (new getter identity) or rule change
+    // invalidates it.
+    var fullRangeStatsCache = (0, react_1.useRef)(new Map());
     var previousEffectiveValueMap = (0, react_1.useRef)(undefined);
     // Lazy initialization
     var getPreviousValueMap = (0, react_1.useCallback)(function () {
@@ -83,26 +105,13 @@ var useConditionalFormatting = function (_a) {
     }, [getSheetRowCount, getSheetColumnCount]);
     return (0, react_1.useMemo)(function () {
         var e_2, _a;
-        var _b, _c, _d, _e, _f, _g;
+        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         var formattingByCell = new Map();
         if (!conditionalFormats) {
             return formattingByCell;
         }
-        var sortedRules = conditionalFormats
-            .map(function (rule, index) { return ({ rule: rule, index: index }); })
-            .sort(function (left, right) {
-            var _a, _b;
-            var leftPriority = (_a = left.rule.priority) !== null && _a !== void 0 ? _a : Number.POSITIVE_INFINITY;
-            var rightPriority = (_b = right.rule.priority) !== null && _b !== void 0 ? _b : Number.POSITIVE_INFINITY;
-            if (leftPriority === rightPriority) {
-                return left.index - right.index;
-            }
-            return leftPriority - rightPriority;
-        })
-            .map(function (_a) {
-            var rule = _a.rule;
-            return rule;
-        });
+        // Excel precedence: the first rule (lowest `priority`) is evaluated first and wins conflicts.
+        var sortedRules = (0, cf_priority_1.sortConditionalFormatRules)(conditionalFormats);
         var rules = evaluationWindow
             ? (0, cf_window_1.windowConditionalFormatRules)({
                 rules: sortedRules,
@@ -161,13 +170,94 @@ var useConditionalFormatting = function (_a) {
                 finally { if (e_3) throw e_3.error; }
             }
         };
+        // Every numeric covered cell of a rule on this sheet, across all of its
+        // (clamped) ranges — the population Excel resolves cfvo thresholds over.
+        var collectRuleNumbers = function (rule) {
+            var e_4, _a, e_5, _b;
+            var cells = [];
+            try {
+                for (var _c = tslib_1.__values(rule.ranges), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var range = _d.value;
+                    if ((range === null || range === void 0 ? void 0 : range.sheetId) !== sheetId)
+                        continue;
+                    try {
+                        for (var _e = (e_5 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampRange(range)))), _f = _e.next(); !_f.done; _f = _e.next()) {
+                            var _g = tslib_1.__read(_f.value, 2), rowIndex = _g[0], columnIndex = _g[1];
+                            var v = getValidationValue(sheetId, rowIndex, columnIndex, rule);
+                            if (!(0, isNil_1.default)(v) &&
+                                typeof v !== "boolean" &&
+                                isNumberValue(sheetId, rowIndex, columnIndex) &&
+                                Number.isFinite(Number(v))) {
+                                cells.push({ rowIndex: rowIndex, columnIndex: columnIndex, value: Number(v) });
+                            }
+                        }
+                    }
+                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                    finally {
+                        try {
+                            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                        }
+                        finally { if (e_5) throw e_5.error; }
+                    }
+                }
+            }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                }
+                finally { if (e_4) throw e_4.error; }
+            }
+            return cells;
+        };
+        // FORMULA cfvo thresholds: a constant or a single same-sheet cell
+        // reference (`=$B$1`) — the forms Excel's rule dialog produces.
+        var resolveFormula = function (formula) {
+            var match = /^=?\s*\$?([A-Z]{1,3})\$?(\d+)\s*$/i.exec(formula);
+            if (!match)
+                return undefined;
+            var cell = (0, utils_1.addressToCell)("".concat(match[1]).concat(match[2]));
+            if (!cell)
+                return undefined;
+            var value = getValidationValue(sheetId, cell.rowIndex, cell.columnIndex);
+            var num = typeof value === "boolean" ? NaN : Number(value);
+            return (0, isNil_1.default)(value) || value === "" || !Number.isFinite(num)
+                ? undefined
+                : num;
+        };
+        var originalRuleById = new Map(sortedRules.map(function (rule) { return [rule.id, rule]; }));
+        // Statistics over the rule's FULL range when the window cut it (Excel
+        // resolves thresholds over every covered cell, not the visible slice);
+        // `undefined` for a rule evaluated whole, whose loaded values are exact.
+        var fullRangeStats = function (rule) {
+            var _a;
+            var original = originalRuleById.get(rule.id);
+            if (!original || original === rule)
+                return undefined;
+            var cache = fullRangeStatsCache.current;
+            var hit = cache.get(rule.id);
+            if (hit &&
+                hit.rule === original &&
+                hit.getValidationValue === getValidationValue &&
+                hit.isNumberValue === isNumberValue) {
+                return hit.stats;
+            }
+            var stats = (_a = getConditionalFormatRuleStats === null || getConditionalFormatRuleStats === void 0 ? void 0 : getConditionalFormatRuleStats(sheetId, original)) !== null && _a !== void 0 ? _a : (0, cf_overlays_1.buildCfRangeStats)(collectRuleNumbers(original).map(function (cell) { return cell.value; }));
+            cache.set(rule.id, {
+                rule: original,
+                getValidationValue: getValidationValue,
+                isNumberValue: isNumberValue,
+                stats: stats,
+            });
+            return stats;
+        };
         // There can be conditions applied
         // to the same range
         // So to get previous value, we have to save it
         // in a key based on condition index
         var conditionIndex = 0;
         var _loop_1 = function (rule) {
-            var e_4, _h, e_5, _j, e_6, _k, e_7, _l, e_8, _m, e_9, _o, e_10, _p, e_11, _q, e_12, _r, e_13, _s, e_14, _t, e_15, _u, e_16, _v, e_17, _w;
+            var e_6, _p, e_7, _q, e_8, _r, e_9, _s, e_10, _t, e_11, _u, e_12, _v, e_13, _w, e_14, _x, e_15, _y, e_16, _z, e_17, _0;
             var engineStamped = (_b = engineStampedRuleIds === null || engineStampedRuleIds === void 0 ? void 0 : engineStampedRuleIds.has(rule.id)) !== null && _b !== void 0 ? _b : false;
             var ranges = rule.ranges, enabled = rule.enabled, booleanRule = rule.booleanRule, gradientRule = rule.gradientRule, topBottomRule = rule.topBottomRule, distinctRule = rule.distinctRule, iconSetRule = rule.iconSetRule, dataBarRule = rule.dataBarRule;
             // Only look for enabled rules
@@ -176,7 +266,7 @@ var useConditionalFormatting = function (_a) {
             }
             if (booleanRule) {
                 try {
-                    for (var ranges_1 = (e_4 = void 0, tslib_1.__values(ranges)), ranges_1_1 = ranges_1.next(); !ranges_1_1.done; ranges_1_1 = ranges_1.next()) {
+                    for (var ranges_1 = (e_6 = void 0, tslib_1.__values(ranges)), ranges_1_1 = ranges_1.next(); !ranges_1_1.done; ranges_1_1 = ranges_1.next()) {
                         var range = ranges_1_1.value;
                         // Only pick current sheet
                         if ((range === null || range === void 0 ? void 0 : range.sheetId) !== sheetId) {
@@ -197,8 +287,8 @@ var useConditionalFormatting = function (_a) {
                         if (isAboveBelowAverage) {
                             var numericValues = [];
                             try {
-                                for (var _x = (e_5 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _y = _x.next(); !_y.done; _y = _x.next()) {
-                                    var _z = tslib_1.__read(_y.value, 2), rowIndex = _z[0], columnIndex = _z[1];
+                                for (var _1 = (e_7 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _2 = _1.next(); !_2.done; _2 = _1.next()) {
+                                    var _3 = tslib_1.__read(_2.value, 2), rowIndex = _3[0], columnIndex = _3[1];
                                     var value = getValidationValue(sheetId, rowIndex, columnIndex, rule);
                                     if (!(0, isNil_1.default)(value) &&
                                         isNumberValue(sheetId, rowIndex, columnIndex) &&
@@ -207,17 +297,20 @@ var useConditionalFormatting = function (_a) {
                                     }
                                 }
                             }
-                            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                            catch (e_7_1) { e_7 = { error: e_7_1 }; }
                             finally {
                                 try {
-                                    if (_y && !_y.done && (_j = _x.return)) _j.call(_x);
+                                    if (_2 && !_2.done && (_q = _1.return)) _q.call(_1);
                                 }
-                                finally { if (e_5) throw e_5.error; }
+                                finally { if (e_7) throw e_7.error; }
+                            }
+                            var above = conditionType === "NUMBER_ABOVE_AVERAGE";
+                            var fullStats = fullRangeStats(rule);
+                            if (fullStats) {
+                                averageValue = (0, cf_overlays_1.averageBoundFromStats)(fullStats, above, booleanRule.stdDev);
                             }
-                            if (numericValues.length) {
-                                averageValue =
-                                    numericValues.reduce(function (sum, entry) { return sum + entry; }, 0) /
-                                        numericValues.length;
+                            else if (numericValues.length) {
+                                averageValue = (0, cf_overlays_1.averageBound)(numericValues, above, booleanRule.stdDev);
                             }
                         }
                         // Formula path vs sync path: see `isConditionalFormatFormulaRule`
@@ -229,8 +322,8 @@ var useConditionalFormatting = function (_a) {
                             (0, validation_1.shouldUsePreviousValue)((_d = booleanRule === null || booleanRule === void 0 ? void 0 : booleanRule.condition) === null || _d === void 0 ? void 0 : _d.type);
                         try {
                             // Iterate all cells within this range
-                            for (var _0 = (e_6 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _1 = _0.next(); !_1.done; _1 = _0.next()) {
-                                var _2 = tslib_1.__read(_1.value, 2), rowIndex = _2[0], columnIndex = _2[1];
+                            for (var _4 = (e_8 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _5 = _4.next(); !_5.done; _5 = _4.next()) {
+                                var _6 = tslib_1.__read(_5.value, 2), rowIndex = _6[0], columnIndex = _6[1];
                                 var effectiveValue = getValidationValue(sheetId, rowIndex, columnIndex, rule);
                                 var satisfies = false;
                                 if (booleanRule === null || booleanRule === void 0 ? void 0 : booleanRule.condition) {
@@ -240,10 +333,15 @@ var useConditionalFormatting = function (_a) {
                                             isNumberValue(sheetId, rowIndex, columnIndex)) {
                                             var numericValue = Number(effectiveValue);
                                             if (Number.isFinite(numericValue)) {
+                                                var inclusive = booleanRule.equalAverage === true;
                                                 satisfies =
                                                     conditionType === "NUMBER_ABOVE_AVERAGE"
-                                                        ? numericValue > averageValue
-                                                        : numericValue < averageValue;
+                                                        ? inclusive
+                                                            ? numericValue >= averageValue
+                                                            : numericValue > averageValue
+                                                        : inclusive
+                                                            ? numericValue <= averageValue
+                                                            : numericValue < averageValue;
                                             }
                                         }
                                     }
@@ -272,21 +370,21 @@ var useConditionalFormatting = function (_a) {
                                 }
                             }
                         }
-                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
-                                if (_1 && !_1.done && (_k = _0.return)) _k.call(_0);
+                                if (_5 && !_5.done && (_r = _4.return)) _r.call(_4);
                             }
-                            finally { if (e_6) throw e_6.error; }
+                            finally { if (e_8) throw e_8.error; }
                         }
                     }
                 }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
                 finally {
                     try {
-                        if (ranges_1_1 && !ranges_1_1.done && (_h = ranges_1.return)) _h.call(ranges_1);
+                        if (ranges_1_1 && !ranges_1_1.done && (_p = ranges_1.return)) _p.call(ranges_1);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_6) throw e_6.error; }
                 }
             }
             else if (gradientRule) {
@@ -294,7 +392,7 @@ var useConditionalFormatting = function (_a) {
                 var values = [];
                 try {
                     // Get colors from all ranges initially
-                    for (var ranges_2 = (e_7 = void 0, tslib_1.__values(ranges)), ranges_2_1 = ranges_2.next(); !ranges_2_1.done; ranges_2_1 = ranges_2.next()) {
+                    for (var ranges_2 = (e_9 = void 0, tslib_1.__values(ranges)), ranges_2_1 = ranges_2.next(); !ranges_2_1.done; ranges_2_1 = ranges_2.next()) {
                         var range = ranges_2_1.value;
                         // Only pick current sheet
                         if ((range === null || range === void 0 ? void 0 : range.sheetId) !== sheetId) {
@@ -321,18 +419,18 @@ var useConditionalFormatting = function (_a) {
                         values.push(rangeValues);
                     }
                 }
-                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                catch (e_9_1) { e_9 = { error: e_9_1 }; }
                 finally {
                     try {
-                        if (ranges_2_1 && !ranges_2_1.done && (_l = ranges_2.return)) _l.call(ranges_2);
+                        if (ranges_2_1 && !ranges_2_1.done && (_s = ranges_2.return)) _s.call(ranges_2);
                     }
-                    finally { if (e_7) throw e_7.error; }
+                    finally { if (e_9) throw e_9.error; }
                 }
-                var colors = (0, heatmap_1.getGradientColors)(values, gradientRule, theme);
+                var colors = (0, heatmap_1.getGradientColors)(values, gradientRule, theme, fullRangeStats(rule));
                 var rangeIndex = 0;
                 try {
                     // Apply colors
-                    for (var ranges_3 = (e_8 = void 0, tslib_1.__values(ranges)), ranges_3_1 = ranges_3.next(); !ranges_3_1.done; ranges_3_1 = ranges_3.next()) {
+                    for (var ranges_3 = (e_10 = void 0, tslib_1.__values(ranges)), ranges_3_1 = ranges_3.next(); !ranges_3_1.done; ranges_3_1 = ranges_3.next()) {
                         var range = ranges_3_1.value;
                         // Only pick current sheet
                         if (range.sheetId !== sheetId) {
@@ -359,17 +457,17 @@ var useConditionalFormatting = function (_a) {
                         rangeIndex++;
                     }
                 }
-                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                catch (e_10_1) { e_10 = { error: e_10_1 }; }
                 finally {
                     try {
-                        if (ranges_3_1 && !ranges_3_1.done && (_m = ranges_3.return)) _m.call(ranges_3);
+                        if (ranges_3_1 && !ranges_3_1.done && (_t = ranges_3.return)) _t.call(ranges_3);
                     }
-                    finally { if (e_8) throw e_8.error; }
+                    finally { if (e_10) throw e_10.error; }
                 }
             }
             else if (topBottomRule) {
                 var _loop_2 = function (range) {
-                    var e_18, _11, e_19, _12;
+                    var e_18, _12, e_19, _13;
                     if (range.sheetId !== sheetId) {
                         return "continue";
                     }
@@ -383,8 +481,8 @@ var useConditionalFormatting = function (_a) {
                     }
                     var numericCells = [];
                     try {
-                        for (var _13 = (e_18 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _14 = _13.next(); !_14.done; _14 = _13.next()) {
-                            var _15 = tslib_1.__read(_14.value, 2), rowIndex = _15[0], columnIndex = _15[1];
+                        for (var _14 = (e_18 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _15 = _14.next(); !_15.done; _15 = _14.next()) {
+                            var _16 = tslib_1.__read(_15.value, 2), rowIndex = _16[0], columnIndex = _16[1];
                             var value = getValidationValue(sheetId, rowIndex, columnIndex, rule);
                             if (!(0, isNil_1.default)(value) &&
                                 isNumberValue(sheetId, rowIndex, columnIndex) &&
@@ -400,7 +498,7 @@ var useConditionalFormatting = function (_a) {
                     catch (e_18_1) { e_18 = { error: e_18_1 }; }
                     finally {
                         try {
-                            if (_14 && !_14.done && (_11 = _13.return)) _11.call(_13);
+                            if (_15 && !_15.done && (_12 = _14.return)) _12.call(_14);
                         }
                         finally { if (e_18) throw e_18.error; }
                     }
@@ -416,7 +514,11 @@ var useConditionalFormatting = function (_a) {
                             ? b.value - a.value
                             : a.value - b.value;
                     });
-                    var thresholdValue = (_g = sorted[Math.min(desiredRank - 1, sorted.length - 1)]) === null || _g === void 0 ? void 0 : _g.value;
+                    // A windowed rule ranks against its full range.
+                    var fullStats = fullRangeStats(rule);
+                    var thresholdValue = fullStats
+                        ? fullRangeRankValue(fullStats, topBottomRule)
+                        : (_g = sorted[Math.min(desiredRank - 1, sorted.length - 1)]) === null || _g === void 0 ? void 0 : _g.value;
                     if (thresholdValue === undefined) {
                         return "continue";
                     }
@@ -441,28 +543,28 @@ var useConditionalFormatting = function (_a) {
                     catch (e_19_1) { e_19 = { error: e_19_1 }; }
                     finally {
                         try {
-                            if (numericCells_1_1 && !numericCells_1_1.done && (_12 = numericCells_1.return)) _12.call(numericCells_1);
+                            if (numericCells_1_1 && !numericCells_1_1.done && (_13 = numericCells_1.return)) _13.call(numericCells_1);
                         }
                         finally { if (e_19) throw e_19.error; }
                     }
                 };
                 try {
-                    for (var ranges_4 = (e_9 = void 0, tslib_1.__values(ranges)), ranges_4_1 = ranges_4.next(); !ranges_4_1.done; ranges_4_1 = ranges_4.next()) {
+                    for (var ranges_4 = (e_11 = void 0, tslib_1.__values(ranges)), ranges_4_1 = ranges_4.next(); !ranges_4_1.done; ranges_4_1 = ranges_4.next()) {
                         var range = ranges_4_1.value;
                         _loop_2(range);
                     }
                 }
-                catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                catch (e_11_1) { e_11 = { error: e_11_1 }; }
                 finally {
                     try {
-                        if (ranges_4_1 && !ranges_4_1.done && (_o = ranges_4.return)) _o.call(ranges_4);
+                        if (ranges_4_1 && !ranges_4_1.done && (_u = ranges_4.return)) _u.call(ranges_4);
                     }
-                    finally { if (e_9) throw e_9.error; }
+                    finally { if (e_11) throw e_11.error; }
                 }
             }
             else if (distinctRule) {
                 try {
-                    for (var ranges_5 = (e_10 = void 0, tslib_1.__values(ranges)), ranges_5_1 = ranges_5.next(); !ranges_5_1.done; ranges_5_1 = ranges_5.next()) {
+                    for (var ranges_5 = (e_12 = void 0, tslib_1.__values(ranges)), ranges_5_1 = ranges_5.next(); !ranges_5_1.done; ranges_5_1 = ranges_5.next()) {
                         var range = ranges_5_1.value;
                         if (range.sheetId !== sheetId) {
                             continue;
@@ -477,8 +579,8 @@ var useConditionalFormatting = function (_a) {
                         }
                         var occurrences = new Map();
                         try {
-                            for (var _3 = (e_11 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _4 = _3.next(); !_4.done; _4 = _3.next()) {
-                                var _5 = tslib_1.__read(_4.value, 2), rowIndex = _5[0], columnIndex = _5[1];
+                            for (var _7 = (e_13 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _8 = _7.next(); !_8.done; _8 = _7.next()) {
+                                var _9 = tslib_1.__read(_8.value, 2), rowIndex = _9[0], columnIndex = _9[1];
                                 var value = getValidationValue(sheetId, rowIndex, columnIndex, rule);
                                 if ((0, isNil_1.default)(value)) {
                                     continue;
@@ -494,24 +596,24 @@ var useConditionalFormatting = function (_a) {
                                 occurrences.get(key).push({ rowIndex: rowIndex, columnIndex: columnIndex });
                             }
                         }
-                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                        catch (e_13_1) { e_13 = { error: e_13_1 }; }
                         finally {
                             try {
-                                if (_4 && !_4.done && (_q = _3.return)) _q.call(_3);
+                                if (_8 && !_8.done && (_w = _7.return)) _w.call(_7);
                             }
-                            finally { if (e_11) throw e_11.error; }
+                            finally { if (e_13) throw e_13.error; }
                         }
                         var shouldFormat = function (count) {
                             return distinctRule.type === "DUPLICATE" ? count > 1 : count === 1;
                         };
                         try {
-                            for (var _6 = (e_12 = void 0, tslib_1.__values(occurrences.values())), _7 = _6.next(); !_7.done; _7 = _6.next()) {
-                                var cells = _7.value;
+                            for (var _10 = (e_14 = void 0, tslib_1.__values(occurrences.values())), _11 = _10.next(); !_11.done; _11 = _10.next()) {
+                                var cells = _11.value;
                                 if (!shouldFormat(cells.length)) {
                                     continue;
                                 }
                                 try {
-                                    for (var cells_1 = (e_13 = void 0, tslib_1.__values(cells)), cells_1_1 = cells_1.next(); !cells_1_1.done; cells_1_1 = cells_1.next()) {
+                                    for (var cells_1 = (e_15 = void 0, tslib_1.__values(cells)), cells_1_1 = cells_1.next(); !cells_1_1.done; cells_1_1 = cells_1.next()) {
                                         var cell = cells_1_1.value;
                                         var cellId = (0, grid_1.cellIdentifier)(cell.rowIndex, cell.columnIndex);
                                         if (stopCells.has(cellId)) {
@@ -523,218 +625,166 @@ var useConditionalFormatting = function (_a) {
                                         }
                                     }
                                 }
-                                catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                                catch (e_15_1) { e_15 = { error: e_15_1 }; }
                                 finally {
                                     try {
-                                        if (cells_1_1 && !cells_1_1.done && (_s = cells_1.return)) _s.call(cells_1);
+                                        if (cells_1_1 && !cells_1_1.done && (_y = cells_1.return)) _y.call(cells_1);
                                     }
-                                    finally { if (e_13) throw e_13.error; }
+                                    finally { if (e_15) throw e_15.error; }
                                 }
                             }
                         }
-                        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                        catch (e_14_1) { e_14 = { error: e_14_1 }; }
                         finally {
                             try {
-                                if (_7 && !_7.done && (_r = _6.return)) _r.call(_6);
+                                if (_11 && !_11.done && (_x = _10.return)) _x.call(_10);
                             }
-                            finally { if (e_12) throw e_12.error; }
+                            finally { if (e_14) throw e_14.error; }
                         }
                     }
                 }
-                catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                catch (e_12_1) { e_12 = { error: e_12_1 }; }
                 finally {
                     try {
-                        if (ranges_5_1 && !ranges_5_1.done && (_p = ranges_5.return)) _p.call(ranges_5);
+                        if (ranges_5_1 && !ranges_5_1.done && (_v = ranges_5.return)) _v.call(ranges_5);
                     }
-                    finally { if (e_10) throw e_10.error; }
+                    finally { if (e_12) throw e_12.error; }
                 }
             }
             else if (iconSetRule) {
-                var glyphs = cf_overlays_1.ICON_SET_GLYPHS[iconSetRule.iconSet];
-                if (!glyphs) {
+                var iconCount_1 = (_h = cf_overlays_1.ICON_SET_GLYPHS[iconSetRule.iconSet]) === null || _h === void 0 ? void 0 : _h.length;
+                if (!iconCount_1) {
                     conditionIndex++;
                     return "continue";
                 }
-                var orderedGlyphs = iconSetRule.reverse
-                    ? tslib_1.__spreadArray([], tslib_1.__read(glyphs), false).reverse()
-                    : glyphs;
-                var orderedColors = iconSetRule.reverse
-                    ? tslib_1.__spreadArray([], tslib_1.__read(cf_overlays_1.ICON_SET_COLORS[iconSetRule.iconSet]), false).reverse()
-                    : cf_overlays_1.ICON_SET_COLORS[iconSetRule.iconSet];
-                var _loop_3 = function (range) {
-                    var e_20, _16, e_21, _17;
-                    if (range.sheetId !== sheetId)
-                        return "continue";
-                    var clampedRange = clampRange(range);
-                    // Aggregate range min/max for PERCENT/PERCENTILE threshold resolution.
-                    var rangeMin = Infinity;
-                    var rangeMax = -Infinity;
-                    var cellValues = [];
-                    try {
-                        for (var _18 = (e_20 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _19 = _18.next(); !_19.done; _19 = _18.next()) {
-                            var _20 = tslib_1.__read(_19.value, 2), rowIndex = _20[0], columnIndex = _20[1];
-                            var v = getValidationValue(sheetId, rowIndex, columnIndex, rule);
-                            if (!(0, isNil_1.default)(v) &&
-                                isNumberValue(sheetId, rowIndex, columnIndex) &&
-                                Number.isFinite(Number(v))) {
-                                var num = Number(v);
-                                cellValues.push({ rowIndex: rowIndex, columnIndex: columnIndex, value: num });
-                                if (num < rangeMin)
-                                    rangeMin = num;
-                                if (num > rangeMax)
-                                    rangeMax = num;
-                            }
-                        }
-                    }
-                    catch (e_20_1) { e_20 = { error: e_20_1 }; }
-                    finally {
-                        try {
-                            if (_19 && !_19.done && (_16 = _18.return)) _16.call(_18);
-                        }
-                        finally { if (e_20) throw e_20.error; }
+                // Thresholds resolve over the rule's whole applies-to range.
+                var cellValues = collectRuleNumbers(rule);
+                if (cellValues.length === 0) {
+                    conditionIndex++;
+                    return "continue";
+                }
+                var stats_1 = (_j = fullRangeStats(rule)) !== null && _j !== void 0 ? _j : (0, cf_overlays_1.buildCfRangeStats)(cellValues.map(function (cell) { return cell.value; }));
+                var thresholds = iconSetRule.thresholds
+                    .slice(0, iconCount_1 - 1)
+                    .map(function (t) { return (0, cf_overlays_1.resolveCfThreshold)(t, stats_1, { resolveFormula: resolveFormula }); });
+                var strict = iconSetRule.thresholds
+                    .slice(0, iconCount_1 - 1)
+                    .map(function (t) { return t.gte === false; });
+                var hideValue = iconSetRule.showValue === false;
+                // The icon a bucket shows: the custom mix when set, else the
+                // family's icon (reversed when asked).
+                var bucketIcon = function (bucket) {
+                    var _a;
+                    var custom = (_a = iconSetRule.icons) === null || _a === void 0 ? void 0 : _a[bucket];
+                    if (custom) {
+                        return custom.iconSet === "NoIcons"
+                            ? undefined
+                            : { iconSet: custom.iconSet, iconId: custom.iconId };
                     }
-                    if (cellValues.length === 0)
-                        return "continue";
-                    var sortedThresholds = iconSetRule.thresholds
-                        .map(function (t) { return (0, cf_overlays_1.resolveThreshold)(t, rangeMin, rangeMax); })
-                        .filter(function (n) { return Number.isFinite(n); })
-                        .sort(function (a, b) { return a - b; });
-                    try {
-                        for (var cellValues_2 = (e_21 = void 0, tslib_1.__values(cellValues)), cellValues_2_1 = cellValues_2.next(); !cellValues_2_1.done; cellValues_2_1 = cellValues_2.next()) {
-                            var cell = cellValues_2_1.value;
-                            var bucket = (0, cf_overlays_1.pickIconBucket)(cell.value, sortedThresholds);
-                            var cellId = (0, grid_1.cellIdentifier)(cell.rowIndex, cell.columnIndex);
-                            if (stopCells.has(cellId))
-                                continue;
-                            var glyphIndex = Math.min(bucket, orderedGlyphs.length - 1);
-                            var glyph = orderedGlyphs[glyphIndex];
-                            var color = orderedColors[Math.min(bucket, orderedColors.length - 1)];
+                    return {
+                        iconSet: iconSetRule.iconSet,
+                        iconId: iconSetRule.reverse ? iconCount_1 - 1 - bucket : bucket,
+                    };
+                };
+                try {
+                    for (var cellValues_1 = (e_16 = void 0, tslib_1.__values(cellValues)), cellValues_1_1 = cellValues_1.next(); !cellValues_1_1.done; cellValues_1_1 = cellValues_1.next()) {
+                        var cell = cellValues_1_1.value;
+                        var cellId = (0, grid_1.cellIdentifier)(cell.rowIndex, cell.columnIndex);
+                        if (stopCells.has(cellId))
+                            continue;
+                        var icon = bucketIcon((0, cf_overlays_1.pickIconBucket)(cell.value, thresholds, strict));
+                        if (icon) {
                             layerFormat(cellId, {
-                                // iconSet + iconId are needed by the icon column filter to
-                                // match cells against a specific (iconSet, iconId) target.
-                                // They're harmless to renderers that only read `glyph`.
-                                conditionalIcon: {
-                                    glyph: glyph,
-                                    color: color,
-                                    iconSet: iconSetRule.iconSet,
-                                    iconId: glyphIndex,
-                                },
+                                // iconSet + iconId drive the painter and the icon column
+                                // filter; `glyph` / `color` are the text stand-ins.
+                                conditionalIcon: tslib_1.__assign({ glyph: (_l = (_k = cf_overlays_1.ICON_SET_GLYPHS[icon.iconSet]) === null || _k === void 0 ? void 0 : _k[icon.iconId]) !== null && _l !== void 0 ? _l : "", color: (_m = cf_overlays_1.ICON_SET_COLORS[icon.iconSet]) === null || _m === void 0 ? void 0 : _m[icon.iconId], iconSet: icon.iconSet, iconId: icon.iconId }, (hideValue ? { hideValue: hideValue } : {})),
                             });
-                            if (rule.stopIfTrue)
-                                stopCells.add(cellId);
-                        }
-                    }
-                    catch (e_21_1) { e_21 = { error: e_21_1 }; }
-                    finally {
-                        try {
-                            if (cellValues_2_1 && !cellValues_2_1.done && (_17 = cellValues_2.return)) _17.call(cellValues_2);
                         }
-                        finally { if (e_21) throw e_21.error; }
-                    }
-                };
-                try {
-                    for (var ranges_6 = (e_14 = void 0, tslib_1.__values(ranges)), ranges_6_1 = ranges_6.next(); !ranges_6_1.done; ranges_6_1 = ranges_6.next()) {
-                        var range = ranges_6_1.value;
-                        _loop_3(range);
+                        if (rule.stopIfTrue)
+                            stopCells.add(cellId);
                     }
                 }
-                catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                catch (e_16_1) { e_16 = { error: e_16_1 }; }
                 finally {
                     try {
-                        if (ranges_6_1 && !ranges_6_1.done && (_t = ranges_6.return)) _t.call(ranges_6);
+                        if (cellValues_1_1 && !cellValues_1_1.done && (_z = cellValues_1.return)) _z.call(cellValues_1);
                     }
-                    finally { if (e_14) throw e_14.error; }
+                    finally { if (e_16) throw e_16.error; }
                 }
             }
             else if (dataBarRule) {
+                // Excel resolves a data bar's bounds over the rule's whole applies-to
+                // range (every area of a multi-area rule together).
+                var cellValues = collectRuleNumbers(rule);
+                if (cellValues.length === 0) {
+                    conditionIndex++;
+                    return "continue";
+                }
+                var stats = (_o = fullRangeStats(rule)) !== null && _o !== void 0 ? _o : (0, cf_overlays_1.buildCfRangeStats)(cellValues.map(function (cell) { return cell.value; }));
+                var resolvedMin = (0, cf_overlays_1.resolveCfThreshold)(dataBarRule.minpoint, stats, {
+                    role: "min",
+                    resolveFormula: resolveFormula,
+                });
+                var resolvedMax = (0, cf_overlays_1.resolveCfThreshold)(dataBarRule.maxpoint, stats, {
+                    role: "max",
+                    resolveFormula: resolveFormula,
+                });
+                var min = Number.isFinite(resolvedMin) ? resolvedMin : stats.min;
+                var max = Number.isFinite(resolvedMax) ? resolvedMax : stats.max;
                 var barColor = (0, themes_1.getStringifiedColor)(dataBarRule.color, theme);
                 var negativeColor = dataBarRule.negativeColor
                     ? (0, themes_1.getStringifiedColor)(dataBarRule.negativeColor, theme)
-                    : undefined;
+                    : barColor;
                 var borderColor = dataBarRule.borderColor
                     ? (0, themes_1.getStringifiedColor)(dataBarRule.borderColor, theme)
                     : undefined;
+                var negativeBorderColor = dataBarRule.negativeBorderColor
+                    ? (0, themes_1.getStringifiedColor)(dataBarRule.negativeBorderColor, theme)
+                    : borderColor;
+                var axisColor = dataBarRule.axisColor
+                    ? (0, themes_1.getStringifiedColor)(dataBarRule.axisColor, theme)
+                    : undefined;
                 var direction = dataBarRule.direction === "rightToLeft"
                     ? "rightToLeft"
                     : "leftToRight";
+                var hideValue = dataBarRule.showValue === false;
                 try {
-                    for (var ranges_7 = (e_15 = void 0, tslib_1.__values(ranges)), ranges_7_1 = ranges_7.next(); !ranges_7_1.done; ranges_7_1 = ranges_7.next()) {
-                        var range = ranges_7_1.value;
-                        if (range.sheetId !== sheetId)
+                    for (var cellValues_2 = (e_17 = void 0, tslib_1.__values(cellValues)), cellValues_2_1 = cellValues_2.next(); !cellValues_2_1.done; cellValues_2_1 = cellValues_2.next()) {
+                        var cell = cellValues_2_1.value;
+                        var cellId = (0, grid_1.cellIdentifier)(cell.rowIndex, cell.columnIndex);
+                        if (stopCells.has(cellId))
                             continue;
-                        var clampedRange = clampRange(range);
-                        var rangeMin = Infinity;
-                        var rangeMax = -Infinity;
-                        var cellValues = [];
-                        try {
-                            for (var _8 = (e_16 = void 0, tslib_1.__values((0, utils_1.iterateCellsInRange)(clampedRange))), _9 = _8.next(); !_9.done; _9 = _8.next()) {
-                                var _10 = tslib_1.__read(_9.value, 2), rowIndex = _10[0], columnIndex = _10[1];
-                                var v = getValidationValue(sheetId, rowIndex, columnIndex, rule);
-                                if (!(0, isNil_1.default)(v) &&
-                                    isNumberValue(sheetId, rowIndex, columnIndex) &&
-                                    Number.isFinite(Number(v))) {
-                                    var num = Number(v);
-                                    cellValues.push({ rowIndex: rowIndex, columnIndex: columnIndex, value: num });
-                                    if (num < rangeMin)
-                                        rangeMin = num;
-                                    if (num > rangeMax)
-                                        rangeMax = num;
-                                }
-                            }
-                        }
-                        catch (e_16_1) { e_16 = { error: e_16_1 }; }
-                        finally {
-                            try {
-                                if (_9 && !_9.done && (_v = _8.return)) _v.call(_8);
-                            }
-                            finally { if (e_16) throw e_16.error; }
-                        }
-                        if (cellValues.length === 0)
+                        var geometry = (0, cf_data_bar_1.computeDataBarGeometry)({
+                            value: cell.value,
+                            min: min,
+                            max: max,
+                            axisPosition: dataBarRule.axisPosition,
+                            minLength: dataBarRule.minLength,
+                            maxLength: dataBarRule.maxLength,
+                            direction: direction,
+                        });
+                        if (!geometry)
                             continue;
-                        var min = (0, cf_overlays_1.resolveThreshold)(dataBarRule.minpoint, rangeMin, rangeMax);
-                        var max = (0, cf_overlays_1.resolveThreshold)(dataBarRule.maxpoint, rangeMin, rangeMax);
-                        var resolvedMin = Number.isFinite(min) ? min : rangeMin;
-                        var resolvedMax = Number.isFinite(max) ? max : rangeMax;
-                        try {
-                            for (var cellValues_1 = (e_17 = void 0, tslib_1.__values(cellValues)), cellValues_1_1 = cellValues_1.next(); !cellValues_1_1.done; cellValues_1_1 = cellValues_1.next()) {
-                                var cell = cellValues_1_1.value;
-                                var cellId = (0, grid_1.cellIdentifier)(cell.rowIndex, cell.columnIndex);
-                                if (stopCells.has(cellId))
-                                    continue;
-                                var isNegative = cell.value < 0 && negativeColor !== undefined;
-                                var fill = (0, cf_overlays_1.computeDataBarFill)(isNegative ? -cell.value : cell.value, isNegative ? 0 : Math.max(0, resolvedMin), isNegative
-                                    ? Math.abs(resolvedMin)
-                                    : Math.max(resolvedMin, resolvedMax));
-                                layerFormat(cellId, {
-                                    conditionalDataBar: {
-                                        color: isNegative
-                                            ? negativeColor
-                                            : barColor,
-                                        fillFraction: fill,
-                                        negative: isNegative,
-                                        borderColor: borderColor,
-                                        direction: direction,
-                                    },
-                                });
-                                if (rule.stopIfTrue)
-                                    stopCells.add(cellId);
-                            }
-                        }
-                        catch (e_17_1) { e_17 = { error: e_17_1 }; }
-                        finally {
-                            try {
-                                if (cellValues_1_1 && !cellValues_1_1.done && (_w = cellValues_1.return)) _w.call(cellValues_1);
-                            }
-                            finally { if (e_17) throw e_17.error; }
-                        }
+                        layerFormat(cellId, {
+                            conditionalDataBar: tslib_1.__assign(tslib_1.__assign({ color: geometry.negative ? negativeColor : barColor, fillFraction: geometry.barEnd - geometry.barStart, negative: geometry.negative, borderColor: geometry.negative
+                                    ? negativeBorderColor
+                                    : borderColor, direction: direction, barStart: geometry.barStart, barEnd: geometry.barEnd, gradient: dataBarRule.gradient !== false }, (geometry.axisPosition !== undefined
+                                ? {
+                                    axisPosition: geometry.axisPosition,
+                                    axisColor: axisColor !== null && axisColor !== void 0 ? axisColor : "#000000",
+                                }
+                                : {})), (hideValue ? { hideValue: hideValue } : {})),
+                        });
+                        if (rule.stopIfTrue)
+                            stopCells.add(cellId);
                     }
                 }
-                catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                catch (e_17_1) { e_17 = { error: e_17_1 }; }
                 finally {
                     try {
-                        if (ranges_7_1 && !ranges_7_1.done && (_u = ranges_7.return)) _u.call(ranges_7);
+                        if (cellValues_2_1 && !cellValues_2_1.done && (_0 = cellValues_2.return)) _0.call(cellValues_2);
                     }
-                    finally { if (e_15) throw e_15.error; }
+                    finally { if (e_17) throw e_17.error; }
                 }
             }
             conditionIndex++;
@@ -766,6 +816,7 @@ var useConditionalFormatting = function (_a) {
         getSheetColumnCount,
         evaluationWindow,
         getConditionalFormatResult,
+        getConditionalFormatRuleStats,
     ]);
 };
 exports.useConditionalFormatting = useConditionalFormatting;