@odoo/o-spreadsheet 18.0.38 → 18.0.40

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.0.38
- * @date 2025-07-28T13:29:40.841Z
- * @hash 0f3b11a
+ * @version 18.0.40
+ * @date 2025-08-18T08:15:29.422Z
+ * @hash ec79db4
  */
 
 'use strict';
@@ -17385,31 +17385,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 = [];
@@ -25582,7 +25591,7 @@ const OFFSET = {
             right: startingCol + offsetWidth - 1,
             bottom: startingRow + offsetHeight - 1,
         };
-        const range = this.getters.getRangeFromZone(this.__originSheetId, dependencyZone);
+        const range = this.getters.getRangeFromZone(sheetId, dependencyZone);
         if (range.invalidXc || range.invalidSheetName) {
             return new InvalidReferenceError();
         }
@@ -43588,7 +43597,7 @@ class PivotLayoutConfigurator extends owl.Component {
         });
     }
     getMeasureId(fieldName, aggregator) {
-        const baseId = fieldName + (aggregator ? `:${aggregator}` : "");
+        const baseId = fieldName.replaceAll("'", "") + (aggregator ? `:${aggregator}` : "");
         let id = baseId;
         let i = 2;
         while (this.props.definition.measures.some((m) => m.id === id)) {
@@ -74640,6 +74649,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.0.38";
-__info__.date = "2025-07-28T13:29:40.841Z";
-__info__.hash = "0f3b11a";
+__info__.version = "18.0.40";
+__info__.date = "2025-08-18T08:15:29.422Z";
+__info__.hash = "ec79db4";

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.0.38
- * @date 2025-07-28T13:29:40.841Z
- * @hash 0f3b11a
+ * @version 18.0.40
+ * @date 2025-08-18T08:15:29.422Z
+ * @hash ec79db4
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -17383,31 +17383,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 = [];
@@ -25580,7 +25589,7 @@ const OFFSET = {
             right: startingCol + offsetWidth - 1,
             bottom: startingRow + offsetHeight - 1,
         };
-        const range = this.getters.getRangeFromZone(this.__originSheetId, dependencyZone);
+        const range = this.getters.getRangeFromZone(sheetId, dependencyZone);
         if (range.invalidXc || range.invalidSheetName) {
             return new InvalidReferenceError();
         }
@@ -43586,7 +43595,7 @@ class PivotLayoutConfigurator extends Component {
         });
     }
     getMeasureId(fieldName, aggregator) {
-        const baseId = fieldName + (aggregator ? `:${aggregator}` : "");
+        const baseId = fieldName.replaceAll("'", "") + (aggregator ? `:${aggregator}` : "");
         let id = baseId;
         let i = 2;
         while (this.props.definition.measures.some((m) => m.id === id)) {
@@ -74595,6 +74604,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, 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.0.38";
-__info__.date = "2025-07-28T13:29:40.841Z";
-__info__.hash = "0f3b11a";
+__info__.version = "18.0.40";
+__info__.date = "2025-08-18T08:15:29.422Z";
+__info__.hash = "ec79db4";

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.0.38
- * @date 2025-07-28T13:29:40.841Z
- * @hash 0f3b11a
+ * @version 18.0.40
+ * @date 2025-08-18T08:15:29.422Z
+ * @hash ec79db4
  */
 
 (function (exports, owl) {
@@ -17384,31 +17384,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 = [];
@@ -25581,7 +25590,7 @@ stores.inject(MyMetaStore, storeInstance);
               right: startingCol + offsetWidth - 1,
               bottom: startingRow + offsetHeight - 1,
           };
-          const range = this.getters.getRangeFromZone(this.__originSheetId, dependencyZone);
+          const range = this.getters.getRangeFromZone(sheetId, dependencyZone);
           if (range.invalidXc || range.invalidSheetName) {
               return new InvalidReferenceError();
           }
@@ -43587,7 +43596,7 @@ stores.inject(MyMetaStore, storeInstance);
           });
       }
       getMeasureId(fieldName, aggregator) {
-          const baseId = fieldName + (aggregator ? `:${aggregator}` : "");
+          const baseId = fieldName.replaceAll("'", "") + (aggregator ? `:${aggregator}` : "");
           let id = baseId;
           let i = 2;
           while (this.props.definition.measures.some((m) => m.id === id)) {
@@ -74639,9 +74648,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.0.38";
-  __info__.date = "2025-07-28T13:29:40.841Z";
-  __info__.hash = "0f3b11a";
+  __info__.version = "18.0.40";
+  __info__.date = "2025-08-18T08:15:29.422Z";
+  __info__.hash = "ec79db4";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);