@odoo/o-spreadsheet 18.2.15 → 18.2.17

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.2.15
- * @date 2025-05-30T08:45:53.952Z
- * @hash 607492d
+ * @version 18.2.17
+ * @date 2025-06-12T09:52:15.050Z
+ * @hash ea64209
  */
 
 'use strict';
@@ -5856,7 +5856,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);
 }
@@ -5905,6 +5907,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.
@@ -5912,9 +5917,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);
@@ -10372,8 +10374,6 @@ function drawLineOrBarOrRadarChartValues(chart, options, ctx) {
             if (isNaN(value)) {
                 continue;
             }
-            const axisId = chart.config.type === "radar" ? dataset.rAxisID : dataset.yAxisID;
-            const displayValue = options.callback(Number(value), axisId);
             const point = dataset.data[i];
             const xPosition = point.x;
             let yPosition = 0;
@@ -10397,7 +10397,8 @@ function drawLineOrBarOrRadarChartValues(chart, options, ctx) {
             textsPositions[xPosition].push(yPosition);
             ctx.fillStyle = point.options.backgroundColor;
             ctx.strokeStyle = options.background || "#ffffff";
-            drawTextWithBackground(displayValue, xPosition, yPosition, ctx);
+            const valueToDisplay = options.callback(Number(value), dataset, i);
+            drawTextWithBackground(valueToDisplay, xPosition, yPosition, ctx);
         }
     }
 }
@@ -10414,7 +10415,7 @@ function drawHorizontalBarChartValues(chart, options, ctx) {
             if (isNaN(value)) {
                 continue;
             }
-            const displayValue = options.callback(value, dataset.xAxisID);
+            const displayValue = options.callback(value, dataset, i);
             const point = dataset.data[i];
             const yPosition = point.y;
             let xPosition = value < 0 ? point.x + point.width / 2 : point.x - point.width / 2;
@@ -10449,10 +10450,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, "y");
             drawTextWithBackground(displayValue, x, y, ctx);
         }
     }
@@ -26218,7 +26231,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 {
@@ -30085,9 +30098,51 @@ function getChartShowValues(definition, args) {
         horizontal: "horizontal" in definition && definition.horizontal,
         showValues: "showValues" in definition ? !!definition.showValues : false,
         background: definition.background,
-        callback: formatChartDatasetValue(axisFormats, locale),
+        callback: (value, dataset) => {
+            const axisId = getDatasetAxisId(definition, dataset);
+            return formatChartDatasetValue(axisFormats, locale)(value, axisId);
+        },
     };
 }
+function getPyramidChartShowValues(definition, args) {
+    const { axisFormats, locale } = args;
+    return {
+        horizontal: true,
+        showValues: "showValues" in definition ? !!definition.showValues : false,
+        background: definition.background,
+        callback: (value, dataset) => {
+            value = Math.abs(Number(value));
+            return formatChartDatasetValue(axisFormats, locale)(value, dataset.xAxisID || "x");
+        },
+    };
+}
+function getWaterfallChartShowValues(definition, args) {
+    const { axisFormats, locale, dataSetsValues } = args;
+    const subtotalIndexes = dataSetsValues.reduce((subtotalIndexes, ds) => {
+        subtotalIndexes.push((subtotalIndexes.at(-1) || -1) + ds.data.length + 1);
+        return subtotalIndexes;
+    }, []);
+    return {
+        showValues: "showValues" in definition ? !!definition.showValues : false,
+        background: definition.background,
+        callback: (value, dataset, index) => {
+            const raw = dataset._dataset.data[index];
+            const delta = raw[1] - raw[0];
+            let sign = delta >= 0 ? "+" : "";
+            if (definition.showSubTotals && subtotalIndexes.includes(index) && sign === "+") {
+                sign = "";
+            }
+            return `${sign}${formatChartDatasetValue(axisFormats, locale)(delta, dataset.yAxisID)}`;
+        },
+    };
+}
+function getDatasetAxisId(definition, dataset) {
+    if (dataset.rAxisID) {
+        return dataset.rAxisID;
+    }
+    const axisId = "horizontal" in definition && definition.horizontal ? dataset.xAxisID : dataset.yAxisID;
+    return axisId || "y";
+}
 
 function getChartTitle(definition) {
     const chartTitle = definition.title;
@@ -30411,6 +30466,7 @@ var CHART_RUNTIME_HELPERS = /*#__PURE__*/Object.freeze({
   getPieChartTooltip: getPieChartTooltip,
   getPyramidChartData: getPyramidChartData,
   getPyramidChartScales: getPyramidChartScales,
+  getPyramidChartShowValues: getPyramidChartShowValues,
   getPyramidChartTooltip: getPyramidChartTooltip,
   getRadarChartData: getRadarChartData,
   getRadarChartDatasets: getRadarChartDatasets,
@@ -30424,6 +30480,7 @@ var CHART_RUNTIME_HELPERS = /*#__PURE__*/Object.freeze({
   getTrendDatasetForLineChart: getTrendDatasetForLineChart,
   getWaterfallChartLegend: getWaterfallChartLegend,
   getWaterfallChartScales: getWaterfallChartScales,
+  getWaterfallChartShowValues: getWaterfallChartShowValues,
   getWaterfallChartTooltip: getWaterfallChartTooltip,
   getWaterfallDatasetAndLabels: getWaterfallDatasetAndLabels
 });
@@ -31556,7 +31613,7 @@ function createPyramidChartRuntime(chart, getters) {
                 title: getChartTitle(definition),
                 legend: getBarChartLegend(definition),
                 tooltip: getPyramidChartTooltip(definition, chartData),
-                chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                chartShowValuesPlugin: getPyramidChartShowValues(definition, chartData),
             },
         },
     };
@@ -32019,7 +32076,7 @@ function createWaterfallChartRuntime(chart, getters) {
                 title: getChartTitle(definition),
                 legend: getWaterfallChartLegend(definition),
                 tooltip: getWaterfallChartTooltip(definition, chartData),
-                chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                chartShowValuesPlugin: getWaterfallChartShowValues(definition, chartData),
                 waterfallLinesPlugin: { showConnectorLines: definition.showConnectorLines },
             },
         },
