@odoo/o-spreadsheet 18.2.36 → 18.2.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.2.36
- * @date 2025-12-02T05:31:10.558Z
- * @hash d385099
+ * @version 18.2.40
+ * @date 2026-01-14T09:59:34.210Z
+ * @hash 755a787
  */
 
 'use strict';
@@ -6018,17 +6018,41 @@ function toCriterionDateNumber(dateValue) {
     const today = DateTime.now();
     switch (dateValue) {
         case "today":
-            return jsDateToNumber(today);
-        case "yesterday":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setDate(today.getDate() - 1)));
-        case "tomorrow":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setDate(today.getDate() + 1)));
+            return Math.floor(jsDateToNumber(today));
+        case "yesterday": {
+            today.setDate(today.getDate() - 1);
+            return Math.floor(jsDateToNumber(today));
+        }
+        case "tomorrow": {
+            today.setDate(today.getDate() + 1);
+            return Math.floor(jsDateToNumber(today));
+        }
         case "lastWeek":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setDate(today.getDate() - 7)));
-        case "lastMonth":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setMonth(today.getMonth() - 1)));
+            today.setDate(today.getDate() - 6);
+            return Math.floor(jsDateToNumber(today));
+        case "lastMonth": {
+            const lastMonth = today.getMonth() === 0 ? 11 : today.getMonth() - 1;
+            const dateInLastMonth = new DateTime(today.getFullYear(), lastMonth, 1);
+            if (today.getDate() > getDaysInMonth(dateInLastMonth)) {
+                today.setDate(1);
+            }
+            else {
+                today.setDate(today.getDate() + 1);
+                today.setMonth(today.getMonth() - 1);
+            }
+            return Math.floor(jsDateToNumber(today));
+        }
         case "lastYear":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setFullYear(today.getFullYear() - 1)));
+            // Handle leap year case
+            if (today.getMonth() === 1 && today.getDate() === 29) {
+                today.setDate(28);
+                today.setFullYear(today.getFullYear() - 1);
+            }
+            else {
+                today.setDate(today.getDate() + 1);
+                today.setFullYear(today.getFullYear() - 1);
+            }
+            return Math.floor(jsDateToNumber(today));
     }
 }
 /** Get all the dates values of a criterion converted to numbers, converting date values such as "today" to actual dates  */
