@odoo/o-spreadsheet 19.2.20 → 19.2.21

package/dist/o_spreadsheet.css

@@ -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.2.20
- * @date 2026-07-13T06:27:12.484Z
- * @hash 99a9aef
+ * @version 19.2.21
+ * @date 2026-07-20T11:02:04.627Z
+ * @hash fba73fe
  */
 :root {
   --os-gray-100: light-dark(#f9fafb, #1b1d26);

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 19.2.20
- * @date 2026-07-13T06:27:10.918Z
- * @hash 99a9aef
+ * @version 19.2.21
+ * @date 2026-07-20T11:02:03.049Z
+ * @hash fba73fe
  */
 
 import { App, Component, blockDom, markRaw, onMounted, onPatched, onWillPatch, onWillStart, onWillUnmount, onWillUpdateProps, status, toRaw, useChildSubEnv, useComponent, useEffect, useEnv, useExternalListener, useRef, useState, useSubEnv, whenReady, xml } from "@odoo/owl";
@@ -6268,7 +6268,7 @@ function getRangeString(range, forSheetId, getSheetName, options = {
 	if (prefixSheet && !sheetName) return CellErrorType.InvalidReference;
 	let rangeString = getRangePartString(range, 0, options);
 	if (range.parts && range.parts.length === 2) {
-		if (range.zone.top !== range.zone.bottom || range.zone.left !== range.zone.right || range.parts[0].rowFixed || range.parts[0].colFixed || range.parts[1].rowFixed || range.parts[1].colFixed) {
+		if (range.zone.top !== range.zone.bottom || range.zone.left !== range.zone.right || range.parts[0].rowFixed || range.parts[0].colFixed || range.parts[1].rowFixed || range.parts[1].colFixed || options.doNotSimplifyRange) {
 			rangeString += ":";
 			rangeString += getRangePartString(range, 1, options);
 		}
@@ -40478,7 +40478,7 @@ var ScorecardChartConfigPanel = class extends Component {
 		return !!this.state.keyValueDispatchResult?.isCancelledBecause("InvalidScorecardKeyValue");
 	}
 	get isBaselineInvalid() {
-		return !!this.state.keyValueDispatchResult?.isCancelledBecause("InvalidScorecardBaseline");
+		return !!this.state.baselineDispatchResult?.isCancelledBecause("InvalidScorecardBaseline");
 	}
 	onKeyValueRangeChanged(ranges) {
 		this.keyValue = ranges[0];
@@ -43796,6 +43796,11 @@ var CompiledFormula = class CompiledFormula {
 		const params = compileTokens(rangeTokenize(formula));
 		return new CompiledFormula(sheetId, params.tokens, params.literalValues, params.symbols, params.dependencies.map((xc) => getters.getRangeFromSheetXC(sheetId, xc)), params.isBadExpression, params.normalizedFormula, params.execute);
 	}
+	areRangeShapesInLineWithNormalizedFormula() {
+		return Array.from(this.normalizedFormula.matchAll(/\|C\||\|R\|/g)).every((value, index) => {
+			return this.rangeDependencies[index].parts.length === 1 && value[0] === "|C|" || this.rangeDependencies[index].parts.length === 2 && value[0] === "|R|" || this.rangeDependencies[index].invalidXc || this.rangeDependencies[index].invalidSheetName;
+		});
+	}
 };
 function compileTokens(tokens) {
 	try {
@@ -55778,6 +55783,7 @@ var Squisher = class {
 	alreadyAppliedNumberOffsets = [];
 	previousStrings = [];
 	baseFormulaWasTransformed = false;
+	rangeToStringOptions = { doNotSimplifyRange: true };
 	constructor(getters) {
 		this.getters = getters;
 	}
@@ -55834,9 +55840,9 @@ var Squisher = class {
 		let references = [];
 		if (!this.baseFormula || this.baseFormula.normalizedFormula !== cell.compiledFormula.normalizedFormula) {
 			this.resetBaseTo(cell.compiledFormula);
-			return cell.compiledFormula.toFormulaString(this.getters);
+			return cell.compiledFormula.toFormulaString(this.getters, this.rangeToStringOptions);
 		} else {
-			if (!this.baseFormulaWasTransformed && deepEquals(cell.compiledFormula.literalValues, this.baseFormula.literalValues) && deepEquals(cell.compiledFormula.rangeDependencies, this.baseFormula.rangeDependencies)) return cell.compiledFormula.toFormulaString(this.getters);
+			if (!this.baseFormulaWasTransformed && deepEquals(cell.compiledFormula.literalValues, this.baseFormula.literalValues) && deepEquals(cell.compiledFormula.rangeDependencies, this.baseFormula.rangeDependencies)) return cell.compiledFormula.toFormulaString(this.getters, this.rangeToStringOptions);
 			numbers = this.squishNumbers(cell.compiledFormula.literalValues.numbers);
 			strings = this.squishStrings(cell.compiledFormula.literalValues.strings);
 			references = this.squishReferences(cell.compiledFormula.rangeDependencies, forSheetId);
@@ -55879,23 +55885,23 @@ var Squisher = class {
 	squishOneReference(reference, previousReferences, index, forSheetId) {
 		const previousReference = previousReferences[index];
 		if (deepEquals(previousReference, reference)) return "=";
-		if (previousReference.sheetId !== reference.sheetId || previousReference.prefixSheet !== reference.prefixSheet || previousReference.invalidSheetName !== reference.invalidSheetName || previousReference.invalidXc !== reference.invalidXc) {
+		if (previousReference.sheetId !== reference.sheetId || previousReference.prefixSheet !== reference.prefixSheet || previousReference.invalidSheetName !== reference.invalidSheetName || previousReference.invalidXc !== reference.invalidXc || previousReference.parts.length !== reference.parts.length) {
 			previousReferences[index] = deepCopy(reference);
-			return getRangeString(reference, forSheetId, this.getters.getSheetName);
+			return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 		}
 		if (previousReference.unboundedZone.bottom === void 0 || previousReference.unboundedZone.right === void 0 || reference.unboundedZone.bottom === void 0 || reference.unboundedZone.right === void 0) {
 			previousReferences[index] = deepCopy(reference);
-			return getRangeString(reference, forSheetId, this.getters.getSheetName);
+			return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 		}
 		for (let i = 0; i < reference.parts.length; i++) if (previousReference.parts[i].colFixed !== reference.parts[i].colFixed || previousReference.parts[i].rowFixed !== reference.parts[i].rowFixed) {
 			previousReferences[index] = deepCopy(reference);
-			return getRangeString(reference, forSheetId, this.getters.getSheetName);
+			return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 		}
 		const currentZone = reference.zone;
 		const previousZone = previousReference.zone;
 		if (currentZone.top !== currentZone.bottom || currentZone.left !== currentZone.right || previousZone.top !== previousZone.bottom || previousZone.left !== previousZone.right) {
 			previousReferences[index] = deepCopy(reference);
-			return getRangeString(reference, forSheetId, this.getters.getSheetName);
+			return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 		}
 		const diffCol = reference.zone.left - previousReference.zone.left;
 		const diffRow = reference.zone.top - previousReference.zone.top;
@@ -55903,7 +55909,7 @@ var Squisher = class {
 		previousReference.unboundedZone = deepCopy(reference.unboundedZone);
 		if (diffCol !== 0 && diffRow === 0) return `${diffCol > 0 ? "+" : "-"}C${Math.abs(diffCol)}`;
 		else if (diffRow !== 0 && diffCol === 0) return `${diffRow > 0 ? "+" : "-"}R${Math.abs(diffRow)}`;
-		return getRangeString(reference, forSheetId, this.getters.getSheetName);
+		return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 	}
 	/**
 	* Squish the number parameters. Result for each parameter should be compared the previous formula.
@@ -56014,10 +56020,19 @@ var Unsquisher = class {
 					break;
 				case "FIRST_OFFSET":
 					this.previousOffset = current;
-					for (const position of positionsOfKey) yield {
-						position,
-						compiled: this.unsquish(current, sheetId, getters)
-					};
+					for (const position of positionsOfKey) {
+						const result = this.unsquish(current, sheetId, getters);
+						if (!result.areRangeShapesInLineWithNormalizedFormula()) {
+							const formulaString = result.toFormulaString(getters);
+							yield {
+								position,
+								compiled: CompiledFormula.Compile(formulaString, sheetId, getters)
+							};
+						} else yield {
+							position,
+							compiled: result
+						};
+					}
 					break;
 				case "COMBINE_OFFSET":
 					if (!this.previousOffset) throw new Error("No previous offset to combine with");
@@ -56025,10 +56040,19 @@ var Unsquisher = class {
 					this.previousOffset.N = currentOffset.N ?? this.previousOffset.N;
 					this.previousOffset.S = currentOffset.S ?? this.previousOffset.S;
 					this.previousOffset.R = currentOffset.R ?? this.previousOffset.R;
-					for (const position of positionsOfKey) yield {
-						position,
-						compiled: this.unsquish(this.previousOffset, sheetId, getters)
-					};
+					for (const position of positionsOfKey) {
+						const result = this.unsquish(this.previousOffset, sheetId, getters);
+						if (!result.areRangeShapesInLineWithNormalizedFormula()) {
+							const formulaString = result.toFormulaString(getters);
+							yield {
+								position,
+								compiled: CompiledFormula.Compile(formulaString, sheetId, getters)
+							};
+						} else yield {
+							position,
+							compiled: result
+						};
+					}
 					break;
 			}
 		}
@@ -63545,6 +63569,8 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 	pivots = {};
 	unusedPivotsInFormulas;
 	custom;
+	pivotPositionCache = new PositionMap();
+	shouldInvalidateCache = false;
 	constructor(config) {
 		super(config);
 		this.custom = config.custom;
@@ -63555,7 +63581,11 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 		}
 	}
 	handle(cmd) {
-		if (invalidateEvaluationCommands.has(cmd.type)) for (const pivotId of this.getters.getPivotIds()) this.setupPivot(pivotId, { recreate: true });
+		if (invalidateEvaluationCommands.has(cmd.type)) {
+			this.shouldInvalidateCache = true;
+			for (const pivotId of this.getters.getPivotIds()) this.setupPivot(pivotId, { recreate: true });
+		}
+		if (cmd.type === "UPDATE_CELL") this.shouldInvalidateCache = true;
 		switch (cmd.type) {
 			case "REFRESH_PIVOT":
 				this.refreshPivot(cmd.id);
@@ -63595,6 +63625,12 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 				break;
 		}
 	}
+	finalize() {
+		if (this.shouldInvalidateCache) {
+			this.pivotPositionCache = new PositionMap();
+			this.shouldInvalidateCache = false;
+		}
+	}
 	/**
 	* Get the id of the first pivot in the formula at the given position. Returns undefined if there
 	* is no pivot at this position
@@ -63606,9 +63642,14 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 	* Get all of the ids of the pivot present in the formula at the given position.
 	*/
 	getPivotIdsFromPosition(position) {
-		const cell = this.getters.getCorrespondingFormulaCell(position);
-		if (cell && cell.isFormula) return this.getPivotIdsFromFormula(position.sheetId, cell.compiledFormula);
-		return [];
+		if (!this.pivotPositionCache.has(position)) {
+			const cell = this.getters.getCorrespondingFormulaCell(position);
+			if (cell && cell.isFormula) {
+				const pivotIds = this.getPivotIdsFromFormula(position.sheetId, cell.compiledFormula);
+				this.pivotPositionCache.set(position, pivotIds);
+			}
+		}
+		return this.pivotPositionCache.get(position) || [];
 	}
 	getPivotIdsFromFormula(sheetId, formula) {
 		return this.getPivotFunctions(sheetId, formula).map((pivotFunction) => {
@@ -65357,7 +65398,12 @@ var TableComputedStylePlugin = class extends UIPlugin {
 	computeTableStyle(sheetId, table) {
 		return lazy(() => {
 			const style = this.getters.getTableStyle(table.config.styleId);
-			const { tableMetaData, config } = this.getTableMetaData(sheetId, table);
+			const tableMetaDataAndConfig = this.getTableMetaData(sheetId, table);
+			if (!tableMetaDataAndConfig) return {
+				borders: {},
+				styles: {}
+			};
+			const { tableMetaData, config } = tableMetaDataAndConfig;
 			const relativeTableStyle = getComputedTableStyle(config, style, tableMetaData);
 			const mapping = this.getTableMapping(sheetId, table);
 			const absoluteTableStyle = {
@@ -65395,6 +65441,7 @@ var TableComputedStylePlugin = class extends UIPlugin {
 		const pivotInfo = this.getters.getPivotStyleAtPosition(mainPosition);
 		if (!pivotInfo) throw new Error("No dynamic pivot info found at pivot table position");
 		const pivot = this.getters.getPivot(pivotInfo.pivotId);
+		if (!pivot.isValid()) return;
 		const pivotStyle = pivotInfo.pivotStyle;
 		const maxRowDepth = pivot.getExpandedTableStructure().getNumberOfRowGroupBys();
 		const pivotCells = pivot.getCollapsedTableStructure().getPivotCells(pivotStyle);
@@ -81544,7 +81591,8 @@ const helpers = {
 	DateTime,
 	parseFormat,
 	isFormula,
-	domainToColRowDomain
+	domainToColRowDomain,
+	PositionMap
 };
 const links = {
 	isMarkdownLink,
@@ -81664,6 +81712,6 @@ const chartHelpers = {
 //#endregion
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, ClientDisconnectedError, CommandResult, CompiledFormula, CorePlugin, CoreViewPlugin, DEFAULT_LOCALE, DEFAULT_LOCALES, DispatchResult, EvaluationError, LocalTransportService, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, canExecuteInReadonly, categories, chartHelpers, components, constants, convertAstNodes, coreTypes, createAutocompleteArgumentsProvider, findCellInNewZone, functionCache, getCaretDownSvg, getCaretUpSvg, helpers, hooks, invalidateCFEvaluationCommands, invalidateChartEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, isCoreCommand, isSheetDependent, iterateAstNodes, links, load, lockedSheetAllowedCommands, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
-__info__.version = "19.2.20";
-__info__.date = "2026-07-13T06:27:10.918Z";
-__info__.hash = "99a9aef";
+__info__.version = "19.2.21";
+__info__.date = "2026-07-20T11:02:03.049Z";
+__info__.hash = "fba73fe";

package/dist/o_spreadsheet.iife.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 19.2.20
- * @date 2026-07-13T06:27:10.918Z
- * @hash 99a9aef
+ * @version 19.2.21
+ * @date 2026-07-20T11:02:03.049Z
+ * @hash fba73fe
  */
 
 (function(exports, _odoo_owl) {
@@ -6270,7 +6270,7 @@ stores.inject(MyMetaStore, storeInstance);
 		if (prefixSheet && !sheetName) return CellErrorType.InvalidReference;
 		let rangeString = getRangePartString(range, 0, options);
 		if (range.parts && range.parts.length === 2) {
-			if (range.zone.top !== range.zone.bottom || range.zone.left !== range.zone.right || range.parts[0].rowFixed || range.parts[0].colFixed || range.parts[1].rowFixed || range.parts[1].colFixed) {
+			if (range.zone.top !== range.zone.bottom || range.zone.left !== range.zone.right || range.parts[0].rowFixed || range.parts[0].colFixed || range.parts[1].rowFixed || range.parts[1].colFixed || options.doNotSimplifyRange) {
 				rangeString += ":";
 				rangeString += getRangePartString(range, 1, options);
 			}
@@ -40480,7 +40480,7 @@ stores.inject(MyMetaStore, storeInstance);
 			return !!this.state.keyValueDispatchResult?.isCancelledBecause("InvalidScorecardKeyValue");
 		}
 		get isBaselineInvalid() {
-			return !!this.state.keyValueDispatchResult?.isCancelledBecause("InvalidScorecardBaseline");
+			return !!this.state.baselineDispatchResult?.isCancelledBecause("InvalidScorecardBaseline");
 		}
 		onKeyValueRangeChanged(ranges) {
 			this.keyValue = ranges[0];
@@ -43798,6 +43798,11 @@ stores.inject(MyMetaStore, storeInstance);
 			const params = compileTokens(rangeTokenize(formula));
 			return new CompiledFormula(sheetId, params.tokens, params.literalValues, params.symbols, params.dependencies.map((xc) => getters.getRangeFromSheetXC(sheetId, xc)), params.isBadExpression, params.normalizedFormula, params.execute);
 		}
+		areRangeShapesInLineWithNormalizedFormula() {
+			return Array.from(this.normalizedFormula.matchAll(/\|C\||\|R\|/g)).every((value, index) => {
+				return this.rangeDependencies[index].parts.length === 1 && value[0] === "|C|" || this.rangeDependencies[index].parts.length === 2 && value[0] === "|R|" || this.rangeDependencies[index].invalidXc || this.rangeDependencies[index].invalidSheetName;
+			});
+		}
 	};
 	function compileTokens(tokens) {
 		try {
@@ -55780,6 +55785,7 @@ stores.inject(MyMetaStore, storeInstance);
 		alreadyAppliedNumberOffsets = [];
 		previousStrings = [];
 		baseFormulaWasTransformed = false;
+		rangeToStringOptions = { doNotSimplifyRange: true };
 		constructor(getters) {
 			this.getters = getters;
 		}
@@ -55836,9 +55842,9 @@ stores.inject(MyMetaStore, storeInstance);
 			let references = [];
 			if (!this.baseFormula || this.baseFormula.normalizedFormula !== cell.compiledFormula.normalizedFormula) {
 				this.resetBaseTo(cell.compiledFormula);
-				return cell.compiledFormula.toFormulaString(this.getters);
+				return cell.compiledFormula.toFormulaString(this.getters, this.rangeToStringOptions);
 			} else {
-				if (!this.baseFormulaWasTransformed && deepEquals(cell.compiledFormula.literalValues, this.baseFormula.literalValues) && deepEquals(cell.compiledFormula.rangeDependencies, this.baseFormula.rangeDependencies)) return cell.compiledFormula.toFormulaString(this.getters);
+				if (!this.baseFormulaWasTransformed && deepEquals(cell.compiledFormula.literalValues, this.baseFormula.literalValues) && deepEquals(cell.compiledFormula.rangeDependencies, this.baseFormula.rangeDependencies)) return cell.compiledFormula.toFormulaString(this.getters, this.rangeToStringOptions);
 				numbers = this.squishNumbers(cell.compiledFormula.literalValues.numbers);
 				strings = this.squishStrings(cell.compiledFormula.literalValues.strings);
 				references = this.squishReferences(cell.compiledFormula.rangeDependencies, forSheetId);
@@ -55881,23 +55887,23 @@ stores.inject(MyMetaStore, storeInstance);
 		squishOneReference(reference, previousReferences, index, forSheetId) {
 			const previousReference = previousReferences[index];
 			if (deepEquals(previousReference, reference)) return "=";
-			if (previousReference.sheetId !== reference.sheetId || previousReference.prefixSheet !== reference.prefixSheet || previousReference.invalidSheetName !== reference.invalidSheetName || previousReference.invalidXc !== reference.invalidXc) {
+			if (previousReference.sheetId !== reference.sheetId || previousReference.prefixSheet !== reference.prefixSheet || previousReference.invalidSheetName !== reference.invalidSheetName || previousReference.invalidXc !== reference.invalidXc || previousReference.parts.length !== reference.parts.length) {
 				previousReferences[index] = deepCopy(reference);
-				return getRangeString(reference, forSheetId, this.getters.getSheetName);
+				return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 			}
 			if (previousReference.unboundedZone.bottom === void 0 || previousReference.unboundedZone.right === void 0 || reference.unboundedZone.bottom === void 0 || reference.unboundedZone.right === void 0) {
 				previousReferences[index] = deepCopy(reference);
-				return getRangeString(reference, forSheetId, this.getters.getSheetName);
+				return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 			}
 			for (let i = 0; i < reference.parts.length; i++) if (previousReference.parts[i].colFixed !== reference.parts[i].colFixed || previousReference.parts[i].rowFixed !== reference.parts[i].rowFixed) {
 				previousReferences[index] = deepCopy(reference);
-				return getRangeString(reference, forSheetId, this.getters.getSheetName);
+				return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 			}
 			const currentZone = reference.zone;
 			const previousZone = previousReference.zone;
 			if (currentZone.top !== currentZone.bottom || currentZone.left !== currentZone.right || previousZone.top !== previousZone.bottom || previousZone.left !== previousZone.right) {
 				previousReferences[index] = deepCopy(reference);
-				return getRangeString(reference, forSheetId, this.getters.getSheetName);
+				return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 			}
 			const diffCol = reference.zone.left - previousReference.zone.left;
 			const diffRow = reference.zone.top - previousReference.zone.top;
@@ -55905,7 +55911,7 @@ stores.inject(MyMetaStore, storeInstance);
 			previousReference.unboundedZone = deepCopy(reference.unboundedZone);
 			if (diffCol !== 0 && diffRow === 0) return `${diffCol > 0 ? "+" : "-"}C${Math.abs(diffCol)}`;
 			else if (diffRow !== 0 && diffCol === 0) return `${diffRow > 0 ? "+" : "-"}R${Math.abs(diffRow)}`;
-			return getRangeString(reference, forSheetId, this.getters.getSheetName);
+			return getRangeString(reference, forSheetId, this.getters.getSheetName, this.rangeToStringOptions);
 		}
 		/**
 		* Squish the number parameters. Result for each parameter should be compared the previous formula.
@@ -56016,10 +56022,19 @@ stores.inject(MyMetaStore, storeInstance);
 						break;
 					case "FIRST_OFFSET":
 						this.previousOffset = current;
-						for (const position of positionsOfKey) yield {
-							position,
-							compiled: this.unsquish(current, sheetId, getters)
-						};
+						for (const position of positionsOfKey) {
+							const result = this.unsquish(current, sheetId, getters);
+							if (!result.areRangeShapesInLineWithNormalizedFormula()) {
+								const formulaString = result.toFormulaString(getters);
+								yield {
+									position,
+									compiled: CompiledFormula.Compile(formulaString, sheetId, getters)
+								};
+							} else yield {
+								position,
+								compiled: result
+							};
+						}
 						break;
 					case "COMBINE_OFFSET":
 						if (!this.previousOffset) throw new Error("No previous offset to combine with");
@@ -56027,10 +56042,19 @@ stores.inject(MyMetaStore, storeInstance);
 						this.previousOffset.N = currentOffset.N ?? this.previousOffset.N;
 						this.previousOffset.S = currentOffset.S ?? this.previousOffset.S;
 						this.previousOffset.R = currentOffset.R ?? this.previousOffset.R;
-						for (const position of positionsOfKey) yield {
-							position,
-							compiled: this.unsquish(this.previousOffset, sheetId, getters)
-						};
+						for (const position of positionsOfKey) {
+							const result = this.unsquish(this.previousOffset, sheetId, getters);
+							if (!result.areRangeShapesInLineWithNormalizedFormula()) {
+								const formulaString = result.toFormulaString(getters);
+								yield {
+									position,
+									compiled: CompiledFormula.Compile(formulaString, sheetId, getters)
+								};
+							} else yield {
+								position,
+								compiled: result
+							};
+						}
 						break;
 				}
 			}
@@ -63547,6 +63571,8 @@ stores.inject(MyMetaStore, storeInstance);
 		pivots = {};
 		unusedPivotsInFormulas;
 		custom;
+		pivotPositionCache = new PositionMap();
+		shouldInvalidateCache = false;
 		constructor(config) {
 			super(config);
 			this.custom = config.custom;
@@ -63557,7 +63583,11 @@ stores.inject(MyMetaStore, storeInstance);
 			}
 		}
 		handle(cmd) {
-			if (invalidateEvaluationCommands.has(cmd.type)) for (const pivotId of this.getters.getPivotIds()) this.setupPivot(pivotId, { recreate: true });
+			if (invalidateEvaluationCommands.has(cmd.type)) {
+				this.shouldInvalidateCache = true;
+				for (const pivotId of this.getters.getPivotIds()) this.setupPivot(pivotId, { recreate: true });
+			}
+			if (cmd.type === "UPDATE_CELL") this.shouldInvalidateCache = true;
 			switch (cmd.type) {
 				case "REFRESH_PIVOT":
 					this.refreshPivot(cmd.id);
@@ -63597,6 +63627,12 @@ stores.inject(MyMetaStore, storeInstance);
 					break;
 			}
 		}
+		finalize() {
+			if (this.shouldInvalidateCache) {
+				this.pivotPositionCache = new PositionMap();
+				this.shouldInvalidateCache = false;
+			}
+		}
 		/**
 		* Get the id of the first pivot in the formula at the given position. Returns undefined if there
 		* is no pivot at this position
@@ -63608,9 +63644,14 @@ stores.inject(MyMetaStore, storeInstance);
 		* Get all of the ids of the pivot present in the formula at the given position.
 		*/
 		getPivotIdsFromPosition(position) {
-			const cell = this.getters.getCorrespondingFormulaCell(position);
-			if (cell && cell.isFormula) return this.getPivotIdsFromFormula(position.sheetId, cell.compiledFormula);
-			return [];
+			if (!this.pivotPositionCache.has(position)) {
+				const cell = this.getters.getCorrespondingFormulaCell(position);
+				if (cell && cell.isFormula) {
+					const pivotIds = this.getPivotIdsFromFormula(position.sheetId, cell.compiledFormula);
+					this.pivotPositionCache.set(position, pivotIds);
+				}
+			}
+			return this.pivotPositionCache.get(position) || [];
 		}
 		getPivotIdsFromFormula(sheetId, formula) {
 			return this.getPivotFunctions(sheetId, formula).map((pivotFunction) => {
@@ -65359,7 +65400,12 @@ stores.inject(MyMetaStore, storeInstance);
 		computeTableStyle(sheetId, table) {
 			return lazy(() => {
 				const style = this.getters.getTableStyle(table.config.styleId);
-				const { tableMetaData, config } = this.getTableMetaData(sheetId, table);
+				const tableMetaDataAndConfig = this.getTableMetaData(sheetId, table);
+				if (!tableMetaDataAndConfig) return {
+					borders: {},
+					styles: {}
+				};
+				const { tableMetaData, config } = tableMetaDataAndConfig;
 				const relativeTableStyle = getComputedTableStyle(config, style, tableMetaData);
 				const mapping = this.getTableMapping(sheetId, table);
 				const absoluteTableStyle = {
@@ -65397,6 +65443,7 @@ stores.inject(MyMetaStore, storeInstance);
 			const pivotInfo = this.getters.getPivotStyleAtPosition(mainPosition);
 			if (!pivotInfo) throw new Error("No dynamic pivot info found at pivot table position");
 			const pivot = this.getters.getPivot(pivotInfo.pivotId);
+			if (!pivot.isValid()) return;
 			const pivotStyle = pivotInfo.pivotStyle;
 			const maxRowDepth = pivot.getExpandedTableStructure().getNumberOfRowGroupBys();
 			const pivotCells = pivot.getCollapsedTableStructure().getPivotCells(pivotStyle);
@@ -81546,7 +81593,8 @@ stores.inject(MyMetaStore, storeInstance);
 		DateTime,
 		parseFormat,
 		isFormula,
-		domainToColRowDomain
+		domainToColRowDomain,
+		PositionMap
 	};
 	const links = {
 		isMarkdownLink,
@@ -81724,8 +81772,8 @@ exports.stores = stores;
 exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
-__info__.version = "19.2.20";
-__info__.date = "2026-07-13T06:27:10.918Z";
-__info__.hash = "99a9aef";
+__info__.version = "19.2.21";
+__info__.date = "2026-07-20T11:02:03.049Z";
+__info__.hash = "fba73fe";
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);