@odoo/o-spreadsheet 18.2.55 → 18.2.58

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.2.55
- * @date 2026-06-06T06:20:25.457Z
- * @hash 57b568a
+ * @version 18.2.58
+ * @date 2026-07-01T05:02:56.953Z
+ * @hash 90648bf
  */
 /* Originates from src/components/spreadsheet/spreadsheet.scss */
 .o-spreadsheet {

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.2.55
- * @date 2026-06-06T06:20:23.893Z
- * @hash 57b568a
+ * @version 18.2.58
+ * @date 2026-07-01T05:02:55.458Z
+ * @hash 90648bf
  */
 
 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";
@@ -314,7 +314,7 @@ const DEFAULT_NUMBER_STYLE = {
 const DEFAULT_VERTICAL_ALIGN = DEFAULT_STYLE.verticalAlign;
 const DEFAULT_WRAPPING_MODE = DEFAULT_STYLE.wrapping;
 const DEFAULT_FONT_SIZE = DEFAULT_STYLE.fontSize;
-const DEFAULT_FONT = "'Roboto', arial";
+const DEFAULT_FONT = "'Roboto', arial, 'Liberation Sans'";
 const DEFAULT_BORDER_DESC = {
 	style: "thin",
 	color: "#000000"
@@ -7314,10 +7314,10 @@ function toNormalizedPivotValue(dimension, groupValue) {
 		type: dimension.type
 	}));
 	if (groupValueString.toLowerCase() === "false") return false;
-	return pivotNormalizationValueRegistry.get(dimension.type)(groupValueString, dimension.granularity);
+	return pivotNormalizationValueRegistry.get(dimension.type)(groupValueString, dimension);
 }
