@odoo/o-spreadsheet 18.4.3 → 18.4.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.4.3
- * @date 2025-07-28T13:39:06.036Z
- * @hash 4b596d7
+ * @version 18.4.5
+ * @date 2025-08-04T06:54:49.107Z
+ * @hash 358931f
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, useExternalListener, onWillUpdateProps, onWillStart, onWillPatch, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -1056,16 +1056,21 @@ const colors = [
     "#001f3f",
 ];
 /*
- * transform a color number (R * 256^2 + G * 256 + B) into classic hex6 value
+ * transform a color number (R * 256^2 + G * 256 + B) into classic hex (+alpha) value
  * */
-function colorNumberString(color) {
-    return toHex(color.toString(16).padStart(6, "0"));
+function colorNumberToHex(color, alpha = 1) {
+    const alphaHex = alpha !== 1
+        ? Math.round(alpha * 255)
+            .toString(16)
+            .padStart(2, "0")
+        : "";
+    return toHex(color.toString(16).padStart(6, "0")) + alphaHex;
 }
 function colorToNumber(color) {
     if (typeof color === "number") {
         return color;
     }
-    return Number.parseInt(toHex(color).slice(1), 16);
+    return Number.parseInt(toHex(color).slice(1, 7), 16);
 }
 /**
  * Converts any CSS color value to a standardized hex6 value.
@@ -1324,6 +1329,12 @@ function hslaToHex(hsla) {
 function hexToHSLA(hex) {
     return rgbaToHSLA(colorToRGBA(hex));
 }
+function colorOrNumberToRGBA(color) {
+    if (typeof color === "number") {
+        return colorToRGBA(colorNumberToHex(color));
+    }
+    return colorToRGBA(color);
+}
 /**
  * Will compare two color strings
  * A tolerance can be provided to account for small differences that could
@@ -1605,6 +1616,8 @@ function getColorScale(colorScalePoints) {
     const sortedColorScalePoints = [...colorScalePoints.sort((a, b) => a.value - b.value)];
     const thresholds = [];
     for (let i = 1; i < sortedColorScalePoints.length; i++) {
+        const minColorAlpha = colorOrNumberToRGBA(sortedColorScalePoints[i - 1].color).a;
+        const maxColorAlpha = colorOrNumberToRGBA(sortedColorScalePoints[i].color).a;
         const minColor = colorToNumber(sortedColorScalePoints[i - 1].color);
         const maxColor = colorToNumber(sortedColorScalePoints[i].color);
         thresholds.push({
@@ -1612,19 +1625,21 @@ function getColorScale(colorScalePoints) {
             max: sortedColorScalePoints[i].value,
             minColor,
             maxColor,
+            minColorAlpha: minColorAlpha,
+            maxColorAlpha: maxColorAlpha,
             colorDiff: computeColorDiffUnits(sortedColorScalePoints[i - 1].value, sortedColorScalePoints[i].value, minColor, maxColor),
         });
     }
     return (value) => {
         if (value < thresholds[0].min) {
-            return colorNumberString(thresholds[0].minColor);
+            return colorNumberToHex(thresholds[0].minColor, thresholds[0].minColorAlpha);
         }
         for (const threshold of thresholds) {
             if (value >= threshold.min && value <= threshold.max) {
-                return colorNumberString(colorCell(value, threshold.min, threshold.minColor, threshold.colorDiff));
+                return colorNumberToHex(colorCell(value, threshold.min, threshold.minColor, threshold.colorDiff), threshold.maxColorAlpha);
             }
         }
-        return colorNumberString(thresholds[thresholds.length - 1].maxColor);
+        return colorNumberToHex(thresholds[thresholds.length - 1].maxColor, thresholds[thresholds.length - 1].maxColorAlpha);
     };
 }
 function computeColorDiffUnits(minValue, maxValue, minColor, maxColor) {
@@ -8624,12 +8639,12 @@ const AGGREGATOR_NAMES = {
     avg: _t("Average"),
     sum: _t("Sum"),
 };
-const NUMBER_CHAR_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
+const DEFAULT_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
 const AGGREGATORS_BY_FIELD_TYPE = {
-    integer: NUMBER_CHAR_AGGREGATORS,
-    char: NUMBER_CHAR_AGGREGATORS,
+    integer: DEFAULT_AGGREGATORS,
+    char: DEFAULT_AGGREGATORS,
+    datetime: DEFAULT_AGGREGATORS,
     boolean: ["count_distinct", "count", "bool_and", "bool_or"],
-    datetime: ["max", "min", "count_distinct", "count"],
 };
 const AGGREGATORS = {};
 for (const type in AGGREGATORS_BY_FIELD_TYPE) {
@@ -22760,6 +22775,7 @@ class ChartJsComponent extends Component {
             this.animationStore = useStore(ChartAnimationStore);
         }
         onMounted(() => {
+            registerChartJSExtensions();
             const runtime = this.chartRuntime;
             this.currentRuntime = runtime;
             // Note: chartJS modify the runtime in place, so it's important to give it a copy
@@ -31707,7 +31723,7 @@ criterionEvaluatorRegistry.add("isValueInRange", {
         }
         const criterionValues = getters.getDataValidationRangeValues(sheetId, criterion);
         return criterionValues
-            .map((value) => value.toLowerCase())
+            .map((value) => value.value.toLowerCase())
             .includes(value.toString().toLowerCase());
     },
     getErrorString: (criterion) => _t("The value must be a value in the range %s", String(criterion.values[0])),
@@ -51843,16 +51859,16 @@ class ConditionalFormatPreview extends Component {
             return cssPropertiesToCss(cellStyleToCss(rule.style));
         }
         else if (rule.type === "ColorScaleRule") {
-            const minColor = colorNumberString(rule.minimum.color);
-            const midColor = rule.midpoint ? colorNumberString(rule.midpoint.color) : null;
-            const maxColor = colorNumberString(rule.maximum.color);
+            const minColor = colorNumberToHex(rule.minimum.color);
+            const midColor = rule.midpoint ? colorNumberToHex(rule.midpoint.color) : null;
+            const maxColor = colorNumberToHex(rule.maximum.color);
             const baseString = "background-image: linear-gradient(to right, ";
             return midColor
                 ? baseString + minColor + ", " + midColor + ", " + maxColor + ")"
                 : baseString + minColor + ", " + maxColor + ")";
         }
         else if (rule.type === "DataBarRule") {
-            const color = colorNumberString(rule.color);
+            const color = colorNumberToHex(rule.color);
             return `background-image: linear-gradient(to right, ${color} 50%, white 50%)`;
         }
         return "";
@@ -52042,7 +52058,8 @@ class ConditionalFormattingEditor extends Component {
     static props = {
         editedCf: Object,
         onCancel: Function,
-        onSave: Function,
+        onExit: Function,
+        isNewCf: Boolean,
     };
     static components = {
         SelectionInput,
@@ -52059,7 +52076,7 @@ class ConditionalFormattingEditor extends Component {
     icons = ICONS;
     iconSets = ICON_SETS;
     getTextDecoration = getTextDecoration;
-    colorNumberString = colorNumberString;
+    colorNumberToHex = colorNumberToHex;
     state;
     setup() {
         this.state = useState({
@@ -52067,6 +52084,7 @@ class ConditionalFormattingEditor extends Component {
             currentCFType: this.props.editedCf.rule.type,
             ranges: this.props.editedCf.ranges,
             rules: this.getDefaultRules(),
+            hasEditedCf: this.props.isNewCf,
         });
         switch (this.props.editedCf.rule.type) {
             case "CellIsRule":
@@ -52118,6 +52136,9 @@ class ConditionalFormattingEditor extends Component {
             ranges: ranges.map((xc) => this.env.model.getters.getRangeDataFromXc(sheetId, xc)),
             sheetId,
         });
+        if (result.isSuccessful) {
+            this.state.hasEditedCf = true;
+        }
         const reasons = result.reasons.filter((r) => r !== "NoChanges" /* CommandResult.NoChanges */);
         if (!newCf.suppressErrors) {
             this.state.errors = reasons;
@@ -52139,7 +52160,15 @@ class ConditionalFormattingEditor extends Component {
     onSave() {
         const result = this.updateConditionalFormat({});
         if (result.length === 0) {
-            this.props.onSave();
+            this.props.onExit();
+        }
+    }
+    onCancel() {
+        if (this.state.hasEditedCf) {
+            this.props.onCancel();
+        }
+        else {
+            this.props.onExit();
         }
     }
     getDefaultRules() {
@@ -52298,9 +52327,9 @@ class ConditionalFormattingEditor extends Component {
     }
     getPreviewGradient() {
         const rule = this.state.rules.colorScale;
-        const minColor = colorNumberString(rule.minimum.color);
-        const midColor = colorNumberString(rule.midpoint?.color || DEFAULT_COLOR_SCALE_MIDPOINT_COLOR);
-        const maxColor = colorNumberString(rule.maximum.color);
+        const minColor = colorNumberToHex(rule.minimum.color);
+        const midColor = colorNumberToHex(rule.midpoint?.color || DEFAULT_COLOR_SCALE_MIDPOINT_COLOR);
+        const maxColor = colorNumberToHex(rule.maximum.color);
         const baseString = "background-image: linear-gradient(to right, ";
         return rule.midpoint === undefined
             ? baseString + minColor + ", " + maxColor + ")"
@@ -52308,8 +52337,8 @@ class ConditionalFormattingEditor extends Component {
     }
     getThresholdColor(threshold) {
         return threshold
-            ? colorNumberString(threshold.color)
-            : colorNumberString(DEFAULT_COLOR_SCALE_MIDPOINT_COLOR);
+            ? colorNumberToHex(threshold.color)
+            : colorNumberToHex(DEFAULT_COLOR_SCALE_MIDPOINT_COLOR);
     }
     onMidpointChange(ev) {
         const type = ev.target.value;
@@ -66532,9 +66561,9 @@ class CustomColorsPlugin extends CoreViewPlugin {
                 formatColors.push(rule.style.fillColor);
             }
             else if (rule.type === "ColorScaleRule") {
-                formatColors.push(colorNumberString(rule.minimum.color));
-                formatColors.push(rule.midpoint ? colorNumberString(rule.midpoint.color) : undefined);
-                formatColors.push(colorNumberString(rule.maximum.color));
+                formatColors.push(colorNumberToHex(rule.minimum.color));
+                formatColors.push(rule.midpoint ? colorNumberToHex(rule.midpoint.color) : undefined);
+                formatColors.push(colorNumberToHex(rule.maximum.color));
             }
         }
         return formatColors.filter(isDefined);
@@ -66905,7 +66934,7 @@ class EvaluationConditionalFormatPlugin extends CoreViewPlugin {
                 if (!computedDataBars[col])
                     computedDataBars[col] = [];
                 computedDataBars[col][row] = {
-                    color: colorNumberString(color),
+                    color: colorNumberToHex(color),
                     percentage: (cell.value * 100) / max,
                 };
             }
@@ -67034,8 +67063,16 @@ class EvaluationDataValidationPlugin extends CoreViewPlugin {
     }
     getDataValidationRangeValues(sheetId, criterion) {
         const range = this.getters.getRangeFromSheetXC(sheetId, String(criterion.values[0]));
-        const criterionValues = this.getters.getRangeValues(range);
-        return criterionValues.map((value) => value?.toString()).filter(isDefined);
+        const values = [];
+        const labelsSet = new Set();
+        for (const p of positions(range.zone)) {
+            const cell = this.getters.getEvaluatedCell({ ...p, sheetId: range.sheetId });
+            if (cell.formattedValue && !labelsSet.has(cell.formattedValue)) {
+                labelsSet.add(cell.formattedValue);
+                values.push({ label: cell.formattedValue, value: cell.value?.toString() || "" });
+            }
+        }
+        return values;
     }
     isCellValidCheckbox(cellPosition) {
         if (!this.getters.isMainCellPosition(cellPosition)) {
@@ -75650,25 +75687,30 @@ autoCompleteProviders.add("dataValidation", {
         }
         const sheetId = this.composer.currentEditedCell.sheetId;
         const values = rule.criterion.type === "isValueInRange"
-            ? Array.from(new Set(this.getters.getDataValidationRangeValues(sheetId, rule.criterion)))
-            : rule.criterion.values;
+            ? this.getters.getDataValidationRangeValues(sheetId, rule.criterion)
+            : rule.criterion.values.map((value) => ({ label: value, value }));
         const isChip = rule.criterion.displayStyle === "chip";
         if (!isChip) {
-            return values.map((value) => ({ text: value }));
+            return values.map((value) => ({
+                text: value.value,
+                fuzzySearchKey: value.label,
+                htmlContent: [{ value: value.label }],
+            }));
         }
         const colors = rule.criterion.colors;
         return values.map((value) => {
-            const color = colors?.[value];
+            const color = colors?.[value.value];
             return {
-                text: value,
+                text: value.value,
                 htmlContent: [
                     {
-                        value,
+                        value: value.label,
                         color: color ? chipTextColor(color) : undefined,
                         backgroundColor: color || GRAY_200,
                         classes: ["badge rounded-pill fs-6 fw-normal w-100 mt-1 text-start"],
                     },
                 ],
+                fuzzySearchKey: value.label,
             };
         });
     },
@@ -79909,7 +79951,6 @@ css /* scss */ `
     }
   }
 
-  .o-spreadsheet-topbar-wrapper,
   .o-spreadsheet-bottombar-wrapper {
     z-index: ${ComponentsImportance.ScrollBar + 1};
   }
@@ -80024,7 +80065,6 @@ class Spreadsheet extends Component {
             this.checkViewportSize();
             stores.on("store-updated", this, render);
             resizeObserver.observe(this.spreadsheetRef.el);
-            registerChartJSExtensions();
         });
         onWillUnmount(() => {
             this.unbindModelEvents();
@@ -82557,7 +82597,7 @@ function addDataBarRule(cf, rule) {
         <dataBar>
           <cfvo type="min" val="0"/>
           <cfvo type="max" val="100"/>
-          <color rgb="${toXlsxHexColor(colorNumberString(rule.color))}"/>
+          <color rgb="${toXlsxHexColor(colorNumberToHex(rule.color))}"/>
         </dataBar>
       </cfRule>
     </conditionalFormatting>
@@ -82585,7 +82625,7 @@ function addColorScaleRule(cf, rule) {
                 continue;
             }
             cfValueObject.push(thresholdAttributes(threshold, position));
-            colors.push([["rgb", toXlsxHexColor(colorNumberString(threshold.color))]]);
+            colors.push([["rgb", toXlsxHexColor(colorNumberToHex(threshold.color))]]);
         }
         if (!canExport) {
             console.warn("Conditional formats with formula rules are not supported at the moment. The rule is therefore skipped.");
@@ -84596,6 +84636,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, ClientDisconnectedError, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, LocalTransportService, 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, invalidateChartEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "18.4.3";
-__info__.date = "2025-07-28T13:39:06.036Z";
-__info__.hash = "4b596d7";
+__info__.version = "18.4.5";
+__info__.date = "2025-08-04T06:54:49.107Z";
+__info__.hash = "358931f";

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.4.3
- * @date 2025-07-28T13:39:06.036Z
- * @hash 4b596d7
+ * @version 18.4.5
+ * @date 2025-08-04T06:54:49.107Z
+ * @hash 358931f
  */
 
 (function (exports, owl) {
@@ -1057,16 +1057,21 @@
       "#001f3f",
   ];
   /*
-   * transform a color number (R * 256^2 + G * 256 + B) into classic hex6 value
+   * transform a color number (R * 256^2 + G * 256 + B) into classic hex (+alpha) value
    * */
-  function colorNumberString(color) {
-      return toHex(color.toString(16).padStart(6, "0"));
+  function colorNumberToHex(color, alpha = 1) {
+      const alphaHex = alpha !== 1
+          ? Math.round(alpha * 255)
+              .toString(16)
+              .padStart(2, "0")
+          : "";
+      return toHex(color.toString(16).padStart(6, "0")) + alphaHex;
   }
   function colorToNumber(color) {
       if (typeof color === "number") {
           return color;
       }
-      return Number.parseInt(toHex(color).slice(1), 16);
+      return Number.parseInt(toHex(color).slice(1, 7), 16);
   }
   /**
    * Converts any CSS color value to a standardized hex6 value.
@@ -1325,6 +1330,12 @@
   function hexToHSLA(hex) {
       return rgbaToHSLA(colorToRGBA(hex));
   }
+  function colorOrNumberToRGBA(color) {
+      if (typeof color === "number") {
+          return colorToRGBA(colorNumberToHex(color));
+      }
+      return colorToRGBA(color);
+  }
   /**
    * Will compare two color strings
    * A tolerance can be provided to account for small differences that could
@@ -1606,6 +1617,8 @@
       const sortedColorScalePoints = [...colorScalePoints.sort((a, b) => a.value - b.value)];
       const thresholds = [];
       for (let i = 1; i < sortedColorScalePoints.length; i++) {
+          const minColorAlpha = colorOrNumberToRGBA(sortedColorScalePoints[i - 1].color).a;
+          const maxColorAlpha = colorOrNumberToRGBA(sortedColorScalePoints[i].color).a;
           const minColor = colorToNumber(sortedColorScalePoints[i - 1].color);
           const maxColor = colorToNumber(sortedColorScalePoints[i].color);
           thresholds.push({
@@ -1613,19 +1626,21 @@
               max: sortedColorScalePoints[i].value,
               minColor,
               maxColor,
+              minColorAlpha: minColorAlpha,
+              maxColorAlpha: maxColorAlpha,
               colorDiff: computeColorDiffUnits(sortedColorScalePoints[i - 1].value, sortedColorScalePoints[i].value, minColor, maxColor),
           });
       }
       return (value) => {
           if (value < thresholds[0].min) {
-              return colorNumberString(thresholds[0].minColor);
+              return colorNumberToHex(thresholds[0].minColor, thresholds[0].minColorAlpha);
           }
           for (const threshold of thresholds) {
               if (value >= threshold.min && value <= threshold.max) {
-                  return colorNumberString(colorCell(value, threshold.min, threshold.minColor, threshold.colorDiff));
+                  return colorNumberToHex(colorCell(value, threshold.min, threshold.minColor, threshold.colorDiff), threshold.maxColorAlpha);
               }
           }
-          return colorNumberString(thresholds[thresholds.length - 1].maxColor);
+          return colorNumberToHex(thresholds[thresholds.length - 1].maxColor, thresholds[thresholds.length - 1].maxColorAlpha);
       };
   }
   function computeColorDiffUnits(minValue, maxValue, minColor, maxColor) {
@@ -8625,12 +8640,12 @@
       avg: _t("Average"),
       sum: _t("Sum"),
   };
-  const NUMBER_CHAR_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
+  const DEFAULT_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
   const AGGREGATORS_BY_FIELD_TYPE = {
-      integer: NUMBER_CHAR_AGGREGATORS,
-      char: NUMBER_CHAR_AGGREGATORS,
+      integer: DEFAULT_AGGREGATORS,
+      char: DEFAULT_AGGREGATORS,
+      datetime: DEFAULT_AGGREGATORS,
       boolean: ["count_distinct", "count", "bool_and", "bool_or"],
-      datetime: ["max", "min", "count_distinct", "count"],
   };
   const AGGREGATORS = {};
   for (const type in AGGREGATORS_BY_FIELD_TYPE) {
@@ -22761,6 +22776,7 @@ stores.inject(MyMetaStore, storeInstance);
               this.animationStore = useStore(ChartAnimationStore);
           }
           owl.onMounted(() => {
+              registerChartJSExtensions();
               const runtime = this.chartRuntime;
               this.currentRuntime = runtime;
               // Note: chartJS modify the runtime in place, so it's important to give it a copy
@@ -31708,7 +31724,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
           const criterionValues = getters.getDataValidationRangeValues(sheetId, criterion);
           return criterionValues
-              .map((value) => value.toLowerCase())
+              .map((value) => value.value.toLowerCase())
               .includes(value.toString().toLowerCase());
       },
       getErrorString: (criterion) => _t("The value must be a value in the range %s", String(criterion.values[0])),
@@ -51844,16 +51860,16 @@ stores.inject(MyMetaStore, storeInstance);
               return cssPropertiesToCss(cellStyleToCss(rule.style));
           }
           else if (rule.type === "ColorScaleRule") {
-              const minColor = colorNumberString(rule.minimum.color);
-              const midColor = rule.midpoint ? colorNumberString(rule.midpoint.color) : null;
-              const maxColor = colorNumberString(rule.maximum.color);
+              const minColor = colorNumberToHex(rule.minimum.color);
+              const midColor = rule.midpoint ? colorNumberToHex(rule.midpoint.color) : null;
+              const maxColor = colorNumberToHex(rule.maximum.color);
               const baseString = "background-image: linear-gradient(to right, ";
               return midColor
                   ? baseString + minColor + ", " + midColor + ", " + maxColor + ")"
                   : baseString + minColor + ", " + maxColor + ")";
           }
           else if (rule.type === "DataBarRule") {
-              const color = colorNumberString(rule.color);
+              const color = colorNumberToHex(rule.color);
               return `background-image: linear-gradient(to right, ${color} 50%, white 50%)`;
           }
           return "";
@@ -52043,7 +52059,8 @@ stores.inject(MyMetaStore, storeInstance);
       static props = {
           editedCf: Object,
           onCancel: Function,
-          onSave: Function,
+          onExit: Function,
+          isNewCf: Boolean,
       };
       static components = {
           SelectionInput,
@@ -52060,7 +52077,7 @@ stores.inject(MyMetaStore, storeInstance);
       icons = ICONS;
       iconSets = ICON_SETS;
       getTextDecoration = getTextDecoration;
-      colorNumberString = colorNumberString;
+      colorNumberToHex = colorNumberToHex;
       state;
       setup() {
           this.state = owl.useState({
@@ -52068,6 +52085,7 @@ stores.inject(MyMetaStore, storeInstance);
               currentCFType: this.props.editedCf.rule.type,
               ranges: this.props.editedCf.ranges,
               rules: this.getDefaultRules(),
+              hasEditedCf: this.props.isNewCf,
           });
           switch (this.props.editedCf.rule.type) {
               case "CellIsRule":
@@ -52119,6 +52137,9 @@ stores.inject(MyMetaStore, storeInstance);
               ranges: ranges.map((xc) => this.env.model.getters.getRangeDataFromXc(sheetId, xc)),
               sheetId,
           });
+          if (result.isSuccessful) {
+              this.state.hasEditedCf = true;
+          }
           const reasons = result.reasons.filter((r) => r !== "NoChanges" /* CommandResult.NoChanges */);
           if (!newCf.suppressErrors) {
               this.state.errors = reasons;
@@ -52140,7 +52161,15 @@ stores.inject(MyMetaStore, storeInstance);
       onSave() {
           const result = this.updateConditionalFormat({});
           if (result.length === 0) {
-              this.props.onSave();
+              this.props.onExit();
+          }
+      }
+      onCancel() {
+          if (this.state.hasEditedCf) {
+              this.props.onCancel();
+          }
+          else {
+              this.props.onExit();
           }
       }
       getDefaultRules() {
@@ -52299,9 +52328,9 @@ stores.inject(MyMetaStore, storeInstance);
       }
       getPreviewGradient() {
           const rule = this.state.rules.colorScale;
-          const minColor = colorNumberString(rule.minimum.color);
-          const midColor = colorNumberString(rule.midpoint?.color || DEFAULT_COLOR_SCALE_MIDPOINT_COLOR);
-          const maxColor = colorNumberString(rule.maximum.color);
+          const minColor = colorNumberToHex(rule.minimum.color);
+          const midColor = colorNumberToHex(rule.midpoint?.color || DEFAULT_COLOR_SCALE_MIDPOINT_COLOR);
+          const maxColor = colorNumberToHex(rule.maximum.color);
           const baseString = "background-image: linear-gradient(to right, ";
           return rule.midpoint === undefined
               ? baseString + minColor + ", " + maxColor + ")"
@@ -52309,8 +52338,8 @@ stores.inject(MyMetaStore, storeInstance);
       }
       getThresholdColor(threshold) {
           return threshold
-              ? colorNumberString(threshold.color)
-              : colorNumberString(DEFAULT_COLOR_SCALE_MIDPOINT_COLOR);
+              ? colorNumberToHex(threshold.color)
+              : colorNumberToHex(DEFAULT_COLOR_SCALE_MIDPOINT_COLOR);
       }
       onMidpointChange(ev) {
           const type = ev.target.value;
@@ -66533,9 +66562,9 @@ stores.inject(MyMetaStore, storeInstance);
                   formatColors.push(rule.style.fillColor);
               }
               else if (rule.type === "ColorScaleRule") {
-                  formatColors.push(colorNumberString(rule.minimum.color));
-                  formatColors.push(rule.midpoint ? colorNumberString(rule.midpoint.color) : undefined);
-                  formatColors.push(colorNumberString(rule.maximum.color));
+                  formatColors.push(colorNumberToHex(rule.minimum.color));
+                  formatColors.push(rule.midpoint ? colorNumberToHex(rule.midpoint.color) : undefined);
+                  formatColors.push(colorNumberToHex(rule.maximum.color));
               }
           }
           return formatColors.filter(isDefined);
@@ -66906,7 +66935,7 @@ stores.inject(MyMetaStore, storeInstance);
                   if (!computedDataBars[col])
                       computedDataBars[col] = [];
                   computedDataBars[col][row] = {
-                      color: colorNumberString(color),
+                      color: colorNumberToHex(color),
                       percentage: (cell.value * 100) / max,
                   };
               }
@@ -67035,8 +67064,16 @@ stores.inject(MyMetaStore, storeInstance);
       }
       getDataValidationRangeValues(sheetId, criterion) {
           const range = this.getters.getRangeFromSheetXC(sheetId, String(criterion.values[0]));
-          const criterionValues = this.getters.getRangeValues(range);
-          return criterionValues.map((value) => value?.toString()).filter(isDefined);
+          const values = [];
+          const labelsSet = new Set();
+          for (const p of positions(range.zone)) {
+              const cell = this.getters.getEvaluatedCell({ ...p, sheetId: range.sheetId });
+              if (cell.formattedValue && !labelsSet.has(cell.formattedValue)) {
+                  labelsSet.add(cell.formattedValue);
+                  values.push({ label: cell.formattedValue, value: cell.value?.toString() || "" });
+              }
+          }
+          return values;
       }
       isCellValidCheckbox(cellPosition) {
           if (!this.getters.isMainCellPosition(cellPosition)) {
@@ -75651,25 +75688,30 @@ stores.inject(MyMetaStore, storeInstance);
           }
           const sheetId = this.composer.currentEditedCell.sheetId;
           const values = rule.criterion.type === "isValueInRange"
-              ? Array.from(new Set(this.getters.getDataValidationRangeValues(sheetId, rule.criterion)))
-              : rule.criterion.values;
+              ? this.getters.getDataValidationRangeValues(sheetId, rule.criterion)
+              : rule.criterion.values.map((value) => ({ label: value, value }));
           const isChip = rule.criterion.displayStyle === "chip";
           if (!isChip) {
-              return values.map((value) => ({ text: value }));
+              return values.map((value) => ({
+                  text: value.value,
+                  fuzzySearchKey: value.label,
+                  htmlContent: [{ value: value.label }],
+              }));
           }
           const colors = rule.criterion.colors;
           return values.map((value) => {
-              const color = colors?.[value];
+              const color = colors?.[value.value];
               return {
-                  text: value,
+                  text: value.value,
                   htmlContent: [
                       {
-                          value,
+                          value: value.label,
                           color: color ? chipTextColor(color) : undefined,
                           backgroundColor: color || GRAY_200,
                           classes: ["badge rounded-pill fs-6 fw-normal w-100 mt-1 text-start"],
                       },
                   ],
+                  fuzzySearchKey: value.label,
               };
           });
       },
@@ -79910,7 +79952,6 @@ stores.inject(MyMetaStore, storeInstance);
     }
   }
 
-  .o-spreadsheet-topbar-wrapper,
   .o-spreadsheet-bottombar-wrapper {
     z-index: ${ComponentsImportance.ScrollBar + 1};
   }
@@ -80025,7 +80066,6 @@ stores.inject(MyMetaStore, storeInstance);
               this.checkViewportSize();
               stores.on("store-updated", this, render);
               resizeObserver.observe(this.spreadsheetRef.el);
-              registerChartJSExtensions();
           });
           owl.onWillUnmount(() => {
               this.unbindModelEvents();
@@ -82558,7 +82598,7 @@ stores.inject(MyMetaStore, storeInstance);
         <dataBar>
           <cfvo type="min" val="0"/>
           <cfvo type="max" val="100"/>
-          <color rgb="${toXlsxHexColor(colorNumberString(rule.color))}"/>
+          <color rgb="${toXlsxHexColor(colorNumberToHex(rule.color))}"/>
         </dataBar>
       </cfRule>
     </conditionalFormatting>
@@ -82586,7 +82626,7 @@ stores.inject(MyMetaStore, storeInstance);
                   continue;
               }
               cfValueObject.push(thresholdAttributes(threshold, position));
-              colors.push([["rgb", toXlsxHexColor(colorNumberString(threshold.color))]]);
+              colors.push([["rgb", toXlsxHexColor(colorNumberToHex(threshold.color))]]);
           }
           if (!canExport) {
               console.warn("Conditional formats with formula rules are not supported at the moment. The rule is therefore skipped.");
@@ -84645,9 +84685,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.4.3";
-  __info__.date = "2025-07-28T13:39:06.036Z";
-  __info__.hash = "4b596d7";
+  __info__.version = "18.4.5";
+  __info__.date = "2025-08-04T06:54:49.107Z";
+  __info__.hash = "358931f";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);