@@ -19095,9 +19119,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);
@@ -19114,8 +19139,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;
@@ -19556,7 +19580,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) {
@@ -19589,8 +19613,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) {
@@ -19644,7 +19667,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) {
@@ -21301,7 +21324,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),
@@ -32662,7 +32685,6 @@ class ChartFigure extends owl.Component {
     static template = "o-spreadsheet-ChartFigure";
     static props = {
         figure: Object,
-        onFigureDeleted: Function,
     };
     static components = {};
     onDoubleClick() {
@@ -32686,7 +32708,6 @@ class ImageFigure extends owl.Component {
     static template = "o-spreadsheet-ImageFigure";
     static props = {
         figure: Object,
-        onFigureDeleted: Function,
     };
     static components = {};
     // ---------------------------------------------------------------------------
@@ -32743,7 +32764,7 @@ figureRegistry.add("image", {
     borderWidth: 0,
     menuBuilder: getImageMenuRegistry,
 });
-function getChartMenu(figureId, onFigureDeleted, env) {
+function getChartMenu(figureId, env) {
     const menuItemSpecs = [
         {
             id: "edit",
@@ -32757,11 +32778,11 @@ function getChartMenu(figureId, onFigureDeleted, env) {
         },
         getCopyMenuItem(figureId, env),
         getCutMenuItem(figureId, env),
-        getDeleteMenuItem(figureId, onFigureDeleted, env),
+        getDeleteMenuItem(figureId, env),
     ];
     return createActions(menuItemSpecs);
 }
-function getImageMenuRegistry(figureId, onFigureDeleted, env) {
+function getImageMenuRegistry(figureId, env) {
     const menuItemSpecs = [
         getCopyMenuItem(figureId, env),
         getCutMenuItem(figureId, env),
@@ -32787,7 +32808,7 @@ function getImageMenuRegistry(figureId, onFigureDeleted, env) {
             },
             icon: "o-spreadsheet-Icon.REFRESH",
         },
-        getDeleteMenuItem(figureId, onFigureDeleted, env),
+        getDeleteMenuItem(figureId, env),
     ];
     return createActions(menuItemSpecs);
 }
@@ -32819,7 +32840,7 @@ function getCutMenuItem(figureId, env) {
         icon: "o-spreadsheet-Icon.CUT",
     };
 }
-function getDeleteMenuItem(figureId, onFigureDeleted, env) {
+function getDeleteMenuItem(figureId, env) {
     return {
         id: "delete",
         name: _t("Delete"),
@@ -32829,7 +32850,6 @@ function getDeleteMenuItem(figureId, onFigureDeleted, env) {
                 sheetId: env.model.getters.getActiveSheetId(),
                 id: figureId,
             });
-            onFigureDeleted();
         },
         icon: "o-spreadsheet-Icon.TRASH",
     };
@@ -42623,7 +42643,7 @@ function useHighlights(highlightProvider) {
 }
 
 css /* scss */ `
-  .o-cf-preview {
+  .o-spreadsheet .o-cf-preview {
     &.o-cf-cursor-ptr {
       cursor: pointer;
     }
@@ -42631,6 +42651,7 @@ css /* scss */ `
     border-bottom: 1px solid ${GRAY_300};
     height: 80px;
     padding: 10px;
+    box-sizing: border-box;
     position: relative;
     cursor: pointer;
     &:hover,
@@ -42644,7 +42665,6 @@ css /* scss */ `
     .o-cf-preview-icon {
       border: 1px solid ${GRAY_300};
       background-color: #fff;
-      position: absolute;
       height: 50px;
       width: 50px;
       .o-icon {
@@ -42653,12 +42673,6 @@ css /* scss */ `
       }
     }
     .o-cf-preview-description {
-      left: 65px;
-      margin-bottom: auto;
-      margin-right: 8px;
-      margin-top: auto;
-      position: relative;
-      width: 142px;
       .o-cf-preview-description-rule {
         margin-bottom: 4px;
         max-height: 2.8em;
@@ -42668,16 +42682,11 @@ css /* scss */ `
         font-size: 12px;
       }
     }
-    .o-cf-delete {
-      left: 90%;
-      top: 39%;
-      position: absolute;
-    }
     &:not(:hover):not(.o-cf-dragging) .o-cf-drag-handle {
       display: none !important;
     }
     .o-cf-drag-handle {
-      left: -8px;
+      left: 2px;
       cursor: move;
       .o-icon {
         width: 6px;
@@ -43666,7 +43675,7 @@ dataValidationEvaluatorRegistry.add("dateIs", {
             return false;
         }
         if (["lastWeek", "lastMonth", "lastYear"].includes(criterion.dateValue)) {
-            const today = jsDateToRoundNumber(DateTime.now());
+            const today = Math.floor(jsDateToNumber(DateTime.now()));
             return isDateBetween(dateValue, today, criterionValue);
         }
         return areDatesSameDay(dateValue, criterionValue);
@@ -44856,6 +44865,11 @@ class FindAndReplaceStore extends SpreadsheetStore {
             case "ACTIVATE_SHEET":
                 this.isSearchDirty = true;
                 this.shouldFinalizeUpdateSelection = true;
+                if (this.searchOptions.specificRange) {
+                    this.searchOptions.specificRange = this.searchOptions.specificRange.clone({
+                        sheetId: this.getters.getActiveSheetId(),
+                    });
+                }
                 break;
             case "REPLACE_SEARCH":
                 for (const match of cmd.matches) {
@@ -45277,9 +45291,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 */ `
@@ -47520,7 +47545,37 @@ pivotRegistry.add("SPREADSHEET", {
     datetimeGranularities: [...dateGranularities, "hour_number", "minute_number", "second_number"],
     isMeasureCandidate: (field) => field.type !== "boolean",
     isGroupable: () => true,
+    adaptRanges: (getters, definition, applyChange) => {
+        if (definition.type !== "SPREADSHEET" || !definition.dataSet) {
+            return definition;
+        }
+        const { sheetId, zone } = definition.dataSet;
+        const range = getters.getRangeFromZone(sheetId, zone);
+        const adaptedRange = adaptPivotRange(range, applyChange);
+        if (adaptedRange === range) {
+            return definition;
+        }
+        const dataSet = adaptedRange && {
+            sheetId: adaptedRange.sheetId,
+            zone: adaptedRange.zone,
+        };
+        return { ...definition, dataSet };
+    },
 });
+function adaptPivotRange(range, applyChange) {
+    if (!range) {
+        return undefined;
+    }
+    const change = applyChange(range);
+    switch (change.changeType) {
+        case "NONE":
+            return range;
+        case "REMOVE":
+            return undefined;
+        default:
+            return change.range;
+    }
+}
 
 class PivotSidePanelStore extends SpreadsheetStore {
     pivotId;
@@ -49161,13 +49216,11 @@ class FigureComponent extends owl.Component {
     static props = {
         figure: Object,
         style: { type: String, optional: true },
-        onFigureDeleted: { type: Function, optional: true },
         onMouseDown: { type: Function, optional: true },
         onClickAnchor: { type: Function, optional: true },
     };
     static components = { Menu };
     static defaultProps = {
-        onFigureDeleted: () => { },
         onMouseDown: () => { },
         onClickAnchor: () => { },
     };
@@ -49241,9 +49294,6 @@ class FigureComponent extends owl.Component {
                 el?.focus({ preventScroll: true });
             }
         }, () => [this.env.model.getters.getSelectedFigureId(), this.props.figure.id, this.figureRef.el]);
-        owl.onWillUnmount(() => {
-            this.props.onFigureDeleted();
-        });
     }
     clickAnchor(dirX, dirY, ev) {
         this.props.onClickAnchor(dirX, dirY, ev);
@@ -49261,7 +49311,6 @@ class FigureComponent extends owl.Component {
                     sheetId: this.env.model.getters.getActiveSheetId(),
                     id: figure.id,
                 });
-                this.props.onFigureDeleted();
                 ev.preventDefault();
                 ev.stopPropagation();
                 break;
@@ -49325,7 +49374,7 @@ class FigureComponent extends owl.Component {
         this.menuState.position = position;
         this.menuState.menuItems = figureRegistry
             .get(this.props.figure.tag)
-            .menuBuilder(this.props.figure.id, this.props.onFigureDeleted, this.env);
+            .menuBuilder(this.props.figure.id, this.env);
     }
 }
 
@@ -49438,21 +49487,20 @@ class ArrayFormulaHighlight extends SpreadsheetStore {
         this.highlightStore.register(this);
     }
     get highlights() {
-        let zone;
         const position = this.model.getters.getActivePosition();
-        const cell = this.getters.getEvaluatedCell(position);
         const spreader = this.model.getters.getArrayFormulaSpreadingOn(position);
-        zone = spreader
+        const zone = spreader
             ? this.model.getters.getSpreadZone(spreader, { ignoreSpillError: true })
             : this.model.getters.getSpreadZone(position, { ignoreSpillError: true });
         if (!zone) {
             return [];
         }
+        const isArrayFormulaBlocked = this.model.getters.isArrayFormulaSpillBlocked(spreader ?? position);
         return [
             {
                 sheetId: position.sheetId,
                 zone,
-                dashed: cell.value === CellErrorType.SpilledBlocked,
+                dashed: isArrayFormulaBlocked,
                 color: "#17A2B8",
                 noFill: true,
                 thinLine: true,
@@ -50520,9 +50568,7 @@ css /*SCSS*/ `
  */
 class FiguresContainer extends owl.Component {
     static template = "o-spreadsheet-FiguresContainer";
-    static props = {
-        onFigureDeleted: Function,
-    };
+    static props = {};
     static components = { FigureComponent };
     dnd = owl.useState({
         draggedFigure: undefined,
@@ -50878,16 +50924,16 @@ css /* scss */ `
 `;
 class GridAddRowsFooter extends owl.Component {
     static template = "o-spreadsheet-GridAddRowsFooter";
-    static props = {
-        focusGrid: Function,
-    };
+    static props = {};
     static components = { ValidationMessages };
+    DOMFocusableElementStore;
     inputRef = owl.useRef("inputRef");
     state = owl.useState({
         inputValue: "100",
         errorFlag: false,
     });
     setup() {
+        this.DOMFocusableElementStore = useStore(DOMFocusableElementStore);
         owl.useExternalListener(window, "click", this.onExternalClick, { capture: true });
     }
     get addRowsPosition() {
@@ -50905,7 +50951,7 @@ class GridAddRowsFooter extends owl.Component {
     }
     onKeydown(ev) {
         if (ev.key.toUpperCase() === "ESCAPE") {
-            this.props.focusGrid();
+            this.focusDefaultElement();
         }
         else if (ev.key.toUpperCase() === "ENTER") {
             this.onConfirm();
@@ -50931,7 +50977,7 @@ class GridAddRowsFooter extends owl.Component {
             quantity,
             dimension: "ROW",
         });
-        this.props.focusGrid();
+        this.focusDefaultElement();
         // After adding new rows, scroll down to the new last row
         const { scrollX } = this.env.model.getters.getActiveSheetScrollInfo();
         const { end } = this.env.model.getters.getRowDimensions(activeSheetId, rowNumber + quantity - 1);
@@ -50944,7 +50990,12 @@ class GridAddRowsFooter extends owl.Component {
         if (this.inputRef.el !== document.activeElement || ev.target === this.inputRef.el) {
             return;
         }
-        this.props.focusGrid();
+        this.focusDefaultElement();
+    }
+    focusDefaultElement() {
+        if (document.activeElement === this.inputRef.el) {
+            this.DOMFocusableElementStore.focus();
+        }
     }
 }
 
@@ -51133,7 +51184,6 @@ class GridOverlay extends owl.Component {
         onCellClicked: { type: Function, optional: true },
         onCellRightClicked: { type: Function, optional: true },
         onGridResized: { type: Function, optional: true },
-        onFigureDeleted: { type: Function, optional: true },
         onGridMoved: Function,
         gridOverlayDimensions: String,
     };
@@ -51149,7 +51199,6 @@ class GridOverlay extends owl.Component {
         onCellClicked: () => { },
         onCellRightClicked: () => { },
         onGridResized: () => { },
-        onFigureDeleted: () => { },
     };
     gridOverlay = owl.useRef("gridOverlay");
     gridOverlayRect = useAbsoluteBoundingRect(this.gridOverlay);
@@ -57556,6 +57605,7 @@ function rangeToMerge(mergeId, range) {
 class RangeAdapter {
     getters;
     providers = [];
+    isAdaptingRanges = false;
     constructor(getters) {
         this.getters = getters;
     }
@@ -57586,6 +57636,9 @@ class RangeAdapter {
     }
     beforeHandle(command) { }
     handle(cmd) {
+        if (this.isAdaptingRanges) {
+            throw new Error("Plugins cannot dispatch commands during adaptRanges phase");
+        }
         switch (cmd.type) {
             case "REMOVE_COLUMNS_ROWS": {
                 let start = cmd.dimension === "COL" ? "left" : "top";
@@ -57741,10 +57794,12 @@ class RangeAdapter {
         return adaptedRange;
     }
     executeOnAllRanges(adaptRange, sheetId) {
+        this.isAdaptingRanges = true;
         const func = this.verifyRangeRemoved(adaptRange);
         for (const provider of this.providers) {
             provider(func, sheetId);
         }
+        this.isAdaptingRanges = false;
     }
     /**
      * Stores the functions bound to each plugin to be able to iterate over all ranges of the application,
@@ -59780,6 +59835,7 @@ class PivotCorePlugin extends CorePlugin {
         "getMeasureCompiledFormula",
         "getPivotName",
         "isExistingPivot",
+        "getMeasureFullDependencies",
     ];
     nextFormulaId = 1;
     pivots = {};
@@ -59862,15 +59918,32 @@ class PivotCorePlugin extends CorePlugin {
             }
             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;
             }
         }
     }
     adaptRanges(applyChange) {
-        for (const sheetId in this.compiledMeasureFormulas) {
-            for (const formulaString in this.compiledMeasureFormulas[sheetId]) {
-                const compiledFormula = this.compiledMeasureFormulas[sheetId][formulaString];
+        for (const pivotId in this.pivots) {
+            const definition = deepCopy(this.pivots[pivotId]?.definition);
+            if (!definition) {
+                continue;
+            }
+            const newDefinition = pivotRegistry
+                .get(definition.type)
+                ?.adaptRanges?.(this.getters, definition, applyChange);
+            if (newDefinition && !deepEquals(definition, newDefinition)) {
+                this.history.update("pivots", pivotId, "definition", newDefinition);
+            }
+        }
+        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);
@@ -59882,8 +59955,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);
                 }
             }
         }
@@ -59921,12 +59995,17 @@ 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`);
+        }
+        return this.compiledMeasureFormulas[pivotId][measure.id].formula;
+    }
+    getMeasureFullDependencies(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].dependencies;
     }
     // -------------------------------------------------------------------------
     // Private
@@ -59936,18 +60015,42 @@ class PivotCorePlugin extends CorePlugin {
             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);
@@ -60005,28 +60108,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;
-            }
-            const def = deepCopy(pivot.definition);
-            for (const measure of def.measures) {
-                if (measure.computedBy?.formula === formulaString) {
-                    const measureIndex = def.measures.indexOf(measure);
-                    if (measureIndex !== -1) {
-                        def.measures[measureIndex].computedBy = {
-                            formula: newFormulaString,
-                            sheetId,
-                        };
-                    }
-                    this.dispatch("UPDATE_PIVOT", { pivotId, pivot: def });
-                }
-            }
+    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);
     }
     checkDuplicatedMeasureIds(definition) {
         const uniqueIds = new Set(definition.measures.map((m) => m.id));
@@ -60142,20 +60234,6 @@ class SettingsPlugin extends CorePlugin {
     }
 }
 
