@odoo/o-spreadsheet 18.1.15 → 18.1.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.1.15
- * @date 2025-04-14T17:17:30.890Z
- * @hash ddaea83
+ * @version 18.1.17
+ * @date 2025-04-25T08:08:46.599Z
+ * @hash a63687f
  */
 
 'use strict';
@@ -3834,11 +3834,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 {
@@ -6891,6 +6893,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
@@ -6931,7 +6939,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) {
@@ -9237,7 +9246,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;
@@ -13572,7 +13581,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;
     },
@@ -15312,7 +15321,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,
@@ -19091,7 +19100,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;
@@ -38554,7 +38563,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 {
@@ -50107,39 +50116,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 = {
@@ -50187,10 +50163,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);
     }
@@ -51548,6 +51520,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);
@@ -52168,6 +52207,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 });
@@ -61832,6 +61875,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);
@@ -63377,10 +63430,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) {
@@ -69652,6 +69703,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 });
@@ -75726,6 +75781,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.1.15";
-__info__.date = "2025-04-14T17:17:30.890Z";
-__info__.hash = "ddaea83";
+__info__.version = "18.1.17";
+__info__.date = "2025-04-25T08:08:46.599Z";
+__info__.hash = "a63687f";

package/dist/o-spreadsheet.d.ts

@@ -11522,7 +11522,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);
 }

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.1.15
- * @date 2025-04-14T17:17:30.890Z
- * @hash ddaea83
+ * @version 18.1.17
+ * @date 2025-04-25T08:08:46.599Z
+ * @hash a63687f
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -3832,11 +3832,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 {
@@ -6889,6 +6891,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
@@ -6929,7 +6937,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) {
@@ -9235,7 +9244,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;
@@ -13570,7 +13579,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;
     },
@@ -15310,7 +15319,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,
@@ -19089,7 +19098,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;
@@ -38552,7 +38561,7 @@ class ColorPicker extends 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 {
@@ -50105,39 +50114,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 Component {
     static template = "o-spreadsheet-GridOverlay";
     static props = {
@@ -50185,10 +50161,6 @@ class GridOverlay extends Component {
         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);
     }
@@ -51546,6 +51518,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);
@@ -52166,6 +52205,10 @@ class Grid extends 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 });
@@ -61830,6 +61873,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);
@@ -63375,10 +63428,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) {
@@ -69650,6 +69701,10 @@ class SpreadsheetDashboard extends 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 });
@@ -75680,6 +75735,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, 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, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "18.1.15";
-__info__.date = "2025-04-14T17:17:30.890Z";
-__info__.hash = "ddaea83";
+__info__.version = "18.1.17";
+__info__.date = "2025-04-25T08:08:46.599Z";
+__info__.hash = "a63687f";