@odoo/o-spreadsheet 18.3.31 → 18.3.32

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.3.31
- * @date 2025-12-26T10:18:10.765Z
- * @hash 1e143e1
+ * @version 18.3.32
+ * @date 2026-01-14T10:00:27.532Z
+ * @hash 8d1d321
  */
 
 (function (exports, owl) {
@@ -18414,9 +18414,10 @@ stores.inject(MyMetaStore, storeInstance);
           throw new EvaluationError(_t("Function PIVOT takes an even number of arguments."));
       }
   }
-  function addPivotDependencies(evalContext, coreDefinition, forMeasures) {
+  function addPivotDependencies(evalContext, pivotId, forMeasures) {
       //TODO This function can be very costly when used with PIVOT.VALUE and PIVOT.HEADER
       const dependencies = [];
+      const coreDefinition = evalContext.getters.getPivotCoreDefinition(pivotId);
       if (coreDefinition.type === "SPREADSHEET" && coreDefinition.dataSet) {
           const { sheetId, zone } = coreDefinition.dataSet;
           const xc = zoneToXc(zone);
@@ -18433,8 +18434,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       for (const measure of forMeasures) {
           if (measure.computedBy) {
-              const formula = evalContext.getters.getMeasureCompiledFormula(measure);
-              dependencies.push(...formula.dependencies.filter((range) => !range.invalidXc));
+              dependencies.push(...evalContext.getters.getMeasureFullDependencies(pivotId, measure));
           }
       }
       const originPosition = evalContext.__originCellPosition;
@@ -18869,7 +18869,7 @@ stores.inject(MyMetaStore, storeInstance);
           assertDomainLength(domainArgs);
           const pivot = this.getters.getPivot(pivotId);
           const coreDefinition = this.getters.getPivotCoreDefinition(pivotId);
-          addPivotDependencies(this, coreDefinition, coreDefinition.measures.filter((m) => m.id === _measure));
+          addPivotDependencies(this, pivotId, coreDefinition.measures.filter((m) => m.id === _measure));
           pivot.init({ reload: pivot.needsReevaluation });
           const error = pivot.assertIsValid({ throwOnError: false });
           if (error) {
@@ -18902,8 +18902,7 @@ stores.inject(MyMetaStore, storeInstance);
           const _pivotId = getPivotId(_pivotFormulaId, this.getters);
           assertDomainLength(domainArgs);
           const pivot = this.getters.getPivot(_pivotId);
-          const coreDefinition = this.getters.getPivotCoreDefinition(_pivotId);
-          addPivotDependencies(this, coreDefinition, []);
+          addPivotDependencies(this, _pivotId, []);
           pivot.init({ reload: pivot.needsReevaluation });
           const error = pivot.assertIsValid({ throwOnError: false });
           if (error) {
@@ -18957,7 +18956,7 @@ stores.inject(MyMetaStore, storeInstance);
           const pivotId = getPivotId(_pivotFormulaId, this.getters);
           const pivot = this.getters.getPivot(pivotId);
           const coreDefinition = this.getters.getPivotCoreDefinition(pivotId);
-          addPivotDependencies(this, coreDefinition, coreDefinition.measures);
+          addPivotDependencies(this, pivotId, coreDefinition.measures);
           pivot.init({ reload: pivot.needsReevaluation });
           const error = pivot.assertIsValid({ throwOnError: false });
           if (error) {
@@ -23229,7 +23228,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       captureSelection(zone, col, row) {
           this.model.selection.capture(this, {
-              cell: { col: col ?? zone.left, row: row ?? zone.right },
+              cell: { col: col ?? zone.left, row: row ?? zone.top },
               zone,
           }, {
               handleEvent: this.handleEvent.bind(this),
@@ -47617,6 +47616,12 @@ stores.inject(MyMetaStore, storeInstance);
               case "ACTIVATE_SHEET":
                   this.isSearchDirty = true;
                   this.shouldFinalizeUpdateSelection = true;
+                  if (this.searchOptions.specificRange) {
+                      this.searchOptions.specificRange = {
+                          ...this.searchOptions.specificRange,
+                          sheetId: this.getters.getActiveSheetId(),
+                      };
+                  }
                   break;
               case "REPLACE_SEARCH":
                   for (const match of cmd.matches) {
@@ -48038,9 +48043,20 @@ stores.inject(MyMetaStore, storeInstance);
           const specificRange = this.env.model.getters.getRangeFromSheetXC(this.env.model.getters.getActiveSheetId(), this.state.dataRange);
           this.store.updateSearchOptions({ specificRange });
       }
+      get specificRange() {
+          const range = this.store.searchOptions.specificRange;
+          return range ? this.env.model.getters.getRangeString(range, "forceSheetReference") : "";
+      }
       get pendingSearch() {
           return this.updateSearchContent.isDebouncePending();
       }
+      get selectionInputKey() {
+          // Selections input are made to work with objects linked to a sheet id. They store the active sheet id at their creation,
+          // and have specific behaviour linked to it (eg. go back to the initial sheet after confirmation).
+          // We don't want all those behaviors here, so we force the recreation of the component when the active sheet changes.
+          // The only drawback is that the input loses focus when changing sheet.
+          return this.env.model.getters.getActiveSheetId();
+      }
   }
 
   css /* scss */ `
@@ -62742,6 +62758,7 @@ stores.inject(MyMetaStore, storeInstance);
           "getMeasureCompiledFormula",
           "getPivotName",
           "isExistingPivot",
+          "getMeasureFullDependencies",
       ];
       nextFormulaId = 1;
       pivots = {};
@@ -62824,7 +62841,7 @@ stores.inject(MyMetaStore, storeInstance);
               }
               case "UPDATE_PIVOT": {
                   this.history.update("pivots", cmd.pivotId, "definition", this.repairSortedColumn(deepCopy(cmd.pivot)));
-                  this.compileCalculatedMeasures(cmd.pivot.measures);
+                  this.compileCalculatedMeasures(cmd.pivotId, cmd.pivot.measures);
                   break;
               }
           }
@@ -62842,9 +62859,14 @@ stores.inject(MyMetaStore, storeInstance);
                   this.history.update("pivots", pivotId, "definition", newDefinition);
               }
           }
-          for (const sheetId in this.compiledMeasureFormulas) {
-              for (const formulaString in this.compiledMeasureFormulas[sheetId]) {
-                  const compiledFormula = this.compiledMeasureFormulas[sheetId][formulaString];
+          for (const pivotId in this.compiledMeasureFormulas) {
+              for (const measureId in this.compiledMeasureFormulas[pivotId]) {
+                  const measure = this.pivots[pivotId]?.definition.measures.find((m) => m.id === measureId);
+                  if (!measure || !measure.computedBy) {
+                      continue;
+                  }
+                  const sheetId = measure.computedBy.sheetId;
+                  const compiledFormula = this.compiledMeasureFormulas[pivotId][measureId].formula;
                   const newDependencies = [];
                   for (const range of compiledFormula.dependencies) {
                       const change = applyChange(range);
@@ -62856,8 +62878,9 @@ stores.inject(MyMetaStore, storeInstance);
                       }
                   }
                   const newFormulaString = this.getters.getFormulaString(sheetId, compiledFormula.tokens, newDependencies);
-                  if (newFormulaString !== formulaString) {
-                      this.replaceMeasureFormula(sheetId, formulaString, newFormulaString);
+                  const oldFormulaString = measure.computedBy.formula;
+                  if (newFormulaString !== oldFormulaString) {
+                      this.replaceMeasureFormula(pivotId, measure, newFormulaString);
                   }
               }
           }
@@ -62895,12 +62918,17 @@ stores.inject(MyMetaStore, storeInstance);
       isExistingPivot(pivotId) {
           return pivotId in this.pivots;
       }
-      getMeasureCompiledFormula(measure) {
+      getMeasureCompiledFormula(pivotId, measure) {
           if (!measure.computedBy) {
               throw new Error(`Measure ${measure.fieldName} is not computed by formula`);
           }
-          const sheetId = measure.computedBy.sheetId;
-          return this.compiledMeasureFormulas[sheetId][measure.computedBy.formula];
+          return this.compiledMeasureFormulas[pivotId][measure.id].formula;
+      }
+      getMeasureFullDependencies(pivotId, measure) {
+          if (!measure.computedBy) {
+              throw new Error(`Measure ${measure.fieldName} is not computed by formula`);
+          }
+          return this.compiledMeasureFormulas[pivotId][measure.id].dependencies;
       }
       // -------------------------------------------------------------------------
       // Private
@@ -62910,18 +62938,42 @@ stores.inject(MyMetaStore, storeInstance);
               definition: this.repairSortedColumn(deepCopy(pivot)),
               formulaId,
           });
-          this.compileCalculatedMeasures(pivot.measures);
+          this.compileCalculatedMeasures(pivotId, pivot.measures);
           this.history.update("formulaIds", formulaId, pivotId);
           this.history.update("nextFormulaId", this.nextFormulaId + 1);
       }
-      compileCalculatedMeasures(measures) {
+      compileCalculatedMeasures(pivotId, measures) {
           for (const measure of measures) {
               if (measure.computedBy) {
-                  const sheetId = measure.computedBy.sheetId;
                   const compiledFormula = this.compileMeasureFormula(measure.computedBy.sheetId, measure.computedBy.formula);
-                  this.history.update("compiledMeasureFormulas", sheetId, measure.computedBy.formula, compiledFormula);
+                  this.history.update("compiledMeasureFormulas", pivotId, measure.id, "formula", compiledFormula);
               }
           }
+          for (const measure of measures) {
+              if (measure.computedBy) {
+                  const dependencies = this.computeMeasureFullDependencies(pivotId, measure);
+                  this.history.update("compiledMeasureFormulas", pivotId, measure.id, "dependencies", dependencies);
+              }
+          }
+      }
+      computeMeasureFullDependencies(pivotId, measure, exploredMeasures = new Set()) {
+          const rangeDependencies = [];
+          const definition = this.getPivotCoreDefinition(pivotId);
+          const formula = this.getMeasureCompiledFormula(pivotId, measure);
+          exploredMeasures.add(measure.id);
+          for (const token of formula.tokens) {
+              if (token.type !== "SYMBOL") {
+                  continue;
+              }
+              const otherMeasure = definition.measures.find((measureCandidate) => getCanonicalSymbolName(measureCandidate.id) === token.value &&
+                  measure.id !== measureCandidate.id);
+              if (!otherMeasure || exploredMeasures.has(otherMeasure.id) || !otherMeasure.computedBy) {
+                  continue;
+              }
+              rangeDependencies.push(...this.computeMeasureFullDependencies(pivotId, otherMeasure, exploredMeasures));
+          }
+          rangeDependencies.push(...formula.dependencies.filter((range) => !range.invalidXc));
+          return rangeDependencies;
       }
       insertPivot(position, formulaId, table) {
           this.resizeSheet(position.sheetId, position, table);
@@ -62981,21 +63033,17 @@ stores.inject(MyMetaStore, storeInstance);
               dependencies: rangeDependencies,
           };
       }
-      replaceMeasureFormula(sheetId, formulaString, newFormulaString) {
-          this.history.update("compiledMeasureFormulas", sheetId, formulaString, undefined);
-          this.history.update("compiledMeasureFormulas", sheetId, newFormulaString, this.compileMeasureFormula(sheetId, newFormulaString));
-          for (const pivotId in this.pivots) {
-              const pivot = this.pivots[pivotId];
-              if (!pivot) {
-                  continue;
-              }
-              for (const measure of pivot.definition.measures) {
-                  if (measure.computedBy?.formula === formulaString) {
-                      const measureIndex = pivot.definition.measures.indexOf(measure);
-                      this.history.update("pivots", pivotId, "definition", "measures", measureIndex, "computedBy", { formula: newFormulaString, sheetId });
-                  }
-              }
+      replaceMeasureFormula(pivotId, measure, newFormulaString) {
+          const pivot = this.pivots[pivotId];
+          if (!pivot) {
+              return;
           }
+          const measureIndex = pivot.definition.measures.indexOf(measure);
+          this.history.update("pivots", pivotId, "definition", "measures", measureIndex, "computedBy", {
+              formula: newFormulaString,
+              sheetId: measure.computedBy.sheetId,
+          });
+          this.compileCalculatedMeasures(pivotId, pivot.definition.measures);
       }
       checkSortedColumnInMeasures(definition) {
           definition = this.repairSortedColumn(definition);
@@ -66285,14 +66333,16 @@ stores.inject(MyMetaStore, storeInstance);
   function withPivotPresentationLayer (PivotClass) {
       class PivotPresentationLayer extends PivotClass {
           getters;
+          pivotId;
           cache = {};
           rankAsc = {};
           rankDesc = {};
           runningTotal = {};
           runningTotalInPercent = {};
-          constructor(custom, params) {
+          constructor(pivotId, custom, params) {
               super(custom, params);
               this.getters = params.getters;
+              this.pivotId = pivotId;
           }
           markAsDirtyForEvaluation() {
               this.cache = {};
@@ -66342,7 +66392,7 @@ stores.inject(MyMetaStore, storeInstance);
                       return handleError(error, measure.aggregator.toUpperCase());
                   }
               }
-              const formula = this.getters.getMeasureCompiledFormula(measure);
+              const formula = this.getters.getMeasureCompiledFormula(this.pivotId, measure);
               const getSymbolValue = (symbolName) => {
                   const { columns, rows } = this.definition;
                   if (columns.find((col) => col.nameWithGranularity === symbolName)) {
@@ -67070,7 +67120,7 @@ stores.inject(MyMetaStore, storeInstance);
           const definition = deepCopy(this.getters.getPivotCoreDefinition(pivotId));
           if (!(pivotId in this.pivots)) {
               const Pivot = withPivotPresentationLayer(pivotRegistry.get(definition.type).ui);
-              this.pivots[pivotId] = new Pivot(this.custom, { definition, getters: this.getters });
+              this.pivots[pivotId] = new Pivot(pivotId, this.custom, { definition, getters: this.getters });
           }
           else if (recreate) {
               this.pivots[pivotId].onDefinitionChange(definition);
@@ -81113,9 +81163,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.3.31";
-  __info__.date = "2025-12-26T10:18:10.765Z";
-  __info__.hash = "1e143e1";
+  __info__.version = "18.3.32";
+  __info__.date = "2026-01-14T10:00:27.532Z";
+  __info__.hash = "8d1d321";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);