@odoo/o-spreadsheet 18.2.22 → 18.2.24

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.2.22
- * @date 2025-07-28T13:37:29.067Z
- * @hash 0e414b1
+ * @version 18.2.24
+ * @date 2025-08-04T06:52:37.759Z
+ * @hash 5709b1b
  */
 
 'use strict';
@@ -8367,12 +8367,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) {
@@ -10652,6 +10652,7 @@ class ChartJsComponent extends owl.Component {
     }
     setup() {
         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
@@ -11317,31 +11318,40 @@ autoCompleteProviders.add("dataValidation", {
         if (!this.composer.currentEditedCell) {
             return [];
         }
-        const position = this.composer.currentEditedCell;
-        const rule = this.getters.getValidationRuleForCell(position);
-        if (!rule ||
-            (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
-            return [];
-        }
-        let values;
-        if (rule.criterion.type === "isValueInList") {
-            values = rule.criterion.values;
-        }
-        else {
-            const range = this.getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
-            values = Array.from(new Set(this.getters
-                .getRangeValues(range)
-                .filter(isNotNull)
-                .map((value) => value.toString())
-                .filter((val) => val !== "")));
-        }
-        return values.map((value) => ({ text: value }));
+        return getProposedValues(this.getters, this.composer.currentEditedCell).map((value) => ({
+            text: value.value?.toString() || "",
+            htmlContent: [{ value: value.label }],
+            fuzzySearchKey: value.label,
+        }));
     },
     selectProposal(tokenAtCursor, value) {
         this.composer.setCurrentContent(value);
         this.composer.stopEdition();
     },
 });
+function getProposedValues(getters, position) {
+    const rule = getters.getValidationRuleForCell(position);
+    if (!rule ||
+        (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
+        return [];
+    }
+    let values = [];
+    if (rule.criterion.type === "isValueInList") {
+        values = rule.criterion.values.map((value) => ({ label: value, value }));
+    }
+    else {
+        const labelsSet = new Set();
+        const range = getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
+        for (const p of positions(range.zone)) {
+            const cell = 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 });
+            }
+        }
+    }
+    return values;
+}
 
 function getHtmlContentFromPattern(pattern, value, highlightColor, className) {
     const pendingHtmlContent = [];
@@ -42812,7 +42822,8 @@ class ConditionalFormattingEditor extends owl.Component {
     static props = {
         editedCf: Object,
         onCancel: Function,
-        onSave: Function,
+        onExit: Function,
+        isNewCf: Boolean,
     };
     static components = {
         SelectionInput,
@@ -42831,6 +42842,7 @@ class ConditionalFormattingEditor extends owl.Component {
     getTextDecoration = getTextDecoration;
     colorNumberString = colorNumberString;
     state;
+    hasEditedCf = this.props.isNewCf;
     setup() {
         this.state = owl.useState({
             errors: [],
@@ -42888,6 +42900,9 @@ class ConditionalFormattingEditor extends owl.Component {
             ranges: ranges.map((xc) => this.env.model.getters.getRangeDataFromXc(sheetId, xc)),
             sheetId,
         });
+        if (result.isSuccessful) {
+            this.hasEditedCf = true;
+        }
         const reasons = result.reasons.filter((r) => r !== "NoChanges" /* CommandResult.NoChanges */);
         if (!newCf.suppressErrors) {
             this.state.errors = reasons;
@@ -42909,7 +42924,15 @@ class ConditionalFormattingEditor extends owl.Component {
     onSave() {
         const result = this.updateConditionalFormat({});
         if (result.length === 0) {
-            this.props.onSave();
+            this.props.onExit();
+        }
+    }
+    onCancel() {
+        if (this.hasEditedCf) {
+            this.props.onCancel();
+        }
+        else {
+            this.props.onExit();
         }
     }
     getDefaultRules() {
@@ -72693,7 +72716,6 @@ class Spreadsheet extends owl.Component {
             this.checkViewportSize();
             stores.on("store-updated", this, render);
             resizeObserver.observe(this.spreadsheetRef.el);
-            registerChartJSExtensions();
         });
         owl.onWillUnmount(() => {
             this.unbindModelEvents();
@@ -77237,6 +77259,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.2.22";
-__info__.date = "2025-07-28T13:37:29.067Z";
-__info__.hash = "0e414b1";
+__info__.version = "18.2.24";
+__info__.date = "2025-08-04T06:52:37.759Z";
+__info__.hash = "5709b1b";

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.22
- * @date 2025-07-28T13:37:29.067Z
- * @hash 0e414b1
+ * @version 18.2.24
+ * @date 2025-08-04T06:52:37.759Z
+ * @hash 5709b1b
  */
 
 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';
@@ -8365,12 +8365,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) {
@@ -10650,6 +10650,7 @@ class ChartJsComponent extends Component {
     }
     setup() {
         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
@@ -11315,31 +11316,40 @@ autoCompleteProviders.add("dataValidation", {
         if (!this.composer.currentEditedCell) {
             return [];
         }
-        const position = this.composer.currentEditedCell;
-        const rule = this.getters.getValidationRuleForCell(position);
-        if (!rule ||
-            (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
-            return [];
-        }
-        let values;
-        if (rule.criterion.type === "isValueInList") {
-            values = rule.criterion.values;
-        }
-        else {
-            const range = this.getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
-            values = Array.from(new Set(this.getters
-                .getRangeValues(range)
-                .filter(isNotNull)
-                .map((value) => value.toString())
-                .filter((val) => val !== "")));
-        }
-        return values.map((value) => ({ text: value }));
+        return getProposedValues(this.getters, this.composer.currentEditedCell).map((value) => ({
+            text: value.value?.toString() || "",
+            htmlContent: [{ value: value.label }],
+            fuzzySearchKey: value.label,
+        }));
     },
     selectProposal(tokenAtCursor, value) {
         this.composer.setCurrentContent(value);
         this.composer.stopEdition();
     },
 });
+function getProposedValues(getters, position) {
+    const rule = getters.getValidationRuleForCell(position);
+    if (!rule ||
+        (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
+        return [];
+    }
+    let values = [];
+    if (rule.criterion.type === "isValueInList") {
+        values = rule.criterion.values.map((value) => ({ label: value, value }));
+    }
+    else {
+        const labelsSet = new Set();
+        const range = getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
+        for (const p of positions(range.zone)) {
+            const cell = 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 });
+            }
+        }
+    }
+    return values;
+}
 
 function getHtmlContentFromPattern(pattern, value, highlightColor, className) {
     const pendingHtmlContent = [];
@@ -42810,7 +42820,8 @@ class ConditionalFormattingEditor extends Component {
     static props = {
         editedCf: Object,
         onCancel: Function,
-        onSave: Function,
+        onExit: Function,
+        isNewCf: Boolean,
     };
     static components = {
         SelectionInput,
@@ -42829,6 +42840,7 @@ class ConditionalFormattingEditor extends Component {
     getTextDecoration = getTextDecoration;
     colorNumberString = colorNumberString;
     state;
+    hasEditedCf = this.props.isNewCf;
     setup() {
         this.state = useState({
             errors: [],
@@ -42886,6 +42898,9 @@ class ConditionalFormattingEditor extends Component {
             ranges: ranges.map((xc) => this.env.model.getters.getRangeDataFromXc(sheetId, xc)),
             sheetId,
         });
+        if (result.isSuccessful) {
+            this.hasEditedCf = true;
+        }
         const reasons = result.reasons.filter((r) => r !== "NoChanges" /* CommandResult.NoChanges */);
         if (!newCf.suppressErrors) {
             this.state.errors = reasons;
@@ -42907,7 +42922,15 @@ class ConditionalFormattingEditor extends Component {
     onSave() {
         const result = this.updateConditionalFormat({});
         if (result.length === 0) {
-            this.props.onSave();
+            this.props.onExit();
+        }
+    }
+    onCancel() {
+        if (this.hasEditedCf) {
+            this.props.onCancel();
+        }
+        else {
+            this.props.onExit();
         }
     }
     getDefaultRules() {
@@ -72691,7 +72714,6 @@ class Spreadsheet extends Component {
             this.checkViewportSize();
             stores.on("store-updated", this, render);
             resizeObserver.observe(this.spreadsheetRef.el);
-            registerChartJSExtensions();
         });
         onWillUnmount(() => {
             this.unbindModelEvents();
@@ -77190,6 +77212,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.22";
-__info__.date = "2025-07-28T13:37:29.067Z";
-__info__.hash = "0e414b1";
+__info__.version = "18.2.24";
+__info__.date = "2025-08-04T06:52:37.759Z";
+__info__.hash = "5709b1b";

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.22
- * @date 2025-07-28T13:37:29.067Z
- * @hash 0e414b1
+ * @version 18.2.24
+ * @date 2025-08-04T06:52:37.759Z
+ * @hash 5709b1b
  */
 
 (function (exports, owl) {
@@ -8366,12 +8366,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) {
@@ -10651,6 +10651,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       setup() {
           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
@@ -11316,31 +11317,40 @@ stores.inject(MyMetaStore, storeInstance);
           if (!this.composer.currentEditedCell) {
               return [];
           }
-          const position = this.composer.currentEditedCell;
-          const rule = this.getters.getValidationRuleForCell(position);
-          if (!rule ||
-              (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
-              return [];
-          }
-          let values;
-          if (rule.criterion.type === "isValueInList") {
-              values = rule.criterion.values;
-          }
-          else {
-              const range = this.getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
-              values = Array.from(new Set(this.getters
-                  .getRangeValues(range)
-                  .filter(isNotNull)
-                  .map((value) => value.toString())
-                  .filter((val) => val !== "")));
-          }
-          return values.map((value) => ({ text: value }));
+          return getProposedValues(this.getters, this.composer.currentEditedCell).map((value) => ({
+              text: value.value?.toString() || "",
+              htmlContent: [{ value: value.label }],
+              fuzzySearchKey: value.label,
+          }));
       },
       selectProposal(tokenAtCursor, value) {
           this.composer.setCurrentContent(value);
           this.composer.stopEdition();
       },
   });
+  function getProposedValues(getters, position) {
+      const rule = getters.getValidationRuleForCell(position);
+      if (!rule ||
+          (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
+          return [];
+      }
+      let values = [];
+      if (rule.criterion.type === "isValueInList") {
+          values = rule.criterion.values.map((value) => ({ label: value, value }));
+      }
+      else {
+          const labelsSet = new Set();
+          const range = getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
+          for (const p of positions(range.zone)) {
+              const cell = 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 });
+              }
+          }
+      }
+      return values;
+  }
 
   function getHtmlContentFromPattern(pattern, value, highlightColor, className) {
       const pendingHtmlContent = [];
@@ -42811,7 +42821,8 @@ stores.inject(MyMetaStore, storeInstance);
       static props = {
           editedCf: Object,
           onCancel: Function,
-          onSave: Function,
+          onExit: Function,
+          isNewCf: Boolean,
       };
       static components = {
           SelectionInput,
@@ -42830,6 +42841,7 @@ stores.inject(MyMetaStore, storeInstance);
       getTextDecoration = getTextDecoration;
       colorNumberString = colorNumberString;
       state;
+      hasEditedCf = this.props.isNewCf;
       setup() {
           this.state = owl.useState({
               errors: [],
@@ -42887,6 +42899,9 @@ stores.inject(MyMetaStore, storeInstance);
               ranges: ranges.map((xc) => this.env.model.getters.getRangeDataFromXc(sheetId, xc)),
               sheetId,
           });
+          if (result.isSuccessful) {
+              this.hasEditedCf = true;
+          }
           const reasons = result.reasons.filter((r) => r !== "NoChanges" /* CommandResult.NoChanges */);
           if (!newCf.suppressErrors) {
               this.state.errors = reasons;
@@ -42908,7 +42923,15 @@ stores.inject(MyMetaStore, storeInstance);
       onSave() {
           const result = this.updateConditionalFormat({});
           if (result.length === 0) {
-              this.props.onSave();
+              this.props.onExit();
+          }
+      }
+      onCancel() {
+          if (this.hasEditedCf) {
+              this.props.onCancel();
+          }
+          else {
+              this.props.onExit();
           }
       }
       getDefaultRules() {
@@ -72692,7 +72715,6 @@ stores.inject(MyMetaStore, storeInstance);
               this.checkViewportSize();
               stores.on("store-updated", this, render);
               resizeObserver.observe(this.spreadsheetRef.el);
-              registerChartJSExtensions();
           });
           owl.onWillUnmount(() => {
               this.unbindModelEvents();
@@ -77236,9 +77258,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.2.22";
-  __info__.date = "2025-07-28T13:37:29.067Z";
-  __info__.hash = "0e414b1";
+  __info__.version = "18.2.24";
+  __info__.date = "2025-08-04T06:52:37.759Z";
+  __info__.hash = "5709b1b";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);