@odoo/o-spreadsheet 18.4.22 → 18.4.24

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.22
- * @date 2025-12-26T10:19:07.786Z
- * @hash 6ddac00
+ * @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),
@@ -47104,7 +47103,6 @@ class GridOverlay extends Component {
         onGridMoved: Function,
         gridOverlayDimensions: String,
         slots: { type: Object, optional: true },
-        getGridSize: Function,
     };
     static components = {
         FiguresContainer,
@@ -47123,14 +47121,7 @@ class GridOverlay extends Component {
     setup() {
         useCellHovered(this.env, this.gridOverlay);
         const resizeObserver = new ResizeObserver(() => {
-            const boundingRect = this.gridOverlayEl.getBoundingClientRect();
-            const { width, height } = this.props.getGridSize();
-            this.props.onGridResized({
-                x: boundingRect.left,
-                y: boundingRect.top,
-                height: height,
-                width: width,
-            });
+            this.props.onGridResized();
         });
         onMounted(() => {
             resizeObserver.observe(this.gridOverlayEl);
@@ -53211,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) {
@@ -53630,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 */ `
@@ -58066,7 +58074,8 @@ class Grid extends Component {
         });
         return !(rect.width === 0 || rect.height === 0);
     }
-    onGridResized({ height, width }) {
+    onGridResized() {
+        const { height, width } = this.props.getGridSize();
         this.env.model.dispatch("RESIZE_SHEETVIEW", {
             width: width - HEADER_WIDTH,
             height: height - HEADER_HEIGHT,
@@ -64258,6 +64267,7 @@ class PivotCorePlugin extends CorePlugin {
         "getMeasureCompiledFormula",
         "getPivotName",
         "isExistingPivot",
+        "getMeasureFullDependencies",
     ];
     nextFormulaId = 1;
     pivots = {};
@@ -64340,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;
             }
         }
@@ -64358,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);
@@ -64372,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);
                 }
             }
         }
@@ -64411,31 +64427,60 @@ 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);
         const pivotCells = table.getPivotCells();
@@ -64494,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);
@@ -68036,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 = {};
@@ -68093,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)) {
@@ -68833,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);
@@ -78172,10 +78215,8 @@ class SpreadsheetDashboard extends Component {
         });
     }
     get gridContainer() {
-        const sheetId = this.env.model.getters.getActiveSheetId();
-        const { right } = this.env.model.getters.getSheetZone(sheetId);
-        const { end } = this.env.model.getters.getColDimensions(sheetId, right);
-        return cssPropertiesToCss({ "max-width": `${end}px` });
+        const maxWidth = this.getMaxSheetWidth();
+        return cssPropertiesToCss({ "max-width": `${maxWidth}px` });
     }
     get gridOverlayDimensions() {
         return cssPropertiesToCss({
@@ -78207,10 +78248,12 @@ class SpreadsheetDashboard extends Component {
     onClosePopover() {
         this.cellPopovers.close();
     }
-    onGridResized({ height, width }) {
+    onGridResized() {
+        const { height, width } = this.props.getGridSize();
+        const maxWidth = this.getMaxSheetWidth();
         this.env.model.dispatch("RESIZE_SHEETVIEW", {
-            width: width,
-            height: height,
+            width: Math.min(maxWidth, width),
+            height,
             gridOffsetX: 0,
             gridOffsetY: 0,
         });
@@ -78228,6 +78271,11 @@ class SpreadsheetDashboard extends Component {
             ...this.env.model.getters.getSheetViewDimensionWithHeaders(),
         };
     }
+    getMaxSheetWidth() {
+        const sheetId = this.env.model.getters.getActiveSheetId();
+        const { right } = this.env.model.getters.getSheetZone(sheetId);
+        return this.env.model.getters.getColDimensions(sheetId, right).end;
+    }
 }
 
 css /* scss */ `
@@ -80468,22 +80516,20 @@ class Spreadsheet extends Component {
         return this.env.model.getters.getVisibleGroupLayers(sheetId, "COL");
     }
     getGridSize() {
-        const topBarHeight = this.spreadsheetRef.el
-            ?.querySelector(".o-spreadsheet-topbar-wrapper")
-            ?.getBoundingClientRect().height || 0;
-        const bottomBarHeight = this.spreadsheetRef.el
-            ?.querySelector(".o-spreadsheet-bottombar-wrapper")
-            ?.getBoundingClientRect().height || 0;
-        const gridWidth = this.spreadsheetRef.el?.querySelector(".o-grid")?.getBoundingClientRect().width || 0;
-        const gridHeight = (this.spreadsheetRef.el?.getBoundingClientRect().height || 0) -
-            (this.spreadsheetRef.el?.querySelector(".o-column-groups")?.getBoundingClientRect().height ||
-                0) -
-            topBarHeight -
-            bottomBarHeight;
-        return {
-            width: Math.max(gridWidth - SCROLLBAR_WIDTH, 0),
-            height: Math.max(gridHeight - SCROLLBAR_WIDTH, 0),
-        };
+        const el = this.spreadsheetRef.el;
+        if (!el) {
+            return { width: 0, height: 0 };
+        }
+        const getHeight = (selector) => el.querySelector(selector)?.getBoundingClientRect().height || 0;
+        const getWidth = (selector) => el.querySelector(selector)?.getBoundingClientRect().width || 0;
+        const rect = el.getBoundingClientRect();
+        const topBarHeight = getHeight(".o-spreadsheet-topbar-wrapper");
+        const bottomBarHeight = getHeight(".o-spreadsheet-bottombar-wrapper");
+        const colGroupHeight = getHeight(".o-column-groups");
+        const gridWidth = getWidth(".o-grid");
+        const width = Math.max(gridWidth - SCROLLBAR_WIDTH, 0);
+        const height = Math.max(rect.height - topBarHeight - bottomBarHeight - colGroupHeight - SCROLLBAR_WIDTH, 0);
+        return { width, height };
     }
 }
 
@@ -84968,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.22";
-__info__.date = "2025-12-26T10:19:07.786Z";
-__info__.hash = "6ddac00";
+__info__.version = "18.4.24";
+__info__.date = "2026-01-14T10:00:55.867Z";
+__info__.hash = "0364f56";