@odoo/o-spreadsheet 18.4.42 → 18.4.46

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.42
- * @date 2026-06-06T06:21:29.595Z
- * @hash bae6e25
+ * @version 18.4.46
+ * @date 2026-07-01T05:02:58.175Z
+ * @hash 26297b3
  */
 /* 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.42
- * @date 2026-06-06T06:21:28.088Z
- * @hash bae6e25
+ * @version 18.4.46
+ * @date 2026-07-01T05:02:56.676Z
+ * @hash 26297b3
  */
 
 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";
@@ -213,7 +213,7 @@ const GRAY_300 = "#D8DADD";
 const GRAY_200 = "#E7E9ED";
 const GRAY_100 = "#F9FAFB";
 const TEXT_BODY = "#374151";
-const TEXT_BODY_MUTED = TEXT_BODY + "C2";
+const TEXT_BODY_MUTED = "#374151C2";
 const TEXT_HEADING = "#111827";
 const PRIMARY_BUTTON_BG = "#714B67";
 const PRIMARY_BUTTON_HOVER_BG = "#624159";
@@ -320,9 +320,6 @@ const COLOR_PICKER_DEFAULTS = [
 ];
 const DEFAULT_CELL_HEIGHT = 23;
 const FOOTER_HEIGHT = 2 * 23;
