@odoo/o-spreadsheet 18.2.4 → 18.2.5

package/dist/o-spreadsheet.esm.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.2.4
- * @date 2025-03-19T08:20:57.717Z
- * @hash 958936a
+ * @version 18.2.5
+ * @date 2025-03-26T12:47:44.113Z
+ * @hash 4675edd
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -1131,7 +1131,10 @@ function rgbaStringToHex(color) {
     }
     else if (stringVals.length === 4) {
         const alpha = parseFloat(stringVals.pop() || "1");
-        alphaHex = Math.round((alpha || 1) * 255);
+        if (isNaN(alpha)) {
+            throw new Error("invalid alpha value");
+        }
+        alphaHex = Math.round(alpha * 255);
     }
     const vals = stringVals.map((val) => parseInt(val, 10));
     if (alphaHex !== 255) {
@@ -6999,7 +7002,7 @@ function isValidLocale(locale) {
  */
 function canonicalizeNumberContent(content, locale) {
     return content.startsWith("=")
-        ? canonicalizeFormula$1(content, locale)
+        ? canonicalizeFormula(content, locale)
         : canonicalizeNumberLiteral(content, locale);
 }
 /**
@@ -7014,7 +7017,7 @@ function canonicalizeNumberContent(content, locale) {
  */
 function canonicalizeContent(content, locale) {
     return content.startsWith("=")
-        ? canonicalizeFormula$1(content, locale)
+        ? canonicalizeFormula(content, locale)
         : canonicalizeLiteral(content, locale);
 }
 /**
@@ -7030,15 +7033,21 @@ function localizeContent(content, locale) {
         ? localizeFormula(content, locale)
         : localizeLiteral(content, locale);
 }
+/** Change a number string to its canonical form (en_US locale) */
+function canonicalizeNumberValue(content, locale) {
+    return content.startsWith("=")
+        ? canonicalizeFormula(content, locale)
+        : canonicalizeNumberLiteral(content, locale);
+}
 /** Change a formula to its canonical form (en_US locale) */
-function canonicalizeFormula$1(formula, locale) {
-    return _localizeFormula$1(formula, locale, DEFAULT_LOCALE);
+function canonicalizeFormula(formula, locale) {
+    return _localizeFormula(formula, locale, DEFAULT_LOCALE);
 }
 /** Change a formula from the canonical form to the given locale */
 function localizeFormula(formula, locale) {
-    return _localizeFormula$1(formula, DEFAULT_LOCALE, locale);
+    return _localizeFormula(formula, DEFAULT_LOCALE, locale);
 }
-function _localizeFormula$1(formula, fromLocale, toLocale) {
+function _localizeFormula(formula, fromLocale, toLocale) {
     if (fromLocale.formulaArgSeparator === toLocale.formulaArgSeparator &&
         fromLocale.decimalSeparator === toLocale.decimalSeparator) {
         return formula;
@@ -7193,37 +7202,6 @@ function getDateTimeFormat(locale) {
     return locale.dateFormat + " " + locale.timeFormat;
 }
 
-/** Change a number string to its canonical form (en_US locale) */
-function canonicalizeNumberValue(content, locale) {
-    return content.startsWith("=")
-        ? canonicalizeFormula(content, locale)
-        : canonicalizeNumberLiteral(content, locale);
-}
-/** Change a formula to its canonical form (en_US locale) */
-function canonicalizeFormula(formula, locale) {
-    return _localizeFormula(formula, locale, DEFAULT_LOCALE);
-}
-function _localizeFormula(formula, fromLocale, toLocale) {
-    if (fromLocale.formulaArgSeparator === toLocale.formulaArgSeparator &&
-        fromLocale.decimalSeparator === toLocale.decimalSeparator) {
-        return formula;
-    }
-    const tokens = tokenize(formula, fromLocale);
-    let localizedFormula = "";
-    for (const token of tokens) {
-        if (token.type === "NUMBER") {
-            localizedFormula += token.value.replace(fromLocale.decimalSeparator, toLocale.decimalSeparator);
-        }
-        else if (token.type === "ARG_SEPARATOR") {
-            localizedFormula += toLocale.formulaArgSeparator;
-        }
-        else {
-            localizedFormula += token.value;
-        }
-    }
-    return localizedFormula;
-}
-
 function boolAnd(args) {
     let foundBoolean = false;
     let acc = true;
@@ -9599,6 +9577,7 @@ class ComposerFocusStore extends SpreadsheetStore {
 }
 
 const TREND_LINE_XAXIS_ID = "x1";
+const MOVING_AVERAGE_TREND_LINE_XAXIS_ID = "xMovingAverage";
 /**
  * This file contains helpers that are common to different charts (mainly
  * line, bar and pie charts)
@@ -9949,6 +9928,9 @@ function truncateLabel(label) {
     }
     return label;
 }
+function isTrendLineAxis(axisID) {
+    return axisID === TREND_LINE_XAXIS_ID || axisID === MOVING_AVERAGE_TREND_LINE_XAXIS_ID;
+}
 
 /** This is a chartJS plugin that will draw the values of each data next to the point/bar/pie slice */
 const chartShowValuesPlugin = {
@@ -9993,7 +9975,7 @@ function drawLineOrBarOrRadarChartValues(chart, options, ctx) {
     const yMin = chart.chartArea.top;
     const textsPositions = {};
     for (const dataset of chart._metasets) {
-        if (dataset.xAxisID === TREND_LINE_XAXIS_ID || dataset.hidden) {
+        if (isTrendLineAxis(dataset.axisID) || dataset.hidden) {
             continue;
         }
         for (let i = 0; i < dataset._parsed.length; i++) {
@@ -10036,7 +10018,7 @@ function drawHorizontalBarChartValues(chart, options, ctx) {
     const xMin = chart.chartArea.left;
     const textsPositions = {};
     for (const dataset of chart._metasets) {
-        if (dataset.xAxisID === TREND_LINE_XAXIS_ID) {
+        if (isTrendLineAxis(dataset.axisID)) {
             return; // ignore trend lines
         }
         for (let i = 0; i < dataset._parsed.length; i++) {
@@ -20544,11 +20526,26 @@ const SEARCH = {
         const _searchFor = toString(searchFor).toLowerCase();
         const _textToSearch = toString(textToSearch).toLowerCase();
         const _startingAt = toNumber(startingAt, this.locale);
-        assert(() => _textToSearch !== "", _t("The text_to_search must be non-empty."));
-        assert(() => _startingAt >= 1, _t("The starting_at (%s) must be greater than or equal to 1.", _startingAt.toString()));
+        if (_textToSearch === "") {
+            return {
+                value: CellErrorType.GenericError,
+                message: _t("The text_to_search must be non-empty."),
+            };
+        }
+        if (_startingAt < 1) {
+            return {
+                value: CellErrorType.GenericError,
+                message: _t("The starting_at (%s) must be greater than or equal to 1.", _startingAt),
+            };
+        }
         const result = _textToSearch.indexOf(_searchFor, _startingAt - 1);
-        assert(() => result >= 0, _t("In [[FUNCTION_NAME]] evaluation, cannot find '%s' within '%s'.", _searchFor, _textToSearch));
-        return result + 1;
+        if (result === -1) {
+            return {
+                value: CellErrorType.GenericError,
+                message: _t("In [[FUNCTION_NAME]] evaluation, cannot find '%s' within '%s'.", _searchFor, _textToSearch),
+            };
+        }
+        return { value: result + 1 };
     },
     isExported: true,
 };
@@ -21883,11 +21880,14 @@ function compileTokens(tokens) {
     }
 }
 function compileTokensOrThrow(tokens) {
-    const { dependencies, constantValues, symbols } = formulaArguments(tokens);
-    const cacheKey = compilationCacheKey(tokens, dependencies, constantValues);
+    const { dependencies, literalValues, symbols } = formulaArguments(tokens);
+    const cacheKey = compilationCacheKey(tokens);
     if (!functionCache[cacheKey]) {
         const ast = parseTokens([...tokens]);
         const scope = new Scope();
+        let stringCount = 0;
+        let numberCount = 0;
+        let dependencyCount = 0;
         if (ast.type === "BIN_OPERATION" && ast.value === ":") {
             throw new BadExpressionError(_t("Invalid formula"));
         }
@@ -21961,16 +21961,15 @@ function compileTokensOrThrow(tokens) {
                 case "BOOLEAN":
                     return code.return(`{ value: ${ast.value} }`);
                 case "NUMBER":
-                    return code.return(`{ value: this.constantValues.numbers[${constantValues.numbers.indexOf(ast.value)}] }`);
+                    return code.return(`this.literalValues.numbers[${numberCount++}]`);
                 case "STRING":
-                    return code.return(`{ value: this.constantValues.strings[${constantValues.strings.indexOf(ast.value)}] }`);
+                    return code.return(`this.literalValues.strings[${stringCount++}]`);
                 case "REFERENCE":
-                    const referenceIndex = dependencies.indexOf(ast.value);
                     if ((!isMeta && ast.value.includes(":")) || hasRange) {
-                        return code.return(`range(deps[${referenceIndex}])`);
+                        return code.return(`range(deps[${dependencyCount++}])`);
                     }
                     else {
-                        return code.return(`ref(deps[${referenceIndex}], ${isMeta ? "true" : "false"})`);
+                        return code.return(`ref(deps[${dependencyCount++}], ${isMeta ? "true" : "false"})`);
                     }
                 case "FUNCALL":
                     const args = compileFunctionArgs(ast).map((arg) => arg.assignResultToVariable());
@@ -22002,7 +22001,7 @@ function compileTokensOrThrow(tokens) {
     const compiledFormula = {
         execute: functionCache[cacheKey],
         dependencies,
-        constantValues,
+        literalValues,
         symbols,
         tokens,
         isBadExpression: false,
@@ -22015,33 +22014,31 @@ function compileTokensOrThrow(tokens) {
  * References, numbers and strings are replaced with placeholders because
  * the compiled formula does not depend on their actual value.
  * Both `=A1+1+"2"` and `=A2+2+"3"` are compiled to the exact same function.
- *
  * Spaces are also ignored to compute the cache key.
  *
- * A formula `=A1+A2+SUM(2, 2, "2")` have the cache key `=|0|+|1|+SUM(|N0|,|N0|,|S0|)`
+ * A formula `=A1+A2+SUM(2, 2, "2")` have the cache key `=|C|+|C|+SUM(|N|,|N|,|S|)`
  */
-function compilationCacheKey(tokens, dependencies, constantValues, symbols) {
+function compilationCacheKey(tokens) {
     let cacheKey = "";
     for (const token of tokens) {
         switch (token.type) {
             case "STRING":
-                const value = removeStringQuotes(token.value);
-                cacheKey += `|S${constantValues.strings.indexOf(value)}|`;
+                cacheKey += "|S|";
                 break;
             case "NUMBER":
-                cacheKey += `|N${constantValues.numbers.indexOf(parseNumber(token.value, DEFAULT_LOCALE))}|`;
+                cacheKey += "|N|";
                 break;
             case "REFERENCE":
             case "INVALID_REFERENCE":
                 if (token.value.includes(":")) {
-                    cacheKey += `R|${dependencies.indexOf(token.value)}|`;
+                    cacheKey += "|R|";
                 }
                 else {
-                    cacheKey += `C|${dependencies.indexOf(token.value)}|`;
+                    cacheKey += "|C|";
                 }
                 break;
             case "SPACE":
-                cacheKey += "";
+                // ignore spaces
                 break;
             default:
                 cacheKey += token.value;
@@ -22054,7 +22051,7 @@ function compilationCacheKey(tokens, dependencies, constantValues, symbols) {
  * Return formula arguments which are references, strings and numbers.
  */
 function formulaArguments(tokens) {
-    const constantValues = {
+    const literalValues = {
         numbers: [],
         strings: [],
     };
@@ -22068,15 +22065,11 @@ function formulaArguments(tokens) {
                 break;
             case "STRING":
                 const value = removeStringQuotes(token.value);
-                if (!constantValues.strings.includes(value)) {
-                    constantValues.strings.push(value);
-                }
+                literalValues.strings.push({ value });
                 break;
             case "NUMBER": {
                 const value = parseNumber(token.value, DEFAULT_LOCALE);
-                if (!constantValues.numbers.includes(value)) {
-                    constantValues.numbers.push(value);
-                }
+                literalValues.numbers.push({ value });
                 break;
             }
             case "SYMBOL": {
@@ -22087,7 +22080,7 @@ function formulaArguments(tokens) {
     }
     return {
         dependencies,
-        constantValues,
+        literalValues,
         symbols,
     };
 }
@@ -23008,9 +23001,9 @@ const XLSX_CHART_TYPES = [
 /** In XLSX color format (no #)  */
 const AUTO_COLOR = "000000";
 const XLSX_ICONSET_MAP = {
-    arrow: "3Arrows",
+    arrows: "3Arrows",
     smiley: "3Symbols",
-    dot: "3TrafficLights1",
+    dots: "3TrafficLights1",
 };
 const NAMESPACE = {
     styleSheet: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
@@ -23541,6 +23534,7 @@ const ICON_SET_CONVERSION_MAP = {
 };
 /** Map between legend position in XLSX file and human readable position  */
 const DRAWING_LEGEND_POSITION_CONVERSION_MAP = {
+    none: "none",
     b: "bottom",
     t: "top",
     l: "left",
@@ -26303,7 +26297,7 @@ class XlsxChartExtractor extends XlsxBaseExtractor {
                     default: "ffffff",
                 }).asString(),
                 legendPosition: DRAWING_LEGEND_POSITION_CONVERSION_MAP[this.extractChildAttr(rootChartElement, "c:legendPos", "val", {
-                    default: "b",
+                    default: "none",
                 }).asString()],
                 stacked: barChartGrouping === "stacked",
                 fontColor: "000000",
@@ -26337,7 +26331,7 @@ class XlsxChartExtractor extends XlsxBaseExtractor {
                 default: "ffffff",
             }).asString(),
             legendPosition: DRAWING_LEGEND_POSITION_CONVERSION_MAP[this.extractChildAttr(chartElement, "c:legendPos", "val", {
-                default: "b",
+                default: "none",
             }).asString()],
             stacked: barChartGrouping === "stacked",
             fontColor: "000000",
@@ -28949,7 +28943,8 @@ function getChartLabelValues(getters, dataSets, labelRange) {
         }
     }
     else if (dataSets.length === 1) {
-        for (let i = 0; i < getData(getters, dataSets[0]).length; i++) {
+        const dataLength = getData(getters, dataSets[0]).length;
+        for (let i = 0; i < dataLength; i++) {
             labels.formattedValues.push("");
             labels.values.push("");
         }
@@ -29132,7 +29127,7 @@ function getLineChartDatasets(definition, args) {
 function getScatterChartDatasets(definition, args) {
     const dataSets = getLineChartDatasets(definition, args);
     for (const dataSet of dataSets) {
-        if (dataSet.xAxisID !== TREND_LINE_XAXIS_ID) {
+        if (!isTrendLineAxis(dataSet.xAxisID)) {
             dataSet.showLine = false;
         }
     }
@@ -29259,7 +29254,9 @@ function getTrendingLineDataSet(dataset, config, data) {
     const borderColor = config.color || lightenColor(rgbaToHex(defaultBorderColor), 0.5);
     return {
         type: "line",
-        xAxisID: TREND_LINE_XAXIS_ID,
+        xAxisID: config.type === "trailingMovingAverage"
+            ? MOVING_AVERAGE_TREND_LINE_XAXIS_ID
+            : TREND_LINE_XAXIS_ID,
         yAxisID: dataset.yAxisID,
         label: dataset.label ? _t("Trend line for %s", dataset.label) : "",
         data,
@@ -29334,22 +29331,19 @@ function getPieChartLegend(definition, args) {
     const { dataSetsValues } = args;
     const dataSetsLength = Math.max(0, ...dataSetsValues.map((ds) => ds?.data?.length ?? 0));
     const colors = getPieColors(new ColorGenerator(dataSetsLength), dataSetsValues);
+    const fontColor = chartFontColor(definition.background);
     return {
         ...getLegendDisplayOptions(definition),
         labels: {
-            color: chartFontColor(definition.background),
             usePointStyle: true,
-            //@ts-ignore
-            generateLabels: (c) => 
-            //@ts-ignore
-            c.data.labels.map((label, index) => ({
+            generateLabels: (c) => c.data.labels?.map((label, index) => ({
                 text: truncateLabel(String(label)),
                 strokeStyle: colors[index],
                 fillStyle: colors[index],
                 pointStyle: "rect",
-                hidden: false,
                 lineWidth: 2,
-            })),
+                fontColor,
+            })) || [],
             filter: (legendItem, data) => {
                 return "datasetIndex" in legendItem
                     ? !data.datasets[legendItem.datasetIndex].hidden
@@ -29482,7 +29476,7 @@ function getCustomLegendLabels(fontColor, legendLabelConfig) {
             color: fontColor,
             usePointStyle: true,
             generateLabels: (chart) => chart.data.datasets.map((dataset, index) => {
-                if (dataset["xAxisID"] === TREND_LINE_XAXIS_ID) {
+                if (isTrendLineAxis(dataset["xAxisID"])) {
                     return {
                         text: truncateLabel(dataset.label),
                         fontColor,
@@ -29540,6 +29534,11 @@ function getBarChartScales(definition, args) {
             offset: false,
             display: false,
         };
+        scales[MOVING_AVERAGE_TREND_LINE_XAXIS_ID] = {
+            ...scales.x,
+            offset: false,
+            display: false,
+        };
     }
     return scales;
 }
@@ -29573,6 +29572,10 @@ function getLineChartScales(definition, args) {
             ...scales.x,
             display: false,
         };
+        scales[MOVING_AVERAGE_TREND_LINE_XAXIS_ID] = {
+            ...scales.x,
+            display: false,
+        };
         if (axisType === "category" || axisType === "time") {
             /* We add a second x axis here to draw the trend lines, with the labels length being
              * set so that the second axis points match the classical x axis
@@ -29581,6 +29584,8 @@ function getLineChartScales(definition, args) {
             scales[TREND_LINE_XAXIS_ID]["type"] = "category";
             scales[TREND_LINE_XAXIS_ID]["labels"] = range(0, maxLength).map((x) => x.toString());
             scales[TREND_LINE_XAXIS_ID]["offset"] = false;
+            scales[MOVING_AVERAGE_TREND_LINE_XAXIS_ID]["type"] = "category";
+            scales[MOVING_AVERAGE_TREND_LINE_XAXIS_ID]["offset"] = false;
         }
     }
     return scales;
@@ -29899,9 +29904,7 @@ function getBarChartTooltip(definition, args) {
         external: customTooltipHandler,
         callbacks: {
             title: function (tooltipItems) {
-                return tooltipItems.some((item) => item.dataset.xAxisID !== TREND_LINE_XAXIS_ID)
-                    ? undefined
-                    : "";
+                return tooltipItems.some((item) => !isTrendLineAxis(item.dataset.xAxisID)) ? undefined : "";
             },
             beforeLabel: (tooltipItem) => tooltipItem.dataset?.label || tooltipItem.label,
             label: function (tooltipItem) {
@@ -29928,7 +29931,7 @@ function getLineChartTooltip(definition, args) {
     if (axisType === "linear") {
         tooltip.callbacks.label = (tooltipItem) => {
             const dataSetPoint = tooltipItem.parsed.y;
-            let label = tooltipItem.dataset.xAxisID === TREND_LINE_XAXIS_ID
+            let label = isTrendLineAxis(tooltipItem.dataset.xAxisID)
                 ? ""
                 : tooltipItem.parsed.x;
             if (typeof label === "string" && isNumber(label, locale)) {
@@ -29950,8 +29953,7 @@ function getLineChartTooltip(definition, args) {
     }
     tooltip.callbacks.beforeLabel = (tooltipItem) => tooltipItem.dataset?.label || tooltipItem.label;
     tooltip.callbacks.title = function (tooltipItems) {
-        const displayTooltipTitle = axisType !== "linear" &&
-            tooltipItems.some((item) => item.dataset.xAxisID !== TREND_LINE_XAXIS_ID);
+        const displayTooltipTitle = axisType !== "linear" && tooltipItems.some((item) => !isTrendLineAxis(item.dataset.xAxisID));
         return displayTooltipTitle ? undefined : "";
     };
     return tooltip;
@@ -34205,6 +34207,7 @@ var CHART_HELPERS = /*#__PURE__*/Object.freeze({
   CHART_COMMON_OPTIONS: CHART_COMMON_OPTIONS,
   GaugeChart: GaugeChart,
   LineChart: LineChart,
+  MOVING_AVERAGE_TREND_LINE_XAXIS_ID: MOVING_AVERAGE_TREND_LINE_XAXIS_ID,
   PieChart: PieChart,
   ScorecardChart: ScorecardChart$1,
   TREND_LINE_XAXIS_ID: TREND_LINE_XAXIS_ID,
@@ -34234,6 +34237,7 @@ var CHART_HELPERS = /*#__PURE__*/Object.freeze({
   getDefinedAxis: getDefinedAxis,
   getPieColors: getPieColors,
   getSmartChartDefinition: getSmartChartDefinition,
+  isTrendLineAxis: isTrendLineAxis,
   shouldRemoveFirstLabel: shouldRemoveFirstLabel,
   toExcelDataset: toExcelDataset,
   toExcelLabelRange: toExcelLabelRange,
@@ -36281,9 +36285,7 @@ class FormulaFingerprintStore extends SpreadsheetStore {
                 }
             }
         }
-        // removes the index placeholders from the normalized formula
-        // =|N0|+|N1|+|N0| -> =|N|+|N|+|N|
-        const normalizedFormula = cell.compiledFormula.normalizedFormula.replace(/(|\w)(\d)(|)/g, "$1$3");
+        const normalizedFormula = cell.compiledFormula.normalizedFormula;
         return hash(fingerprintVector) + normalizedFormula;
     }
     getLiteralFingerprint(position) {
@@ -39628,9 +39630,11 @@ class SeriesDesignEditor extends Component {
         if (!runtime || !("chartJsConfig" in runtime)) {
             return [];
         }
-        return runtime.chartJsConfig.data.datasets.map((d) => d.label);
+        return runtime.chartJsConfig.data.datasets
+            .filter((d) => !isTrendLineAxis(d["xAxisID"] ?? ""))
+            .map((d) => d.label);
     }
-    updateSerieEditor(ev) {
+    updateEditedSeries(ev) {
         this.state.index = ev.target.selectedIndex;
     }
     updateDataSeriesColor(color) {
@@ -39643,7 +39647,7 @@ class SeriesDesignEditor extends Component {
         };
         this.props.updateChart(this.props.figureId, { dataSets });
     }
-    getDataSerieColor() {
+    getDataSeriesColor() {
         const dataSets = this.props.definition.dataSets;
         if (!dataSets?.[this.state.index])
             return "";
@@ -39663,7 +39667,7 @@ class SeriesDesignEditor extends Component {
         };
         this.props.updateChart(this.props.figureId, { dataSets });
     }
-    getDataSerieLabel() {
+    getDataSeriesLabel() {
         const dataSets = this.props.definition.dataSets;
         return dataSets[this.state.index]?.label || this.getDataSeries()[this.state.index];
     }
@@ -39776,7 +39780,7 @@ class SeriesWithAxisDesignEditor extends Component {
         }
         this.updateTrendLineValue(index, { window });
     }
-    getDataSerieColor(index) {
+    getDataSeriesColor(index) {
         const dataSets = this.props.definition.dataSets;
         if (!dataSets?.[index])
             return "";
@@ -39787,7 +39791,7 @@ class SeriesWithAxisDesignEditor extends Component {
     }
     getTrendLineColor(index) {
         return (this.getTrendLineConfiguration(index)?.color ??
-            setColorAlpha(this.getDataSerieColor(index), 0.5));
+            setColorAlpha(this.getDataSeriesColor(index), 0.5));
     }
     updateTrendLineColor(index, color) {
         this.updateTrendLineValue(index, { color });
@@ -70767,7 +70771,9 @@ css /* scss */ `
     border: 1px solid;
     font-family: ${DEFAULT_FONT};
 
-    .o-composer:empty:not(:focus):not(.active)::before {
+    /* In readonly we always show the fx icon if the composer is empty, not matter the focus */
+    .o-composer:empty:not(:focus):not(.active)::before,
+    &.o-topbar-composer-readonly .o-composer:empty::before {
       content: url("data:image/svg+xml,${encodeURIComponent(FX_SVG)}");
       position: relative;
       top: 20%;
@@ -74093,10 +74099,14 @@ function addIconSetRule(cf, rule) {
             continue;
         }
         const cfValueObjectNodes = cfValueObject.map((attrs) => escapeXml /*xml*/ `<cfvo ${formatAttributes(attrs)} />`);
+        const iconSetAttrs = [["iconSet", getIconSet(rule.icons)]];
+        if (isIconSetReversed(rule.icons)) {
+            iconSetAttrs.push(["reverse", "1"]);
+        }
         conditionalFormats.push(escapeXml /*xml*/ `
       <conditionalFormatting sqref="${range}">
         <cfRule ${formatAttributes(ruleAttributes)}>
-          <iconSet iconSet="${getIconSet(rule.icons)}">
+          <iconSet ${formatAttributes(iconSetAttrs)}>
             ${joinXmlNodes(cfValueObjectNodes)}
           </iconSet>
         </cfRule>
@@ -74114,9 +74124,21 @@ function commonCfAttributes(cf) {
         ["stopIfTrue", cf.stopIfTrue ? 1 : 0],
     ];
 }
+function isIconSetReversed(iconSet) {
+    const defaultIconSet = ICON_SETS[detectIconsType(iconSet)];
+    return iconSet.upper === defaultIconSet.bad && iconSet.lower === defaultIconSet.good;
+}
 function getIconSet(iconSet) {
-    return XLSX_ICONSET_MAP[Object.keys(XLSX_ICONSET_MAP).find((key) => iconSet.upper.toLowerCase().startsWith(key)) ||
-        "dots"];
+    return XLSX_ICONSET_MAP[detectIconsType(iconSet)];
+}
+/**
+ * Partial detection based on "upper" point only.
+ * We support any arbitrary icon in the set, while excel doesn't allow
+ * mixing icons from different types.
+ */
+function detectIconsType(iconSet) {
+    const type = Object.keys(ICON_SETS).find((type) => Object.values(ICON_SETS[type]).includes(iconSet.upper)) || "dots";
+    return type;
 }
 function thresholdAttributes(threshold, position) {
     const type = getExcelThresholdType(threshold.type, position);
@@ -76021,6 +76043,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "18.2.4";
-__info__.date = "2025-03-19T08:20:57.717Z";
-__info__.hash = "958936a";
+__info__.version = "18.2.5";
+__info__.date = "2025-03-26T12:47:44.113Z";
+__info__.hash = "4675edd";