@odoo/o-spreadsheet 18.5.0-alpha.1 → 18.5.0-alpha.3

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.5.0-alpha.1
- * @date 2025-06-27T09:12:49.245Z
- * @hash 756e75b
+ * @version 18.5.0-alpha.3
+ * @date 2025-07-28T13:43:05.981Z
+ * @hash 53dfee8
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, useExternalListener, onWillUpdateProps, onWillStart, onWillPatch, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -852,6 +852,7 @@ const specialWhiteSpaceSpecialCharacters = [
 ];
 const specialWhiteSpaceRegexp = new RegExp(specialWhiteSpaceSpecialCharacters.join("|"), "g");
 const newLineRegexp = /(\r\n|\r)/g;
+const whiteSpaceCharacters = specialWhiteSpaceSpecialCharacters.concat([" "]);
 /**
  * Replace all different newlines characters by \n
  */
@@ -1988,8 +1989,9 @@ const INITIAL_JS_DAY = DateTime.fromTimestamp(0);
 const DATE_JS_1900_OFFSET = INITIAL_JS_DAY.getTime() - INITIAL_1900_DAY.getTime();
 const mdyDateRegexp = /^\d{1,2}(\/|-|\s)\d{1,2}((\/|-|\s)\d{1,4})?$/;
 const ymdDateRegexp = /^\d{3,4}(\/|-|\s)\d{1,2}(\/|-|\s)\d{1,2}$/;
