@odoo/o-spreadsheet 18.4.23 → 18.4.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.4.23
- * @date 2026-01-07T16:21:07.502Z
- * @hash a0135e8
+ * @version 18.4.24
+ * @date 2026-01-14T10:00:55.867Z
+ * @hash 0364f56
  */
 
 'use strict';
@@ -19070,9 +19070,10 @@ function assertDomainLength(domain) {
         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);
@@ -19089,8 +19090,7 @@ function addPivotDependencies(evalContext, coreDefinition, forMeasures) {
     }
     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;
@@ -19559,7 +19559,7 @@ const PIVOT_VALUE = {
         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) {
@@ -19592,8 +19592,7 @@ const PIVOT_HEADER = {
         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) {
@@ -19651,7 +19650,7 @@ const PIVOT = {
         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) {
@@ -32905,7 +32904,7 @@ class AbstractComposerStore extends SpreadsheetStore {
     }
     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),
@@ -53205,6 +53204,12 @@ class FindAndReplaceStore extends SpreadsheetStore {
             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) {
@@ -53624,9 +53629,20 @@ class FindAndReplacePanel extends owl.Component {
         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 */ `
@@ -64253,6 +64269,7 @@ class PivotCorePlugin extends CorePlugin {
         "getMeasureCompiledFormula",
         "getPivotName",
         "isExistingPivot",
+        "getMeasureFullDependencies",
     ];
     nextFormulaId = 1;
     pivots = {};
@@ -64335,7 +64352,7 @@ class PivotCorePlugin extends CorePlugin {
             }
             case "UPDATE_PIVOT": {
                 this.history.update("pivots", cmd.pivotId, "definition", deepCopy(cmd.pivot));
-                this.compileCalculatedMeasures(cmd.pivot.measures);
+                this.compileCalculatedMeasures(cmd.pivotId, cmd.pivot.measures);
                 break;
             }
         }
@@ -64353,9 +64370,14 @@ class PivotCorePlugin extends CorePlugin {
                 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);
@@ -64367,8 +64389,9 @@ class PivotCorePlugin extends CorePlugin {
                     }
                 }
                 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);
                 }
             }
         }
@@ -64406,30 +64429,59 @@ class PivotCorePlugin extends CorePlugin {
     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
     // -------------------------------------------------------------------------
     addPivot(pivotId, pivot, formulaId = this.nextFormulaId.toString()) {
         this.history.update("pivots", pivotId, { definition: 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);
@@ -64489,21 +64541,17 @@ class PivotCorePlugin extends CorePlugin {
             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) {
         const measures = definition.measures.map((measure) => measure.id);
@@ -68031,14 +68079,16 @@ const PERCENT_FORMAT = "0.00%";
 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 = {};
@@ -68088,7 +68138,7 @@ function withPivotPresentationLayer (PivotClass) {
                     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)) {
@@ -68828,7 +68878,7 @@ class PivotUIPlugin extends CoreViewPlugin {
         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);
@@ -85014,6 +85064,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.4.23";
-__info__.date = "2026-01-07T16:21:07.502Z";
-__info__.hash = "a0135e8";
+__info__.version = "18.4.24";
+__info__.date = "2026-01-14T10:00:55.867Z";
+__info__.hash = "0364f56";

package/dist/o-spreadsheet.d.ts

@@ -5151,14 +5151,18 @@ interface Pivot$1 {
     definition: PivotCoreDefinition;
     formulaId: string;
 }
+interface MeasureState {
+    formula: RangeCompiledFormula;
+    dependencies: Range[];
+}
 interface CoreState {
     nextFormulaId: number;
     pivots: Record<UID, Pivot$1 | undefined>;
     formulaIds: Record<UID, string | undefined>;
-    compiledMeasureFormulas: Record<UID, Record<string, RangeCompiledFormula | undefined>>;
+    compiledMeasureFormulas: Record<UID, Record<string, MeasureState | undefined>>;
 }
 declare class PivotCorePlugin extends CorePlugin<CoreState> implements CoreState {
-    static getters: readonly ["getPivotCoreDefinition", "getPivotDisplayName", "getPivotId", "getPivotFormulaId", "getPivotIds", "getMeasureCompiledFormula", "getPivotName", "isExistingPivot"];
+    static getters: readonly ["getPivotCoreDefinition", "getPivotDisplayName", "getPivotId", "getPivotFormulaId", "getPivotIds", "getMeasureCompiledFormula", "getPivotName", "isExistingPivot", "getMeasureFullDependencies"];
     readonly nextFormulaId: number;
     readonly pivots: {
         [pivotId: UID]: Pivot$1 | undefined;
@@ -5166,7 +5170,7 @@ declare class PivotCorePlugin extends CorePlugin<CoreState> implements CoreState
     readonly formulaIds: {
         [formulaId: UID]: UID | undefined;
     };
-    readonly compiledMeasureFormulas: Record<UID, Record<string, RangeCompiledFormula>>;
+    readonly compiledMeasureFormulas: Record<UID, Record<string, MeasureState>>;
     allowDispatch(cmd: CoreCommand): CommandResult | CommandResult[];
     handle(cmd: CoreCommand): void;
     adaptRanges(applyChange: ApplyRangeChange): void;
@@ -5185,9 +5189,11 @@ declare class PivotCorePlugin extends CorePlugin<CoreState> implements CoreState
     getPivotFormulaId(pivotId: UID): string;
     getPivotIds(): UID[];
     isExistingPivot(pivotId: UID): boolean;
-    getMeasureCompiledFormula(measure: PivotCoreMeasure): RangeCompiledFormula;
+    getMeasureCompiledFormula(pivotId: UID, measure: PivotCoreMeasure): RangeCompiledFormula;
+    getMeasureFullDependencies(pivotId: UID, measure: PivotCoreMeasure): Range[];
     private addPivot;
     private compileCalculatedMeasures;
+    private computeMeasureFullDependencies;
     private insertPivot;
     private resizeSheet;
     private getPivotCore;

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.23
- * @date 2026-01-07T16:21:07.502Z
- * @hash a0135e8
+ * @version 18.4.24
+ * @date 2026-01-14T10:00:55.867Z
+ * @hash 0364f56
  */
 
 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';
@@ -19068,9 +19068,10 @@ function assertDomainLength(domain) {
         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);
@@ -19087,8 +19088,7 @@ function addPivotDependencies(evalContext, coreDefinition, forMeasures) {
     }
     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;
@@ -19557,7 +19557,7 @@ const PIVOT_VALUE = {
         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) {
@@ -19590,8 +19590,7 @@ const PIVOT_HEADER = {
         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) {
@@ -19649,7 +19648,7 @@ const PIVOT = {
         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) {
@@ -32903,7 +32902,7 @@ class AbstractComposerStore extends SpreadsheetStore {
     }
     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),
@@ -53203,6 +53202,12 @@ class FindAndReplaceStore extends SpreadsheetStore {
             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) {
@@ -53622,9 +53627,20 @@ class FindAndReplacePanel extends Component {
         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 */ `
@@ -64251,6 +64267,7 @@ class PivotCorePlugin extends CorePlugin {
         "getMeasureCompiledFormula",
         "getPivotName",
         "isExistingPivot",
+        "getMeasureFullDependencies",
     ];
     nextFormulaId = 1;
     pivots = {};
@@ -64333,7 +64350,7 @@ class PivotCorePlugin extends CorePlugin {
             }
             case "UPDATE_PIVOT": {
                 this.history.update("pivots", cmd.pivotId, "definition", deepCopy(cmd.pivot));
-                this.compileCalculatedMeasures(cmd.pivot.measures);
+                this.compileCalculatedMeasures(cmd.pivotId, cmd.pivot.measures);
                 break;
             }
         }
@@ -64351,9 +64368,14 @@ class PivotCorePlugin extends CorePlugin {
                 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);
@@ -64365,8 +64387,9 @@ class PivotCorePlugin extends CorePlugin {
                     }
                 }
                 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);
                 }
             }
         }
@@ -64404,30 +64427,59 @@ class PivotCorePlugin extends CorePlugin {
     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
     // -------------------------------------------------------------------------
     addPivot(pivotId, pivot, formulaId = this.nextFormulaId.toString()) {
         this.history.update("pivots", pivotId, { definition: 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);
@@ -64487,21 +64539,17 @@ class PivotCorePlugin extends CorePlugin {
             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) {
         const measures = definition.measures.map((measure) => measure.id);
@@ -68029,14 +68077,16 @@ const PERCENT_FORMAT = "0.00%";
 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 = {};
@@ -68086,7 +68136,7 @@ function withPivotPresentationLayer (PivotClass) {
                     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)) {
@@ -68826,7 +68876,7 @@ class PivotUIPlugin extends CoreViewPlugin {
         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);
@@ -84964,6 +85014,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.23";
-__info__.date = "2026-01-07T16:21:07.502Z";
-__info__.hash = "a0135e8";
+__info__.version = "18.4.24";
+__info__.date = "2026-01-14T10:00:55.867Z";
+__info__.hash = "0364f56";