@odoo/o-spreadsheet 18.4.0-alpha.7 → 18.4.0-alpha.8

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.0-alpha.7
- * @date 2025-06-06T09:32:44.285Z
- * @hash 2bfbe64
+ * @version 18.4.0-alpha.8
+ * @date 2025-06-12T09:53:48.133Z
+ * @hash 9b7a8d0
  */
 
 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';
@@ -130,7 +130,7 @@ class Registry {
 
 const CANVAS_SHIFT = 0.5;
 // Colors
-const HIGHLIGHT_COLOR = "#37A850";
+const HIGHLIGHT_COLOR = "#017E84";
 const BACKGROUND_GRAY_COLOR = "#f5f5f5";
 const BACKGROUND_HEADER_COLOR = "#F8F9FA";
 const BACKGROUND_HEADER_SELECTED_COLOR = "#E8EAED";
@@ -143,7 +143,7 @@ const CELL_BORDER_COLOR = "#E2E3E3";
 const BACKGROUND_CHART_COLOR = "#FFFFFF";
 const DISABLED_TEXT_COLOR = "#CACACA";
 const DEFAULT_COLOR_SCALE_MIDPOINT_COLOR = 0xb6d7a8;
-const LINK_COLOR = "#017E84";
+const LINK_COLOR = HIGHLIGHT_COLOR;
 const FILTERS_COLOR = "#188038";
 const SEPARATOR_COLOR = "#E0E2E4";
 const ICONS_COLOR = "#4A4F59";
@@ -172,7 +172,7 @@ const BUTTON_HOVER_BG = GRAY_300;
 const BUTTON_HOVER_TEXT_COLOR = "#111827";
 const BUTTON_ACTIVE_BG = "#e6f2f3";
 const BUTTON_ACTIVE_TEXT_COLOR = "#111827";
-const ACTION_COLOR = "#017E84";
+const ACTION_COLOR = HIGHLIGHT_COLOR;
 const ACTION_COLOR_HOVER = "#01585c";
 const ALERT_WARNING_BG = "#FBEBCC";
 const ALERT_WARNING_BORDER = "#F8E2B3";
@@ -1566,6 +1566,19 @@ class AlternatingColorGenerator extends ColorGenerator {
         this.palette = getAlternatingColorsPalette(paletteSize).filter((c) => !preferredColors.includes(c));
     }
 }