-const dateSeparatorsRegex = /\/|-|\s/;
-const dateRegexp = /^(\d{1,4})[\/-\s](\d{1,4})([\/-\s](\d{1,4}))?$/;
+const whiteSpaceChars = whiteSpaceCharacters.join("");
+const dateSeparatorsRegex = new RegExp(`\/|-|${whiteSpaceCharacters.join("|")}`);
+const dateRegexp = new RegExp(`^(\\d{1,4})[\/${whiteSpaceChars}\-](\\d{1,4})([\/${whiteSpaceChars}\-](\\d{1,4}))?$`);
 const timeRegexp = /((\d+(:\d+)?(:\d+)?\s*(AM|PM))|(\d+:\d+(:\d+)?))$/;
 /** Convert a value number representing a date, or return undefined if it isn't possible */
 function valueToDateNumber(value, locale) {
@@ -2899,6 +2901,7 @@ const availableConditionalFormatOperators = new Set([
     "isEmpty",
     "isNotEqual",
     "isEqual",
+    "customFormula",
 ]);
 
 const availableDataValidationOperators = new Set([
@@ -5031,11 +5034,11 @@ function isTextFormat(format) {
     }
 }
 
-function evaluateLiteral(literalCell, localeFormat) {
+function evaluateLiteral(literalCell, localeFormat, position) {
     const value = isTextFormat(localeFormat.format) && literalCell.parsedValue !== null
         ? literalCell.content
         : literalCell.parsedValue;
-    const functionResult = { value, format: localeFormat.format };
+    const functionResult = { value, format: localeFormat.format, origin: position };
     return createEvaluatedCell(functionResult, localeFormat.locale);
 }
 function parseLiteral(content, locale) {
@@ -5057,10 +5060,11 @@ function parseLiteral(content, locale) {
     }
     return content;
 }
-function createEvaluatedCell(functionResult, locale = DEFAULT_LOCALE, cell) {
+function createEvaluatedCell(functionResult, locale = DEFAULT_LOCALE, cell, origin) {
     const link = detectLink(functionResult.value);
     if (!link) {
-        return _createEvaluatedCell(functionResult, locale, cell);
+        const evaluateCell = _createEvaluatedCell(functionResult, locale, cell);
+        return addOrigin(evaluateCell, functionResult.origin ?? origin);
     }
     const value = parseLiteral(link.label, locale);
     const format = functionResult.format ||
@@ -5071,10 +5075,10 @@ function createEvaluatedCell(functionResult, locale = DEFAULT_LOCALE, cell) {
         value,
         format,
     };
-    return {
+    return addOrigin({
         ..._createEvaluatedCell(linkPayload, locale, cell),
         link,
-    };
+    }, functionResult.origin ?? origin);
 }
 function _createEvaluatedCell(functionResult, locale, cell) {
     let { value, format, message } = functionResult;
@@ -5164,6 +5168,17 @@ function errorCell(value, message) {
         defaultAlign: "center",
     };
 }
+function addOrigin(cell, origin) {
+    if (cell.value === null) {
+        // ignore empty cells to allow sharing the same object instance
+        return cell;
+    }
+    if ("origin" in cell) {
+        return cell;
+    }
+    cell.origin = origin;
+    return cell;
+}
 
 function toCriterionDateNumber(dateValue) {
     const today = DateTime.now();
@@ -6924,6 +6939,8 @@ function splitWordToSpecificWidth(ctx, word, width, style) {
 function splitTextToWidth(ctx, text, style, width) {
     if (!style)
         style = {};
+    if (isMarkdownLink(text))
+        text = parseMarkdownLink(text).label;
     const brokenText = [];
     // Checking if text contains NEWLINE before split makes it very slightly slower if text contains it,
     // but 5-10x faster if it doesn't
@@ -7842,6 +7859,7 @@ function changeCFRuleLocale(rule, changeContentLocale) {
                 case "isGreaterOrEqualTo":
                 case "isLessThan":
                 case "isLessOrEqualTo":
+                case "customFormula":
                     rule.values = rule.values.map((v) => changeContentLocale(v));
                     return rule;
                 case "beginsWithText":
@@ -8764,6 +8782,10 @@ function toNormalizedPivotValue(dimension, groupValue) {
     if (groupValue === null || groupValue === "null") {
         return null;
     }
+    const extractedGroupValue = typeof groupValue === "object" ? groupValue.value : groupValue;
+    if (isEvaluationError(extractedGroupValue)) {
+        return extractedGroupValue;
+    }
     const groupValueString = typeof groupValue === "boolean"
         ? toString(groupValue).toLocaleLowerCase()
         : toString(groupValue);
@@ -10526,6 +10548,7 @@ const EXCEL_IMPORT_DEFAULT_NUMBER_OF_ROWS = 100;
 /** The possible values for the XLSX polynomial trendline order are defined by the ST_Order simple type (§21.2.3.29) */
 const MAX_XLSX_POLYNOMIAL_DEGREE = 6;
 const FIRST_NUMFMT_ID = 164;
+const DEFAULT_DOUGHNUT_CHART_HOLE_SIZE = 50;
 const FORCE_DEFAULT_ARGS_FUNCTIONS = {
     FLOOR: [{ type: "NUMBER", value: 1 }],
     CEILING: [{ type: "NUMBER", value: 1 }],
@@ -19025,13 +19048,19 @@ const COLUMN = {
         if (isEvaluationError(cellReference?.value)) {
             return cellReference;
         }
-        const column = cellReference === undefined
-            ? this.__originCellPosition?.col
-            : toZone(cellReference.value).left;
-        if (column === undefined) {
-            return new EvaluationError(_t("In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter."));
+        if (cellReference === undefined) {
+            if (this.__originCellPosition?.col === undefined) {
+                return new EvaluationError(_t("In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter."));
+            }
+            return this.__originCellPosition.col + 1;
+        }
+        const zone = this.getters.getRangeFromSheetXC(this.getters.getActiveSheetId(), cellReference.value).zone;
+        if (zone.left === zone.right) {
+            return zone.left + 1;
         }
-        return column + 1;
+        return generateMatrix(zone.right - zone.left + 1, 1, (col, row) => ({
+            value: zone.left + col + 1,
+        }));
     },
     isExported: true,
 };
@@ -19262,13 +19291,19 @@ const ROW = {
         if (isEvaluationError(cellReference?.value)) {
             return cellReference;
         }
-        const row = cellReference === undefined
-            ? this.__originCellPosition?.row
-            : toZone(cellReference.value).top;
-        if (row === undefined) {
-            return new EvaluationError(_t("In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter."));
+        if (cellReference === undefined) {
+            if (this.__originCellPosition?.row === undefined) {
+                return new EvaluationError(_t("In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter."));
+            }
+            return this.__originCellPosition.row + 1;
         }
-        return row + 1;
+        const zone = this.getters.getRangeFromSheetXC(this.getters.getActiveSheetId(), cellReference.value).zone;
+        if (zone.top === zone.bottom) {
+            return zone.top + 1;
+        }
+        return generateMatrix(1, zone.bottom - zone.top + 1, (col, row) => ({
+            value: zone.top + row + 1,
+        }));
     },
     isExported: true,
 };
@@ -22845,6 +22880,16 @@ class AbstractChart {
     static getDefinitionFromContextCreation(context) {
         throw new Error("This method should be implemented by sub class");
     }
+    getCommonDataSetAttributesForExcel(labelRange, dataSets, shouldRemoveFirstLabel) {
+        const excelDataSets = dataSets
+            .map((ds) => toExcelDataset(this.getters, ds))
+            .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference);
+        const excelLabelRange = toExcelLabelRange(this.getters, labelRange, shouldRemoveFirstLabel);
+        return {
+            dataSets: excelDataSets,
+            labelRange: excelLabelRange,
+        };
+    }
 }
 
 function getBaselineText(baseline, keyValue, baselineMode, humanize, locale) {
@@ -26327,6 +26372,7 @@ class BarChart extends AbstractChart {
             labelRange: context.auxiliaryRange || undefined,
             axesDesign: context.axesDesign,
             showValues: context.showValues,
+            horizontal: context.horizontal,
         };
     }
     getContextCreation() {
@@ -26384,10 +26430,7 @@ class BarChart extends AbstractChart {
         };
     }
     getDefinitionForExcel() {
-        const dataSets = this.dataSets
-            .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference);
-        const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
+        const { dataSets, labelRange } = this.getCommonDataSetAttributesForExcel(this.labelRange, this.dataSets, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         const definition = this.getDefinition();
         return {
             ...definition,
@@ -26975,10 +27018,7 @@ class ComboChart extends AbstractChart {
         if (this.aggregated) {
             return undefined;
         }
-        const dataSets = this.dataSets
-            .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference);
-        const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
+        const { dataSets, labelRange } = this.getCommonDataSetAttributesForExcel(this.labelRange, this.dataSets, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         const definition = this.getDefinition();
         return {
             ...definition,
@@ -27446,7 +27486,9 @@ function getSectionThresholdValue(sheetId, threshold, minValue, maxValue, getter
 }
 function getFormulaNumberValue(sheetId, formula, getters) {
     const value = getters.evaluateFormula(sheetId, formula);
-    return isMatrix(value) ? undefined : tryToNumber(value, getters.getLocale());
+    return isMultipleElementMatrix(value)
+        ? undefined
+        : tryToNumber(toScalar(value), getters.getLocale());
 }
 function getInvalidGaugeRuntime(chart, getters) {
     return {
@@ -27715,10 +27757,7 @@ class LineChart extends AbstractChart {
         return new LineChart(definition, this.sheetId, this.getters);
     }
     getDefinitionForExcel() {
-        const dataSets = this.dataSets
-            .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference);
-        const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
+        const { dataSets, labelRange } = this.getCommonDataSetAttributesForExcel(this.labelRange, this.dataSets, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         const definition = this.getDefinition();
         return {
             ...definition,
@@ -27806,7 +27845,8 @@ class PieChart extends AbstractChart {
             type: "pie",
             labelRange: context.auxiliaryRange || undefined,
             aggregated: context.aggregated ?? false,
-            isDoughnut: false,
+            isDoughnut: context.isDoughnut,
+            pieHolePercentage: context.pieHolePercentage,
             showValues: context.showValues,
         };
     }
@@ -27854,10 +27894,7 @@ class PieChart extends AbstractChart {
         return new PieChart(definition, sheetId, this.getters);
     }
     getDefinitionForExcel() {
-        const dataSets = this.dataSets
-            .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference);
-        const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
+        const { dataSets, labelRange } = this.getCommonDataSetAttributesForExcel(this.labelRange, this.dataSets, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
             backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
@@ -28002,8 +28039,22 @@ class PyramidChart extends AbstractChart {
             showValues: this.showValues,
         };
     }
-    getDefinitionForExcel() {
-        return undefined;
+    getDefinitionForExcel(getters) {
+        const { dataSets, labelRange } = this.getCommonDataSetAttributesForExcel(this.labelRange, this.dataSets, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
+        const definition = this.getDefinition();
+        const chartData = getPyramidChartData(definition, this.dataSets, this.labelRange, getters);
+        const { dataSetsValues } = chartData;
+        const maxValue = Math.max(...dataSetsValues.map((dataSet) => Math.max(...dataSet.data.map(Math.abs))));
+        return {
+            ...definition,
+            horizontal: true,
+            backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
+            fontColor: toXlsxHexColor(chartFontColor(this.background)),
+            dataSets,
+            labelRange,
+            verticalAxis: getDefinedAxis(definition),
+            maxValue,
+        };
     }
     updateRanges(applyChange) {
         const { dataSets, labelRange, isStale } = updateChartRangesWithDataSets(this.getters, applyChange, this.dataSets, this.labelRange);
@@ -28146,10 +28197,7 @@ class RadarChart extends AbstractChart {
         if (this.aggregated) {
             return undefined;
         }
-        const dataSets = this.dataSets
-            .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference);
-        const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
+        const { dataSets, labelRange } = this.getCommonDataSetAttributesForExcel(this.labelRange, this.dataSets, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         const definition = this.getDefinition();
         return {
             ...definition,
@@ -31071,6 +31119,9 @@ class ErrorToolTip extends Component {
         return undefined;
     }
     get errorOriginPositionString() {
+        if (this.env.model.getters.isDashboard()) {
+            return "";
+        }
         const evaluationError = this.evaluationError;
         const position = evaluationError?.errorOriginPosition;
         if (!position || deepEquals(position, this.props.cellPosition)) {
@@ -32593,6 +32644,9 @@ class AbstractComposerStore extends SpreadsheetStore {
     get isAutoCompleteDisplayed() {
         return !!this.autoComplete.provider;
     }
+    get canBeToggled() {
+        return this.autoComplete.provider?.canBeToggled ?? true;
+    }
     cycleReferences() {
         const locale = this.getters.getLocale();
         const updated = cycleFixedReference(this.composerSelection, this._currentContent, locale);
@@ -33122,6 +33176,7 @@ class AbstractComposerStore extends SpreadsheetStore {
                     proposals,
                     selectProposal: provider.selectProposal,
                     autoSelectFirstProposal: provider.autoSelectFirstProposal ?? false,
+                    canBeToggled: provider.canBeToggled,
                 };
             }
             if (exactMatch && this._currentContent !== this.initialContent) {
@@ -33144,6 +33199,7 @@ class AbstractComposerStore extends SpreadsheetStore {
                     proposals,
                     selectProposal: provider.selectProposal,
                     autoSelectFirstProposal: provider.autoSelectFirstProposal ?? false,
+                    canBeToggled: provider.canBeToggled,
                 };
             }
         }
@@ -33714,9 +33770,13 @@ class Composer extends Component {
         }
     }
     closeAssistant() {
+        if (!this.props.composerStore.canBeToggled)
+            return;
         this.assistant.forcedClosed = true;
     }
     openAssistant() {
+        if (!this.props.composerStore.canBeToggled)
+            return;
         this.assistant.forcedClosed = false;
     }
     onWheel(event) {
@@ -33906,7 +33966,7 @@ class Composer extends Component {
         return [...new Set(argsToFocus)];
     }
     autoComplete(value) {
-        if (!value || this.assistant.forcedClosed) {
+        if (!value || (this.assistant.forcedClosed && this.props.composerStore.canBeToggled)) {
             return;
         }
         this.props.composerStore.insertAutoCompleteValue(value);
@@ -37484,7 +37544,7 @@ const CF_OPERATOR_TYPE_CONVERSION_MAP = {
 /** Conversion map CF types in XLSX <=> Cf types in o_spreadsheet */
 const CF_TYPE_CONVERSION_MAP = {
     aboveAverage: undefined,
-    expression: undefined,
+    expression: "customFormula",
     cellIs: undefined, // exist but isn't an operator in o_spreadsheet
     colorScale: undefined, // exist but isn't an operator in o_spreadsheet
     dataBar: undefined,
@@ -38088,7 +38148,6 @@ function convertConditionalFormats(xlsxCfs, dxfs, warningManager) {
             case "containsErrors":
             case "notContainsErrors":
             case "duplicateValues":
-            case "expression":
             case "top10":
             case "uniqueValues":
             case "timePeriod":
@@ -38121,6 +38180,12 @@ function convertConditionalFormats(xlsxCfs, dxfs, warningManager) {
                 operator = CF_TYPE_CONVERSION_MAP[rule.type];
                 values.push(rule.text);
                 break;
+            case "expression":
+                if (!rule.formula?.length)
+                    continue;
+                operator = CF_TYPE_CONVERSION_MAP[rule.type];
+                values.push(`=${rule.formula[0]}`);
+                break;
             case "containsBlanks":
             case "notContainsBlanks":
                 operator = CF_TYPE_CONVERSION_MAP[rule.type];
@@ -38350,6 +38415,8 @@ function convertOperator(operator) {
             return "equal";
         case "isNotEqual":
             return "notEqual";
+        case "customFormula":
+            return "";
     }
 }
 // -------------------------------------
@@ -38685,6 +38752,9 @@ function convertChartData(chartData) {
         aggregated: false,
         cumulative: chartData.cumulative || false,
         labelsAsText: false,
+        horizontal: chartData.horizontal,
+        isDoughnut: chartData.isDoughnut,
+        pieHolePercentage: chartData.pieHolePercentage,
     };
     try {
         const ChartClass = chartRegistry.get(chartData.type);
@@ -39219,40 +39289,112 @@ function convertPivotTableConfig(pivotTable) {
  * In all the sheets, replace the table-only references in the formula cells with standard references.
  */
 function convertTableFormulaReferences(convertedSheets, xlsxSheets) {
+    let deconstructedSheets = null;
     for (const tableSheet of convertedSheets) {
         const tables = xlsxSheets.find((s) => isSheetNameEqual(s.sheetName, tableSheet.name)).tables;
+        if (!tables || tables.length === 0) {
+            continue;
+        }
+        // Only deconstruct sheets if we are sure there are tables to process
+        if (!deconstructedSheets) {
+            deconstructedSheets = deconstructSheets(convertedSheets);
+        }
         for (const table of tables) {
-            const tabRef = table.name + "[";
-            for (const sheet of convertedSheets) {
-                for (const xc in sheet.cells) {
-                    const cell = sheet.cells[xc];
-                    let cellContent = sheet.cells[xc];
-                    if (cell && cellContent && cellContent.startsWith("=")) {
-                        let refIndex;
-                        while ((refIndex = cellContent.indexOf(tabRef)) !== -1) {
-                            let endIndex = refIndex + tabRef.length;
-                            let openBrackets = 1;
-                            while (openBrackets > 0 && endIndex < cellContent.length) {
-                                if (cellContent[endIndex] === "[") {
-                                    openBrackets++;
-                                }
-                                else if (cellContent[endIndex] === "]") {
-                                    openBrackets--;
-                                }
-                                endIndex++;
-                            }
-                            const reference = cellContent.slice(refIndex + tabRef.length, endIndex - 1);
-                            const sheetPrefix = tableSheet.id === sheet.id ? "" : tableSheet.name + "!";
-                            const convertedRef = convertTableReference(sheetPrefix, reference, table, xc);
-                            cellContent =
-                                cellContent.slice(0, refIndex) + convertedRef + cellContent.slice(endIndex);
+            for (const sheetId in deconstructedSheets) {
+                const sheet = convertedSheets.find((s) => s.id === sheetId);
+                for (const xc in deconstructedSheets[sheetId]) {
+                    const deconstructedCell = deconstructedSheets[sheetId][xc];
+                    for (let i = deconstructedCell.length - 3; i >= 0; i -= 2) {
+                        const possibleTable = deconstructedSheets[sheetId][xc][i];
+                        if (!possibleTable.endsWith(table.name)) {
+                            continue;
                         }
+                        const possibleRef = deconstructedSheets[sheetId][xc][i + 1];
+                        const sheetPrefix = tableSheet.id === sheet.id ? "" : tableSheet.name + "!";
+                        const convertedRef = convertTableReference(sheetPrefix, possibleRef, table, xc);
+                        deconstructedSheets[sheetId][xc][i + 2] =
+                            possibleTable.slice(0, possibleTable.indexOf(table.name)) +
+                                convertedRef +
+                                deconstructedSheets[sheetId][xc][i + 2];
+                        deconstructedSheets[sheetId][xc].splice(i, 2);
+                    }
+                    // sheet.cells[xc] = cellContent;
+                }
+            }
+        }
+    }
+    if (!deconstructedSheets) {
+        return;
+    }
+    for (const sheetId in deconstructedSheets) {
+        const sheet = convertedSheets.find((s) => s.id === sheetId);
+        for (const xc in deconstructedSheets[sheetId]) {
+            const deconstructedCell = deconstructedSheets[sheetId][xc];
+            if (deconstructedCell.length === 1) {
+                sheet.cells[xc] = deconstructedCell[0];
+                continue;
+            }
+            let newContent = "";
+            for (let i = 0; i < deconstructedCell.length; i += 2) {
+                newContent += deconstructedCell[i] + "[" + deconstructedCell[i + 1] + "]";
+            }
+            newContent += deconstructedCell[deconstructedCell.length - 1];
+            sheet.cells[xc] = newContent;
+        }
+    }
+}
+/**
+ * Deconstruct the content of the cells in the sheets to extract possible table references.
+ * Example from "=AVERAGE(Table1[colName1])-AVERAGE(Table2[colName2])":
+ * return --> ["=AVERAGE(Table1", "colName1", ")-AVERAGE(Table2", "colName2", ")"]
+ */
+function deconstructSheets(convertedSheets) {
+    const deconstructedSheets = {};
+    for (const sheet of convertedSheets) {
+        for (const xc in sheet.cells) {
+            const cellContent = sheet.cells[xc];
+            if (!cellContent || !cellContent.startsWith("=")) {
+                continue;
+            }
+            const startIndex = cellContent.indexOf("[");
+            if (startIndex === -1) {
+                continue;
+            }
+            const deconstructedCell = [];
+            let possibleTable = cellContent.slice(0, startIndex);
+            let possibleRef = "";
+            let openBrackets = 1;
+            let mainPossibleTableIndex = 0;
+            let mainOpenBracketIndex = startIndex;
+            for (let index = startIndex + 1; index < cellContent.length; index++) {
+                if (cellContent[index] === "[") {
+                    if (openBrackets === 0) {
+                        possibleTable = cellContent.slice(mainPossibleTableIndex, index);
+                        mainOpenBracketIndex = index;
                     }
-                    sheet.cells[xc] = cellContent;
+                    openBrackets++;
+                    continue;
                 }
+                if (cellContent[index] === "]") {
+                    openBrackets--;
+                    if (openBrackets === 0) {
+                        possibleRef = cellContent.slice(mainOpenBracketIndex + 1, index);
+                        deconstructedCell.push(possibleTable);
+                        deconstructedCell.push(possibleRef);
+                        mainPossibleTableIndex = index + 1;
+                    }
+                }
+            }
+            if (deconstructedCell.length) {
+                if (!deconstructedSheets[sheet.id]) {
+                    deconstructedSheets[sheet.id] = {};
+                }
+                deconstructedCell.push(cellContent.slice(mainPossibleTableIndex));
+                deconstructedSheets[sheet.id][xc] = [...deconstructedCell];
             }
         }
     }
+    return deconstructedSheets;
 }
 /**
  * Convert table-specific references in formulas into standard references. A table reference is composed of columns names,
@@ -39889,6 +40031,12 @@ class XlsxChartExtractor extends XlsxBaseExtractor {
             const barChartGrouping = this.extractChildAttr(rootChartElement, "c:grouping", "val", {
                 default: "clustered",
             }).asString();
+            const chartDirection = this.extractChildAttr(rootChartElement, "c:barDir", "val", {
+                default: "col",
+            }).asString();
+            const chartHoleSize = this.extractChildAttr(rootChartElement, "c:holeSize", "val", {
+                default: "0",
+            }).asNum();
             return {
                 title: { text: chartTitle },
                 type: CHART_TYPE_CONVERSION_MAP[chartType],
@@ -39902,6 +40050,9 @@ class XlsxChartExtractor extends XlsxBaseExtractor {
                 }).asString()],
                 stacked: barChartGrouping === "stacked",
                 fontColor: "000000",
+                horizontal: chartDirection === "bar",
+                isDoughnut: chartHoleSize > 0,
+                pieHolePercentage: chartHoleSize,
             };
         })[0];
     }
@@ -45564,10 +45715,10 @@ class CellComposerStore extends AbstractComposerStore {
         const cellValue = isFormula(content)
             ? this.getters.evaluateFormula(this.sheetId, content)
             : parseLiteral(content, this.getters.getLocale());
-        if (isMatrix(cellValue)) {
+        if (isMultipleElementMatrix(cellValue)) {
             return true;
         }
-        const validationResult = this.getters.getValidationResultForCellValue(cellValue, cellPosition);
+        const validationResult = this.getters.getValidationResultForCellValue(toScalar(cellValue), cellPosition);
         if (!validationResult.isValid && validationResult.rule.isBlocking) {
             return false;
         }
@@ -50679,10 +50830,10 @@ class GaugeChartDesignPanel extends Component {
             return tryToNumber(value, locale) !== undefined;
         }
         const evaluatedValue = this.env.model.getters.evaluateFormula(this.sheetId, value);
-        if (isMatrix(evaluatedValue)) {
+        if (isMultipleElementMatrix(evaluatedValue)) {
             return false;
         }
-        return tryToNumber(evaluatedValue, locale) !== undefined;
+        return tryToNumber(toScalar(evaluatedValue), locale) !== undefined;
     }
     get sheetId() {
         const chart = this.env.model.getters.getChart(this.props.figureId);
@@ -50892,6 +51043,9 @@ class PieChartDesignPanel extends Component {
             pieHolePercentage,
         });
     }
+    get defaultHoleSize() {
+        return DEFAULT_DOUGHNUT_CHART_HOLE_SIZE;
+    }
 }
 
 class RadarChartDesignPanel extends Component {
@@ -51536,12 +51690,32 @@ class ChartPanel extends Component {
     static template = "o-spreadsheet-ChartPanel";
     static components = { Section, ChartTypePicker };
     static props = { onCloseSidePanel: Function, figureId: String };
+    panelContentRef;
+    scrollPositions = {
+        configuration: 0,
+        design: 0,
+    };
     store;
     get figureId() {
         return this.props.figureId;
     }
     setup() {
         this.store = useLocalStore(MainChartPanelStore);
+        this.panelContentRef = useRef("panelContent");
+        useEffect(() => {
+            const el = this.panelContentRef.el;
+            const activePanel = this.store.panel;
+            if (el) {
+                el.scrollTop = this.scrollPositions[activePanel];
+            }
+        }, () => [this.store.panel]);
+    }
+    switchPanel(panel) {
+        const el = this.panelContentRef.el;
+        if (el) {
+            this.scrollPositions[this.store.panel] = el.scrollTop;
+        }
+        this.store.activatePanel(panel);
     }
     updateChart(figureId, updateDefinition) {
         if (figureId !== this.figureId) {
@@ -55493,10 +55667,7 @@ class SpreadsheetPivot {
         if (finalCell.value === null) {
             return { value: _t("(Undefined)") };
         }
-        return {
-            value: finalCell.value,
-            format: finalCell.format,
-        };
+        return finalCell;
     }
     getPivotCellValueAndFormat(measureId, domain) {
         const dataEntries = this.filterDataEntriesFromDomain(this.dataEntries, domain);
@@ -55598,9 +55769,15 @@ class SpreadsheetPivot {
         return domain.reduce((current, acc) => this.filterDataEntriesFromDomainNode(current, acc), dataEntries);
     }
     filterDataEntriesFromDomainNode(dataEntries, domain) {
-        const { field, value } = domain;
+        const { field, value, type } = domain;
         const { nameWithGranularity } = this.getDimension(field);
-        return dataEntries.filter((entry) => entry[nameWithGranularity]?.value === value);
+        return dataEntries.filter((entry) => {
+            const cellValue = entry[nameWithGranularity]?.value;
+            if (type === "char") {
+                return String(cellValue) === String(value);
+            }
+            return cellValue === value;
+        });
     }
     getDimension(nameWithGranularity) {
         return this.definition.getDimension(nameWithGranularity);
@@ -55734,7 +55911,6 @@ pivotRegistry.add("SPREADSHEET", {
     ui: SpreadsheetPivot,
     definition: SpreadsheetPivotRuntimeDefinition,
     externalData: false,
-    onIterationEndEvaluation: (pivot) => pivot.markAsDirtyForEvaluation(),
     dateGranularities: [...dateGranularities],
     datetimeGranularities: [...dateGranularities, "hour_number", "minute_number", "second_number"],
     isMeasureCandidate: (field) => field.type !== "boolean",
@@ -64385,7 +64561,7 @@ const onIterationEndEvaluationRegistry = new Registry();
 onIterationEndEvaluationRegistry.add("pivots", (getters) => {
     for (const pivotId of getters.getPivotIds()) {
         const pivot = getters.getPivot(pivotId);
-        pivotRegistry.get(pivot.type).onIterationEndEvaluation(pivot);
+        pivot.markAsDirtyForEvaluation?.();
     }
 });
 
@@ -65553,7 +65729,7 @@ class SpreadingRelation {
 const EMPTY_ARRAY = [];
 
 const MAX_ITERATION = 30;
-const ERROR_CYCLE_CELL = Object.freeze(createEvaluatedCell(new CircularDependencyError()));
+const ERROR_CYCLE_CELL = Object.freeze(createEvaluatedCell({ ...new CircularDependencyError(), origin: undefined }));
 const EMPTY_CELL = Object.freeze(createEvaluatedCell({ value: null }));
 class Evaluator {
     context;
@@ -65787,11 +65963,12 @@ class Evaluator {
             this.cellsBeingComputed.add(cellId);
             return cell.isFormula
                 ? this.computeFormulaCell(position, cell)
-                : evaluateLiteral(cell, localeFormat);
+                : evaluateLiteral(cell, localeFormat, position);
         }
         catch (e) {
             e.value = e?.value || CellErrorType.GenericError;
             e.message = e?.message || implementationErrorMessage;
+            e.origin = position;
             return createEvaluatedCell(e);
         }
         finally {
@@ -65808,7 +65985,7 @@ class Evaluator {
     computeFormulaCell(formulaPosition, cellData) {
         const formulaReturn = updateEvalContextAndExecute(cellData.compiledFormula, this.compilationParams, formulaPosition.sheetId, this.buildSafeGetSymbolValue(), formulaPosition);
         if (!isMatrix(formulaReturn)) {
-            const evaluatedCell = createEvaluatedCell(nullValueToZeroValue(formulaReturn), this.getters.getLocale(), cellData);
+            const evaluatedCell = createEvaluatedCell(nullValueToZeroValue(formulaReturn), this.getters.getLocale(), cellData, formulaPosition);
             if (evaluatedCell.type === CellValueType.error) {
                 evaluatedCell.errorOriginPosition = formulaReturn.errorOriginPosition ?? formulaPosition;
             }
@@ -65884,7 +66061,7 @@ class Evaluator {
         const spreadValues = (i, j) => {
             const position = { sheetId, col: i + col, row: j + row };
             const cell = this.getters.getCell(position);
-            const evaluatedCell = createEvaluatedCell(nullValueToZeroValue(matrixResult[i][j]), this.getters.getLocale(), cell);
+            const evaluatedCell = createEvaluatedCell(nullValueToZeroValue(matrixResult[i][j]), this.getters.getLocale(), cell, position);
             if (evaluatedCell.type === CellValueType.error) {
                 evaluatedCell.errorOriginPosition = matrixResult[i][j].errorOriginPosition ?? position;
             }
@@ -66557,7 +66734,7 @@ class EvaluationChartPlugin extends CoreViewPlugin {
                     continue;
                 }
                 const figureId = figure.id;
-                const figureData = this.getters.getChart(figureId)?.getDefinitionForExcel();
+                const figureData = this.getters.getChart(figureId)?.getDefinitionForExcel(this.getters);
                 if (figureData) {
                     figures.push({
                         ...figure,
@@ -66849,12 +67026,12 @@ class EvaluationConditionalFormatPlugin extends CoreViewPlugin {
             }
             return this.getters.evaluateFormula(sheetId, value) ?? "";
         });
-        if (evaluatedCriterionValues.some(isMatrix)) {
+        if (evaluatedCriterionValues.some(isMultipleElementMatrix)) {
             return false;
         }
         const evaluatedCriterion = {
             type: rule.operator,
-            values: evaluatedCriterionValues,
+            values: evaluatedCriterionValues.map(toScalar),
         };
         return evaluator.isValueValid(cell.value ?? "", evaluatedCriterion, this.getters, sheetId);
     }
@@ -67014,10 +67191,10 @@ class EvaluationDataValidationPlugin extends CoreViewPlugin {
         const evaluator = criterionEvaluatorRegistry.get(criterion.type);
         const offset = this.getCellOffsetInRule(cellPosition, rule);
         const evaluatedCriterionValues = this.getEvaluatedCriterionValues(sheetId, offset, criterion);
-        if (evaluatedCriterionValues.some(isMatrix)) {
+        if (evaluatedCriterionValues.some(isMultipleElementMatrix)) {
             return undefined;
         }
-        const evaluatedCriterion = { ...criterion, values: evaluatedCriterionValues };
+        const evaluatedCriterion = { ...criterion, values: evaluatedCriterionValues.map(toScalar) };
         if (evaluator.isValueValid(cellValue, evaluatedCriterion, this.getters, sheetId)) {
             return undefined;
         }
@@ -67470,6 +67647,23 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
     static getters = ["getRowSize", "getHeaderSize", "getMaxAnchorOffset"];
     tallestCellInRow = {};
     ctx = document.createElement("canvas").getContext("2d");
+    beforeHandle(cmd) {
+        switch (cmd.type) {
+            // Ensure rows are updated before "UPDATE_CELL" is dispatched from cell plugin.
+            // "UPDATE_CELL" uses the Sheet core plugin to access row data.
+            // If "ADD_COLUMNS_ROWS" has not been processed yet by header_sizes_ui,
+            // size updates may apply to incorrect (pre-insert) rows.
+            case "ADD_COLUMNS_ROWS":
+                if (cmd.dimension === "COL") {
+                    return;
+                }
+                const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
+                const newCells = Array(cmd.quantity).fill(undefined);
+                const newTallestCells = insertItemsAtIndex(this.tallestCellInRow[cmd.sheetId], newCells, addIndex);
+                this.history.update("tallestCellInRow", cmd.sheetId, newTallestCells);
+                break;
+        }
+    }
     handle(cmd) {
         switch (cmd.type) {
             case "START":
@@ -67499,16 +67693,6 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
                 this.history.update("tallestCellInRow", cmd.sheetId, tallestCells);
                 break;
             }
-            case "ADD_COLUMNS_ROWS": {
-                if (cmd.dimension === "COL") {
-                    return;
-                }
-                const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
-                const newCells = Array(cmd.quantity).fill(undefined);
-                const newTallestCells = insertItemsAtIndex(this.tallestCellInRow[cmd.sheetId], newCells, addIndex);
-                this.history.update("tallestCellInRow", cmd.sheetId, newTallestCells);
-                break;
-            }
             case "RESIZE_COLUMNS_ROWS":
                 {
                     const sheetId = cmd.sheetId;
@@ -67660,13 +67844,13 @@ function withPivotPresentationLayer (PivotClass) {
             super(custom, params);
             this.getters = params.getters;
         }
-        init(params) {
+        markAsDirtyForEvaluation() {
             this.cache = {};
             this.rankAsc = {};
             this.rankDesc = {};
             this.runningTotal = {};
             this.runningTotalInPercent = {};
-            super.init(params);
+            super.markAsDirtyForEvaluation?.();
         }
         getPivotCellValueAndFormat(measureName, domain) {
             return this.getMeasureDisplayValue(measureName, domain);
@@ -67791,7 +67975,7 @@ function withPivotPresentationLayer (PivotClass) {
                     return this.getSubTreeMatchingDomain(node.children, domain, domainLevel + 1);
                 }
             }
-            return tree;
+            return [];
         }
         treeToLeafDomains(tree, parentDomain = []) {
             const domains = [];
@@ -73530,12 +73714,12 @@ class FilterEvaluationPlugin extends UIPlugin {
                     }
                     return this.getters.evaluateFormula(sheetId, value) ?? "";
                 });
-                if (evaluatedCriterionValues.some(isMatrix)) {
+                if (evaluatedCriterionValues.some(isMultipleElementMatrix)) {
                     continue;
                 }
                 const evaluatedCriterion = {
                     type: filterValue.type,
-                    values: evaluatedCriterionValues,
+                    values: evaluatedCriterionValues.map(toScalar),
                     dateValue: filterValue.dateValue,
                 };
                 for (let row = filteredZone.top; row <= filteredZone.bottom; row++) {
@@ -74057,6 +74241,14 @@ class GridSelectionPlugin extends UIPlugin {
         const isBasedBefore = cmd.base < start;
         const deltaCol = isBasedBefore && isCol ? thickness : 0;
         const deltaRow = isBasedBefore && !isCol ? thickness : 0;
+        const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
+        const originalSize = Object.fromEntries(toRemove.map((element) => {
+            const size = isCol
+                ? this.getters.getColSize(cmd.sheetId, element)
+                : this.getters.getUserRowSize(cmd.sheetId, element);
+            const isDefaultCol = isCol && size === DEFAULT_CELL_WIDTH;
+            return [element, isDefaultCol ? undefined : size];
+        }));
         const target = [
             {
                 left: isCol ? start + deltaCol : 0,
@@ -74087,13 +74279,12 @@ class GridSelectionPlugin extends UIPlugin {
         const col = selection.left;
         const row = selection.top;
         this.setSelectionMixin({ zone: selection, cell: { col, row } }, [selection]);
-        const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
         let currentIndex = isBasedBefore ? cmd.base : cmd.base + 1;
         const resizingGroups = {};
         for (const element of toRemove) {
-            const size = this.getters.getHeaderSize(cmd.sheetId, cmd.dimension, element);
+            const size = originalSize[element];
             const currentSize = this.getters.getHeaderSize(cmd.sheetId, cmd.dimension, currentIndex);
-            if (size !== currentSize) {
+            if (size && size !== currentSize) {
                 resizingGroups[size] ??= [];
                 resizingGroups[size].push(currentIndex);
                 currentIndex += 1;
@@ -75519,6 +75710,7 @@ const coreViewsPluginRegistry = new Registry()
 
 autoCompleteProviders.add("dataValidation", {
     displayAllOnInitialContent: true,
+    canBeToggled: false,
     getProposals(tokenAtCursor, content) {
         if (isFormula(content)) {
             return [];
@@ -77084,14 +77276,12 @@ class BottomBarSheet extends Component {
         this.editionState = "initializing";
     }
     stopEdition() {
-        const input = this.sheetNameRef.el;
-        if (!this.state.isEditing || !input)
+        if (!this.state.isEditing || !this.sheetNameRef.el)
             return;
         this.state.isEditing = false;
         this.editionState = "initializing";
-        input.blur();
+        this.sheetNameRef.el.blur();
         const inputValue = this.getInputContent() || "";
-        input.innerText = inputValue;
         interactiveRenameSheet(this.env, this.props.sheetId, inputValue, () => this.startEdition());
     }
     cancelEdition() {
@@ -81509,6 +81699,9 @@ function createChart(chart, chartSheetIndex, data) {
         case "combo":
             plot = addComboChart(chart.data);
             break;
+        case "pyramid":
+            plot = addPyramidChart(chart.data);
+            break;
         case "line":
             plot = addLineChart(chart.data);
             break;
@@ -81516,12 +81709,12 @@ function createChart(chart, chartSheetIndex, data) {
             plot = addScatterChart(chart.data);
             break;
         case "pie":
-            plot = addDoughnutChart(chart.data, chartSheetIndex, data, { holeSize: 0 });
+            plot = addDoughnutChart(chart.data, chartSheetIndex, data);
             break;
         case "radar":
             plot = addRadarChart(chart.data);
     }
-    let position = "t";
+    let position = "none";
     switch (chart.data.legendPosition) {
         case "bottom":
             position = "b";
@@ -81551,7 +81744,7 @@ function createChart(chart, chartSheetIndex, data) {
           ${plot}
           ${shapeProperty({ backgroundColor: chart.data.backgroundColor })}
         </c:plotArea>
-        ${addLegend(position, fontColor)}
+        ${position !== "none" ? addLegend(position, fontColor) : ""}
       </c:chart>
     </c:chartSpace>
   `;
@@ -81709,6 +81902,7 @@ function addBarChart(chart) {
     //
     // overlap and gapWitdh seems to be by default at -20 and 20 in chart.js.
     // See https://www.chartjs.org/docs/latest/charts/bar.html and https://www.chartjs.org/docs/latest/charts/bar.html#barpercentage-vs-categorypercentage
+    const chartDirection = chart.horizontal ? "bar" : "col";
     const dataSetsColors = chart.dataSets.map((ds) => ds.backgroundColor ?? "");
     const colors = new ColorGenerator(chart.dataSets.length, dataSetsColors);
     const leftDataSetsNodes = [];
@@ -81745,7 +81939,7 @@ function addBarChart(chart) {
   ${leftDataSetsNodes.length
         ? escapeXml /*xml*/ `
         <c:barChart>
-          <c:barDir val="col"/>
+          <c:barDir val="${chartDirection}"/>
           <c:grouping val="${grouping}"/>
           <c:overlap val="${overlap}"/>
           <c:gapWidth val="70"/>
@@ -81755,8 +81949,12 @@ function addBarChart(chart) {
           <c:axId val="${catAxId}" />
           <c:axId val="${valAxId}" />
         </c:barChart>
-        ${addAx("b", "c:catAx", catAxId, valAxId, chart.axesDesign?.x?.title, chart.fontColor)}
-        ${addAx("l", "c:valAx", valAxId, catAxId, chart.axesDesign?.y?.title, chart.fontColor)}
+        ${chartDirection === "col"
+            ? addAx("b", "c:catAx", catAxId, valAxId, chart.axesDesign?.x?.title, chart.fontColor)
+            : addAx("b", "c:catAx", catAxId, valAxId, chart.axesDesign?.y?.title, chart.fontColor, undefined, "maxMin")}
+        ${chartDirection === "col"
+            ? addAx("l", "c:valAx", valAxId, catAxId, chart.axesDesign?.y?.title, chart.fontColor)
+            : addAx("l", "c:valAx", valAxId, catAxId, chart.axesDesign?.x?.title, chart.fontColor, undefined, undefined, "max")}
       `
         : ""}
   ${rightDataSetsNodes.length
@@ -81882,7 +82080,7 @@ function addComboChart(chart) {
         : ""}
     ${!useRightAxisForBarSerie || leftDataSetsNodes.length
         ? escapeXml /*xml*/ `
-        ${addAx("b", "c:catAx", catAxId, valAxId, chart.axesDesign?.x?.title, chart.fontColor, leftDataSetsNodes.length ? 1 : 0)}
+        ${addAx("b", "c:catAx", catAxId, valAxId, chart.axesDesign?.x?.title, chart.fontColor, 0)}
         ${addAx("l", "c:valAx", valAxId, catAxId, chart.axesDesign?.y?.title, chart.fontColor)}
       `
         : ""}
@@ -81894,6 +82092,94 @@ function addComboChart(chart) {
         : ""}
   `;
 }
+function addPyramidChart(chart) {
+    const dataSets = chart.dataSets;
+    const dataSetsColors = dataSets.map((ds) => ds.backgroundColor ?? "");
+    const colors = new ColorGenerator(dataSets.length, dataSetsColors);
+    const leftDataSet = dataSets[0];
+    const rightDataSet = dataSets[1];
+    const firstColor = toXlsxHexColor(colors.next());
+    const secondColor = toXlsxHexColor(colors.next());
+    const { maxValue, majorUnit } = getPyramidChartHorizontalAxisConfig(chart.maxValue);
+    const labelRangeEl = chart.labelRange
+        ? escapeXml `<c:cat>${stringRef(chart.labelRange)}</c:cat>`
+        : "";
+    const leftBarDataSetNode = escapeXml /*xml*/ `
+  <c:ser>
+    <c:idx val="0"/>
+    <c:order val="0"/>
+    <c:invertIfNegative val="0" />
+    ${extractDataSetLabel(leftDataSet.label)}
+    ${shapeProperty({
+        backgroundColor: firstColor,
+        line: { color: firstColor },
+    })}
+    ${labelRangeEl}
+    <!-- x-coordinate values -->
+    <c:val>
+      ${numberRef(leftDataSet.range)}
+    </c:val>
+  </c:ser>
+`;
+    const rightBarDataSetNode = escapeXml /*xml*/ `
+  <c:ser>
+    <c:idx val="1"/>
+    <c:order val="1"/>
+    <c:invertIfNegative val="0" />
+    ${extractDataSetLabel(rightDataSet.label)}
+    ${shapeProperty({
+        backgroundColor: secondColor,
+        line: { color: secondColor },
+    })}
+    ${chart.labelRange ? escapeXml /*xml*/ `<c:cat>${stringRef(chart.labelRange)}</c:cat>` : ""}
+    <!-- x-coordinate values -->
+    <c:val>
+      ${numberRef(rightDataSet.range)}
+    </c:val>
+  </c:ser>
+`;
+    return escapeXml /*xml*/ `
+    <c:barChart>
+      <c:barDir val="bar"/>
+      <c:grouping val="clustered"/>
+      <c:varyColors val="0" />
+      ${leftBarDataSetNode}
+      <c:gapWidth val="50" />
+      <c:axId val="${catAxId}" />
+      <c:axId val="${valAxId}" />
+    </c:barChart>
+    <c:barChart>
+      <c:barDir val="bar"/>
+      <c:grouping val="clustered"/>
+      <c:varyColors val="0" />
+      ${rightBarDataSetNode}
+      <c:gapWidth val="50" />
+      <c:axId val="${secondaryCatAxId}" />
+      <c:axId val="${secondaryValAxId}" />
+    </c:barChart>
+    ${addAx("r", "c:catAx", catAxId, valAxId, chart.axesDesign?.y?.title, chart.fontColor, 0, "maxMin", "autoZero", "high")}
+    ${addAx("b", "c:valAx", valAxId, catAxId, chart.axesDesign?.x?.title, chart.fontColor, 0, "maxMin", "max", "nextTo", maxValue, majorUnit, "#0;#0")}
+    ${addAx("t", "c:valAx", secondaryValAxId, secondaryCatAxId, undefined, chart.fontColor, 1)}
+    ${addAx("l", "c:catAx", secondaryCatAxId, secondaryValAxId, undefined, chart.fontColor, 1, "maxMin")}
+  `;
+}
+function getPyramidChartHorizontalAxisConfig(maxValue) {
+    const adjustMaxToDivisibleBy = (value, divisor) => {
+        let adjusted = Math.ceil(value);
+        while (adjusted % divisor !== 0) {
+            adjusted++;
+        }
+        return adjusted;
+    };
+    const tickCount = 4;
+    const interval = tickCount - 1;
+    const adjustedMax = adjustMaxToDivisibleBy(maxValue, interval);
+    const majorUnit = adjustedMax / interval;
+    return {
+        maxValue: adjustedMax,
+        majorUnit,
+    };
+}
 function addLineChart(chart) {
     const dataSetsColors = chart.dataSets.map((ds) => ds.backgroundColor ?? "");
     const colors = new ColorGenerator(chart.dataSets.length, dataSetsColors);
@@ -82086,7 +82372,7 @@ function addRadarChart(chart) {
       `}
   `;
 }
-function addDoughnutChart(chart, chartSheetIndex, data, { holeSize } = { holeSize: 50 }) {
+function addDoughnutChart(chart, chartSheetIndex, data) {
     const maxLength = largeMax(chart.dataSets.map((ds) => getRangeSize(ds.range, chartSheetIndex, data)));
     const colors = new ColorGenerator(maxLength);
     const doughnutColors = range(0, maxLength).map(() => toXlsxHexColor(colors.next()));
@@ -82124,7 +82410,7 @@ function addDoughnutChart(chart, chartSheetIndex, data, { holeSize } = { holeSiz
     return escapeXml /*xml*/ `
     <c:doughnutChart>
       <c:varyColors val="1" />
-      <c:holeSize val="${holeSize}" />
+      <c:holeSize val="${chart.pieHolePercentage ?? (chart.isDoughnut ? DEFAULT_DOUGHNUT_CHART_HOLE_SIZE : 0)}" />
       ${insertDataLabels()}
       ${joinXmlNodes(dataSetsNodes)}
     </c:doughnutChart>
@@ -82143,25 +82429,35 @@ function insertDataLabels({ showLeaderLines } = { showLeaderLines: false }) {
     </dLbls>
   `;
 }
-function addAx(position, axisName, axId, crossAxId, title, defaultFontColor, deleteAxis = 0) {
+function addAx(position, axisName, axId, crossAxId, title, defaultFontColor, deleteAxis = 0, orientation = "minMax", crossPosition, tickLabelPosition = "nextTo", maxValue, majorUnit, format = "General") {
     // Each Axis present inside a graph needs to be identified by an unsigned integer in order to be referenced by its crossAxis.
     // I.e. x-axis, will reference y-axis and vice-versa.
     const color = title?.color ? toXlsxHexColor(title.color) : defaultFontColor;
     const fontSize = title?.fontSize ?? CHART_AXIS_TITLE_FONT_SIZE;
+    const crossBetweenEl = axisName === "c:valAx" ? escapeXml `<c:crossBetween val="between" />` : "";
+    const maxValueEl = maxValue ? escapeXml `<c:max val="${maxValue}" />` : "";
+    const minValueEl = maxValue ? escapeXml `<c:min val="${-maxValue}" />` : "";
+    const majorUnitEl = majorUnit ? escapeXml `<c:majorUnit val="${majorUnit}" />` : "";
     return escapeXml /*xml*/ `
     <${axisName}>
       <c:axId val="${axId}"/>
       <c:crossAx val="${crossAxId}"/> <!-- reference to the other axe of the chart -->
-      <c:crosses val="${position === "b" || position === "l" ? "min" : "max"}"/>
+      <c:crosses val="${crossPosition || (position === "b" || position === "l" ? "min" : "max")}"/>
+      <c:auto val="1"/>
+      ${crossBetweenEl}
       <c:delete val="${deleteAxis}"/> <!-- by default, axis are not displayed -->
       <c:scaling>
-        <c:orientation  val="minMax" />
+        <c:orientation  val="${orientation}" />
+        ${maxValueEl}
+        ${minValueEl}
       </c:scaling>
+      ${majorUnitEl}
       <c:axPos val="${position}" />
+      <c:tickLblPos val="${tickLabelPosition}" />
       ${insertMajorGridLines()}
       <c:majorTickMark val="out" />
       <c:minorTickMark val="none" />
-      <c:numFmt formatCode="General" sourceLinked="1" />
+      <c:numFmt formatCode="${format}" sourceLinked="${format === "General" ? "1" : "0"}" />
       <c:title>
         ${insertText(title?.text ?? "", color, fontSize, title)}
       </c:title>
@@ -82356,7 +82652,10 @@ function addConditionalFormatting(dxfs, conditionalFormats) {
 function addCellIsRule(cf, rule, dxfs) {
     const ruleAttributes = commonCfAttributes(cf);
     const operator = convertOperator(rule.operator);
-    ruleAttributes.push(...cellRuleTypeAttributes(rule), ["operator", operator]);
+    ruleAttributes.push(...cellRuleTypeAttributes(rule));
+    if (operator.length) {
+        ruleAttributes.push(["operator", operator]);
+    }
     const formulas = cellRuleFormula(cf.ranges, rule).map((formula) => escapeXml /*xml*/ `<formula>${formula}</formula>`);
     const dxf = {
         font: {
@@ -82402,6 +82701,8 @@ function cellRuleFormula(ranges, rule) {
         case "isLessThan":
         case "isLessOrEqualTo":
             return [values[0]];
+        case "customFormula":
+            return values[0].startsWith("=") ? [values[0].slice(1)] : [values[0]];
         case "isBetween":
         case "isNotBetween":
             return [values[0], values[1]];
@@ -82430,6 +82731,8 @@ function cellRuleTypeAttributes(rule) {
         case "isBetween":
         case "isNotBetween":
             return [["type", "cellIs"]];
+        case "customFormula":
+            return [["type", "expression"]];
     }
 }
 function addDataBarRule(cf, rule) {
@@ -84463,6 +84766,7 @@ const stores = {
     PivotSidePanelStore,
     PivotMeasureDisplayPanelStore,
     ClientFocusStore,
+    GridRenderer,
 };
 function addFunction(functionName, functionDescription) {
     functionRegistry.add(functionName, functionDescription);
@@ -84481,6 +84785,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 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.5.0-alpha.1";
-__info__.date = "2025-06-27T09:12:49.245Z";
-__info__.hash = "756e75b";
+__info__.version = "18.5.0-alpha.3";
+__info__.date = "2025-07-28T13:43:05.981Z";
+__info__.hash = "53dfee8";