-const MENU_SEPARATOR_BORDER_WIDTH = 1;
-const MENU_SEPARATOR_PADDING = 5;
-const MENU_SEPARATOR_HEIGHT = 1 + 2 * 5;
 const DEFAULT_STYLE = {
 	align: "left",
 	verticalAlign: "bottom",
@@ -342,7 +339,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"
@@ -1624,7 +1621,7 @@ function isPositionDependent(cmd) {
 function isZoneDependent(cmd) {
 	return "sheetId" in cmd && "zone" in cmd;
 }
-const invalidateEvaluationCommands = new Set([
+const invalidateEvaluationCommands = /* @__PURE__ */ new Set([
 	"RENAME_SHEET",
 	"DELETE_SHEET",
 	"CREATE_SHEET",
@@ -1643,7 +1640,7 @@ const invalidateEvaluationCommands = new Set([
 	"REMOVE_PIVOT",
 	"DUPLICATE_PIVOT"
 ]);
-const invalidateChartEvaluationCommands = new Set([
+const invalidateChartEvaluationCommands = /* @__PURE__ */ new Set([
 	"EVALUATE_CELLS",
 	"EVALUATE_CHARTS",
 	"UPDATE_CELL",
@@ -1662,20 +1659,20 @@ const invalidateChartEvaluationCommands = new Set([
 	"UNDO",
 	"REDO"
 ]);
-const invalidateDependenciesCommands = new Set(["MOVE_RANGES"]);
-const invalidateCFEvaluationCommands = new Set([
+const invalidateDependenciesCommands = /* @__PURE__ */ new Set(["MOVE_RANGES"]);
+const invalidateCFEvaluationCommands = /* @__PURE__ */ new Set([
 	"EVALUATE_CELLS",
 	"ADD_CONDITIONAL_FORMAT",
 	"REMOVE_CONDITIONAL_FORMAT",
 	"CHANGE_CONDITIONAL_FORMAT_PRIORITY"
 ]);
-const invalidateBordersCommands = new Set([
+const invalidateBordersCommands = /* @__PURE__ */ new Set([
 	"AUTOFILL_CELL",
 	"SET_BORDER",
 	"SET_ZONE_BORDERS",
 	"SET_BORDERS_ON_TARGET"
 ]);
-const readonlyAllowedCommands = new Set([
+const readonlyAllowedCommands = /* @__PURE__ */ new Set([
 	"START",
 	"ACTIVATE_SHEET",
 	"COPY",
@@ -1687,7 +1684,7 @@ const readonlyAllowedCommands = new Set([
 	"UPDATE_FILTER",
 	"UPDATE_CHART"
 ]);
-const coreTypes = new Set([
+const coreTypes = /* @__PURE__ */ new Set([
 	"UPDATE_CELL",
 	"UPDATE_CELL_POSITION",
 	"CLEAR_CELL",
@@ -1919,7 +1916,7 @@ let CommandResult = /* @__PURE__ */ function(CommandResult) {
 
 //#endregion
 //#region src/types/conditional_formatting.ts
-const availableConditionalFormatOperators = new Set([
+const availableConditionalFormatOperators = /* @__PURE__ */ new Set([
 	"containsText",
 	"notContainsText",
 	"isGreaterThan",
@@ -1938,7 +1935,7 @@ const availableConditionalFormatOperators = new Set([
 
 //#endregion
 //#region src/types/data_validation.ts
-const availableDataValidationOperators = new Set([
+const availableDataValidationOperators = /* @__PURE__ */ new Set([
 	"containsText",
 	"notContainsText",
 	"isEqualText",
@@ -2663,12 +2660,10 @@ const getNumberRegex = memoize(function getNumberRegex(locale) {
 	const pIntegerAndDecimals = `(?:\\d+(?:${escapeRegExp(locale.thousandsSeparator || "")}\\d{3,})*(?:${decimalSeparator}\\d*)?)`;
 	const pOnlyDecimals = `(?:${decimalSeparator}\\d+)`;
 	const pNumber = "(?:\\s*" + pIntegerAndDecimals + "|" + pOnlyDecimals + ")(?:e(?:\\+|-)?\\d+)?(?:\\s*%)?";
-	const pMinus = "(?:\\s*-)?";
-	const pCurrencyFormat = "(?:\\s*[\\$€])?";
 	const pNumberExp = "^(?:(?:" + [
-		pMinus + pCurrencyFormat + pNumber,
-		pMinus + pNumber + pCurrencyFormat,
-		pCurrencyFormat + pMinus + pNumber
+		"(?:\\s*-)?(?:\\s*[\\$€])?" + pNumber,
+		"(?:\\s*-)?" + pNumber + "(?:\\s*[\\$€])?",
+		"(?:\\s*[\\$€])?(?:\\s*-)?" + pNumber
 	].join(")|(?:") + "))$";
 	return new RegExp(pNumberExp, "i");
 });
@@ -4579,7 +4574,7 @@ function getDateCriterionFormattedValues(values, locale) {
 function recomputeZones(zones, zonesToRemove = []) {
 	if (zones.length <= 1 && zonesToRemove.length === 0) return zones;
 	const profilesStartingPosition = [0];
-	const profiles = new Map([[0, []]]);
+	const profiles = /* @__PURE__ */ new Map([[0, []]]);
 	modifyProfiles(profilesStartingPosition, profiles, zones, false);
 	modifyProfiles(profilesStartingPosition, profiles, zonesToRemove, true);
 	return constructZonesFromProfiles(profilesStartingPosition, profiles);
@@ -5318,7 +5313,6 @@ function getCanonicalRepresentation(item) {
 //#region src/helpers/edge_scrolling.ts
 const MAX_DELAY = 140;
 const MIN_DELAY = 20;
-const ACCELERATION = .035;
 /**
 * Decreasing exponential function used to determine the "speed" of edge-scrolling
 * as the timeout delay.
@@ -5326,7 +5320,7 @@ const ACCELERATION = .035;
 * Returns a timeout delay in milliseconds.
 */
 function scrollDelay(value) {
-	return 20 + (140 - 20) * Math.exp(-ACCELERATION * (value - 1));
+	return 20 + (140 - 20) * Math.exp(-.035 * (value - 1));
 }
 
 //#endregion
@@ -6152,7 +6146,7 @@ var UuidGenerator = class {
 	smallUuid() {
 		if (window.crypto) return "10000000-1000".replace(/[01]/g, (c) => {
 			const n = Number(c);
-			return (n ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> n / 4).toString(16);
+			return (n ^ crypto.getRandomValues(/* @__PURE__ */ new Uint8Array(1))[0] & 15 >> n / 4).toString(16);
 		});
 		else return "xxxxxxxx-xxxx".replace(/[xy]/g, function(c) {
 			const r = Math.random() * 16 | 0;
@@ -6166,7 +6160,7 @@ var UuidGenerator = class {
 	uuidv4() {
 		if (window.crypto) return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, (c) => {
 			const n = Number(c);
-			return (n ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> n / 4).toString(16);
+			return (n ^ crypto.getRandomValues(/* @__PURE__ */ new Uint8Array(1))[0] & 15 >> n / 4).toString(16);
 		});
 		else return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
 			const r = Math.random() * 16 | 0;
@@ -7610,10 +7604,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"`;
@@ -26261,11 +26255,11 @@ var FigureComponent = class extends Component {
 	getResizerPosition(resizer) {
 		const anchorCenteringOffset = (ANCHOR_SIZE - ACTIVE_BORDER_WIDTH) / 2;
 		const style = {};
-		if (resizer.includes("top")) style.top = `${-anchorCenteringOffset}px`;
-		else if (resizer.includes("bottom")) style.bottom = `${-anchorCenteringOffset}px`;
+		if (resizer.includes("top")) style.top = `-3px`;
+		else if (resizer.includes("bottom")) style.bottom = `-3px`;
 		else style.bottom = `calc(50% - ${anchorCenteringOffset}px)`;
-		if (resizer.includes("left")) style.left = `${-anchorCenteringOffset}px`;
-		else if (resizer.includes("right")) style.right = `${-anchorCenteringOffset}px`;
+		if (resizer.includes("left")) style.left = `-3px`;
+		else if (resizer.includes("right")) style.right = `-3px`;
 		else style.right = `calc(50% - ${anchorCenteringOffset}px)`;
 		return cssPropertiesToCss(style);
 	}
@@ -29226,11 +29220,10 @@ function startDnd(onPointerMove, onPointerUp) {
 const LINE_VERTICAL_PADDING = 1;
 const PICKER_PADDING = 8;
 const ITEM_BORDER_WIDTH = 1;
-const ITEM_EDGE_LENGTH = 18;
 const ITEMS_PER_LINE = 10;
 const MAGNIFIER_EDGE = 16;
 const ITEM_GAP = 2;
-const CONTENT_WIDTH = ITEMS_PER_LINE * (ITEM_EDGE_LENGTH + 2 * ITEM_BORDER_WIDTH) + (ITEMS_PER_LINE - 1) * ITEM_GAP;
+const CONTENT_WIDTH = 218;
 const INNER_GRADIENT_WIDTH = CONTENT_WIDTH - 2 * ITEM_BORDER_WIDTH;
 const INNER_GRADIENT_HEIGHT = CONTENT_WIDTH - 30 - 2 * ITEM_BORDER_WIDTH;
 css`
@@ -29242,7 +29235,7 @@ css`
     line-height: 1.2;
     overflow-y: auto;
     overflow-x: hidden;
-    width: ${CONTENT_WIDTH + 2 * PICKER_PADDING}px;
+    width: ${234}px;
 
     .o-color-picker-section-name {
       margin: 0px ${ITEM_BORDER_WIDTH}px;
@@ -29268,8 +29261,8 @@ css`
       }
     }
     .o-color-picker-line-item {
-      width: ${ITEM_EDGE_LENGTH + 2 * ITEM_BORDER_WIDTH}px;
-      height: ${ITEM_EDGE_LENGTH + 2 * ITEM_BORDER_WIDTH}px;
+      width: ${20}px;
+      height: ${20}px;
       margin: 0px;
       border-radius: 50px;
       border: ${ITEM_BORDER_WIDTH}px solid #666666;
@@ -29313,13 +29306,13 @@ css`
     }
 
     .o-custom-selector {
-      padding: ${PICKER_PADDING + 2}px ${PICKER_PADDING}px;
+      padding: ${10}px ${PICKER_PADDING}px;
       position: relative;
       .o-gradient {
         margin-bottom: ${MAGNIFIER_EDGE / 2}px;
         border: ${ITEM_BORDER_WIDTH}px solid #c0c0c0;
-        width: ${INNER_GRADIENT_WIDTH + 2 * ITEM_BORDER_WIDTH}px;
-        height: ${INNER_GRADIENT_HEIGHT + 2 * ITEM_BORDER_WIDTH}px;
+        width: ${218}px;
+        height: ${188}px;
         position: relative;
       }
 
@@ -29457,8 +29450,8 @@ var ColorPicker = class extends Component {
 		const left = Math.round(INNER_GRADIENT_WIDTH * clip(s / 100, 0, 1));
 		const top = Math.round(INNER_GRADIENT_HEIGHT * clip(1 - 2 * l / (200 - s), 0, 1));
 		return cssPropertiesToCss({
-			left: `${-MAGNIFIER_EDGE / 2 + left}px`,
-			top: `${-MAGNIFIER_EDGE / 2 + top}px`,
+			left: `${-16 / 2 + left}px`,
+			top: `${-16 / 2 + top}px`,
 			background: hslaToHex(this.state.currentHslaColor)
 		});
 	}
@@ -31640,17 +31633,16 @@ linkMenuRegistry.add("sheet", {
 
 //#endregion
 //#region src/components/link/link_editor/link_editor.ts
-const PADDING = 12;
 css`
   .o-link-editor {
     font-size: 13px;
     background-color: white;
     box-shadow: 0 1px 4px 3px rgba(60, 64, 67, 0.15);
-    padding: ${PADDING}px;
+    padding: ${12}px;
     display: flex;
     flex-direction: column;
     border-radius: 4px;
-    width: ${340 + 2 * PADDING}px;
+    width: ${364}px;
 
     .o-section {
       .o-section-title {
@@ -39673,8 +39665,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;
@@ -47020,9 +47016,9 @@ var FindAndReplaceStore = class extends SpreadsheetStore {
 	allSheetsMatches = [];
 	activeSheetMatches = [];
 	specificRangeMatches = [];
+	selectedMatchPosition = null;
 	currentSearchRegex = null;
 	initialShowFormulaState;
-	preserveSelectedMatchIndex = false;
 	irreplaceableMatchCount = 0;
 	isSearchDirty = false;
 	shouldFinalizeUpdateSelection = false;
@@ -47144,7 +47140,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({
@@ -47156,8 +47155,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() {
@@ -47225,6 +47230,7 @@ var FindAndReplaceStore = class extends SpreadsheetStore {
 		const matches = this.searchMatches;
 		if (!matches.length) {
 			this.selectedMatchIndex = null;
+			this.selectedMatchPosition = null;
 			return;
 		}
 		let nextIndex;
@@ -47238,14 +47244,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();
@@ -47256,7 +47261,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,
@@ -47264,7 +47268,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.
@@ -48690,8 +48693,8 @@ var PivotRuntimeDefinition = class {
 	collapsedDomains;
 	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;
 		this.collapsedDomains = definition.collapsedDomains;
 	}
@@ -48705,6 +48708,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;
@@ -48748,40 +48785,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
@@ -51898,7 +51901,7 @@ var Grid = class extends Component {
 		ev.preventDefault();
 		const clipboardData = ev.clipboardData;
 		if (!clipboardData) return;
-		const image = [...clipboardData.files]?.find((file) => AllowedImageMimeTypes.includes(file.type));
+		const image = [...clipboardData.files].find((file) => AllowedImageMimeTypes.includes(file.type));
 		const osClipboard = { content: {
 			["text/plain"]: clipboardData?.getData("text/plain"),
 			["text/html"]: clipboardData?.getData("text/html")
@@ -58659,6 +58662,9 @@ var CustomColorsPlugin = class extends CoreViewPlugin {
 			case "CREATE_CHART":
 				this.tryToAddColors(this.getChartColors(cmd.figureId));
 				break;
+			case "COLOR_SHEET":
+				if (cmd.color) this.tryToAddColors([cmd.color]);
+				break;
 			case "UPDATE_CELL":
 			case "ADD_CONDITIONAL_FORMAT":
 			case "SET_BORDER":
@@ -58681,8 +58687,12 @@ 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));
-		return [...new Set([...usedColors])];
+		for (const sheetId of this.getters.getSheetIds()) usedColors = usedColors.concat(this.getSheetColors(sheetId), this.getColorsFromCells(sheetId), this.getFormattingColors(sheetId), this.getTableColors(sheetId));
+		return [.../* @__PURE__ */ 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));
@@ -59342,7 +59352,7 @@ iconsOnCellRegistry.add("pivot_collapse", (getters, position) => {
 		const definition = getters.getPivotCoreDefinition(pivotId);
 		const isDashboard = getters.isDashboard();
 		const fields = pivotCell.dimension === "COL" ? definition.columns : definition.rows;
-		const hasIcon = !isDashboard && pivotCell.domain.length !== fields.length;
+		const hasIcon = !isDashboard && !getters.shouldShowFormulas() && pivotCell.domain.length !== fields.length;
 		const isCollapsed = (definition.collapsedDomains?.[pivotCell.dimension] ?? []).some((domain) => deepEquals(domain, pivotCell.domain));
 		const indent = pivotCell.dimension === "ROW" ? (pivotCell.domain.length - 1) * 15 : 0;
 		return {
@@ -63653,7 +63663,7 @@ var TableComputedStylePlugin = class extends UIPlugin {
 		};
 	}
 };
-const invalidateTableStyleCommandsSet = new Set([
+const invalidateTableStyleCommandsSet = /* @__PURE__ */ new Set([
 	"HIDE_COLUMNS_ROWS",
 	"UNHIDE_COLUMNS_ROWS",
 	"UNFOLD_HEADER_GROUP",
@@ -65909,14 +65919,14 @@ var InternalViewport = class {
 	adjustPositionX(targetCol) {
 		const sheetId = this.sheetId;
 		const { start, end } = this.getters.getColDimensions(sheetId, targetCol);
-		if (this.offsetX + this.viewportWidth + this.offsetCorrectionX < end) this.offsetX = end - this.viewportWidth;
+		if (this.offsetX + this.viewportWidth + this.offsetCorrectionX < end) this.offsetX = end - this.viewportWidth - this.offsetCorrectionX;
 		else if (this.offsetX + this.offsetCorrectionX > start) this.offsetX = start - this.offsetCorrectionX;
 		this.adjustViewportZoneX();
 	}
 	adjustPositionY(targetRow) {
 		const sheetId = this.sheetId;
 		const { start, end } = this.getters.getRowDimensions(sheetId, targetRow);
-		if (this.offsetY + this.viewportHeight + this.offsetCorrectionY < end) this.offsetY = end - this.viewportHeight;
+		if (this.offsetY + this.viewportHeight + this.offsetCorrectionY < end) this.offsetY = end - this.viewportHeight - this.offsetCorrectionY;
 		else if (this.offsetY + this.offsetCorrectionY > start) this.offsetY = start - this.offsetCorrectionY;
 		this.adjustViewportZoneY();
 	}
@@ -68329,11 +68339,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();
@@ -68435,6 +68448,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;
 			}
 		});
 	}
@@ -72962,11 +72977,11 @@ function addBarChart(chart) {
           <!-- each data marker in the series does not have a different color -->
           <c:varyColors val="0"/>
           ${joinXmlNodes(rightDataSetsNodes)}
-          <c:axId val="${catAxId + 1}" />
-          <c:axId val="${valAxId + 1}" />
+          <c:axId val="${17781238}" />
+          <c:axId val="${88853994}" />
         </c:barChart>
-        ${addAx("b", "c:catAx", catAxId + 1, valAxId + 1, chart.axesDesign?.x?.title, chart.fontColor, leftDataSetsNodes.length ? 1 : 0)}
-        ${addAx("r", "c:valAx", valAxId + 1, catAxId + 1, chart.axesDesign?.y1?.title, chart.fontColor)}
+        ${addAx("b", "c:catAx", 17781238, 88853994, chart.axesDesign?.x?.title, chart.fontColor, leftDataSetsNodes.length ? 1 : 0)}
+        ${addAx("r", "c:valAx", 88853994, 17781238, chart.axesDesign?.y1?.title, chart.fontColor)}
       ` : ""}`;
 }
 function addComboChart(chart) {
@@ -73124,11 +73139,11 @@ function addLineChart(chart) {
           <!-- each data marker in the series does not have a different color -->
           <c:varyColors val="0"/>
           ${joinXmlNodes(rightDataSetsNodes)}
-          <c:axId val="${catAxId + 1}" />
-          <c:axId val="${valAxId + 1}" />
+          <c:axId val="${17781238}" />
+          <c:axId val="${88853994}" />
         </c:lineChart>
-        ${addAx("b", "c:catAx", catAxId + 1, valAxId + 1, chart.axesDesign?.x?.title, chart.fontColor, leftDataSetsNodes.length ? 1 : 0)}
-        ${addAx("r", "c:valAx", valAxId + 1, catAxId + 1, chart.axesDesign?.y1?.title, chart.fontColor)}
+        ${addAx("b", "c:catAx", 17781238, 88853994, chart.axesDesign?.x?.title, chart.fontColor, leftDataSetsNodes.length ? 1 : 0)}
+        ${addAx("r", "c:valAx", 88853994, 17781238, chart.axesDesign?.y1?.title, chart.fontColor)}
       ` : ""}
   `;
 }
@@ -73191,11 +73206,11 @@ function addScatterChart(chart) {
         <c:varyColors val="0"/>
         <c:scatterStyle val="lineMarker"/>
         ${joinXmlNodes(rightDataSetsNodes)}
-        <c:axId val="${catAxId + 1}" />
-        <c:axId val="${valAxId + 1}" />
+        <c:axId val="${17781238}" />
+        <c:axId val="${88853994}" />
       </c:scatterChart>
-      ${addAx("b", "c:valAx", catAxId + 1, valAxId + 1, chart.axesDesign?.x?.title, chart.fontColor, leftDataSetsNodes.length ? 1 : 0)}
-      ${addAx("r", "c:valAx", valAxId + 1, catAxId + 1, chart.axesDesign?.y1?.title, chart.fontColor)}
+      ${addAx("b", "c:valAx", 17781238, 88853994, chart.axesDesign?.x?.title, chart.fontColor, leftDataSetsNodes.length ? 1 : 0)}
+      ${addAx("r", "c:valAx", 88853994, 17781238, chart.axesDesign?.y1?.title, chart.fontColor)}
     ` : ""}`;
 }
 function addRadarChart(chart) {
@@ -75364,6 +75379,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.42";
-__info__.date = "2026-06-06T06:21:28.088Z";
-__info__.hash = "bae6e25";
+__info__.version = "18.4.46";
+__info__.date = "2026-07-01T05:02:56.676Z";
+__info__.hash = "26297b3";