@odoo/o-spreadsheet 18.4.40 → 18.4.42

package/dist/o_spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.4.40
- * @date 2026-05-15T07:04:46.418Z
- * @hash bb1e6d6
+ * @version 18.4.42
+ * @date 2026-06-06T06:21:28.088Z
+ * @hash bae6e25
  */
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
@@ -3401,6 +3401,7 @@ function emptyDataErrorMessage(argName) {
 //#endregion
 //#region src/helpers/format/format_tokenizer.ts
 function tokenizeFormat(str) {
+	str = str.replace(/\s/g, " ");
 	const chars = new TokenizingChars(str);
 	const result = [];
 	let currentFormatPart = [];
@@ -5663,8 +5664,13 @@ function getApplyRangeChangeAddColRow(cmd) {
 			changeType: "NONE",
 			range
 		};
+		const isUnboundedAtEnd = range.unboundedZone[end] === void 0;
+		if (isUnboundedAtEnd && !range.unboundedZone.hasHeader) return {
+			changeType: "RESIZE",
+			range: createAdaptedRange(range, dimension, "RESIZE", cmd.quantity)
+		};
 		if (cmd.position === "after") {
-			if (range.zone[start] <= cmd.base && cmd.base < range.zone[end]) return {
+			if (range.zone[start] <= cmd.base && (cmd.base < range.zone[end] || isUnboundedAtEnd)) return {
 				changeType: "RESIZE",
 				range: createAdaptedRange(range, dimension, "RESIZE", cmd.quantity)
 			};
@@ -9198,6 +9204,10 @@ const FORCE_DEFAULT_ARGS_FUNCTIONS = {
 	ROUNDDOWN: [{
 		type: "NUMBER",
 		value: 0
+	}],
+	IFERROR: [{
+		type: "NUMBER",
+		value: 0
 	}]
 };
 /**
@@ -37051,11 +37061,10 @@ const INSERT_TABLE = (env) => {
 	if (interactiveCreateTable(env, env.model.getters.getActiveSheetId()).isSuccessful) env.openSidePanel("TableSidePanel", {});
 };
 const DELETE_SELECTED_TABLE = (env) => {
-	const position = env.model.getters.getActivePosition();
-	const table = env.model.getters.getTable(position);
+	const table = env.model.getters.getFirstTableInSelection();
 	if (!table) return;
 	env.model.dispatch("REMOVE_TABLE", {
-		sheetId: position.sheetId,
+		sheetId: env.model.getters.getActiveSheetId(),
 		target: [table.range.zone]
 	});
 };
@@ -47731,7 +47740,7 @@ function getVisiblePivotCellPositions(getters, pivotId) {
 			col,
 			row
 		};
-		if (pivotId === getters.getPivotIdFromPosition(position)) positions.push(position);
+		if (getters.getPivotIdsFromPosition(position).includes(pivotId)) positions.push(position);
 	}
 	return positions;
 }
@@ -48656,6 +48665,9 @@ function extractFormulaIdFromToken(tokenAtCursor) {
 function getFirstPivotFunction(tokens) {
 	return getFunctionsFromTokens(tokens, PIVOT_FUNCTIONS)[0];
 }
+function getPivotFunctions(tokens) {
+	return getFunctionsFromTokens(tokens, PIVOT_FUNCTIONS);
+}
 /**
 * Parse a spreadsheet formula and detect the number of PIVOT functions that are
 * present in the given formula.
@@ -60424,6 +60436,7 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 		"getPivot",
 		"getFirstPivotFunction",
 		"getPivotIdFromPosition",
+		"getPivotIdsFromPosition",
 		"getPivotCellFromPosition",
 		"generateNewCalculatedMeasureName",
 		"isPivotUnused",
@@ -60448,9 +60461,11 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 				this.refreshPivot(cmd.id);
 				break;
 			case "ADD_PIVOT":
+				this.unusedPivots?.push(cmd.pivotId);
 				this.setupPivot(cmd.pivotId);
 				break;
 			case "DUPLICATE_PIVOT":
+				this.unusedPivots?.push(cmd.newPivotId);
 				this.setupPivot(cmd.newPivotId);
 				break;
 			case "UPDATE_PIVOT":
@@ -60481,37 +60496,52 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 		}
 	}
 	/**
-	* Get the id of the pivot at the given position. Returns undefined if there
+	* Get the id of the first pivot in the formula at the given position. Returns undefined if there
 	* is no pivot at this position
 	*/
 	getPivotIdFromPosition(position) {
+		return this.getPivotIdsFromPosition(position)[0];
+	}
+	/**
+	* 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) {
-			const pivotFunction = this.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens);
-			if (pivotFunction) {
-				const pivotId = pivotFunction.args[0]?.toString();
-				return pivotId && this.getters.getPivotId(pivotId);
-			}
-		}
+		if (cell && cell.isFormula) return this.getPivotIdsFromFormula(position.sheetId, cell.compiledFormula);
+		return [];
+	}
+	getPivotIdsFromFormula(sheetId, formula) {
+		return this.getPivotFunctions(sheetId, formula.tokens).map((pivotFunction) => {
+			const pivotId = pivotFunction.args[0]?.toString();
+			return pivotId && this.getters.getPivotId(pivotId);
+		}).filter(isDefined);
 	}
 	isSpillPivotFormula(position) {
 		const cell = this.getters.getCorrespondingFormulaCell(position);
 		if (cell && cell.isFormula) return this.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens)?.functionName === "PIVOT";
 		return false;
 	}
-	getFirstPivotFunction(sheetId, tokens) {
-		const pivotFunction = getFirstPivotFunction(tokens);
-		if (!pivotFunction) return;
-		const { functionName, args } = pivotFunction;
-		return {
-			functionName,
-			args: args.map((argAst) => {
+	getPivotFunctions(sheetId, tokens) {
+		const pivotFunctions = getPivotFunctions(tokens);
+		if (!pivotFunctions.length) return [];
+		const evaluatedPivotFunctions = [];
+		for (const pivotFunction of pivotFunctions) {
+			const { functionName, args } = pivotFunction;
+			const evaluatedArgs = args.map((argAst) => {
 				if (argAst.type === "EMPTY") return;
 				else if (argAst.type === "STRING" || argAst.type === "BOOLEAN" || argAst.type === "NUMBER") return argAst.value;
 				const argsString = astToFormula(argAst);
 				return this.getters.evaluateFormula(sheetId, argsString);
-			})
-		};
+			});
+			evaluatedPivotFunctions.push({
+				functionName,
+				args: evaluatedArgs
+			});
+		}
+		return evaluatedPivotFunctions;
+	}
+	getFirstPivotFunction(sheetId, tokens) {
+		return this.getPivotFunctions(sheetId, tokens)[0];
 	}
 	/**
 	* Returns the domain args of a pivot formula from a position.
@@ -60615,8 +60645,8 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 		const unusedPivots = new Set(this.getters.getPivotIds());
 		for (const sheetId of this.getters.getSheetIds()) for (const cellId in this.getters.getCells(sheetId)) {
 			const position = this.getters.getCellPosition(cellId);
-			const pivotId = this.getPivotIdFromPosition(position);
-			if (pivotId) {
+			const pivotIds = this.getPivotIdsFromPosition(position);
+			for (const pivotId of pivotIds) {
 				unusedPivots.delete(pivotId);
 				if (!unusedPivots.size) {
 					this.unusedPivots = [];
@@ -60624,6 +60654,21 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 				}
 			}
 		}
+		for (const pivotId of this.getters.getPivotIds()) {
+			const pivot = this.getters.getPivotCoreDefinition(pivotId);
+			for (const measure of pivot.measures) if (measure.computedBy) {
+				const { sheetId } = measure.computedBy;
+				const formula = this.getters.getMeasureCompiledFormula(pivotId, measure);
+				const relatedPivotIds = this.getPivotIdsFromFormula(sheetId, formula);
+				for (const relatedPivotId of relatedPivotIds) {
+					unusedPivots.delete(relatedPivotId);
+					if (!unusedPivots.size) {
+						this.unusedPivots = [];
+						return [];
+					}
+				}
+			}
+		}
 		this.unusedPivots = [...unusedPivots];
 		return this.unusedPivots;
 	}
@@ -75553,6 +75598,6 @@ exports.stores = stores;
 exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
-__info__.version = "18.4.40";
-__info__.date = "2026-05-15T07:04:46.418Z";
-__info__.hash = "bb1e6d6";
+__info__.version = "18.4.42";
+__info__.date = "2026-06-06T06:21:28.088Z";
+__info__.hash = "bae6e25";

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 18.4.40
- * @date 2026-05-15T07:04:47.982Z
- * @hash bb1e6d6
+ * @version 18.4.42
+ * @date 2026-06-06T06:21:29.595Z
+ * @hash bae6e25
  */
 /* Originates from src/components/top_bar/top_bar.scss */
 @media (max-width: 1200px) {

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.40
- * @date 2026-05-15T07:04:46.418Z
- * @hash bb1e6d6
+ * @version 18.4.42
+ * @date 2026-06-06T06:21:28.088Z
+ * @hash bae6e25
  */
 
 import { App, Component, blockDom, markRaw, onMounted, onPatched, onWillPatch, onWillStart, onWillUnmount, onWillUpdateProps, status, toRaw, useChildSubEnv, useComponent, useEffect, useEnv, useExternalListener, useRef, useState, useSubEnv, xml } from "@odoo/owl";
@@ -3400,6 +3400,7 @@ function emptyDataErrorMessage(argName) {
 //#endregion
 //#region src/helpers/format/format_tokenizer.ts
 function tokenizeFormat(str) {
+	str = str.replace(/\s/g, " ");
 	const chars = new TokenizingChars(str);
 	const result = [];
 	let currentFormatPart = [];
@@ -5662,8 +5663,13 @@ function getApplyRangeChangeAddColRow(cmd) {
 			changeType: "NONE",
 			range
 		};
+		const isUnboundedAtEnd = range.unboundedZone[end] === void 0;
+		if (isUnboundedAtEnd && !range.unboundedZone.hasHeader) return {
+			changeType: "RESIZE",
+			range: createAdaptedRange(range, dimension, "RESIZE", cmd.quantity)
+		};
 		if (cmd.position === "after") {
-			if (range.zone[start] <= cmd.base && cmd.base < range.zone[end]) return {
+			if (range.zone[start] <= cmd.base && (cmd.base < range.zone[end] || isUnboundedAtEnd)) return {
 				changeType: "RESIZE",
 				range: createAdaptedRange(range, dimension, "RESIZE", cmd.quantity)
 			};
@@ -9197,6 +9203,10 @@ const FORCE_DEFAULT_ARGS_FUNCTIONS = {
 	ROUNDDOWN: [{
 		type: "NUMBER",
 		value: 0
+	}],
+	IFERROR: [{
+		type: "NUMBER",
+		value: 0
 	}]
 };
 /**
@@ -37050,11 +37060,10 @@ const INSERT_TABLE = (env) => {
 	if (interactiveCreateTable(env, env.model.getters.getActiveSheetId()).isSuccessful) env.openSidePanel("TableSidePanel", {});
 };
 const DELETE_SELECTED_TABLE = (env) => {
-	const position = env.model.getters.getActivePosition();
-	const table = env.model.getters.getTable(position);
+	const table = env.model.getters.getFirstTableInSelection();
 	if (!table) return;
 	env.model.dispatch("REMOVE_TABLE", {
-		sheetId: position.sheetId,
+		sheetId: env.model.getters.getActiveSheetId(),
 		target: [table.range.zone]
 	});
 };
@@ -47730,7 +47739,7 @@ function getVisiblePivotCellPositions(getters, pivotId) {
 			col,
 			row
 		};
-		if (pivotId === getters.getPivotIdFromPosition(position)) positions.push(position);
+		if (getters.getPivotIdsFromPosition(position).includes(pivotId)) positions.push(position);
 	}
 	return positions;
 }
@@ -48655,6 +48664,9 @@ function extractFormulaIdFromToken(tokenAtCursor) {
 function getFirstPivotFunction(tokens) {
 	return getFunctionsFromTokens(tokens, PIVOT_FUNCTIONS)[0];
 }
+function getPivotFunctions(tokens) {
+	return getFunctionsFromTokens(tokens, PIVOT_FUNCTIONS);
+}
 /**
 * Parse a spreadsheet formula and detect the number of PIVOT functions that are
 * present in the given formula.
@@ -60239,6 +60251,7 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 		"getPivot",
 		"getFirstPivotFunction",
 		"getPivotIdFromPosition",
+		"getPivotIdsFromPosition",
 		"getPivotCellFromPosition",
 		"generateNewCalculatedMeasureName",
 		"isPivotUnused",
@@ -60263,9 +60276,11 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 				this.refreshPivot(cmd.id);
 				break;
 			case "ADD_PIVOT":
+				this.unusedPivots?.push(cmd.pivotId);
 				this.setupPivot(cmd.pivotId);
 				break;
 			case "DUPLICATE_PIVOT":
+				this.unusedPivots?.push(cmd.newPivotId);
 				this.setupPivot(cmd.newPivotId);
 				break;
 			case "UPDATE_PIVOT":
@@ -60296,37 +60311,52 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 		}
 	}
 	/**
-	* Get the id of the pivot at the given position. Returns undefined if there
+	* Get the id of the first pivot in the formula at the given position. Returns undefined if there
 	* is no pivot at this position
 	*/
 	getPivotIdFromPosition(position) {
+		return this.getPivotIdsFromPosition(position)[0];
+	}
+	/**
+	* 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) {
-			const pivotFunction = this.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens);
-			if (pivotFunction) {
-				const pivotId = pivotFunction.args[0]?.toString();
-				return pivotId && this.getters.getPivotId(pivotId);
-			}
-		}
+		if (cell && cell.isFormula) return this.getPivotIdsFromFormula(position.sheetId, cell.compiledFormula);
+		return [];
+	}
+	getPivotIdsFromFormula(sheetId, formula) {
+		return this.getPivotFunctions(sheetId, formula.tokens).map((pivotFunction) => {
+			const pivotId = pivotFunction.args[0]?.toString();
+			return pivotId && this.getters.getPivotId(pivotId);
+		}).filter(isDefined);
 	}
 	isSpillPivotFormula(position) {
 		const cell = this.getters.getCorrespondingFormulaCell(position);
 		if (cell && cell.isFormula) return this.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens)?.functionName === "PIVOT";
 		return false;
 	}
-	getFirstPivotFunction(sheetId, tokens) {
-		const pivotFunction = getFirstPivotFunction(tokens);
-		if (!pivotFunction) return;
-		const { functionName, args } = pivotFunction;
-		return {
-			functionName,
-			args: args.map((argAst) => {
+	getPivotFunctions(sheetId, tokens) {
+		const pivotFunctions = getPivotFunctions(tokens);
+		if (!pivotFunctions.length) return [];
+		const evaluatedPivotFunctions = [];
+		for (const pivotFunction of pivotFunctions) {
+			const { functionName, args } = pivotFunction;
+			const evaluatedArgs = args.map((argAst) => {
 				if (argAst.type === "EMPTY") return;
 				else if (argAst.type === "STRING" || argAst.type === "BOOLEAN" || argAst.type === "NUMBER") return argAst.value;
 				const argsString = astToFormula(argAst);
 				return this.getters.evaluateFormula(sheetId, argsString);
-			})
-		};
+			});
+			evaluatedPivotFunctions.push({
+				functionName,
+				args: evaluatedArgs
+			});
+		}
+		return evaluatedPivotFunctions;
+	}
+	getFirstPivotFunction(sheetId, tokens) {
+		return this.getPivotFunctions(sheetId, tokens)[0];
 	}
 	/**
 	* Returns the domain args of a pivot formula from a position.
@@ -60430,8 +60460,8 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 		const unusedPivots = new Set(this.getters.getPivotIds());
 		for (const sheetId of this.getters.getSheetIds()) for (const cellId in this.getters.getCells(sheetId)) {
 			const position = this.getters.getCellPosition(cellId);
-			const pivotId = this.getPivotIdFromPosition(position);
-			if (pivotId) {
+			const pivotIds = this.getPivotIdsFromPosition(position);
+			for (const pivotId of pivotIds) {
 				unusedPivots.delete(pivotId);
 				if (!unusedPivots.size) {
 					this.unusedPivots = [];
@@ -60439,6 +60469,21 @@ var PivotUIPlugin = class extends CoreViewPlugin {
 				}
 			}
 		}
+		for (const pivotId of this.getters.getPivotIds()) {
+			const pivot = this.getters.getPivotCoreDefinition(pivotId);
+			for (const measure of pivot.measures) if (measure.computedBy) {
+				const { sheetId } = measure.computedBy;
+				const formula = this.getters.getMeasureCompiledFormula(pivotId, measure);
+				const relatedPivotIds = this.getPivotIdsFromFormula(sheetId, formula);
+				for (const relatedPivotId of relatedPivotIds) {
+					unusedPivots.delete(relatedPivotId);
+					if (!unusedPivots.size) {
+						this.unusedPivots = [];
+						return [];
+					}
+				}
+			}
+		}
 		this.unusedPivots = [...unusedPivots];
 		return this.unusedPivots;
 	}
@@ -75319,6 +75364,6 @@ const chartHelpers = {
 //#endregion
 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.40";
-__info__.date = "2026-05-15T07:04:46.418Z";
-__info__.hash = "bb1e6d6";
+__info__.version = "18.4.42";
+__info__.date = "2026-06-06T06:21:28.088Z";
+__info__.hash = "bae6e25";

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 18.4.40
- * @date 2026-05-15T07:04:46.418Z
- * @hash bb1e6d6
+ * @version 18.4.42
+ * @date 2026-06-06T06:21:28.088Z
+ * @hash bae6e25
  */
 
 (function(exports, _odoo_owl) {
@@ -3402,6 +3402,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 //#endregion
 //#region src/helpers/format/format_tokenizer.ts
 	function tokenizeFormat(str) {
+		str = str.replace(/\s/g, " ");
 		const chars = new TokenizingChars(str);
 		const result = [];
 		let currentFormatPart = [];
@@ -5664,8 +5665,13 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				changeType: "NONE",
 				range
 			};
+			const isUnboundedAtEnd = range.unboundedZone[end] === void 0;
+			if (isUnboundedAtEnd && !range.unboundedZone.hasHeader) return {
+				changeType: "RESIZE",
+				range: createAdaptedRange(range, dimension, "RESIZE", cmd.quantity)
+			};
 			if (cmd.position === "after") {
-				if (range.zone[start] <= cmd.base && cmd.base < range.zone[end]) return {
+				if (range.zone[start] <= cmd.base && (cmd.base < range.zone[end] || isUnboundedAtEnd)) return {
 					changeType: "RESIZE",
 					range: createAdaptedRange(range, dimension, "RESIZE", cmd.quantity)
 				};
@@ -9199,6 +9205,10 @@ stores.inject(MyMetaStore, storeInstance);
 		ROUNDDOWN: [{
 			type: "NUMBER",
 			value: 0
+		}],
+		IFERROR: [{
+			type: "NUMBER",
+			value: 0
 		}]
 	};
 	/**
@@ -37052,11 +37062,10 @@ stores.inject(MyMetaStore, storeInstance);
 		if (interactiveCreateTable(env, env.model.getters.getActiveSheetId()).isSuccessful) env.openSidePanel("TableSidePanel", {});
 	};
 	const DELETE_SELECTED_TABLE = (env) => {
-		const position = env.model.getters.getActivePosition();
-		const table = env.model.getters.getTable(position);
+		const table = env.model.getters.getFirstTableInSelection();
 		if (!table) return;
 		env.model.dispatch("REMOVE_TABLE", {
-			sheetId: position.sheetId,
+			sheetId: env.model.getters.getActiveSheetId(),
 			target: [table.range.zone]
 		});
 	};
@@ -47732,7 +47741,7 @@ stores.inject(MyMetaStore, storeInstance);
 				col,
 				row
 			};
-			if (pivotId === getters.getPivotIdFromPosition(position)) positions.push(position);
+			if (getters.getPivotIdsFromPosition(position).includes(pivotId)) positions.push(position);
 		}
 		return positions;
 	}
@@ -48657,6 +48666,9 @@ stores.inject(MyMetaStore, storeInstance);
 	function getFirstPivotFunction(tokens) {
 		return getFunctionsFromTokens(tokens, PIVOT_FUNCTIONS)[0];
 	}
+	function getPivotFunctions(tokens) {
+		return getFunctionsFromTokens(tokens, PIVOT_FUNCTIONS);
+	}
 	/**
 	* Parse a spreadsheet formula and detect the number of PIVOT functions that are
 	* present in the given formula.
@@ -60241,6 +60253,7 @@ stores.inject(MyMetaStore, storeInstance);
 			"getPivot",
 			"getFirstPivotFunction",
 			"getPivotIdFromPosition",
+			"getPivotIdsFromPosition",
 			"getPivotCellFromPosition",
 			"generateNewCalculatedMeasureName",
 			"isPivotUnused",
@@ -60265,9 +60278,11 @@ stores.inject(MyMetaStore, storeInstance);
 					this.refreshPivot(cmd.id);
 					break;
 				case "ADD_PIVOT":
+					this.unusedPivots?.push(cmd.pivotId);
 					this.setupPivot(cmd.pivotId);
 					break;
 				case "DUPLICATE_PIVOT":
+					this.unusedPivots?.push(cmd.newPivotId);
 					this.setupPivot(cmd.newPivotId);
 					break;
 				case "UPDATE_PIVOT":
@@ -60298,37 +60313,52 @@ stores.inject(MyMetaStore, storeInstance);
 			}
 		}
 		/**
-		* Get the id of the pivot at the given position. Returns undefined if there
+		* Get the id of the first pivot in the formula at the given position. Returns undefined if there
 		* is no pivot at this position
 		*/
 		getPivotIdFromPosition(position) {
+			return this.getPivotIdsFromPosition(position)[0];
+		}
+		/**
+		* 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) {
-				const pivotFunction = this.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens);
-				if (pivotFunction) {
-					const pivotId = pivotFunction.args[0]?.toString();
-					return pivotId && this.getters.getPivotId(pivotId);
-				}
-			}
+			if (cell && cell.isFormula) return this.getPivotIdsFromFormula(position.sheetId, cell.compiledFormula);
+			return [];
+		}
+		getPivotIdsFromFormula(sheetId, formula) {
+			return this.getPivotFunctions(sheetId, formula.tokens).map((pivotFunction) => {
+				const pivotId = pivotFunction.args[0]?.toString();
+				return pivotId && this.getters.getPivotId(pivotId);
+			}).filter(isDefined);
 		}
 		isSpillPivotFormula(position) {
 			const cell = this.getters.getCorrespondingFormulaCell(position);
 			if (cell && cell.isFormula) return this.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens)?.functionName === "PIVOT";
 			return false;
 		}
-		getFirstPivotFunction(sheetId, tokens) {
-			const pivotFunction = getFirstPivotFunction(tokens);
-			if (!pivotFunction) return;
-			const { functionName, args } = pivotFunction;
-			return {
-				functionName,
-				args: args.map((argAst) => {
+		getPivotFunctions(sheetId, tokens) {
+			const pivotFunctions = getPivotFunctions(tokens);
+			if (!pivotFunctions.length) return [];
+			const evaluatedPivotFunctions = [];
+			for (const pivotFunction of pivotFunctions) {
+				const { functionName, args } = pivotFunction;
+				const evaluatedArgs = args.map((argAst) => {
 					if (argAst.type === "EMPTY") return;
 					else if (argAst.type === "STRING" || argAst.type === "BOOLEAN" || argAst.type === "NUMBER") return argAst.value;
 					const argsString = astToFormula(argAst);
 					return this.getters.evaluateFormula(sheetId, argsString);
-				})
-			};
+				});
+				evaluatedPivotFunctions.push({
+					functionName,
+					args: evaluatedArgs
+				});
+			}
+			return evaluatedPivotFunctions;
+		}
+		getFirstPivotFunction(sheetId, tokens) {
+			return this.getPivotFunctions(sheetId, tokens)[0];
 		}
 		/**
 		* Returns the domain args of a pivot formula from a position.
@@ -60432,8 +60462,8 @@ stores.inject(MyMetaStore, storeInstance);
 			const unusedPivots = new Set(this.getters.getPivotIds());
 			for (const sheetId of this.getters.getSheetIds()) for (const cellId in this.getters.getCells(sheetId)) {
 				const position = this.getters.getCellPosition(cellId);
-				const pivotId = this.getPivotIdFromPosition(position);
-				if (pivotId) {
+				const pivotIds = this.getPivotIdsFromPosition(position);
+				for (const pivotId of pivotIds) {
 					unusedPivots.delete(pivotId);
 					if (!unusedPivots.size) {
 						this.unusedPivots = [];
@@ -60441,6 +60471,21 @@ stores.inject(MyMetaStore, storeInstance);
 					}
 				}
 			}
+			for (const pivotId of this.getters.getPivotIds()) {
+				const pivot = this.getters.getPivotCoreDefinition(pivotId);
+				for (const measure of pivot.measures) if (measure.computedBy) {
+					const { sheetId } = measure.computedBy;
+					const formula = this.getters.getMeasureCompiledFormula(pivotId, measure);
+					const relatedPivotIds = this.getPivotIdsFromFormula(sheetId, formula);
+					for (const relatedPivotId of relatedPivotIds) {
+						unusedPivots.delete(relatedPivotId);
+						if (!unusedPivots.size) {
+							this.unusedPivots = [];
+							return [];
+						}
+					}
+				}
+			}
 			this.unusedPivots = [...unusedPivots];
 			return this.unusedPivots;
 		}
@@ -75370,8 +75415,8 @@ exports.stores = stores;
 exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
-__info__.version = "18.4.40";
-__info__.date = "2026-05-15T07:04:46.418Z";
-__info__.hash = "bb1e6d6";
+__info__.version = "18.4.42";
+__info__.date = "2026-06-06T06:21:28.088Z";
+__info__.hash = "bae6e25";
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);