@odoo/o-spreadsheet 18.4.3 → 18.4.4

package/dist/o-spreadsheet.cjs.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.4
+ * @date 2025-07-30T11:20:08.639Z
+ * @hash b14de14
  */
 
 'use strict';
@@ -8626,12 +8626,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) {
@@ -31709,7 +31709,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])),
@@ -52044,7 +52044,8 @@ class ConditionalFormattingEditor extends owl.Component {
     static props = {
         editedCf: Object,
         onCancel: Function,
-        onSave: Function,
+        onExit: Function,
+        isNewCf: Boolean,
     };
     static components = {
         SelectionInput,
@@ -52069,6 +52070,7 @@ class ConditionalFormattingEditor extends owl.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":
@@ -52120,6 +52122,9 @@ class ConditionalFormattingEditor extends owl.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;
@@ -52141,7 +52146,15 @@ class ConditionalFormattingEditor extends owl.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() {
@@ -67036,8 +67049,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)) {
@@ -75652,25 +75673,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,
             };
         });
     },
@@ -84646,6 +84672,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.4.3";
-__info__.date = "2025-07-28T13:39:06.036Z";
-__info__.hash = "4b596d7";
+__info__.version = "18.4.4";
+__info__.date = "2025-07-30T11:20:08.639Z";
+__info__.hash = "b14de14";

package/dist/o-spreadsheet.d.ts

@@ -5557,7 +5557,10 @@ declare class EvaluationDataValidationPlugin extends CoreViewPlugin {
      * The value must be canonicalized.
      */
     getDataValidationInvalidCriterionValueMessage(criterionType: DataValidationCriterionType, value: string): string | undefined;
-    getDataValidationRangeValues(sheetId: UID, criterion: EvaluatedCriterion): string[];
+    getDataValidationRangeValues(sheetId: UID, criterion: EvaluatedCriterion): {
+        value: string;
+        label: string;
+    }[];
     isCellValidCheckbox(cellPosition: CellPosition): boolean;
     /** Get the validation result if the cell on the given position had the given value */
     getValidationResultForCellValue(cellValue: CellValue, cellPosition: CellPosition): ValidationResult;

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.4
+ * @date 2025-07-30T11:20:08.639Z
+ * @hash b14de14
  */
 
 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';
@@ -8624,12 +8624,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) {
@@ -31707,7 +31707,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])),
@@ -52042,7 +52042,8 @@ class ConditionalFormattingEditor extends Component {
     static props = {
         editedCf: Object,
         onCancel: Function,
-        onSave: Function,
+        onExit: Function,
+        isNewCf: Boolean,
     };
     static components = {
         SelectionInput,
@@ -52067,6 +52068,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 +52120,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 +52144,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() {
@@ -67034,8 +67047,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 +75671,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,
             };
         });
     },
@@ -84596,6 +84622,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.4";
+__info__.date = "2025-07-30T11:20:08.639Z";
+__info__.hash = "b14de14";

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.4
+ * @date 2025-07-30T11:20:08.639Z
+ * @hash b14de14
  */
 
 (function (exports, owl) {
@@ -8625,12 +8625,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) {
@@ -31708,7 +31708,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])),
@@ -52043,7 +52043,8 @@ stores.inject(MyMetaStore, storeInstance);
       static props = {
           editedCf: Object,
           onCancel: Function,
-          onSave: Function,
+          onExit: Function,
+          isNewCf: Boolean,
       };
       static components = {
           SelectionInput,
@@ -52068,6 +52069,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 +52121,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 +52145,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() {
@@ -67035,8 +67048,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 +75672,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,
               };
           });
       },
@@ -84645,9 +84671,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.4";
+  __info__.date = "2025-07-30T11:20:08.639Z";
+  __info__.hash = "b14de14";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);