@odoo/o-spreadsheet 18.0.23 → 18.0.25

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.0.23
- * @date 2025-04-14T17:16:35.374Z
- * @hash f560133
+ * @version 18.0.25
+ * @date 2025-04-25T08:08:43.377Z
+ * @hash 24aac2c
  */
 
 'use strict';
@@ -3665,11 +3665,13 @@ const CellErrorType = {
     NullError: "#NULL!",
 };
 const errorTypes = new Set(Object.values(CellErrorType));
-class EvaluationError extends Error {
+class EvaluationError {
+    message;
     value;
     constructor(message = _t("Error"), value = CellErrorType.GenericError) {
-        super(message);
+        this.message = message;
         this.value = value;
+        this.message = message.toString();
     }
 }
 class BadExpressionError extends EvaluationError {
@@ -6736,6 +6738,12 @@ function tokenizeString(chars) {
     }
     return null;
 }
+/**
+  - \p{L} is for any letter (from any language)
+  - \p{N} is for any number
+  - the u flag at the end is for unicode, which enables the `\p{...}` syntax
+ */
+const unicodeSymbolCharRegexp = /\p{L}|\p{N}|_|\.|!|\$/u;
 const SYMBOL_CHARS = new Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.!$");
 /**
  * A "Symbol" is just basically any word-like element that can appear in a
@@ -6776,7 +6784,8 @@ function tokenizeSymbol(chars) {
             };
         }
     }
-    while (chars.current && SYMBOL_CHARS.has(chars.current)) {
+    while (chars.current &&
+        (SYMBOL_CHARS.has(chars.current) || chars.current.match(unicodeSymbolCharRegexp))) {
         result += chars.shift();
     }
     if (result.length) {
@@ -9039,7 +9048,7 @@ function transformZone(zone, executed) {
     if (executed.type === "ADD_COLUMNS_ROWS") {
         return expandZoneOnInsertion(zone, executed.dimension === "COL" ? "left" : "top", executed.base, executed.position, executed.quantity);
     }
-    return { ...zone };
+    return zone;
 }
 function transformRangeData(range, executed) {
     const deletedSheet = executed.type === "DELETE_SHEET" && executed.sheetId;
@@ -15661,9 +15670,11 @@ const GAUGE_TITLE_PADDING_LEFT = SCORECARD_GAUGE_CHART_PADDING;
 const GAUGE_TITLE_PADDING_TOP = SCORECARD_GAUGE_CHART_PADDING;
 function drawGaugeChart(canvas, runtime) {
     const canvasBoundingRect = canvas.getBoundingClientRect();
-    canvas.width = canvasBoundingRect.width;
-    canvas.height = canvasBoundingRect.height;
+    const dpr = window.devicePixelRatio || 1;
+    canvas.width = dpr * canvasBoundingRect.width;
+    canvas.height = dpr * canvasBoundingRect.height;
     const ctx = canvas.getContext("2d");
+    ctx.scale(dpr, dpr);
     const config = getGaugeRenderingConfig(canvasBoundingRect, runtime, ctx);
     drawBackground(ctx, config);
     drawGauge(ctx, config);
@@ -16225,9 +16236,11 @@ let ScorecardChart$1 = class ScorecardChart extends AbstractChart {
 };
 function drawScoreChart(structure, canvas) {
     const ctx = canvas.getContext("2d");
-    canvas.width = structure.canvas.width;
-    const availableWidth = canvas.width - DEFAULT_CHART_PADDING;
-    canvas.height = structure.canvas.height;
+    const dpr = window.devicePixelRatio || 1;
+    canvas.width = dpr * structure.canvas.width;
+    canvas.height = dpr * structure.canvas.height;
+    ctx.scale(dpr, dpr);
+    const availableWidth = structure.canvas.width - DEFAULT_CHART_PADDING;
     ctx.fillStyle = structure.canvas.backgroundColor;
     ctx.fillRect(0, 0, structure.canvas.width, structure.canvas.height);
     if (structure.title) {
@@ -16938,6 +16951,10 @@ class ChartJsComponent extends owl.Component {
                 this.currentRuntime = runtime;
             }
         });
+        owl.useEffect(() => {
+            this.currentRuntime = this.chartRuntime;
+            this.updateChartJs(deepCopy(this.currentRuntime));
+        }, () => [window.devicePixelRatio]);
     }
     createChart(chartData) {
         const canvas = this.canvas.el;
@@ -16979,7 +16996,7 @@ class ScorecardChart extends owl.Component {
         owl.useEffect(this.createChart.bind(this), () => {
             const canvas = this.canvas.el;
             const rect = canvas.getBoundingClientRect();
-            return [rect.width, rect.height, this.runtime, this.canvas.el];
+            return [rect.width, rect.height, this.runtime, this.canvas.el, window.devicePixelRatio];
         });
     }
     createChart() {
@@ -17447,7 +17464,7 @@ const MINVERSE = {
         assertSquareMatrix(_t("The argument square_matrix must have the same number of columns and rows."), _matrix);
         const { inverted } = invertMatrix(_matrix);
         if (!inverted) {
-            throw new EvaluationError(_t("The matrix is not invertible."));
+            return new EvaluationError(_t("The matrix is not invertible."));
         }
         return inverted;
     },
@@ -17607,7 +17624,7 @@ const TOCOL = {
             .flat()
             .filter(shouldKeepValue(_ignore));
         if (result.length === 0) {
-            throw new NotAvailableError(_t("No results for the given arguments of TOCOL."));
+            return new NotAvailableError(_t("No results for the given arguments of TOCOL."));
         }
         return [result];
     },
@@ -17628,7 +17645,7 @@ const TOROW = {
             .filter(shouldKeepValue(_ignore))
             .map((item) => [item]);
         if (result.length === 0 || result[0].length === 0) {
-            throw new NotAvailableError(_t("No results for the given arguments of TOROW."));
+            return new NotAvailableError(_t("No results for the given arguments of TOROW."));
         }
         return result;
     },
@@ -18475,7 +18492,7 @@ const PRODUCT = {
                             count += 1;
                         }
                         if (isEvaluationError(f)) {
-                            throw j;
+                            return j;
                         }
                     }
                 }
@@ -19378,7 +19395,7 @@ const MATTHEWS = {
         const flatY = dataY.flat();
         assertSameNumberOfElements(flatX, flatY);
         if (flatX.length === 0) {
-            throw new EvaluationError(_t("[[FUNCTION_NAME]] expects non-empty ranges for both parameters."));
+            return new EvaluationError(_t("[[FUNCTION_NAME]] expects non-empty ranges for both parameters."));
         }
         const n = flatX.length;
         let trueN = 0, trueP = 0, falseP = 0, falseN = 0;
@@ -19741,7 +19758,7 @@ const RANK = {
             }
         }
         if (!found) {
-            throw new NotAvailableError(_t("Value not found in the given data."));
+            return new NotAvailableError(_t("Value not found in the given data."));
         }
         return rank;
     },
@@ -21366,7 +21383,7 @@ const FILTER = {
             }
         }
         if (!result.length) {
-            throw new NotAvailableError(_t("No match found in FILTER evaluation"));
+            return new NotAvailableError(_t("No match found in FILTER evaluation"));
         }
         return mode === "row" ? transposeMatrix(result) : result;
     },
@@ -21495,7 +21512,7 @@ const UNIQUE = {
             result.push(row.data);
         }
         if (!result.length)
-            throw new EvaluationError(_t("No unique values found"));
+            return new EvaluationError(_t("No unique values found"));
         return _byColumn ? result : transposeMatrix(result);
     },
     isExported: true,
@@ -24421,7 +24438,7 @@ const IFS = {
                 return result;
             }
         }
-        throw new EvaluationError(_t("No match."));
+        return new EvaluationError(_t("No match."));
     },
     isExported: true,
 };
@@ -24612,7 +24629,7 @@ const COLUMN = {
     ],
     compute: function (cellReference) {
         if (isEvaluationError(cellReference?.value)) {
-            throw cellReference;
+            return cellReference;
         }
         const column = cellReference === undefined
             ? this.__originCellPosition?.col
@@ -24630,7 +24647,7 @@ const COLUMNS = {
     args: [arg("range (meta)", _t("The range whose column count will be returned."))],
     compute: function (range) {
         if (isEvaluationError(range?.value)) {
-            throw range;
+            return range;
         }
         const zone = toZone(range.value);
         return zone.right - zone.left + 1;
@@ -24708,11 +24725,11 @@ const INDIRECT = {
     compute: function (reference, useA1Notation = { value: true }) {
         let _reference = reference?.value?.toString();
         if (!_reference) {
-            throw new InvalidReferenceError(_t("Reference should be defined."));
+            return new InvalidReferenceError(_t("Reference should be defined."));
         }
         const _useA1Notation = toBoolean(useA1Notation);
         if (!_useA1Notation) {
-            throw new EvaluationError(_t("R1C1 notation is not supported."));
+            return new EvaluationError(_t("R1C1 notation is not supported."));
         }
         const sheetId = this.__originSheetId;
         const originPosition = this.__originCellPosition;
@@ -24724,7 +24741,7 @@ const INDIRECT = {
         }
         const range = this.getters.getRangeFromSheetXC(sheetId, _reference);
         if (range === undefined || range.invalidXc || range.invalidSheetName) {
-            throw new InvalidReferenceError();
+            return new InvalidReferenceError();
         }
         if (originPosition) {
             this.addDependencies?.(originPosition, [range]);
@@ -24835,7 +24852,7 @@ const ROW = {
     ],
     compute: function (cellReference) {
         if (isEvaluationError(cellReference?.value)) {
-            throw cellReference;
+            return cellReference;
         }
         const row = cellReference === undefined
             ? this.__originCellPosition?.row
@@ -24853,7 +24870,7 @@ const ROWS = {
     args: [arg("range (meta)", _t("The range whose row count will be returned."))],
     compute: function (range) {
         if (isEvaluationError(range?.value)) {
-            throw range;
+            return range;
         }
         const zone = toZone(range.value);
         return zone.bottom - zone.top + 1;
@@ -25039,11 +25056,11 @@ const PIVOT = {
         const _pivotFormulaId = toString(pivotFormulaId);
         const _rowCount = toNumber(rowCount, this.locale);
         if (_rowCount < 0) {
-            throw new EvaluationError(_t("The number of rows must be positive."));
+            return new EvaluationError(_t("The number of rows must be positive."));
         }
         const _columnCount = toNumber(columnCount, this.locale);
         if (_columnCount < 0) {
-            throw new EvaluationError(_t("The number of columns must be positive."));
+            return new EvaluationError(_t("The number of columns must be positive."));
         }
         const _includeColumnHeaders = toBoolean(includeColumnHeaders);
         const _includedTotal = toBoolean(includeTotal);
@@ -25111,7 +25128,7 @@ const OFFSET = {
         }
         const _cellReference = cellReference?.value;
         if (!_cellReference) {
-            throw new Error("In this context, the function OFFSET needs to have a cell or range in parameter.");
+            return new EvaluationError("In this context, the function OFFSET needs to have a cell or range in parameter.");
         }
         const zone = toZone(_cellReference);
         let offsetHeight = zone.bottom - zone.top + 1;
@@ -28917,7 +28934,7 @@ class GaugeChartComponent extends owl.Component {
         owl.useEffect(() => drawGaugeChart(this.canvas.el, this.runtime), () => {
             const canvas = this.canvas.el;
             const rect = canvas.getBoundingClientRect();
-            return [rect.width, rect.height, this.runtime, this.canvas.el];
+            return [rect.width, rect.height, this.runtime, this.canvas.el, window.devicePixelRatio];
         });
     }
 }
@@ -37475,7 +37492,7 @@ class ColorPicker extends owl.Component {
     }
     setHexColor(ev) {
         // only support HEX code input
-        const val = ev.target.value.slice(0, 7);
+        const val = ev.target.value.replace("##", "#").slice(0, 7);
         this.state.customHexColor = val;
         if (!isColorValid(val)) ;
         else {
@@ -48010,39 +48027,6 @@ function useCellHovered(env, gridRef, callback) {
     }
     return hoveredPosition;
 }
-function useTouchMove(gridRef, handler, canMoveUp) {
-    let x = null;
-    let y = null;
-    function onTouchStart(ev) {
-        if (ev.touches.length !== 1)
-            return;
-        x = ev.touches[0].clientX;
-        y = ev.touches[0].clientY;
-    }
-    function onTouchEnd() {
-        x = null;
-        y = null;
-    }
-    function onTouchMove(ev) {
-        if (ev.touches.length !== 1)
-            return;
-        // On mobile browsers, swiping down is often associated with "pull to refresh".
-        // We only want this behavior if the grid is already at the top.
-        // Otherwise we only want to move the canvas up, without triggering any refresh.
-        if (canMoveUp()) {
-            ev.preventDefault();
-            ev.stopPropagation();
-        }
-        const currentX = ev.touches[0].clientX;
-        const currentY = ev.touches[0].clientY;
-        handler(x - currentX, y - currentY);
-        x = currentX;
-        y = currentY;
-    }
-    useRefListener(gridRef, "touchstart", onTouchStart);
-    useRefListener(gridRef, "touchend", onTouchEnd);
-    useRefListener(gridRef, "touchmove", onTouchMove);
-}
 class GridOverlay extends owl.Component {
     static template = "o-spreadsheet-GridOverlay";
     static props = {
@@ -48090,10 +48074,6 @@ class GridOverlay extends owl.Component {
         owl.onWillUnmount(() => {
             resizeObserver.disconnect();
         });
-        useTouchMove(this.gridOverlay, this.props.onGridMoved, () => {
-            const { scrollY } = this.env.model.getters.getActiveSheetDOMScrollInfo();
-            return scrollY > 0;
-        });
         this.cellPopovers = useStore(CellPopoverStore);
         this.paintFormatStore = useStore(PaintFormatStore);
     }
@@ -49442,6 +49422,73 @@ function useGridDrawing(refName, model, canvasSize) {
     }
 }
 
+const friction = 0.95;
+const verticalScrollFactor = 1;
+const horizontalScrollFactor = 1;
+function useTouchScroll(ref, updateScroll, canMoveUp) {
+    let lastX = 0;
+    let lastY = 0;
+    let velocityX = 0;
+    let velocityY = 0;
+    let isMouseDown = false;
+    let lastTime = 0;
+    useRefListener(ref, "touchstart", onTouchStart, { capture: false });
+    useRefListener(ref, "touchmove", onTouchMove, { capture: false });
+    useRefListener(ref, "touchend", onTouchEnd, { capture: false });
+    function onTouchStart(event) {
+        isMouseDown = true;
+        ({ clientX: lastX, clientY: lastY } = event.touches[0]);
+        velocityX = 0;
+        velocityY = 0;
+    }
+    function onTouchMove(event) {
+        if (!isMouseDown)
+            return;
+        const currentTime = Date.now();
+        const { clientX, clientY } = event.touches[0];
+        let deltaX = lastX - clientX;
+        let deltaY = lastY - clientY;
+        const elapsedTime = currentTime - lastTime;
+        velocityX = deltaX / elapsedTime;
+        velocityY = deltaY / elapsedTime;
+        lastX = clientX;
+        lastY = clientY;
+        lastTime = currentTime;
+        if (canMoveUp()) {
+            if (event.cancelable) {
+                event.preventDefault();
+            }
+            event.stopPropagation();
+        }
+        updateScroll(deltaX * horizontalScrollFactor, deltaY * verticalScrollFactor);
+    }
+    function onTouchEnd(ev) {
+        isMouseDown = false;
+        lastX = lastY = 0;
+        requestAnimationFrame(scroll);
+    }
+    function scroll() {
+        if (Math.abs(velocityX) < 0.05) {
+            velocityX = 0;
+        }
+        if (Math.abs(velocityY) < 0.05) {
+            velocityY = 0;
+        }
+        if (!velocityX && !velocityY) {
+            return;
+        }
+        const currentTime = Date.now();
+        const elapsedTime = Math.abs(currentTime - lastTime);
+        const deltaX = velocityX * elapsedTime;
+        const deltaY = velocityY * elapsedTime;
+        updateScroll(deltaX * horizontalScrollFactor, deltaY * verticalScrollFactor);
+        lastTime = currentTime;
+        velocityX *= friction;
+        velocityY *= friction;
+        requestAnimationFrame(scroll);
+    }
+}
+
 function useWheelHandler(handler) {
     function normalize(val, deltaMode) {
         return val * (deltaMode === 0 ? 1 : DEFAULT_CELL_HEIGHT);
@@ -50062,6 +50109,10 @@ class Grid extends owl.Component {
                 this.DOMFocusableElementStore.focusableElement?.focus();
             }
         }, () => [this.sidePanel.isOpen]);
+        useTouchScroll(this.gridRef, this.moveCanvas.bind(this), () => {
+            const { scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
+            return scrollY > 0;
+        });
     }
     onCellHovered({ col, row }) {
         this.hoveredCell.hover({ col, row });
@@ -59857,6 +59908,16 @@ function withPivotPresentationLayer (PivotClass) {
                 }
                 return values;
             }
+            else if (rowDomain.length === this.definition.rows.length &&
+                colDomain.length &&
+                colDomain.length < this.definition.columns.length) {
+                const colSubTree = this.getSubTreeMatchingDomain(table.getColTree(), colDomain);
+                const domains = this.treeToLeafDomains(colSubTree, colDomain);
+                for (const domain of domains) {
+                    values.push(this._getPivotCellValueAndFormat(measure.id, rowDomain.concat(domain)));
+                }
+                return values;
+            }
             else {
                 const tree = table.getRowTree();
                 const subTree = this.getSubTreeMatchingDomain(tree, rowDomain);
@@ -61388,10 +61449,8 @@ function mergeTransformation(toTransform, executed) {
     }
     const target = [];
     for (const zone1 of toTransform.target) {
-        for (const zone2 of executed.target) {
-            if (!overlap(zone1, zone2)) {
-                target.push({ ...zone1 });
-            }
+        if (executed.target.every((zone2) => !overlap(zone1, zone2))) {
+            target.push(zone1);
         }
     }
     if (target.length) {
@@ -67619,6 +67678,10 @@ class SpreadsheetDashboard extends owl.Component {
             this.hoveredCell.clear();
         });
         this.cellPopovers = useStore(CellPopoverStore);
+        useTouchScroll(gridRef, this.moveCanvas.bind(this), () => {
+            const { scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
+            return scrollY > 0;
+        });
     }
     onCellHovered({ col, row }) {
         this.hoveredCell.hover({ col, row });
@@ -73714,6 +73777,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.0.23";
-__info__.date = "2025-04-14T17:16:35.374Z";
-__info__.hash = "f560133";
+__info__.version = "18.0.25";
+__info__.date = "2025-04-25T08:08:43.377Z";
+__info__.hash = "24aac2c";

package/dist/o-spreadsheet.d.ts

@@ -11111,7 +11111,8 @@ declare const CellErrorType: {
     readonly GenericError: "#ERROR";
     readonly NullError: "#NULL!";
 };
-declare class EvaluationError extends Error {
+declare class EvaluationError {
+    readonly message: string;
     readonly value: string;
     constructor(message?: string, value?: string);
 }