-function adaptPivotRange(range, applyChange) {
-    if (!range) {
-        return undefined;
-    }
-    const change = applyChange(range);
-    switch (change.changeType) {
-        case "NONE":
-            return range;
-        case "REMOVE":
-            return undefined;
-        default:
-            return change.range;
-    }
-}
 class SpreadsheetPivotCorePlugin extends CorePlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
@@ -60166,27 +60244,6 @@ class SpreadsheetPivotCorePlugin extends CorePlugin {
         }
         return "Success" /* CommandResult.Success */;
     }
-    adaptRanges(applyChange) {
-        for (const pivotId of this.getters.getPivotIds()) {
-            const definition = this.getters.getPivotCoreDefinition(pivotId);
-            if (definition.type !== "SPREADSHEET") {
-                continue;
-            }
-            if (definition.dataSet) {
-                const { sheetId, zone } = definition.dataSet;
-                const range = this.getters.getRangeFromZone(sheetId, zone);
-                const adaptedRange = adaptPivotRange(range, applyChange);
-                if (adaptedRange === range) {
-                    return;
-                }
-                const dataSet = adaptedRange && {
-                    sheetId: adaptedRange.sheetId,
-                    zone: adaptedRange.zone,
-                };
-                this.dispatch("UPDATE_PIVOT", { pivotId, pivot: { ...definition, dataSet } });
-            }
-        }
-    }
     checkDataSetValidity(definition) {
         if (definition.type === "SPREADSHEET" && definition.dataSet) {
             const { zone, sheetId } = definition.dataSet;
@@ -61528,6 +61585,9 @@ class Evaluator {
         const arrayFormulas = this.spreadingRelations.searchFormulaPositionsSpreadingOn(position.sheetId, positionToZone(position));
         return Array.from(arrayFormulas).find((position) => !this.blockedArrayFormulas.has(position));
     }
+    isArrayFormulaSpillBlocked(position) {
+        return this.blockedArrayFormulas.has(position);
+    }
     updateDependencies(position) {
         // removing dependencies is slow because it requires
         // to traverse the entire r-tree.
@@ -61539,13 +61599,8 @@ class Evaluator {
     addDependencies(position, dependencies) {
         this.formulaDependencies().addDependencies(position, dependencies);
         for (const range of dependencies) {
-            const sheetId = range.sheetId;
-            const { left, bottom, right, top } = range.zone;
-            for (let col = left; col <= right; col++) {
-                for (let row = top; row <= bottom; row++) {
-                    this.computeAndSave({ sheetId, col, row });
-                }
-            }
+            // ensure that all ranges are computed
+            this.compilationParams.ensureRange(range);
         }
     }
     updateCompilationParameters() {
@@ -61748,6 +61803,10 @@ class Evaluator {
         this.assertSheetHasEnoughSpaceToSpreadFormulaResult(formulaPosition, formulaReturn);
         const nbColumns = formulaReturn.length;
         const nbRows = formulaReturn[0].length;
+        if (nbRows === 0) {
+            // empty matrix
+            return createEvaluatedCell({ value: 0 }, this.getters.getLocale(), cellData);
+        }
         const resultZone = {
             top: formulaPosition.row,
             bottom: formulaPosition.row + nbRows - 1,
@@ -62023,6 +62082,7 @@ class EvaluationPlugin extends CoreViewPlugin {
         "getEvaluatedCellsPositions",
         "getSpreadZone",
         "getArrayFormulaSpreadingOn",
+        "isArrayFormulaSpillBlocked",
         "isEmpty",
     ];
     shouldRebuildDependenciesGraph = true;
@@ -62135,6 +62195,9 @@ class EvaluationPlugin extends CoreViewPlugin {
     getArrayFormulaSpreadingOn(position) {
         return this.evaluator.getArrayFormulaSpreadingOn(position);
     }
+    isArrayFormulaSpillBlocked(position) {
+        return this.evaluator.isArrayFormulaSpillBlocked(position);
+    }
     /**
      * Check if a zone only contains empty cells
      */
@@ -63320,14 +63383,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 = {};
@@ -63377,7 +63442,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)) {
@@ -64105,7 +64170,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);
@@ -72840,7 +72905,7 @@ class Spreadsheet extends owl.Component {
                 document.activeElement?.contains(this.spreadsheetRef.el)) {
                 this.focusGrid();
             }
-        }, () => [this.env.model.getters.getActiveSheetId()]);
+        });
         owl.useExternalListener(window, "resize", () => this.render(true));
         // For some reason, the wheel event is not properly registered inside templates
         // in Chromium-based browsers based on chromium 125
@@ -77405,6 +77470,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.2.36";
-__info__.date = "2025-12-02T05:31:10.558Z";
-__info__.hash = "d385099";
+__info__.version = "18.2.40";
+__info__.date = "2026-01-14T09:59:34.210Z";
+__info__.hash = "755a787";