+class AlternatingColorMap {
+    availableColors;
+    colors = {};
+    constructor(paletteSize = 12) {
+        this.availableColors = new AlternatingColorGenerator(paletteSize);
+    }
+    get(id) {
+        if (!this.colors[id]) {
+            this.colors[id] = this.availableColors.next();
+        }
+        return this.colors[id];
+    }
+}
 /**
  * Returns a function that maps a value to a color using a color scale defined by the given
  * color/threshold values pairs.
@@ -5005,7 +5018,9 @@ function isTextFormat(format) {
 }
 
 function evaluateLiteral(literalCell, localeFormat) {
-    const value = isTextFormat(localeFormat.format) ? literalCell.content : literalCell.parsedValue;
+    const value = isTextFormat(localeFormat.format) && literalCell.parsedValue !== null
+        ? literalCell.content
+        : literalCell.parsedValue;
     const functionResult = { value, format: localeFormat.format };
     return createEvaluatedCell(functionResult, localeFormat.locale);
 }
@@ -5054,6 +5069,9 @@ function _createEvaluatedCell(functionResult, locale, cell) {
     if (isEvaluationError(value)) {
         return errorCell(value, message);
     }
+    if (value === null) {
+        return emptyCell(format);
+    }
     if (isTextFormat(format)) {
         // TO DO:
         // with the next line, the value of the cell is transformed depending on the format.
@@ -5061,9 +5079,6 @@ function _createEvaluatedCell(functionResult, locale, cell) {
         // to interpret the value as a number.
         return textCell(toString(value), format, formattedValue);
     }
-    if (value === null) {
-        return emptyCell(format);
-    }
     if (typeof value === "number") {
         if (isDateTimeFormat(format || "")) {
             return dateTimeCell(value, format, formattedValue);
@@ -19351,8 +19366,9 @@ const PIVOT = {
         arg("include_total (boolean, default=TRUE)", _t("Whether to include total/sub-totals or not.")),
         arg("include_column_titles (boolean, default=TRUE)", _t("Whether to include the column titles or not.")),
         arg("column_count (number, optional)", _t("number of columns")),
+        arg("include_measure_titles (boolean, default=TRUE)", _t("Whether to include the measure titles row or not.")),
     ],
-    compute: function (pivotFormulaId, rowCount = { value: 10000 }, includeTotal = { value: true }, includeColumnHeaders = { value: true }, columnCount = { value: Number.MAX_VALUE }) {
+    compute: function (pivotFormulaId, rowCount = { value: 10000 }, includeTotal = { value: true }, includeColumnHeaders = { value: true }, columnCount = { value: Number.MAX_VALUE }, includeMeasureTitles = { value: true }) {
         const _pivotFormulaId = toString(pivotFormulaId);
         const _rowCount = toNumber(rowCount, this.locale);
         if (_rowCount < 0) {
@@ -19362,8 +19378,11 @@ const PIVOT = {
         if (_columnCount < 0) {
             return new EvaluationError(_t("The number of columns must be positive."));
         }
-        const _includeColumnHeaders = toBoolean(includeColumnHeaders);
-        const _includedTotal = toBoolean(includeTotal);
+        const visibilityOptions = {
+            displayColumnHeaders: toBoolean(includeColumnHeaders),
+            displayTotals: toBoolean(includeTotal),
+            displayMeasuresRow: toBoolean(includeMeasureTitles),
+        };
         const pivotId = getPivotId(_pivotFormulaId, this.getters);
         const pivot = this.getters.getPivot(pivotId);
         const coreDefinition = this.getters.getPivotCoreDefinition(pivotId);
@@ -19374,9 +19393,15 @@ const PIVOT = {
             return error;
         }
         const table = pivot.getCollapsedTableStructure();
-        const cells = table.getPivotCells(_includedTotal, _includeColumnHeaders);
-        const headerRows = _includeColumnHeaders ? table.columns.length : 0;
-        const pivotTitle = this.getters.getPivotDisplayName(pivotId);
+        const cells = table.getPivotCells(visibilityOptions);
+        let headerRows = 0;
+        if (visibilityOptions.displayColumnHeaders) {
+            headerRows = table.columns.length - 1;
+        }
+        if (visibilityOptions.displayMeasuresRow) {
+            headerRows++;
+        }
+        const pivotTitle = this.getters.getPivotName(pivotId);
         const tableHeight = Math.min(headerRows + _rowCount, cells[0].length);
         if (tableHeight === 0) {
             return [[{ value: pivotTitle }]];
@@ -19404,7 +19429,7 @@ const PIVOT = {
                 }
             }
         }
-        if (_includeColumnHeaders) {
+        if (visibilityOptions.displayColumnHeaders || visibilityOptions.displayMeasuresRow) {
             result[0][0] = { value: pivotTitle };
         }
         return result;
@@ -21743,10 +21768,22 @@ function drawPieChartValues(chart, options, ctx) {
             const midAngle = (startAngle + endAngle) / 2;
             const midRadius = (innerRadius + outerRadius) / 2;
             const x = bar.x + midRadius * Math.cos(midAngle);
-            const y = bar.y + midRadius * Math.sin(midAngle) + 7;
+            const y = bar.y + midRadius * Math.sin(midAngle);
+            const displayValue = options.callback(value, dataset, i);
+            const textHeight = 12; // ChartJS default
+            const textWidth = computeTextWidth(ctx, displayValue, { fontSize: textHeight }, "px");
+            const radius = outerRadius - innerRadius;
+            // Check if the text fits in the slice. Not perfect, but good enough heuristic.
+            if (textWidth >= radius || radius < textHeight) {
+                continue;
+            }
+            const sliceAngle = endAngle - startAngle;
+            const midWidth = 2 * midRadius * Math.tan(sliceAngle / 2);
+            if (sliceAngle < Math.PI / 2 && (textWidth >= midWidth || midWidth < textHeight)) {
+                continue;
+            }
             ctx.fillStyle = chartFontColor(options.background);
             ctx.strokeStyle = options.background || "#ffffff";
-            const displayValue = options.callback(value, dataset, i);
             drawTextWithBackground(displayValue, x, y, ctx);
         }
     }
@@ -34939,17 +34976,22 @@ class FilterMenuValueList extends Component {
     static components = { FilterMenuValueItem };
     state = useState({
         values: [],
+        displayedValues: [],
         textFilter: "",
         selectedValue: undefined,
+        numberOfDisplayedValues: 50,
+        hasMoreValues: false,
     });
     searchBar = useRef("filterMenuSearchBar");
     setup() {
         onWillUpdateProps((nextProps) => {
             if (!deepEquals(nextProps.filterPosition, this.props.filterPosition)) {
                 this.state.values = this.getFilterHiddenValues(nextProps.filterPosition);
+                this.computeDisplayedValues();
             }
         });
         this.state.values = this.getFilterHiddenValues(this.props.filterPosition);
+        this.computeDisplayedValues();
     }
     getFilterHiddenValues(position) {
         const sheetId = this.env.model.getters.getActiveSheetId();
@@ -34967,21 +35009,28 @@ class FilterMenuValueList extends Component {
         }
         const cellValues = cells.map((val) => val.cellValue);
         const filterValues = filterValue?.filterType === "values" ? filterValue.hiddenValues : [];
-        const strValues = [...cellValues, ...filterValues];
-        const normalizedFilteredValues = filterValues.map(toLowerCase);
-        // Set with lowercase values to avoid duplicates
-        const normalizedValues = [...new Set(strValues.map(toLowerCase))];
-        const sortedValues = normalizedValues.sort((val1, val2) => val1.localeCompare(val2, undefined, { numeric: true, sensitivity: "base" }));
-        return sortedValues.map((normalizedValue) => {
-            let checked = false;
-            if (filterValue?.filterType !== "criterion") {
-                checked = normalizedFilteredValues.findIndex((val) => val === normalizedValue) === -1;
+        const normalizedFilteredValues = new Set(filterValues.map(toLowerCase));
+        const set = new Set();
+        const values = [];
+        const addValue = (value) => {
+            const normalizedValue = toLowerCase(value);
+            if (!set.has(normalizedValue)) {
+                values.push({
+                    string: value || "",
+                    checked: filterValue?.filterType !== "criterion"
+                        ? !normalizedFilteredValues.has(normalizedValue)
+                        : false,
+                    normalizedValue,
+                });
+                set.add(normalizedValue);
             }
-            return {
-                checked,
-                string: strValues.find((val) => toLowerCase(val) === normalizedValue) || "",
-            };
-        });
+        };
+        cellValues.forEach(addValue);
+        filterValues.forEach(addValue);
+        return values.sort((val1, val2) => val1.normalizedValue.localeCompare(val2.normalizedValue, undefined, {
+            numeric: true,
+            sensitivity: "base",
+        }));
     }
     checkValue(value) {
         this.state.selectedValue = value.string;
@@ -34993,25 +35042,37 @@ class FilterMenuValueList extends Component {
         this.state.selectedValue = value.string;
     }
     selectAll() {
-        this.displayedValues.forEach((value) => (value.checked = true));
-        this.updateHiddenValues();
+        this.state.displayedValues.forEach((value) => (value.checked = true));
+        this.props.onUpdateHiddenValues([]);
     }
     clearAll() {
-        this.displayedValues.forEach((value) => (value.checked = false));
-        this.updateHiddenValues();
+        this.state.displayedValues.forEach((value) => (value.checked = false));
+        const hiddenValues = this.state.values.map((val) => val.string);
+        this.props.onUpdateHiddenValues(hiddenValues);
     }
     updateHiddenValues() {
         const hiddenValues = this.state.values.filter((val) => !val.checked).map((val) => val.string);
         this.props.onUpdateHiddenValues(hiddenValues);
     }
-    get displayedValues() {
-        if (!this.state.textFilter) {
-            return this.state.values;
-        }
-        return fuzzyLookup(this.state.textFilter, this.state.values, (val) => val.string);
+    updateSearch(ev) {
+        const target = ev.target;
+        this.state.textFilter = target.value;
+        this.state.selectedValue = undefined;
+        this.computeDisplayedValues();
+    }
+    computeDisplayedValues() {
+        const values = !this.state.textFilter
+            ? this.state.values
+            : fuzzyLookup(this.state.textFilter, this.state.values, (val) => val.string);
+        this.state.displayedValues = values.slice(0, this.state.numberOfDisplayedValues);
+        this.state.hasMoreValues = values.length > this.state.numberOfDisplayedValues;
+    }
+    loadMoreValues() {
+        this.state.numberOfDisplayedValues += 100;
+        this.computeDisplayedValues();
     }
     onKeyDown(ev) {
-        const displayedValues = this.displayedValues;
+        const displayedValues = this.state.displayedValues;
         if (displayedValues.length === 0)
             return;
         let selectedIndex = undefined;
@@ -38484,7 +38545,7 @@ class XlsxBaseExtractor {
      */
     handleMissingValue(parentElement, missingElementName, optionalArgs) {
         if (optionalArgs?.required) {
-            if (optionalArgs?.default) {
+            if (optionalArgs?.default !== undefined) {
                 this.warningManager.addParsingWarning(`Missing required ${missingElementName} in element <${parentElement.tagName}> of ${this.currentFile}, replacing it by the default value ${optionalArgs.default}`);
             }
             else {
@@ -48707,7 +48768,8 @@ css /* scss */ `
     input.o-font-size {
       outline: none;
       height: 20px;
-      width: 23px;
+      width: 31px;
+      text-align: center;
     }
   }
   .o-text-options > div {
@@ -53785,28 +53847,45 @@ class SpreadsheetPivotTable {
     getNumberOfDataColumns() {
         return this.columns.at(-1)?.length || 0;
     }
-    getPivotCells(includeTotal = true, includeColumnHeaders = true) {
-        const key = JSON.stringify({ includeTotal, includeColumnHeaders });
+    getSkippedRows(visibilityOptions) {
+        const skippedRows = new Set();
+        if (!visibilityOptions.displayColumnHeaders) {
+            for (let i = 0; i < this.columns.length - 1; i++) {
+                skippedRows.add(i);
+            }
+        }
+        if (!visibilityOptions.displayMeasuresRow) {
+            skippedRows.add(this.columns.length - 1);
+        }
+        return skippedRows;
+    }
+    getPivotCells(visibilityOptions = {
+        displayColumnHeaders: true,
+        displayTotals: true,
+        displayMeasuresRow: true,
+    }) {
+        const key = JSON.stringify(visibilityOptions);
         if (!this.pivotCells[key]) {
+            const { displayTotals } = visibilityOptions;
             const numberOfDataRows = this.rows.length;
             const numberOfDataColumns = this.getNumberOfDataColumns();
             let pivotHeight = this.columns.length + numberOfDataRows;
             let pivotWidth = 1 /*(row headers)*/ + numberOfDataColumns;
-            if (!includeTotal && numberOfDataRows !== 1) {
+            if (!displayTotals && numberOfDataRows !== 1) {
                 pivotHeight -= 1;
             }
-            if (!includeTotal && numberOfDataColumns !== this.measures.length) {
+            if (!displayTotals && numberOfDataColumns !== this.measures.length) {
                 pivotWidth -= this.measures.length;
             }
             const domainArray = [];
-            const startRow = includeColumnHeaders ? 0 : this.columns.length;
+            const skippedRows = this.getSkippedRows(visibilityOptions);
             for (let col = 0; col < pivotWidth; col++) {
                 domainArray.push([]);
-                for (let row = startRow; row < pivotHeight; row++) {
-                    if (!includeTotal && row === pivotHeight) {
+                for (let row = 0; row < pivotHeight; row++) {
+                    if (skippedRows.has(row)) {
                         continue;
                     }
-                    domainArray[col].push(this.getPivotCell(col, row, includeTotal));
+                    domainArray[col].push(this.getPivotCell(col, row, displayTotals));
                 }
             }
             this.pivotCells[key] = domainArray;
@@ -61997,7 +62076,9 @@ class TablePlugin extends CorePlugin {
                 const ranges = cmd.ranges.map((rangeData) => this.getters.getRangeFromRangeData(rangeData));
                 const union = this.getters.getRangesUnion(ranges);
                 const mergesInTarget = this.getters.getMergesInZone(cmd.sheetId, union.zone);
-                this.dispatch("REMOVE_MERGE", { sheetId: cmd.sheetId, target: mergesInTarget });
+                if (mergesInTarget.length) {
+                    this.dispatch("REMOVE_MERGE", { sheetId: cmd.sheetId, target: mergesInTarget });
+                }
                 const id = this.consumeNextId();
                 const config = cmd.config || DEFAULT_TABLE_CONFIG;
                 const newTable = cmd.tableType === "dynamic"
@@ -62096,14 +62177,16 @@ class TablePlugin extends CorePlugin {
         const zoneToCheckIfEmpty = direction === "down"
             ? { ...zone, bottom: zone.bottom + 1, top: zone.bottom + 1 }
             : { ...zone, right: zone.right + 1, left: zone.right + 1 };
-        for (const position of positions(zoneToCheckIfEmpty)) {
-            const cellPosition = { sheetId, ...position };
-            // Since this plugin is loaded before CellPlugin, the getters still give us the old cell content
-            const cellContent = this.getters.getCell(cellPosition)?.content;
-            if (cellContent ||
-                this.getters.isInMerge(cellPosition) ||
-                this.getTablesOverlappingZones(sheetId, [positionToZone(position)]).length) {
-                return "none";
+        for (let row = zoneToCheckIfEmpty.top; row <= zoneToCheckIfEmpty.bottom; row++) {
+            for (let col = zoneToCheckIfEmpty.left; col <= zoneToCheckIfEmpty.right; col++) {
+                const cellPosition = { sheetId, col, row };
+                // Since this plugin is loaded before CellPlugin, the getters still give us the old cell content
+                const cellContent = this.getters.getCell(cellPosition)?.content;
+                if (cellContent ||
+                    this.getters.isInMerge(cellPosition) ||
+                    this.getTablesOverlappingZones(sheetId, [positionToZone(cellPosition)]).length) {
+                    return "none";
+                }
             }
         }
         return direction;
@@ -67256,10 +67339,15 @@ class PivotUIPlugin extends CoreViewPlugin {
             const includeTotal = toScalar(args[2]);
             const shouldIncludeTotal = includeTotal === undefined ? true : toBoolean(includeTotal);
             const includeColumnHeaders = toScalar(args[3]);
+            const includeMeasures = toScalar(args[5]);
+            const shouldIncludeMeasures = includeMeasures === undefined ? true : toBoolean(includeMeasures);
             const shouldIncludeColumnHeaders = includeColumnHeaders === undefined ? true : toBoolean(includeColumnHeaders);
-            const pivotCells = pivot
-                .getCollapsedTableStructure()
-                .getPivotCells(shouldIncludeTotal, shouldIncludeColumnHeaders);
+            const visibilityOptions = {
+                displayColumnHeaders: shouldIncludeColumnHeaders,
+                displayTotals: shouldIncludeTotal,
+                displayMeasuresRow: shouldIncludeMeasures,
+            };
+            const pivotCells = pivot.getCollapsedTableStructure().getPivotCells(visibilityOptions);
             const pivotCol = position.col - mainPosition.col;
             const pivotRow = position.row - mainPosition.row;
             return pivotCells[pivotCol][pivotRow];
@@ -69481,8 +69569,7 @@ class CollaborativePlugin extends UIPlugin {
         "isFullySynchronized",
     ];
     static layers = ["Selection"];
-    availableColors = new AlternatingColorGenerator(12);
-    colors = {};
+    colors = new AlternatingColorMap(12);
     session;
     constructor(config) {
         super(config);
@@ -69500,7 +69587,7 @@ class CollaborativePlugin extends UIPlugin {
     }
     getConnectedClients() {
         return [...this.session.getConnectedClients()].map((client) => {
-            return { ...client, color: this.colors[client.id] };
+            return { ...client, color: this.colors.get(client.id) };
         });
     }
     isFullySynchronized() {
@@ -69529,10 +69616,7 @@ class CollaborativePlugin extends UIPlugin {
                 client.position &&
                 client.position.sheetId === sheetId &&
                 this.isPositionValid(client.position)) {
-                if (!this.colors[client.id]) {
-                    this.colors[client.id] = this.availableColors.next();
-                }
-                clients.push({ ...client, color: this.colors[client.id], position: client.position });
+                clients.push({ ...client, position: client.position });
             }
         }
         return clients;
@@ -72406,9 +72490,10 @@ class FilterEvaluationPlugin extends UIPlugin {
                 const filteredValues = filterValue.hiddenValues?.map(toLowerCase);
                 if (!filteredValues)
                     continue;
+                const filteredValuesSet = new Set(filteredValues);
                 for (let row = filteredZone.top; row <= filteredZone.bottom; row++) {
                     const value = this.getCellValueAsString(sheetId, filter.col, row);
-                    if (filteredValues.includes(value)) {
+                    if (filteredValuesSet.has(value)) {
                         hiddenRows.add(row);
                     }
                 }
@@ -75090,7 +75175,7 @@ topbarMenuRegistry
 })
     .addChild("settings", ["file"], {
     name: _t("Settings"),
-    sequence: 100,
+    sequence: 200,
     execute: (env) => env.openSidePanel("Settings"),
     isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.COG",
@@ -77999,7 +78084,7 @@ css /* scss */ `
 
   .o-spreadsheet-topbar {
     line-height: 1.2;
-    font-size: 13px;
+    font-size: 14px;
     font-weight: 500;
     background-color: #fff;
 
@@ -83254,9 +83339,9 @@ const constants = {
 };
 const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 
-export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, 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 };
+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.0-alpha.7";
-__info__.date = "2025-06-06T09:32:44.285Z";
-__info__.hash = "2bfbe64";
+__info__.version = "18.4.0-alpha.8";
+__info__.date = "2025-06-12T09:53:48.133Z";
+__info__.hash = "9b7a8d0";