-function normalizeDateTime(value, granularity) {
-	return pivotTimeAdapter(granularity ?? "month").normalizeFunctionValue(value);
+function normalizeDateTime(value, dimension) {
+	return pivotTimeAdapter(dimension.granularity ?? "month").normalizeFunctionValue(value);
 }
 function toFunctionPivotValue(value, dimension) {
 	if (value === null) return `"null"`;
@@ -39488,9 +39488,9 @@ var FindAndReplaceStore = class extends SpreadsheetStore {
 	allSheetsMatches = [];
 	activeSheetMatches = [];
 	specificRangeMatches = [];
+	selectedMatchPosition = null;
 	currentSearchRegex = null;
 	initialShowFormulaState;
-	preserveSelectedMatchIndex = false;
 	irreplaceableMatchCount = 0;
 	isSearchDirty = false;
 	shouldFinalizeUpdateSelection = false;
@@ -39609,7 +39609,10 @@ var FindAndReplaceStore = class extends SpreadsheetStore {
 	*/
 	_updateSearch(toSearch, searchOptions) {
 		this.searchOptions = searchOptions;
-		if (toSearch !== this.toSearch) this.selectedMatchIndex = null;
+		if (toSearch !== this.toSearch) {
+			this.selectedMatchIndex = null;
+			this.selectedMatchPosition = null;
+		}
 		this.toSearch = toSearch;
 		this.currentSearchRegex = getSearchRegex(this.toSearch, this.searchOptions);
 		this.refreshSearch({
@@ -39621,8 +39624,14 @@ var FindAndReplaceStore = class extends SpreadsheetStore {
 	* refresh the matches according to the current search options
 	*/
 	refreshSearch(options) {
-		if (!this.preserveSelectedMatchIndex) this.selectedMatchIndex = null;
 		this.findMatches();
+		if (this.selectedMatchPosition) if (this.selectedMatchPosition.sheetId !== this.getters.getActiveSheetId()) {
+			this.selectedMatchIndex = null;
+			this.selectedMatchPosition = null;
+		} else {
+			const index = this.searchMatches.findIndex((match) => match.sheetId === this.selectedMatchPosition?.sheetId && match.col === this.selectedMatchPosition?.col && match.row === this.selectedMatchPosition?.row);
+			if (index !== -1) this.selectedMatchIndex = index;
+		}
 		this.selectNextCell(0, options);
 	}
 	getSheetsInSearchOrder() {
@@ -39690,6 +39699,7 @@ var FindAndReplaceStore = class extends SpreadsheetStore {
 		const matches = this.searchMatches;
 		if (!matches.length) {
 			this.selectedMatchIndex = null;
+			this.selectedMatchPosition = null;
 			return;
 		}
 		let nextIndex;
@@ -39703,14 +39713,13 @@ var FindAndReplaceStore = class extends SpreadsheetStore {
 		} else nextIndex = this.selectedMatchIndex + indexChange;
 		nextIndex = (nextIndex + matches.length) % matches.length;
 		this.selectedMatchIndex = nextIndex;
+		this.selectedMatchPosition = matches[this.selectedMatchIndex];
 		const selectedMatch = matches[nextIndex];
 		if (options.jumpToMatchSheet && this.getters.getActiveSheetId() !== selectedMatch.sheetId) {
-			this.preserveSelectedMatchIndex = true;
 			this.model.dispatch("ACTIVATE_SHEET", {
 				sheetIdFrom: this.getters.getActiveSheetId(),
 				sheetIdTo: selectedMatch.sheetId
 			});
-			this.preserveSelectedMatchIndex = false;
 			this.isSearchDirty = false;
 		}
 		this.model.selection.getBackToDefault();
@@ -39721,7 +39730,6 @@ var FindAndReplaceStore = class extends SpreadsheetStore {
 	*/
 	replace() {
 		if (this.selectedMatchIndex === null) return;
-		this.preserveSelectedMatchIndex = true;
 		this.shouldFinalizeUpdateSelection = true;
 		this.model.dispatch("REPLACE_SEARCH", {
 			searchString: this.toSearch,
@@ -39729,7 +39737,6 @@ var FindAndReplaceStore = class extends SpreadsheetStore {
 			matches: [this.searchMatches[this.selectedMatchIndex]],
 			searchOptions: this.searchOptions
 		});
-		this.preserveSelectedMatchIndex = false;
 	}
 	/**
 	* Apply the replace function to all the matches one time.
@@ -41018,8 +41025,8 @@ var PivotRuntimeDefinition = class {
 	sortedColumn;
 	constructor(definition, fields) {
 		this.measures = definition.measures.map((measure) => createMeasure(fields, measure));
-		this.columns = definition.columns.map((dimension) => createPivotDimension(fields, dimension));
-		this.rows = definition.rows.map((dimension) => createPivotDimension(fields, dimension));
+		this.columns = definition.columns.map((dimension) => this.createPivotDimension(fields, dimension));
+		this.rows = definition.rows.map((dimension) => this.createPivotDimension(fields, dimension));
 		this.sortedColumn = definition.sortedColumn;
 	}
 	getDimension(nameWithGranularity) {
@@ -41032,6 +41039,40 @@ var PivotRuntimeDefinition = class {
 		if (!measure) throw new EvaluationError(_t("Field %s is not a measure", id));
 		return measure;
 	}
+	createPivotDimension(fields, dimension) {
+		const field = fields[dimension.fieldName];
+		const type = field?.type ?? "integer";
+		const granularity = field && isDateOrDatetimeField(field) ? dimension.granularity : void 0;
+		return {
+			/**
+			* Get the display name of the dimension
+			* e.g. "stage_id" -> "Stage", "create_date:month" -> "Create Date"
+			*/
+			displayName: field?.string ?? dimension.fieldName,
+			/**
+			* Get the name of the dimension, as it is stored in the pivot formula
+			* e.g. "stage_id", "create_date:month"
+			*/
+			nameWithGranularity: dimension.fieldName + (granularity ? `:${granularity}` : ""),
+			/**
+			* Get the name of the field of the dimension
+			* e.g. "stage_id" -> "stage_id", "create_date:month" -> "create_date"
+			*/
+			fieldName: dimension.fieldName,
+			/**
+			* Get the aggregate operator of the dimension
+			* e.g. "stage_id" -> undefined, "create_date:month" -> "month"
+			*/
+			granularity,
+			/**
+			* Get the type of the field of the dimension
+			* e.g. "stage_id" -> "many2one", "create_date:month" -> "date"
+			*/
+			type,
+			order: dimension.order,
+			isValid: !!field
+		};
+	}
 };
 function createMeasure(fields, measure) {
 	const fieldName = measure.fieldName;
@@ -41075,40 +41116,6 @@ function createMeasure(fields, measure) {
 		display: measure.display
 	};
 }
-function createPivotDimension(fields, dimension) {
-	const field = fields[dimension.fieldName];
-	const type = field?.type ?? "integer";
-	const granularity = field && isDateOrDatetimeField(field) ? dimension.granularity : void 0;
-	return {
-		/**
-		* Get the display name of the dimension
-		* e.g. "stage_id" -> "Stage", "create_date:month" -> "Create Date"
-		*/
-		displayName: field?.string ?? dimension.fieldName,
-		/**
-		* Get the name of the dimension, as it is stored in the pivot formula
-		* e.g. "stage_id", "create_date:month"
-		*/
-		nameWithGranularity: dimension.fieldName + (granularity ? `:${granularity}` : ""),
-		/**
-		* Get the name of the field of the dimension
-		* e.g. "stage_id" -> "stage_id", "create_date:month" -> "create_date"
-		*/
-		fieldName: dimension.fieldName,
-		/**
-		* Get the aggregate operator of the dimension
-		* e.g. "stage_id" -> undefined, "create_date:month" -> "month"
-		*/
-		granularity,
-		/**
-		* Get the type of the field of the dimension
-		* e.g. "stage_id" -> "many2one", "create_date:month" -> "date"
-		*/
-		type,
-		order: dimension.order,
-		isValid: !!field
-	};
-}
 
 //#endregion
 //#region src/helpers/pivot/spreadsheet_pivot/runtime_definition_spreadsheet_pivot.ts
@@ -44192,8 +44199,12 @@ var CellComposerStore = class extends AbstractComposerStore {
 	}
 	stopEdition(direction) {
 		if (this.canStopEdition()) {
+			const { col, row } = this.currentEditedCell;
 			this._stopEdition();
-			if (direction) this.model.selection.moveAnchorCell(direction, 1);
+			if (direction) {
+				this.model.selection.selectCell(col, row);
+				this.model.selection.moveAnchorCell(direction, 1);
+			}
 			return;
 		}
 		const editedCell = this.currentEditedCell;
@@ -55003,6 +55014,9 @@ var CustomColorsPlugin = class extends CoreViewPlugin {
 			case "CREATE_CHART":
 				this.tryToAddColors(this.getChartColors(cmd.id));
 				break;
+			case "COLOR_SHEET":
+				if (cmd.color) this.tryToAddColors([cmd.color]);
+				break;
 			case "UPDATE_CELL":
 			case "ADD_CONDITIONAL_FORMAT":
 			case "SET_BORDER":
@@ -55025,9 +55039,13 @@ var CustomColorsPlugin = class extends CoreViewPlugin {
 	}
 	computeCustomColors() {
 		let usedColors = [];
-		for (const sheetId of this.getters.getSheetIds()) usedColors = usedColors.concat(this.getColorsFromCells(sheetId), this.getFormattingColors(sheetId), this.getTableColors(sheetId));
+		for (const sheetId of this.getters.getSheetIds()) usedColors = usedColors.concat(this.getSheetColors(sheetId), this.getColorsFromCells(sheetId), this.getFormattingColors(sheetId), this.getTableColors(sheetId));
 		return [...new Set([...usedColors])];
 	}
+	getSheetColors(sheetId) {
+		const sheet = this.getters.getSheet(sheetId);
+		return sheet.color ? [sheet.color] : [];
+	}
 	getColorsFromCells(sheetId) {
 		const cells = Object.values(this.getters.getCells(sheetId));
 		const colors = /* @__PURE__ */ new Set();
@@ -62602,11 +62620,14 @@ var BottomBarSheet = class extends Component {
 			}
 		});
 		this.DOMFocusableElementStore = useStore(DOMFocusableElementStore);
-		useExternalListener(window, "click", () => this.state.pickerOpened = false);
+		useExternalListener(window, "click", this.onExternalClick.bind(this), { capture: true });
 		useEffect((sheetId) => {
 			if (this.props.sheetId === sheetId) this.scrollToSheet();
 		}, () => [this.env.model.getters.getActiveSheetId()]);
 	}
+	onExternalClick(ev) {
+		if (!ev.target.closest(".o-color-picker")) this.state.pickerOpened = false;
+	}
 	focusInputAndSelectContent() {
 		if (!this.state.isEditing || !this.sheetNameRef.el) return;
 		this.sheetNameRef.el.focus();
@@ -62703,6 +62724,8 @@ var BottomBarSheet = class extends Component {
 			},
 			openSheetColorPickerCallback: () => {
 				this.state.pickerOpened = true;
+				const sheet = this.env.model.getters.getSheet(this.props.sheetId);
+				this.state.currentPickerColor = sheet.color;
 			}
 		});
 	}
@@ -68937,6 +68960,6 @@ const chartHelpers = {
 //#endregion
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, 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, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
-__info__.version = "18.2.55";
-__info__.date = "2026-06-06T06:20:23.893Z";
-__info__.hash = "57b568a";
+__info__.version = "18.2.58";
+__info__.date = "2026-07-01T05:02:55.458Z";
+__info__.hash = "90648bf";

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.2.55
- * @date 2026-06-06T06:20:23.893Z
- * @hash 57b568a
+ * @version 18.2.58
+ * @date 2026-07-01T05:02:55.458Z
+ * @hash 90648bf
  */
 
 (function(exports, _odoo_owl) {
@@ -316,7 +316,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 	const DEFAULT_VERTICAL_ALIGN = DEFAULT_STYLE.verticalAlign;
 	const DEFAULT_WRAPPING_MODE = DEFAULT_STYLE.wrapping;
 	const DEFAULT_FONT_SIZE = DEFAULT_STYLE.fontSize;
-	const DEFAULT_FONT = "'Roboto', arial";
+	const DEFAULT_FONT = "'Roboto', arial, 'Liberation Sans'";
 	const DEFAULT_BORDER_DESC = {
 		style: "thin",
 		color: "#000000"
@@ -7316,10 +7316,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			type: dimension.type
 		}));
 		if (groupValueString.toLowerCase() === "false") return false;
-		return pivotNormalizationValueRegistry.get(dimension.type)(groupValueString, dimension.granularity);
+		return pivotNormalizationValueRegistry.get(dimension.type)(groupValueString, dimension);
 	}
-	function normalizeDateTime(value, granularity) {
-		return pivotTimeAdapter(granularity ?? "month").normalizeFunctionValue(value);
+	function normalizeDateTime(value, dimension) {
+		return pivotTimeAdapter(dimension.granularity ?? "month").normalizeFunctionValue(value);
 	}
 	function toFunctionPivotValue(value, dimension) {
 		if (value === null) return `"null"`;
@@ -39490,9 +39490,9 @@ stores.inject(MyMetaStore, storeInstance);
 		allSheetsMatches = [];
 		activeSheetMatches = [];
 		specificRangeMatches = [];
+		selectedMatchPosition = null;
 		currentSearchRegex = null;
 		initialShowFormulaState;
-		preserveSelectedMatchIndex = false;
 		irreplaceableMatchCount = 0;
 		isSearchDirty = false;
 		shouldFinalizeUpdateSelection = false;
@@ -39611,7 +39611,10 @@ stores.inject(MyMetaStore, storeInstance);
 		*/
 		_updateSearch(toSearch, searchOptions) {
 			this.searchOptions = searchOptions;
-			if (toSearch !== this.toSearch) this.selectedMatchIndex = null;
+			if (toSearch !== this.toSearch) {
+				this.selectedMatchIndex = null;
+				this.selectedMatchPosition = null;
+			}
 			this.toSearch = toSearch;
 			this.currentSearchRegex = getSearchRegex(this.toSearch, this.searchOptions);
 			this.refreshSearch({
@@ -39623,8 +39626,14 @@ stores.inject(MyMetaStore, storeInstance);
 		* refresh the matches according to the current search options
 		*/
 		refreshSearch(options) {
-			if (!this.preserveSelectedMatchIndex) this.selectedMatchIndex = null;
 			this.findMatches();
+			if (this.selectedMatchPosition) if (this.selectedMatchPosition.sheetId !== this.getters.getActiveSheetId()) {
+				this.selectedMatchIndex = null;
+				this.selectedMatchPosition = null;
+			} else {
+				const index = this.searchMatches.findIndex((match) => match.sheetId === this.selectedMatchPosition?.sheetId && match.col === this.selectedMatchPosition?.col && match.row === this.selectedMatchPosition?.row);
+				if (index !== -1) this.selectedMatchIndex = index;
+			}
 			this.selectNextCell(0, options);
 		}
 		getSheetsInSearchOrder() {
@@ -39692,6 +39701,7 @@ stores.inject(MyMetaStore, storeInstance);
 			const matches = this.searchMatches;
 			if (!matches.length) {
 				this.selectedMatchIndex = null;
+				this.selectedMatchPosition = null;
 				return;
 			}
 			let nextIndex;
@@ -39705,14 +39715,13 @@ stores.inject(MyMetaStore, storeInstance);
 			} else nextIndex = this.selectedMatchIndex + indexChange;
 			nextIndex = (nextIndex + matches.length) % matches.length;
 			this.selectedMatchIndex = nextIndex;
+			this.selectedMatchPosition = matches[this.selectedMatchIndex];
 			const selectedMatch = matches[nextIndex];
 			if (options.jumpToMatchSheet && this.getters.getActiveSheetId() !== selectedMatch.sheetId) {
-				this.preserveSelectedMatchIndex = true;
 				this.model.dispatch("ACTIVATE_SHEET", {
 					sheetIdFrom: this.getters.getActiveSheetId(),
 					sheetIdTo: selectedMatch.sheetId
 				});
-				this.preserveSelectedMatchIndex = false;
 				this.isSearchDirty = false;
 			}
 			this.model.selection.getBackToDefault();
@@ -39723,7 +39732,6 @@ stores.inject(MyMetaStore, storeInstance);
 		*/
 		replace() {
 			if (this.selectedMatchIndex === null) return;
-			this.preserveSelectedMatchIndex = true;
 			this.shouldFinalizeUpdateSelection = true;
 			this.model.dispatch("REPLACE_SEARCH", {
 				searchString: this.toSearch,
@@ -39731,7 +39739,6 @@ stores.inject(MyMetaStore, storeInstance);
 				matches: [this.searchMatches[this.selectedMatchIndex]],
 				searchOptions: this.searchOptions
 			});
-			this.preserveSelectedMatchIndex = false;
 		}
 		/**
 		* Apply the replace function to all the matches one time.
@@ -41020,8 +41027,8 @@ stores.inject(MyMetaStore, storeInstance);
 		sortedColumn;
 		constructor(definition, fields) {
 			this.measures = definition.measures.map((measure) => createMeasure(fields, measure));
-			this.columns = definition.columns.map((dimension) => createPivotDimension(fields, dimension));
-			this.rows = definition.rows.map((dimension) => createPivotDimension(fields, dimension));
+			this.columns = definition.columns.map((dimension) => this.createPivotDimension(fields, dimension));
+			this.rows = definition.rows.map((dimension) => this.createPivotDimension(fields, dimension));
 			this.sortedColumn = definition.sortedColumn;
 		}
 		getDimension(nameWithGranularity) {
@@ -41034,6 +41041,40 @@ stores.inject(MyMetaStore, storeInstance);
 			if (!measure) throw new EvaluationError(_t("Field %s is not a measure", id));
 			return measure;
 		}
+		createPivotDimension(fields, dimension) {
+			const field = fields[dimension.fieldName];
+			const type = field?.type ?? "integer";
+			const granularity = field && isDateOrDatetimeField(field) ? dimension.granularity : void 0;
+			return {
+				/**
+				* Get the display name of the dimension
+				* e.g. "stage_id" -> "Stage", "create_date:month" -> "Create Date"
+				*/
+				displayName: field?.string ?? dimension.fieldName,
+				/**
+				* Get the name of the dimension, as it is stored in the pivot formula
+				* e.g. "stage_id", "create_date:month"
+				*/
+				nameWithGranularity: dimension.fieldName + (granularity ? `:${granularity}` : ""),
+				/**
+				* Get the name of the field of the dimension
+				* e.g. "stage_id" -> "stage_id", "create_date:month" -> "create_date"
+				*/
+				fieldName: dimension.fieldName,
+				/**
+				* Get the aggregate operator of the dimension
+				* e.g. "stage_id" -> undefined, "create_date:month" -> "month"
+				*/
+				granularity,
+				/**
+				* Get the type of the field of the dimension
+				* e.g. "stage_id" -> "many2one", "create_date:month" -> "date"
+				*/
+				type,
+				order: dimension.order,
+				isValid: !!field
+			};
+		}
 	};
 	function createMeasure(fields, measure) {
 		const fieldName = measure.fieldName;
@@ -41077,40 +41118,6 @@ stores.inject(MyMetaStore, storeInstance);
 			display: measure.display
 		};
 	}
-	function createPivotDimension(fields, dimension) {
-		const field = fields[dimension.fieldName];
-		const type = field?.type ?? "integer";
-		const granularity = field && isDateOrDatetimeField(field) ? dimension.granularity : void 0;
-		return {
-			/**
-			* Get the display name of the dimension
-			* e.g. "stage_id" -> "Stage", "create_date:month" -> "Create Date"
-			*/
-			displayName: field?.string ?? dimension.fieldName,
-			/**
-			* Get the name of the dimension, as it is stored in the pivot formula
-			* e.g. "stage_id", "create_date:month"
-			*/
-			nameWithGranularity: dimension.fieldName + (granularity ? `:${granularity}` : ""),
-			/**
-			* Get the name of the field of the dimension
-			* e.g. "stage_id" -> "stage_id", "create_date:month" -> "create_date"
-			*/
-			fieldName: dimension.fieldName,
-			/**
-			* Get the aggregate operator of the dimension
-			* e.g. "stage_id" -> undefined, "create_date:month" -> "month"
-			*/
-			granularity,
-			/**
-			* Get the type of the field of the dimension
-			* e.g. "stage_id" -> "many2one", "create_date:month" -> "date"
-			*/
-			type,
-			order: dimension.order,
-			isValid: !!field
-		};
-	}
 
 //#endregion
 //#region src/helpers/pivot/spreadsheet_pivot/runtime_definition_spreadsheet_pivot.ts
@@ -44194,8 +44201,12 @@ stores.inject(MyMetaStore, storeInstance);
 		}
 		stopEdition(direction) {
 			if (this.canStopEdition()) {
+				const { col, row } = this.currentEditedCell;
 				this._stopEdition();
-				if (direction) this.model.selection.moveAnchorCell(direction, 1);
+				if (direction) {
+					this.model.selection.selectCell(col, row);
+					this.model.selection.moveAnchorCell(direction, 1);
+				}
 				return;
 			}
 			const editedCell = this.currentEditedCell;
@@ -55005,6 +55016,9 @@ stores.inject(MyMetaStore, storeInstance);
 				case "CREATE_CHART":
 					this.tryToAddColors(this.getChartColors(cmd.id));
 					break;
+				case "COLOR_SHEET":
+					if (cmd.color) this.tryToAddColors([cmd.color]);
+					break;
 				case "UPDATE_CELL":
 				case "ADD_CONDITIONAL_FORMAT":
 				case "SET_BORDER":
@@ -55027,9 +55041,13 @@ stores.inject(MyMetaStore, storeInstance);
 		}
 		computeCustomColors() {
 			let usedColors = [];
-			for (const sheetId of this.getters.getSheetIds()) usedColors = usedColors.concat(this.getColorsFromCells(sheetId), this.getFormattingColors(sheetId), this.getTableColors(sheetId));
+			for (const sheetId of this.getters.getSheetIds()) usedColors = usedColors.concat(this.getSheetColors(sheetId), this.getColorsFromCells(sheetId), this.getFormattingColors(sheetId), this.getTableColors(sheetId));
 			return [...new Set([...usedColors])];
 		}
+		getSheetColors(sheetId) {
+			const sheet = this.getters.getSheet(sheetId);
+			return sheet.color ? [sheet.color] : [];
+		}
 		getColorsFromCells(sheetId) {
 			const cells = Object.values(this.getters.getCells(sheetId));
 			const colors = /* @__PURE__ */ new Set();
@@ -62604,11 +62622,14 @@ stores.inject(MyMetaStore, storeInstance);
 				}
 			});
 			this.DOMFocusableElementStore = useStore(DOMFocusableElementStore);
-			(0, _odoo_owl.useExternalListener)(window, "click", () => this.state.pickerOpened = false);
+			(0, _odoo_owl.useExternalListener)(window, "click", this.onExternalClick.bind(this), { capture: true });
 			(0, _odoo_owl.useEffect)((sheetId) => {
 				if (this.props.sheetId === sheetId) this.scrollToSheet();
 			}, () => [this.env.model.getters.getActiveSheetId()]);
 		}
+		onExternalClick(ev) {
+			if (!ev.target.closest(".o-color-picker")) this.state.pickerOpened = false;
+		}
 		focusInputAndSelectContent() {
 			if (!this.state.isEditing || !this.sheetNameRef.el) return;
 			this.sheetNameRef.el.focus();
@@ -62705,6 +62726,8 @@ stores.inject(MyMetaStore, storeInstance);
 				},
 				openSheetColorPickerCallback: () => {
 					this.state.pickerOpened = true;
+					const sheet = this.env.model.getters.getSheet(this.props.sheetId);
+					this.state.currentPickerColor = sheet.color;
 				}
 			});
 		}
@@ -68985,8 +69008,8 @@ exports.stores = stores;
 exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
-__info__.version = "18.2.55";
-__info__.date = "2026-06-06T06:20:23.893Z";
-__info__.hash = "57b568a";
+__info__.version = "18.2.58";
+__info__.date = "2026-07-01T05:02:55.458Z";
+__info__.hash = "90648bf";
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);