@@ -33371,19 +33428,26 @@ class FilterMenu extends owl.Component {
             .filter(({ row }) => !this.env.model.getters.isRowHidden(sheetId, row))
             .map(({ col, row }) => this.env.model.getters.getEvaluatedCell({ sheetId, col, row }).formattedValue);
         const filterValues = this.env.model.getters.getFilterHiddenValues({ sheetId, ...position });
-        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) => {
-            const checked = normalizedFilteredValues.findIndex((filteredValue) => filteredValue === normalizedValue) ===
-                -1;
-            return {
-                checked,
-                string: strValues.find((val) => toLowerCase(val) === normalizedValue) || "",
-            };
-        });
+        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: !normalizedFilteredValues.has(normalizedValue),
+                    normalizedValue,
+                });
+                set.add(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;
@@ -44665,13 +44729,15 @@ class FindAndReplaceStore extends SpreadsheetStore {
         if (this.selectedMatchIndex === null) {
             return;
         }
+        this.preserveSelectedMatchIndex = true;
+        this.shouldFinalizeUpdateSelection = true;
         this.model.dispatch("REPLACE_SEARCH", {
             searchString: this.toSearch,
             replaceWith: this.toReplace,
             matches: [this.searchMatches[this.selectedMatchIndex]],
             searchOptions: this.searchOptions,
         });
-        this.selectNextCell(Direction.next, { jumpToMatchSheet: true, updateSelection: true });
+        this.preserveSelectedMatchIndex = false;
     }
     /**
      * Apply the replace function to all the matches one time.
@@ -52272,6 +52338,9 @@ function useTouchScroll(ref, updateScroll, canMoveUp) {
         let deltaX = lastX - clientX;
         let deltaY = lastY - clientY;
         const elapsedTime = currentTime - lastTime;
+        if (!elapsedTime) {
+            return;
+        }
         velocityX = deltaX / elapsedTime;
         velocityY = deltaY / elapsedTime;
         lastX = clientX;
@@ -52292,6 +52361,11 @@ function useTouchScroll(ref, updateScroll, canMoveUp) {
     function onTouchEnd(ev) {
         isMouseDown = false;
         lastX = lastY = 0;
+        if (resetTimeout) {
+            clearTimeout(resetTimeout);
+        }
+        velocityX *= 1.2;
+        velocityY *= 1.2;
         requestAnimationFrame(scroll);
     }
     function scroll() {
@@ -58540,7 +58614,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"
@@ -58639,14 +58715,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;
@@ -59432,7 +59510,7 @@ class PivotCorePlugin extends CorePlugin {
                 break;
             }
             case "UPDATE_PIVOT": {
-                this.history.update("pivots", cmd.pivotId, "definition", deepCopy(cmd.pivot));
+                this.history.update("pivots", cmd.pivotId, "definition", this.repairSortedColumn(deepCopy(cmd.pivot)));
                 this.compileCalculatedMeasures(cmd.pivot.measures);
                 break;
             }
@@ -59503,7 +59581,10 @@ class PivotCorePlugin extends CorePlugin {
     // Private
     // -------------------------------------------------------------------------
     addPivot(pivotId, pivot, formulaId = this.nextFormulaId.toString()) {
-        this.history.update("pivots", pivotId, { definition: deepCopy(pivot), formulaId });
+        this.history.update("pivots", pivotId, {
+            definition: this.repairSortedColumn(deepCopy(pivot)),
+            formulaId,
+        });
         this.compileCalculatedMeasures(pivot.measures);
         this.history.update("formulaIds", formulaId, pivotId);
         this.history.update("nextFormulaId", this.nextFormulaId + 1);
@@ -59596,6 +59677,26 @@ class PivotCorePlugin extends CorePlugin {
         }
         return "Success" /* CommandResult.Success */;
     }
