@odoo/o-spreadsheet 19.0.16 → 19.0.18

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 19.0.16
- * @date 2026-01-07T16:21:15.857Z
- * @hash 9f3f13a
+ * @version 19.0.18
+ * @date 2026-01-21T11:06:57.346Z
+ * @hash bd44f59
  */
 
 'use strict';
@@ -42,7 +42,8 @@ function createAction(item) {
                 return children
                     .map((child) => (typeof child === "function" ? child(env) : child))
                     .flat()
-                    .map(createAction);
+                    .map(createAction)
+                    .sort((a, b) => a.sequence - b.sequence);
             }
             : () => [],
         isReadonlyAllowed: item.isReadonlyAllowed || false,
@@ -782,6 +783,7 @@ const DEFAULT_STYLE = {
     fillColor: "",
     textColor: "",
 };
+const DEFAULT_NUMBER_STYLE = { ...DEFAULT_STYLE, align: "right" };
 const DEFAULT_VERTICAL_ALIGN = DEFAULT_STYLE.verticalAlign;
 const DEFAULT_WRAPPING_MODE = DEFAULT_STYLE.wrapping;
 // Fonts
@@ -5028,7 +5030,11 @@ function evaluatePredicate(value = "", criterion, locale) {
     if (operator === "<>" || operator === "=") {
         let result;
         if (typeof value === typeof operand) {
-            if (typeof value === "string" && typeof operand === "string") {
+            if (value === "" && operand === "") {
+                // fast path to avoid regex evaluation
+                result = true;
+            }
+            else if (typeof value === "string" && typeof operand === "string") {
                 result = wildcardToRegExp(operand).test(value);
             }
             else {
@@ -7054,7 +7060,7 @@ function getApplyRangeChangeRemoveColRow(cmd) {
     const groups = groupConsecutive(elements);
     return (range) => {
         if (range.sheetId !== cmd.sheetId) {
-            return { changeType: "NONE" };
+            return { changeType: "NONE", range };
         }
         let newRange = range;
         let changeType = "NONE";
@@ -7081,10 +7087,7 @@ function getApplyRangeChangeRemoveColRow(cmd) {
                 newRange = createAdaptedRange(newRange, dimension, changeType, -(max - min + 1));
             }
         }
-        if (changeType !== "NONE") {
-            return { changeType, range: newRange };
-        }
-        return { changeType: "NONE" };
+        return { changeType, range: newRange };
     };
 }
 function getApplyRangeChangeAddColRow(cmd) {
@@ -7093,7 +7096,7 @@ function getApplyRangeChangeAddColRow(cmd) {
     const dimension = cmd.dimension === "COL" ? "columns" : "rows";
     return (range) => {
         if (range.sheetId !== cmd.sheetId) {
-            return { changeType: "NONE" };
+            return { changeType: "NONE", range };
         }
         if (cmd.position === "after") {
             if (range.zone[start] <= cmd.base && cmd.base < range.zone[end]) {
@@ -7123,13 +7126,13 @@ function getApplyRangeChangeAddColRow(cmd) {
                 };
             }
         }
-        return { changeType: "NONE" };
+        return { changeType: "NONE", range };
     };
 }
 function getApplyRangeChangeDeleteSheet(cmd) {
     return (range) => {
         if (range.sheetId !== cmd.sheetId && range.invalidSheetName !== cmd.sheetName) {
-            return { changeType: "NONE" };
+            return { changeType: "NONE", range };
         }
         const invalidSheetName = cmd.sheetName;
         range = {
@@ -7156,14 +7159,14 @@ function getApplyRangeChangeRenameSheet(cmd) {
             const newRange = { ...range, sheetId, invalidSheetName };
             return { changeType: "CHANGE", range: newRange };
         }
-        return { changeType: "NONE" };
+        return { changeType: "NONE", range };
     };
 }
 function getApplyRangeChangeMoveRange(cmd) {
     const originZone = cmd.target[0];
     return (range) => {
         if (range.sheetId !== cmd.sheetId || !isZoneInside(range.zone, originZone)) {
-            return { changeType: "NONE" };
+            return { changeType: "NONE", range };
         }
         const targetSheetId = cmd.targetSheetId;
         const offsetX = cmd.col - originZone.left;
@@ -7329,11 +7332,20 @@ function computeTextLinesHeight(textLineHeight, numberOfLines = 1) {
 /**
  * Get the default height of the cell given its style.
  */
-function getDefaultCellHeight(ctx, cell, colSize) {
+function getDefaultCellHeight(ctx, cell, locale, colSize) {
     if (!cell || (!cell.isFormula && !cell.content)) {
         return DEFAULT_CELL_HEIGHT;
     }
-    const content = cell.isFormula ? "" : cell.content;
+    let content = "";
+    try {
+        if (!cell.isFormula) {
+            const localeFormat = { format: cell.format, locale };
+            content = formatValue(parseLiteral(cell.content, locale), localeFormat);
+        }
+    }
+    catch {
+        content = CellErrorType.GenericError;
+    }
     return getCellContentHeight(ctx, content, cell.style, colSize);
 }
 function getCellContentHeight(ctx, content, style, colSize) {
@@ -20100,9 +20112,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);
@@ -20119,8 +20132,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;
@@ -20617,7 +20629,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) {
@@ -20650,8 +20662,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) {
@@ -20709,7 +20720,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) {
@@ -22228,7 +22239,16 @@ function createComputeFunction(descr) {
             }
             acceptToVectorize.push(!argDefinition.acceptMatrix);
         }
-        return applyVectorization(errorHandlingCompute.bind(this), args, acceptToVectorize);
+        return replaceErrorPlaceholderInResult(applyVectorization(errorHandlingCompute.bind(this), args, acceptToVectorize));
+    }
+    function replaceErrorPlaceholderInResult(result) {
+        if (!isMatrix(result)) {
+            replaceFunctionNamePlaceholder(result, descr.name);
+        }
+        else {
+            matrixForEach(result, (result) => replaceFunctionNamePlaceholder(result, descr.name));
+        }
+        return result;
     }
     function errorHandlingCompute(...args) {
         for (let i = 0; i < args.length; i++) {
@@ -22257,13 +22277,12 @@ function createComputeFunction(descr) {
         const result = descr.compute.apply(this, args);
         if (!isMatrix(result)) {
             if (typeof result === "object" && result !== null && "value" in result) {
-                replaceFunctionNamePlaceholder(result, descr.name);
                 return result;
             }
+            descr.name;
             return { value: result };
         }
         if (typeof result[0][0] === "object" && result[0][0] !== null && "value" in result[0][0]) {
-            matrixForEach(result, (result) => replaceFunctionNamePlaceholder(result, descr.name));
             return result;
         }
         return matrixMap(result, (row) => ({ value: row }));
@@ -22776,7 +22795,7 @@ function adaptFormulaStringRanges(defaultSheetId, formula, applyChange) {
             continue;
         }
         const sheetXC = tokens[tokenIdx].value;
-        const newSheetXC = adaptStringRange(defaultSheetId, sheetXC, applyChange);
+        const newSheetXC = adaptStringRange(defaultSheetId, sheetXC, applyChange).range;
         if (sheetXC !== newSheetXC) {
             tokens[tokenIdx] = {
                 value: newSheetXC,
@@ -22786,23 +22805,30 @@ function adaptFormulaStringRanges(defaultSheetId, formula, applyChange) {
     }
     return concat$1(tokens.map((token) => token.value));
 }
-function adaptStringRange(defaultSheetId, sheetXC, applyChange) {
+function adaptStringRange(defaultSheetId, sheetXC, rangeAdapter) {
     const sheetName = splitReference(sheetXC).sheetName;
     if (sheetName
-        ? !isSheetNameEqual(sheetName, applyChange.sheetName.old)
-        : defaultSheetId !== applyChange.sheetId) {
-        return sheetXC;
+        ? !isSheetNameEqual(sheetName, rangeAdapter.sheetName.old)
+        : defaultSheetId !== rangeAdapter.sheetId) {
+        return { changeType: "NONE", range: sheetXC };
     }
-    const sheetId = sheetName ? applyChange.sheetId : defaultSheetId;
+    const sheetId = sheetName ? rangeAdapter.sheetId : defaultSheetId;
     const range = getRange(sheetXC, sheetId);
     if (range.invalidXc) {
-        return sheetXC;
+        return { changeType: "NONE", range: sheetXC };
     }
-    const change = applyChange.applyChange(range);
+    const change = rangeAdapter.applyChange(range);
     if (change.changeType === "NONE" || change.changeType === "REMOVE") {
-        return sheetXC;
+        return { changeType: change.changeType, range: sheetXC };
     }
-    return getRangeString(change.range, defaultSheetId, getSheetNameGetter(applyChange));
+    const rangeStr = getRangeString(change.range, defaultSheetId, getSheetNameGetter(rangeAdapter));
+    if (rangeStr === CellErrorType.InvalidReference) {
+        return { changeType: "REMOVE", range: rangeStr };
+    }
+    return {
+        changeType: change.changeType,
+        range: rangeStr,
+    };
 }
 function getSheetNameGetter(applyChange) {
     return (sheetId) => {
@@ -22907,8 +22933,6 @@ function adaptChartRange(range, applyChange) {
     }
     const change = applyChange(range);
     switch (change.changeType) {
-        case "NONE":
-            return range;
         case "REMOVE":
             return undefined;
         default:
@@ -23060,16 +23084,16 @@ function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
 function transformChartDefinitionWithDataSetsWithZone(chartSheetId, definition, applyChange) {
     let labelRange;
     if (definition.labelRange) {
-        const adaptedRange = adaptStringRange(chartSheetId, definition.labelRange, applyChange);
-        if (adaptedRange !== CellErrorType.InvalidReference) {
+        const { changeType, range: adaptedRange } = adaptStringRange(chartSheetId, definition.labelRange, applyChange);
+        if (changeType !== "REMOVE") {
             labelRange = adaptedRange;
         }
     }
     const dataSets = [];
     for (const dataSet of definition.dataSets) {
         const newDataSet = { ...dataSet };
-        const adaptedRange = adaptStringRange(chartSheetId, dataSet.dataRange, applyChange);
-        if (adaptedRange !== CellErrorType.InvalidReference) {
+        const { changeType, range: adaptedRange } = adaptStringRange(chartSheetId, dataSet.dataRange, applyChange);
+        if (changeType !== "REMOVE") {
             newDataSet.dataRange = adaptedRange;
             dataSets.push(newDataSet);
         }
@@ -24468,14 +24492,14 @@ let ScorecardChart$1 = class ScorecardChart extends AbstractChart {
         let baseline;
         let keyValue;
         if (definition.baseline) {
-            const adaptedRange = adaptStringRange(chartSheetId, definition.baseline, applyChange);
-            if (adaptedRange !== CellErrorType.InvalidReference) {
+            const { changeType, range: adaptedRange } = adaptStringRange(chartSheetId, definition.baseline, applyChange);
+            if (changeType !== "REMOVE") {
                 baseline = adaptedRange;
             }
         }
         if (definition.keyValue) {
-            const adaptedRange = adaptStringRange(chartSheetId, definition.keyValue, applyChange);
-            if (adaptedRange !== CellErrorType.InvalidReference) {
+            const { changeType, range: adaptedRange } = adaptStringRange(chartSheetId, definition.keyValue, applyChange);
+            if (changeType !== "REMOVE") {
                 keyValue = adaptedRange;
             }
         }
@@ -24532,7 +24556,7 @@ let ScorecardChart$1 = class ScorecardChart extends AbstractChart {
         // This kind of graph is not exportable in Excel
         return undefined;
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const baseline = adaptChartRange(this.baseline, applyChange);
         const keyValue = adaptChartRange(this.keyValue, applyChange);
         if (this.baseline === baseline && this.keyValue === keyValue) {
@@ -27698,7 +27722,7 @@ class BarChart extends AbstractChart {
             verticalAxis: getDefinedAxis(definition),
         };
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -28904,7 +28928,7 @@ class ComboChart extends AbstractChart {
             verticalAxis: getDefinedAxis(definition),
         };
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -29080,7 +29104,7 @@ class FunnelChart extends AbstractChart {
     getDefinitionForExcel() {
         return undefined;
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -29191,8 +29215,8 @@ class GaugeChart extends AbstractChart {
     static transformDefinition(chartSheetId, definition, applyChange) {
         let dataRange;
         if (definition.dataRange) {
-            const adaptedRange = adaptStringRange(chartSheetId, definition.dataRange, applyChange);
-            if (adaptedRange !== CellErrorType.InvalidReference) {
+            const { changeType, range: adaptedRange } = adaptStringRange(chartSheetId, definition.dataRange, applyChange);
+            if (changeType !== "REMOVE") {
                 dataRange = adaptedRange;
             }
         }
@@ -29269,13 +29293,9 @@ class GaugeChart extends AbstractChart {
                 : undefined,
         };
     }
-    updateRanges(applyChange, sheetId, adaptSheetName) {
+    updateRanges({ applyChange, adaptFormulaString }) {
         const dataRange = adaptChartRange(this.dataRange, applyChange);
-        const adaptFormula = (formula) => adaptFormulaStringRanges(this.sheetId, formula, {
-            applyChange,
-            sheetId,
-            sheetName: adaptSheetName,
-        });
+        const adaptFormula = (formula) => adaptFormulaString(this.sheetId, formula);
         const sectionRule = adaptSectionRuleFormulas(this.sectionRule, adaptFormula);
         const definition = this.getDefinitionWithSpecificRanges(dataRange, sectionRule);
         return new GaugeChart(definition, this.sheetId, this.getters);
@@ -29503,7 +29523,7 @@ class GeoChart extends AbstractChart {
     getDefinitionForExcel() {
         return undefined;
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -29645,7 +29665,7 @@ class LineChart extends AbstractChart {
                 : undefined,
         };
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -29802,7 +29822,7 @@ class PieChart extends AbstractChart {
             labelRange,
         };
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -29957,7 +29977,7 @@ class PyramidChart extends AbstractChart {
             maxValue,
         };
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -30107,7 +30127,7 @@ class RadarChart extends AbstractChart {
             labelRange,
         };
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -30235,7 +30255,7 @@ class ScatterChart extends AbstractChart {
                 : undefined,
         };
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -30402,7 +30422,7 @@ class SunburstChart extends AbstractChart {
     getDefinitionForExcel() {
         return undefined;
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -30552,7 +30572,7 @@ class TreeMapChart extends AbstractChart {
     getDefinitionForExcel() {
         return undefined;
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -30713,7 +30733,7 @@ class WaterfallChart extends AbstractChart {
         // TODO: implement export excel
         return undefined;
     }
-    updateRanges(applyChange) {
+    updateRanges({ applyChange }) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
         if (!isStale) {
             return this;
@@ -35230,7 +35250,6 @@ class AbstractComposerStore extends SpreadsheetStore {
         });
     }
     handleEvent(event) {
-        this.hideHelp();
         const sheetId = this.getters.getActiveSheetId();
         let unboundedZone;
         if (event.options.unbounded) {
@@ -35484,7 +35503,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),
@@ -35578,6 +35597,7 @@ class AbstractComposerStore extends SpreadsheetStore {
         this.colorIndexByRange = {};
         this.hoveredTokens = [];
         this.hoveredContentEvaluation = "";
+        this.hideHelp();
     }
     /**
      * Reset the current content to the active cell content
@@ -40820,6 +40840,7 @@ function extractStyle(data, content, styleId, formatId, borderId) {
                 ? V_ALIGNMENT_EXPORT_CONVERSION_MAP[style.verticalAlign]
                 : undefined,
             wrapText: style.wrapping === "wrap" || content?.includes(NEWLINE) ? true : undefined,
+            shrinkToFit: style.wrapping === "clip" ? true : undefined,
         },
     };
     styles.font["strike"] = !!style?.strikethrough || undefined;
@@ -40840,6 +40861,7 @@ function normalizeStyle(construct, styles) {
             vertical: styles.alignment.vertical,
             horizontal: styles.alignment.horizontal,
             wrapText: styles.alignment.wrapText,
+            shrinkToFit: styles.alignment.shrinkToFit,
         },
     };
     return pushElement(style, construct.styles);
@@ -47890,8 +47912,6 @@ function adaptPivotRange(range, applyChange) {
     }
     const change = applyChange(range);
     switch (change.changeType) {
-        case "NONE":
-            return range;
         case "REMOVE":
             return undefined;
         default:
@@ -55457,7 +55477,7 @@ class GaugeChartConfigPanel extends owl.Component {
     });
     dataRange = this.props.definition.dataRange;
     get configurationErrorMessages() {
-        const cancelledReasons = [...(this.state.dataRangeDispatchResult?.reasons || [])];
+        const cancelledReasons = [...(this.state.dataRangeDispatchResult?.reasons || [])].filter((reason) => reason !== "NoChanges" /* CommandResult.NoChanges */);
         return cancelledReasons.map((error) => ChartTerms.Errors[error] || ChartTerms.Errors.Unexpected);
     }
     get isDataRangeInvalid() {
@@ -55543,7 +55563,7 @@ class GaugeChartDesignPanel extends owl.Component {
         });
     }
     get designErrorMessages() {
-        const cancelledReasons = [...(this.state.sectionRuleCancelledReasons || [])];
+        const cancelledReasons = [...(this.state.sectionRuleCancelledReasons || [])].filter((reason) => reason !== "NoChanges" /* CommandResult.NoChanges */);
         return cancelledReasons.map((error) => ChartTerms.Errors[error] || ChartTerms.Errors.Unexpected);
     }
     get isRangeMinInvalid() {
@@ -55915,7 +55935,7 @@ class ScorecardChartConfigPanel extends owl.Component {
         const cancelledReasons = [
             ...(this.state.keyValueDispatchResult?.reasons || []),
             ...(this.state.baselineDispatchResult?.reasons || []),
-        ];
+        ].filter((reason) => reason !== "NoChanges" /* CommandResult.NoChanges */);
         return cancelledReasons.map((error) => ChartTerms.Errors[error] || ChartTerms.Errors.Unexpected);
     }
     get isKeyValueInvalid() {
@@ -57877,6 +57897,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) {
@@ -58296,9 +58322,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 */ `
@@ -62204,7 +62241,7 @@ class CorePlugin extends BasePlugin {
      * @param sheetId an sheetId to adapt either range of that sheet specifically, or ranges pointing to that sheet
      * @param sheetName couple of old and new sheet names to adapt ranges pointing to that sheet
      */
-    adaptRanges(applyChange, sheetId, sheetName) { }
+    adaptRanges(rangeAdapterFunctions, sheetId, sheetName) { }
     /**
      * Implement this method to clean unused external resources, such as images
      * stored on a server which have been deleted.
@@ -62283,7 +62320,7 @@ class BordersPlugin extends CorePlugin {
             }
         }
     }
-    adaptRanges(applyChange, sheetId) {
+    adaptRanges({ applyChange }, sheetId) {
         const newBorders = [];
         for (const border of this.borders[sheetId] ?? []) {
             const change = applyChange(this.getters.getRangeFromZone(sheetId, border.zone));
@@ -62646,7 +62683,7 @@ class CellPlugin extends CorePlugin {
     ];
     nextId = 1;
     cells = {};
-    adaptRanges(applyChange, sheetId, sheetName) {
+    adaptRanges({ applyChange }, sheetId, sheetName) {
         for (const sheet of Object.keys(this.cells)) {
             for (const cell of Object.values(this.cells[sheet] || {})) {
                 if (cell.isFormula) {
@@ -62868,7 +62905,7 @@ class CellPlugin extends CorePlugin {
             for (const position of positions) {
                 const cell = this.getters.getCell(position);
                 const xc = toXC(position.col, position.row);
-                const style = this.removeDefaultStyleValues(cell.style);
+                const style = this.extractCustomStyle(cell);
                 if (Object.keys(style).length) {
                     const styleId = getItemId(style, styles);
                     positionsByStyle[styleId] ??= [];
@@ -62914,10 +62951,14 @@ class CellPlugin extends CorePlugin {
             }
         }
     }
-    removeDefaultStyleValues(style) {
-        const cleanedStyle = { ...style };
-        for (const property in DEFAULT_STYLE) {
-            if (cleanedStyle[property] === DEFAULT_STYLE[property]) {
+    extractCustomStyle(cell) {
+        const cleanedStyle = { ...cell.style };
+        const defaultStyle = isNumber(cell.content, DEFAULT_LOCALE)
+            ? DEFAULT_NUMBER_STYLE
+            : DEFAULT_STYLE;
+        for (const property in cleanedStyle) {
+            if ((property !== "align" || !cell.isFormula) &&
+                cleanedStyle[property] === defaultStyle[property]) {
                 delete cleanedStyle[property];
             }
         }
@@ -63268,12 +63309,12 @@ class ChartPlugin extends CorePlugin {
     charts = {};
     createChart = chartFactory(this.getters);
     validateChartDefinition = (cmd) => validateChartDefinition(this, cmd.definition);
-    adaptRanges(applyChange, sheetId, adaptSheetName) {
+    adaptRanges(rangeAdapters) {
         for (const [chartId, chart] of Object.entries(this.charts)) {
             if (!chart) {
                 continue;
             }
-            const newChart = chart.chart.updateRanges(applyChange, sheetId, adaptSheetName);
+            const newChart = chart.chart.updateRanges(rangeAdapters);
             this.history.update("charts", chartId, newChart ? { figureId: chart.figureId, chart: newChart } : undefined);
         }
     }
@@ -63528,7 +63569,7 @@ class ConditionalFormatPlugin extends CorePlugin {
         "getAdaptedCfRanges",
     ];
     cfRules = {};
-    adaptCFFormulas(applyChange) {
+    adaptCFFormulas({ applyChange, adaptFormulaString }) {
         for (const sheetId in this.cfRules) {
             for (const rule of this.cfRules[sheetId]) {
                 if (rule.rule.type === "DataBarRule" && rule.rule.rangeValues) {
@@ -63552,7 +63593,7 @@ class ConditionalFormatPlugin extends CorePlugin {
                     for (let i = 0; i < rule.rule.values.length; i++) {
                         this.history.update("cfRules", sheetId, this.cfRules[sheetId].indexOf(rule), "rule", 
                         //@ts-expect-error
-                        "values", i, this.getters.adaptFormulaStringDependencies(sheetId, rule.rule.values[i], applyChange));
+                        "values", i, adaptFormulaString(sheetId, rule.rule.values[i]));
                     }
                 }
                 else if (rule.rule.type === "IconSetRule") {
@@ -63560,7 +63601,7 @@ class ConditionalFormatPlugin extends CorePlugin {
                         if (rule.rule[inflectionPoint].type === "formula") {
                             this.history.update("cfRules", sheetId, this.cfRules[sheetId].indexOf(rule), "rule", 
                             //@ts-expect-error
-                            inflectionPoint, "value", this.getters.adaptFormulaStringDependencies(sheetId, rule.rule[inflectionPoint].value, applyChange));
+                            inflectionPoint, "value", adaptFormulaString(sheetId, rule.rule[inflectionPoint].value));
                         }
                     }
                 }
@@ -63570,14 +63611,14 @@ class ConditionalFormatPlugin extends CorePlugin {
                         if (ruleValue?.type === "formula" && ruleValue?.value) {
                             this.history.update("cfRules", sheetId, this.cfRules[sheetId].indexOf(rule), "rule", 
                             //@ts-expect-error
-                            value, "value", this.getters.adaptFormulaStringDependencies(sheetId, ruleValue.value, applyChange));
+                            value, "value", adaptFormulaString(sheetId, ruleValue.value));
                         }
                     }
                 }
             }
         }
     }
-    adaptCFRanges(sheetId, applyChange) {
+    adaptCFRanges(sheetId, { applyChange }) {
         for (const rule of this.cfRules[sheetId]) {
             for (const range of rule.ranges) {
                 const change = applyChange(range);
@@ -63601,12 +63642,12 @@ class ConditionalFormatPlugin extends CorePlugin {
             }
         }
     }
-    adaptRanges(applyChange, sheetId) {
+    adaptRanges(rangeAdapters, sheetId) {
         const sheetIds = sheetId ? [sheetId] : Object.keys(this.cfRules);
         for (const sheetId of sheetIds) {
-            this.adaptCFRanges(sheetId, applyChange);
+            this.adaptCFRanges(sheetId, rangeAdapters);
         }
-        this.adaptCFFormulas(applyChange);
+        this.adaptCFFormulas(rangeAdapters);
     }
     // ---------------------------------------------------------------------------
     // Command Handling
@@ -63983,23 +64024,23 @@ class DataValidationPlugin extends CorePlugin {
         "getValidationRuleForCell",
     ];
     rules = {};
-    adaptRanges(applyChange, sheetId) {
-        this.adaptDVRanges(sheetId, applyChange);
-        this.adaptDVFormulas(applyChange);
+    adaptRanges(rangeAdapters, sheetId) {
+        this.adaptDVRanges(sheetId, rangeAdapters);
+        this.adaptDVFormulas(rangeAdapters);
     }
-    adaptDVFormulas(applyChange) {
+    adaptDVFormulas({ adaptFormulaString }) {
         for (const sheetId in this.rules) {
             const rules = this.rules[sheetId];
             for (let ruleIndex = rules.length - 1; ruleIndex >= 0; ruleIndex--) {
                 const rule = this.rules[sheetId][ruleIndex];
                 for (let valueIndex = 0; valueIndex < rule.criterion.values.length; valueIndex++) {
-                    const value = this.getters.adaptFormulaStringDependencies(sheetId, rule.criterion.values[valueIndex], applyChange);
+                    const value = adaptFormulaString(sheetId, rule.criterion.values[valueIndex]);
                     this.history.update("rules", sheetId, ruleIndex, "criterion", "values", valueIndex, value);
                 }
             }
         }
     }
-    adaptDVRanges(sheetId, applyChange) {
+    adaptDVRanges(sheetId, { applyChange }) {
         const rules = this.rules[sheetId];
         for (let ruleIndex = rules.length - 1; ruleIndex >= 0; ruleIndex--) {
             const rule = this.rules[sheetId][ruleIndex];
@@ -64273,7 +64314,7 @@ class FigurePlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
-    adaptRanges(applyChange, sheetId) {
+    adaptRanges({ applyChange }, sheetId) {
         for (const figure of this.getFigures(sheetId)) {
             const change = applyChange(this.getters.getRangeFromZone(sheetId, {
                 left: figure.col,
@@ -65104,8 +65145,8 @@ class MergePlugin extends CorePlugin {
                 break;
         }
     }
-    adaptRanges(applyChange, sheetId) {
-        this.applyRangeChangeOnSheet(sheetId, applyChange);
+    adaptRanges(rangeAdapters, sheetId) {
+        this.applyRangeChangeOnSheet(sheetId, rangeAdapters);
     }
     // ---------------------------------------------------------------------------
     // Getters
@@ -65407,7 +65448,7 @@ class MergePlugin extends CorePlugin {
     /**
      * Apply a range change on merges of a particular sheet.
      */
-    applyRangeChangeOnSheet(sheetId, applyChange) {
+    applyRangeChangeOnSheet(sheetId, { applyChange }) {
         const merges = Object.entries(this.merges[sheetId] || {});
         for (const [mergeId, range] of merges) {
             if (range) {
@@ -65481,7 +65522,7 @@ function rangeToMerge(mergeId, range) {
     };
 }
 
-class RangeAdapter {
+class RangeAdapterPlugin {
     getters;
     providers = [];
     isAdaptingRanges = false;
@@ -65489,7 +65530,6 @@ class RangeAdapter {
         this.getters = getters;
     }
     static getters = [
-        "adaptFormulaStringDependencies",
         "copyFormulaStringForSheet",
         "extendRange",
         "getRangeString",
@@ -65520,8 +65560,8 @@ class RangeAdapter {
             throw new Error("Plugins cannot dispatch commands during adaptRanges phase");
         }
         const rangeAdapter = getRangeAdapter(cmd);
-        if (rangeAdapter?.applyChange) {
-            this.executeOnAllRanges(rangeAdapter.applyChange, rangeAdapter.sheetId, rangeAdapter.sheetName);
+        if (rangeAdapter) {
+            this.executeOnAllRanges(rangeAdapter);
         }
     }
     finalize() { }
@@ -65540,11 +65580,15 @@ class RangeAdapter {
             return result;
         };
     }
-    executeOnAllRanges(adaptRange, sheetId, sheetName) {
+    executeOnAllRanges(rangeAdapter) {
         this.isAdaptingRanges = true;
-        const func = this.verifyRangeRemoved(adaptRange);
+        const adapterFunctions = {
+            applyChange: this.verifyRangeRemoved(rangeAdapter.applyChange),
+            adaptRangeString: (defaultSheetId, sheetXC) => adaptStringRange(defaultSheetId, sheetXC, rangeAdapter),
+            adaptFormulaString: (defaultSheetId, formula) => adaptFormulaStringRanges(defaultSheetId, formula, rangeAdapter),
+        };
         for (const provider of this.providers) {
-            provider(func, sheetId, sheetName);
+            provider(adapterFunctions, rangeAdapter.sheetId, rangeAdapter.sheetName);
         }
         this.isAdaptingRanges = false;
     }
@@ -65712,18 +65756,6 @@ class RangeAdapter {
         const unionOfZones = unionUnboundedZones(...zones);
         return this.getRangeFromZone(ranges[0].sheetId, unionOfZones);
     }
-    adaptFormulaStringDependencies(sheetId, formula, applyChange) {
-        if (!formula.startsWith("=")) {
-            return formula;
-        }
-        const compiledFormula = compile(formula);
-        const updatedDependencies = compiledFormula.dependencies.map((dep) => {
-            const range = this.getters.getRangeFromSheetXC(sheetId, dep);
-            const changedRange = applyChange(range);
-            return changedRange.changeType === "NONE" ? range : changedRange.range;
-        });
-        return this.getters.getFormulaString(sheetId, compiledFormula.tokens, updatedDependencies);
-    }
     /**
      * Copy a formula string to another sheet.
      *
@@ -66611,7 +66643,7 @@ class TablePlugin extends CorePlugin {
     static getters = ["getCoreTable", "getCoreTables", "getCoreTableMatchingTopLeft"];
     tables = {};
     nextTableId = 1;
-    adaptRanges(applyChange, sheetId) {
+    adaptRanges({ applyChange }, sheetId) {
         for (const table of this.getCoreTables(sheetId)) {
             this.applyRangeChangeOnTable(sheetId, table, applyChange);
         }
@@ -67608,6 +67640,7 @@ class PivotCorePlugin extends CorePlugin {
         "getMeasureCompiledFormula",
         "getPivotName",
         "isExistingPivot",
+        "getMeasureFullDependencies",
     ];
     nextFormulaId = 1;
     pivots = {};
@@ -67690,12 +67723,12 @@ 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;
             }
         }
     }
-    adaptRanges(applyChange) {
+    adaptRanges({ applyChange, adaptFormulaString }) {
         for (const pivotId in this.pivots) {
             const definition = deepCopy(this.pivots[pivotId]?.definition);
             if (!definition) {
@@ -67708,22 +67741,22 @@ 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];
-                const newDependencies = [];
-                for (const range of compiledFormula.dependencies) {
-                    const change = applyChange(range);
-                    if (change.changeType === "NONE") {
-                        newDependencies.push(range);
-                    }
-                    else {
-                        newDependencies.push(change.range);
-                    }
+        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 newFormulaString = this.getters.getFormulaString(sheetId, compiledFormula.tokens, newDependencies);
-                if (newFormulaString !== formulaString) {
-                    this.replaceMeasureFormula(sheetId, formulaString, newFormulaString);
+                const sheetId = measure.computedBy.sheetId;
+                const { formula: compiledFormula, dependencies: indirectDependencies } = this.compiledMeasureFormulas[pivotId][measureId];
+                // adapt direct dependencies
+                this.history.update("compiledMeasureFormulas", pivotId, measureId, "formula", "dependencies", compiledFormula.dependencies.map((range) => applyChange(range).range));
+                // adapt all dependencies (including indirect)
+                this.history.update("compiledMeasureFormulas", pivotId, measure.id, "dependencies", indirectDependencies.map((range) => applyChange(range).range));
+                const oldFormulaString = measure.computedBy.formula;
+                const newFormulaString = adaptFormulaString(sheetId, oldFormulaString);
+                if (newFormulaString !== oldFormulaString) {
+                    this.replaceMeasureFormula(pivotId, measure, newFormulaString);
                 }
             }
         }
@@ -67761,31 +67794,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();
@@ -67844,21 +67906,16 @@ 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,
+        });
     }
     checkSortedColumnInMeasures(definition) {
         const measures = definition.measures.map((measure) => measure.id);
@@ -69504,11 +69561,16 @@ class SpreadingRelation {
         return this.arrayFormulasToResults.get(formulasPosition);
     }
     /**
-     * Remove a node, also remove it from other nodes adjacency list
+     * Remove a spreading relation for a given array formula position
+     * and its result zone
      */
     removeNode(position) {
+        const resultZone = this.arrayFormulasToResults.get(position);
+        if (!resultZone) {
+            return;
+        }
         this.resultsToArrayFormulas.remove({
-            boundingBox: { sheetId: position.sheetId, zone: positionToZone(position) },
+            boundingBox: { sheetId: position.sheetId, zone: resultZone },
             data: position,
         });
         this.arrayFormulasToResults.delete(position);
@@ -69821,6 +69883,10 @@ class Evaluator {
             // empty matrix
             return createEvaluatedCell({ value: 0 }, this.getters.getLocale(), cellData);
         }
+        if (nbRows === 1 && nbColumns === 1) {
+            // single value matrix
+            return createEvaluatedCell(nullValueToZeroValue(formulaReturn[0][0]), this.getters.getLocale(), cellData);
+        }
         const resultZone = {
             top: formulaPosition.row,
             bottom: formulaPosition.row + nbRows - 1,
@@ -71540,6 +71606,7 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
     handle(cmd) {
         switch (cmd.type) {
             case "START":
+            case "UPDATE_LOCALE":
                 for (const sheetId of this.getters.getSheetIds()) {
                     this.initializeSheet(sheetId);
                 }
@@ -71661,7 +71728,7 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
         }
         const cell = this.getters.getCell(position);
         const colSize = this.getters.getColSize(position.sheetId, position.col);
-        return getDefaultCellHeight(this.ctx, cell, colSize);
+        return getDefaultCellHeight(this.ctx, cell, this.getters.getLocale(), colSize);
     }
     isInMultiRowMerge(position) {
         const merge = this.getters.getMerge(position);
@@ -71708,14 +71775,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 = {};
@@ -71765,7 +71834,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)) {
@@ -72520,7 +72589,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);
@@ -73982,7 +74051,7 @@ function addConditionalFormatCommandAdaptRange(cmd, applyChange) {
         cmd.cf.rule = {
             ...rule,
             rangeValues: rule.rangeValues
-                ? adaptStringRange(cmd.sheetId, rule.rangeValues, applyChange)
+                ? adaptStringRange(cmd.sheetId, rule.rangeValues, applyChange).range
                 : undefined,
         };
     }
@@ -87602,6 +87671,9 @@ function addStyles(styles) {
         if (style.alignment && style.alignment.wrapText) {
             alignAttrs.push(["wrapText", "1"]);
         }
+        if (style.alignment && style.alignment.shrinkToFit) {
+            alignAttrs.push(["shrinkToFit", "1"]);
+        }
         if (alignAttrs.length > 0) {
             attributes.push(["applyAlignment", "1"]); // for Libre Office
             styleNodes.push(escapeXml /*xml*/ `<xf ${formatAttributes(attributes)}><alignment ${formatAttributes(alignAttrs)} /></xf> `);
@@ -88372,7 +88444,7 @@ class Model extends EventBus {
         this.config = this.setupConfig(config);
         this.session = this.setupSession(workbookData.revisionId);
         this.coreGetters = {};
-        this.range = new RangeAdapter(this.coreGetters);
+        this.range = new RangeAdapterPlugin(this.coreGetters);
         this.coreGetters.getRangeString = this.range.getRangeString.bind(this.range);
         this.coreGetters.getRangeFromSheetXC = this.range.getRangeFromSheetXC.bind(this.range);
         this.coreGetters.createAdaptedRanges = this.range.createAdaptedRanges.bind(this.range);
@@ -88386,8 +88458,6 @@ class Model extends EventBus {
         this.coreGetters.extendRange = this.range.extendRange.bind(this.range);
         this.coreGetters.getRangesUnion = this.range.getRangesUnion.bind(this.range);
         this.coreGetters.removeRangesSheetPrefix = this.range.removeRangesSheetPrefix.bind(this.range);
-        this.coreGetters.adaptFormulaStringDependencies =
-            this.range.adaptFormulaStringDependencies.bind(this.range);
         this.coreGetters.copyFormulaStringForSheet = this.range.copyFormulaStringForSheet.bind(this.range);
         this.getters = {
             isReadonly: () => this.config.mode === "readonly" || this.config.mode === "dashboard",
@@ -89125,6 +89195,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "19.0.16";
-__info__.date = "2026-01-07T16:21:15.857Z";
-__info__.hash = "9f3f13a";
+__info__.version = "19.0.18";
+__info__.date = "2026-01-21T11:06:57.346Z";
+__info__.hash = "bd44f59";