@odoo/o-spreadsheet 18.2.4 → 18.2.5

package/dist/o-spreadsheet.iife.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
  */
 
 (function (exports, owl) {
@@ -1132,7 +1132,10 @@
       }
       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) {
@@ -7000,7 +7003,7 @@
    */
   function canonicalizeNumberContent(content, locale) {
       return content.startsWith("=")
-          ? canonicalizeFormula$1(content, locale)
+          ? canonicalizeFormula(content, locale)
           : canonicalizeNumberLiteral(content, locale);
   }
   /**
@@ -7015,7 +7018,7 @@
    */
   function canonicalizeContent(content, locale) {
       return content.startsWith("=")
-          ? canonicalizeFormula$1(content, locale)
+          ? canonicalizeFormula(content, locale)
           : canonicalizeLiteral(content, locale);
   }
   /**
@@ -7031,15 +7034,21 @@
           ? 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;
@@ -7194,37 +7203,6 @@
       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;
@@ -9600,6 +9578,7 @@ stores.inject(MyMetaStore, storeInstance);
   }
 
   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)
@@ -9950,6 +9929,9 @@ stores.inject(MyMetaStore, storeInstance);
       }
       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 = {
@@ -9994,7 +9976,7 @@ stores.inject(MyMetaStore, storeInstance);
       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++) {
@@ -10037,7 +10019,7 @@ stores.inject(MyMetaStore, storeInstance);
       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++) {
@@ -20545,11 +20527,26 @@ stores.inject(MyMetaStore, storeInstance);
           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,
   };
@@ -21884,11 +21881,14 @@ stores.inject(MyMetaStore, storeInstance);
       }
   }
   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"));
           }
@@ -21962,16 +21962,15 @@ stores.inject(MyMetaStore, storeInstance);
                   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());
@@ -22003,7 +22002,7 @@ stores.inject(MyMetaStore, storeInstance);
       const compiledFormula = {
           execute: functionCache[cacheKey],
           dependencies,
-          constantValues,
+          literalValues,
           symbols,
           tokens,
           isBadExpression: false,
@@ -22016,33 +22015,31 @@ stores.inject(MyMetaStore, storeInstance);
    * 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;
@@ -22055,7 +22052,7 @@ stores.inject(MyMetaStore, storeInstance);
    * Return formula arguments which are references, strings and numbers.
    */
   function formulaArguments(tokens) {
-      const constantValues = {
+      const literalValues = {
           numbers: [],
           strings: [],
       };
@@ -22069,15 +22066,11 @@ stores.inject(MyMetaStore, storeInstance);
                   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": {
@@ -22088,7 +22081,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       return {
           dependencies,
-          constantValues,
+          literalValues,
           symbols,
       };
   }
@@ -23009,9 +23002,9 @@ stores.inject(MyMetaStore, storeInstance);
   /** 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",
@@ -23542,6 +23535,7 @@ stores.inject(MyMetaStore, storeInstance);
   };
   /** 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",
@@ -26304,7 +26298,7 @@ stores.inject(MyMetaStore, storeInstance);
                       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",
@@ -26338,7 +26332,7 @@ stores.inject(MyMetaStore, storeInstance);
                   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",
@@ -28950,7 +28944,8 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       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("");
           }
@@ -29133,7 +29128,7 @@ stores.inject(MyMetaStore, storeInstance);
   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;
           }
       }
@@ -29260,7 +29255,9 @@ stores.inject(MyMetaStore, storeInstance);
       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,
@@ -29335,22 +29332,19 @@ stores.inject(MyMetaStore, storeInstance);
       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
@@ -29483,7 +29477,7 @@ stores.inject(MyMetaStore, storeInstance);
               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,
@@ -29541,6 +29535,11 @@ stores.inject(MyMetaStore, storeInstance);
               offset: false,
               display: false,
           };
+          scales[MOVING_AVERAGE_TREND_LINE_XAXIS_ID] = {
+              ...scales.x,
+              offset: false,
+              display: false,
+          };
       }
       return scales;
   }
@@ -29574,6 +29573,10 @@ stores.inject(MyMetaStore, storeInstance);
               ...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
@@ -29582,6 +29585,8 @@ stores.inject(MyMetaStore, storeInstance);
               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;
@@ -29900,9 +29905,7 @@ stores.inject(MyMetaStore, storeInstance);
           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) {
@@ -29929,7 +29932,7 @@ stores.inject(MyMetaStore, storeInstance);
       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)) {
@@ -29951,8 +29954,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       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;
@@ -34206,6 +34208,7 @@ stores.inject(MyMetaStore, storeInstance);
     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,
@@ -34235,6 +34238,7 @@ stores.inject(MyMetaStore, storeInstance);
     getDefinedAxis: getDefinedAxis,
     getPieColors: getPieColors,
     getSmartChartDefinition: getSmartChartDefinition,
+    isTrendLineAxis: isTrendLineAxis,
     shouldRemoveFirstLabel: shouldRemoveFirstLabel,
     toExcelDataset: toExcelDataset,
     toExcelLabelRange: toExcelLabelRange,
@@ -36282,9 +36286,7 @@ stores.inject(MyMetaStore, storeInstance);
                   }
               }
           }
-          // 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) {
@@ -39629,9 +39631,11 @@ stores.inject(MyMetaStore, storeInstance);
           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) {
@@ -39644,7 +39648,7 @@ stores.inject(MyMetaStore, storeInstance);
           };
           this.props.updateChart(this.props.figureId, { dataSets });
       }
-      getDataSerieColor() {
+      getDataSeriesColor() {
           const dataSets = this.props.definition.dataSets;
           if (!dataSets?.[this.state.index])
               return "";
@@ -39664,7 +39668,7 @@ stores.inject(MyMetaStore, storeInstance);
           };
           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];
       }
@@ -39777,7 +39781,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
           this.updateTrendLineValue(index, { window });
       }
-      getDataSerieColor(index) {
+      getDataSeriesColor(index) {
           const dataSets = this.props.definition.dataSets;
           if (!dataSets?.[index])
               return "";
@@ -39788,7 +39792,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       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 });
@@ -70768,7 +70772,9 @@ stores.inject(MyMetaStore, storeInstance);
     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%;
@@ -74094,10 +74100,14 @@ stores.inject(MyMetaStore, storeInstance);
               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>
@@ -74115,9 +74125,21 @@ stores.inject(MyMetaStore, storeInstance);
           ["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);
@@ -76067,9 +76089,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = 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";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);