+    repairSortedColumn(definition) {
+        if (definition.sortedColumn) {
+            // Fix for an upgrade issue: the sortedColumn measure was not updated
+            // from using fieldName to using id. If the sortedColumn measure matches
+            // a measure fieldName in the definition, update it to use the measure's id instead
+            // of its fieldName.
+            // TODO: add an upgrade step to fix this in master and remove this code
+            const sortedMeasure = definition.measures.find((measure) => measure.fieldName === definition.sortedColumn?.measure);
+            if (sortedMeasure) {
+                return {
+                    ...definition,
+                    sortedColumn: {
+                        ...definition.sortedColumn,
+                        measure: sortedMeasure.id,
+                    },
+                };
+            }
+        }
+        return definition;
+    }
     // ---------------------------------------------------------------------
     // Import/Export
     // ---------------------------------------------------------------------
@@ -67997,9 +68098,10 @@ class FilterEvaluationPlugin extends UIPlugin {
             const filteredZone = filter.filteredRange?.zone;
             if (!filteredValues || !filteredZone)
                 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);
                 }
             }
@@ -68507,11 +68609,6 @@ class GridSelectionPlugin extends UIPlugin {
             },
         ];
         const sheetId = this.getActiveSheetId();
-        const handler = new CellClipboardHandler(this.getters, this.dispatch);
-        const data = handler.copy(getClipboardDataPositions(sheetId, target));
-        if (!data) {
-            return;
-        }
         const base = isBasedBefore ? cmd.base : cmd.base + 1;
         const pasteTarget = [
             {
@@ -68521,7 +68618,14 @@ class GridSelectionPlugin extends UIPlugin {
                 bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
             },
         ];
-        handler.paste({ zones: pasteTarget, sheetId }, data, { isCutOperation: true });
+        for (const Handler of clipboardHandlersRegistries.cellHandlers.getAll()) {
+            const handler = new Handler(this.getters, this.dispatch);
+            const data = handler.copy(getClipboardDataPositions(sheetId, target));
+            if (!data) {
+                continue;
+            }
+            handler.paste({ zones: pasteTarget, sheetId }, data, { isCutOperation: true });
+        }
         const selection = pasteTarget[0];
         const col = selection.left;
         const row = selection.top;
@@ -76911,6 +77015,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.2.15";
-__info__.date = "2025-05-30T08:45:53.952Z";
-__info__.hash = "607492d";
+__info__.version = "18.2.17";
+__info__.date = "2025-06-12T09:52:15.050Z";
+__info__.hash = "ea64209";

package/dist/o-spreadsheet.d.ts

@@ -1,5 +1,5 @@
 import * as chart_js from 'chart.js';
-import { ChartConfiguration, Point, Chart, Color as Color$1, ChartType as ChartType$1 } from 'chart.js';
+import { ChartConfiguration, Point, Chart, Color as Color$1, ChartType as ChartType$1, ChartMeta } from 'chart.js';
 import * as ChartGeo from 'chartjs-chart-geo';
 import * as GeoJSON$1 from 'geojson';
 import * as _odoo_owl from '@odoo/owl';
@@ -4834,6 +4834,7 @@ declare class PivotCorePlugin extends CorePlugin<CoreState> implements CoreState
     private compileMeasureFormula;
     private replaceMeasureFormula;
     private checkDuplicatedMeasureIds;
+    private repairSortedColumn;
     /**
      * Import the pivots
      */
@@ -6286,7 +6287,7 @@ interface ChartShowValuesPluginOptions {
     showValues: boolean;
     background?: Color;
     horizontal?: boolean;
-    callback: (value: number | string, axisId: string) => string;
+    callback: (value: number | string, dataset: ChartMeta, index: number) => string;
 }
 declare module "chart.js" {
     interface PluginOptionsByType<TType extends ChartType$1> {
@@ -13433,6 +13434,8 @@ declare const chartHelpers: {
         [key: string]: chart_js.ScaleOptionsByType<"projection" | keyof chart_js.ColorScaleTypeRegistry>;
     }>;
     getChartShowValues(definition: ChartWithDataSetDefinition, args: ChartRuntimeGenerationArgs): ChartShowValuesPluginOptions;
+    getPyramidChartShowValues(definition: ChartWithDataSetDefinition, args: ChartRuntimeGenerationArgs): ChartShowValuesPluginOptions;
+    getWaterfallChartShowValues(definition: WaterfallChartDefinition, args: ChartRuntimeGenerationArgs): ChartShowValuesPluginOptions;
     getChartTitle(definition: ChartWithDataSetDefinition): chart_js_dist_types_utils._DeepPartialObject<chart_js.TitleOptions>;
     getBarChartTooltip(definition: GenericDefinition<BarChartDefinition>, args: ChartRuntimeGenerationArgs): chart_js_dist_types_utils._DeepPartialObject<chart_js.TooltipOptions<any>>;
     getLineChartTooltip(definition: GenericDefinition<LineChartDefinition>, args: ChartRuntimeGenerationArgs): chart_js_dist_types_utils._DeepPartialObject<chart_js.TooltipOptions<any>>;