@odoo/o-spreadsheet 17.4.9 → 17.4.11

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 17.4.9
- * @date 2024-10-14T07:53:51.633Z
- * @hash b7015b7
+ * @version 17.4.11
+ * @date 2024-11-08T12:15:26.239Z
+ * @hash 2eb3f1c
  */
 
 'use strict';
@@ -7627,7 +7627,10 @@ function parseOperand(tokens) {
         case "STRING":
             return { type: "STRING", value: removeStringQuotes(current.value) };
         case "INVALID_REFERENCE":
-            throw new InvalidReferenceError();
+            return {
+                type: "REFERENCE",
+                value: CellErrorType.InvalidReference,
+            };
         case "REFERENCE":
             if (tokens[0]?.value === ":" && tokens[1]?.type === "REFERENCE") {
                 tokens.shift();
@@ -8431,6 +8434,7 @@ const ChartTerms = {
     StackedBarChart: _t("Stacked bar chart"),
     StackedLineChart: _t("Stacked line chart"),
     StackedAreaChart: _t("Stacked area chart"),
+    StackedColumnChart: _t("Stacked column chart"),
     CumulativeData: _t("Cumulative data"),
     TreatLabelsAsText: _t("Treat labels as text"),
     AggregatedChart: _t("Aggregate"),
@@ -10625,67 +10629,112 @@ const chartShowValuesPlugin = {
         ctx.save();
         ctx.textAlign = "center";
         ctx.textBaseline = "middle";
-        ctx.fillStyle = chartFontColor(options.background);
-        ctx.strokeStyle = chartFontColor(ctx.fillStyle);
-        chart._metasets.forEach(function (dataset) {
-            switch (dataset.type) {
-                case "doughnut":
-                case "pie": {
-                    for (let i = 0; i < dataset._parsed.length; i++) {
-                        const bar = dataset.data[i];
-                        const { startAngle, endAngle, innerRadius, outerRadius } = bar;
-                        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;
-                        ctx.fillStyle = chartFontColor(bar.options.backgroundColor);
-                        ctx.strokeStyle = chartFontColor(ctx.fillStyle);
-                        const value = options.callback(dataset._parsed[i]);
-                        ctx.strokeText(value, x, y);
-                        ctx.fillText(value, x, y);
-                    }
-                    break;
-                }
-                case "bar":
-                case "line": {
-                    const yOffset = dataset.type === "bar" && !options.horizontal ? 0 : 3;
-                    for (let i = 0; i < dataset._parsed.length; i++) {
-                        const point = dataset.data[i];
-                        const value = options.horizontal ? dataset._parsed[i].x : dataset._parsed[i].y;
-                        const displayedValue = options.callback(value - 0);
-                        let xPosition = 0, yPosition = 0;
-                        if (options.horizontal) {
-                            yPosition = point.y;
-                            if (value < 0) {
-                                ctx.textAlign = "right";
-                                xPosition = point.x - yOffset;
-                            }
-                            else {
-                                ctx.textAlign = "left";
-                                xPosition = point.x + yOffset;
-                            }
-                        }
-                        else {
-                            xPosition = point.x;
-                            if (value < 0) {
-                                ctx.textBaseline = "top";
-                                yPosition = point.y + yOffset;
-                            }
-                            else {
-                                ctx.textBaseline = "bottom";
-                                yPosition = point.y - yOffset;
-                            }
-                        }
-                        ctx.strokeText(displayedValue, xPosition, yPosition);
-                        ctx.fillText(displayedValue, xPosition, yPosition);
-                    }
-                    break;
-                }
-            }
-        });
+        ctx.miterLimit = 1; // Avoid sharp artifacts on strokeText
+        switch (chart.config.type) {
+            case "pie":
+            case "doughnut":
+                drawPieChartValues(chart, options, ctx);
+                break;
+            case "bar":
+            case "line":
+                options.horizontal
+                    ? drawHorizontalBarChartValues(chart, options, ctx)
+                    : drawLineOrBarChartValues(chart, options, ctx);
+                break;
+        }
         ctx.restore();
     },
 };
+function drawTextWithBackground(text, x, y, ctx) {
+    ctx.lineWidth = 3; // Stroke the text with a big lineWidth width to have some kind of background
+    ctx.strokeText(text, x, y);
+    ctx.lineWidth = 1;
+    ctx.fillText(text, x, y);
+}
+function drawLineOrBarChartValues(chart, options, ctx) {
+    const yMax = chart.chartArea.bottom;
+    const yMin = chart.chartArea.top;
+    const textsPositions = {};
+    for (const dataset of chart._metasets) {
+        for (let i = 0; i < dataset._parsed.length; i++) {
+            const value = dataset._parsed[i].y;
+            const point = dataset.data[i];
+            const xPosition = point.x;
+            let yPosition = 0;
+            if (chart.config.type === "line") {
+                yPosition = point.y - 10;
+            }
+            else {
+                yPosition = value < 0 ? point.y - point.height / 2 : point.y + point.height / 2;
+            }
+            yPosition = Math.min(yPosition, yMax);
+            yPosition = Math.max(yPosition, yMin);
+            // Avoid overlapping texts with same X
+            if (!textsPositions[xPosition]) {
+                textsPositions[xPosition] = [];
+            }
+            for (const otherPosition of textsPositions[xPosition] || []) {
+                if (Math.abs(otherPosition - yPosition) < 13) {
+                    yPosition = otherPosition - 13;
+                }
+            }
+            textsPositions[xPosition].push(yPosition);
+            ctx.fillStyle = point.options.backgroundColor;
+            ctx.strokeStyle = options.background || "#ffffff";
+            drawTextWithBackground(options.callback(value - 0), xPosition, yPosition, ctx);
+        }
+    }
+}
+function drawHorizontalBarChartValues(chart, options, ctx) {
+    const xMax = chart.chartArea.right;
+    const xMin = chart.chartArea.left;
+    const textsPositions = {};
+    for (const dataset of chart._metasets) {
+        for (let i = 0; i < dataset._parsed.length; i++) {
+            const value = dataset._parsed[i].x;
+            const displayValue = options.callback(value - 0);
+            const point = dataset.data[i];
+            const yPosition = point.y;
+            let xPosition = value < 0 ? point.x + point.width / 2 : point.x - point.width / 2;
+            xPosition = Math.min(xPosition, xMax);
+            xPosition = Math.max(xPosition, xMin);
+            // Avoid overlapping texts with same Y
+            if (!textsPositions[yPosition]) {
+                textsPositions[yPosition] = [];
+            }
+            const textWidth = computeTextWidth(ctx, displayValue, { fontSize: 12 }, "px");
+            for (const otherPosition of textsPositions[yPosition]) {
+                if (Math.abs(otherPosition - xPosition) < textWidth) {
+                    xPosition = otherPosition + textWidth + 3;
+                }
+            }
+            textsPositions[yPosition].push(xPosition);
+            ctx.fillStyle = point.options.backgroundColor;
+            ctx.strokeStyle = options.background || "#ffffff";
+            drawTextWithBackground(displayValue, xPosition, yPosition, ctx);
+        }
+    }
+}
+function drawPieChartValues(chart, options, ctx) {
+    for (const dataset of chart._metasets) {
+        for (let i = 0; i < dataset._parsed.length; i++) {
+            const value = Number(dataset._parsed[i]);
+            if (isNaN(value) || value === 0) {
+                continue;
+            }
+            const bar = dataset.data[i];
+            const { startAngle, endAngle, innerRadius, outerRadius } = bar;
+            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;
+            ctx.fillStyle = chartFontColor(options.background);
+            ctx.strokeStyle = options.background || "#ffffff";
+            const displayValue = options.callback(value);
+            drawTextWithBackground(displayValue, x, y, ctx);
+        }
+    }
+}
 
 /** This is a chartJS plugin that will draw connector lines between the bars of a Waterfall chart */
 const waterfallLinesPlugin = {
@@ -23415,7 +23464,7 @@ function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale, tr
                         const xLabel = tooltipItem.dataset?.label || tooltipItem.label;
                         // tooltipItem.parsed can be an object or a number for pie charts
                         let yLabel = horizontalChart ? tooltipItem.parsed.x : tooltipItem.parsed.y;
-                        if (!yLabel) {
+                        if (yLabel === undefined || yLabel === null) {
                             yLabel = tooltipItem.parsed;
                         }
                         const toolTipFormat = !format && Math.abs(yLabel) >= 1000 ? "#,##" : format;
@@ -31586,6 +31635,12 @@ class GenericChartConfigPanel extends owl.Component {
 
 class BarConfigPanel extends GenericChartConfigPanel {
     static template = "o-spreadsheet-BarConfigPanel";
+    get stackedLabel() {
+        const definition = this.props.definition;
+        return definition.horizontal
+            ? this.chartTerms.StackedBarChart
+            : this.chartTerms.StackedColumnChart;
+    }
     onUpdateStacked(stacked) {
         this.props.updateChart(this.props.figureId, {
             stacked,
@@ -32754,7 +32809,9 @@ class LineConfigPanel extends GenericChartConfigPanel {
     }
     get stackedLabel() {
         const definition = this.props.definition;
-        return definition.fillArea ? this.chartTerms.StackedAreaChart : this.chartTerms.StackedBarChart;
+        return definition.fillArea
+            ? this.chartTerms.StackedAreaChart
+            : this.chartTerms.StackedLineChart;
     }
     getLabelRangeOptions() {
         const options = super.getLabelRangeOptions();
@@ -46532,7 +46589,7 @@ function load(data, verboseImport) {
     if (!data) {
         return createEmptyWorkbookData();
     }
-    console.group("Loading data");
+    console.debug("### Loading data ###");
     const start = performance.now();
     if (data["[Content_Types].xml"]) {
         const reader = new XlsxReader(data);
@@ -46546,13 +46603,13 @@ function load(data, verboseImport) {
     // apply migrations, if needed
     if ("version" in data) {
         if (data.version < CURRENT_VERSION) {
-            console.info("Migrating data from version", data.version);
+            console.debug("Migrating data from version", data.version);
             data = migrate(data);
         }
     }
     data = repairData(data);
-    console.info("Data loaded in", performance.now() - start, "ms");
-    console.groupEnd();
+    console.debug("Data loaded in", performance.now() - start, "ms");
+    console.debug("###");
     return data;
 }
 function migrate(data) {
@@ -46561,7 +46618,7 @@ function migrate(data) {
     for (let i = index; i < MIGRATIONS.length; i++) {
         data = MIGRATIONS[i].applyMigration(data);
     }
-    console.info("Data migrated in", performance.now() - start, "ms");
+    console.debug("Data migrated in", performance.now() - start, "ms");
     return data;
 }
 const MIGRATIONS = [
@@ -54121,7 +54178,7 @@ class Evaluator {
         cellsToCompute.addMany(arrayFormulasPositions);
         cellsToCompute.addMany(this.getCellsDependingOn(arrayFormulasPositions));
         this.evaluate(cellsToCompute);
-        console.info("evaluate Cells", performance.now() - start, "ms");
+        console.debug("evaluate Cells", performance.now() - start, "ms");
     }
     getArrayFormulasImpactedByChangesOf(positions) {
         const impactedPositions = this.createEmptyPositionSet();
@@ -54160,7 +54217,7 @@ class Evaluator {
         const start = performance.now();
         this.evaluatedCells = new PositionMap();
         this.evaluate(this.getAllCells());
-        console.info("evaluate all cells", performance.now() - start, "ms");
+        console.debug("evaluate all cells", performance.now() - start, "ms");
     }
     evaluateFormulaResult(sheetId, formulaString) {
         try {
@@ -55982,6 +56039,10 @@ class PivotUIPlugin extends UIPlugin {
         if (!pivot.isValid()) {
             return EMPTY_PIVOT_CELL;
         }
+        if (functionName === "PIVOT" &&
+            !cell.content.replaceAll(" ", "").toUpperCase().startsWith("=PIVOT")) {
+            return EMPTY_PIVOT_CELL;
+        }
         if (functionName === "PIVOT") {
             const includeTotal = args[2] === false ? false : undefined;
             const includeColumnHeaders = args[3] === false ? false : undefined;
@@ -57310,7 +57371,7 @@ class Session extends EventBus {
             this.onMessageReceived(message);
         }
         this.isReplayingInitialRevisions = false;
-        console.info("Replayed", numberOfCommands, "commands in", performance.now() - start, "ms");
+        console.debug("Replayed", numberOfCommands, "commands in", performance.now() - start, "ms");
     }
     /**
      * Notify the server that the user client left the collaborative session
@@ -66573,7 +66634,8 @@ function addFormula(cell) {
     }
     const attrs = [["t", type]];
     const XlsxFormula = adaptFormulaToExcel(formula);
-    const node = escapeXml /*xml*/ `<f>${XlsxFormula}</f><v>${cell.value}</v>`;
+    const exportedValue = adaptFormulaValueToExcel(cell.value);
+    const node = escapeXml /*xml*/ `<f>${XlsxFormula}</f><v>${exportedValue}</v>`;
     return { attrs, node };
 }
 function addContent(content, sharedStrings, forceString = false) {
@@ -66608,8 +66670,14 @@ function adaptFormulaToExcel(formulaText) {
         ast = addMissingRequiredArgs(ast);
         return ast;
     });
+    ast = convertAstNodes(ast, "REFERENCE", (ast) => {
+        return ast.value === CellErrorType.InvalidReference ? { ...ast, value: "#REF!" } : ast;
+    });
     return ast ? astToFormula(ast) : formulaText;
 }
+function adaptFormulaValueToExcel(formulaValue) {
+    return formulaValue === CellErrorType.InvalidReference ? "#REF!" : formulaValue;
+}
 /**
  * Some Excel function need required args that might not be mandatory in o-spreadsheet.
  * This adds those missing args.
@@ -67920,7 +67988,7 @@ class Model extends EventBus {
     coreHandlers = [];
     constructor(data = {}, config = {}, stateUpdateMessages = [], uuidGenerator = new UuidGenerator(), verboseImport = true) {
         const start = performance.now();
-        console.group("Model creation");
+        console.debug("##### Model creation #####");
         super();
         setDefaultTranslationMethod();
         stateUpdateMessages = repairInitialMessages(data, stateUpdateMessages);
@@ -67992,16 +68060,16 @@ class Model extends EventBus {
         this.joinSession();
         if (config.snapshotRequested) {
             const startSnapshot = performance.now();
-            console.info("Snapshot requested");
+            console.debug("Snapshot requested");
             this.session.snapshot(this.exportData());
             this.garbageCollectExternalResources();
-            console.info("Snapshot taken in", performance.now() - startSnapshot, "ms");
+            console.debug("Snapshot taken in", performance.now() - startSnapshot, "ms");
         }
         // mark all models as "raw", so they will not be turned into reactive objects
         // by owl, since we do not rely on reactivity
         owl.markRaw(this);
-        console.info("Model created in", performance.now() - start, "ms");
-        console.groupEnd();
+        console.debug("Model created in", performance.now() - start, "ms");
+        console.debug("######");
     }
     joinSession() {
         this.session.join(this.config.client);
@@ -68224,7 +68292,7 @@ class Model extends EventBus {
                     this.finalize();
                     const time = performance.now() - start;
                     if (time > 5) {
-                        console.info(type, time, "ms");
+                        console.debug(type, time, "ms");
                     }
                 });
                 this.session.save(command, commands, changes);
@@ -68610,6 +68678,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.4.9";
-__info__.date = "2024-10-14T07:53:51.633Z";
-__info__.hash = "b7015b7";
+__info__.version = "17.4.11";
+__info__.date = "2024-11-08T12:15:26.239Z";
+__info__.hash = "2eb3f1c";

package/dist/o-spreadsheet.d.ts

@@ -6714,6 +6714,7 @@ declare class GenericChartConfigPanel extends Component<Props$W, SpreadsheetChil
         StackedBarChart: string;
         StackedLineChart: string;
         StackedAreaChart: string;
+        StackedColumnChart: string;
         CumulativeData: string;
         TreatLabelsAsText: string;
         AggregatedChart: string;
@@ -6766,6 +6767,7 @@ declare class GenericChartConfigPanel extends Component<Props$W, SpreadsheetChil
 
 declare class BarConfigPanel extends GenericChartConfigPanel {
     static template: string;
+    get stackedLabel(): string;
     onUpdateStacked(stacked: boolean): void;
     onUpdateAggregated(aggregated: boolean): void;
 }
@@ -11615,6 +11617,7 @@ declare const constants: {
         StackedBarChart: string;
         StackedLineChart: string;
         StackedAreaChart: string;
+        StackedColumnChart: string;
         CumulativeData: string;
         TreatLabelsAsText: string;
         AggregatedChart: string;