@odoo/o-spreadsheet 17.4.34 → 17.4.36

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.34
- * @date 2025-05-12T05:23:37.387Z
- * @hash e3ac48a
+ * @version 17.4.36
+ * @date 2025-05-20T05:54:11.995Z
+ * @hash fabd931
  */
 
 'use strict';
@@ -1916,7 +1916,7 @@ function isDateAfter(date, dateAfter) {
  */
 const getFormulaNumberRegex = memoize(function getFormulaNumberRegex(decimalSeparator) {
     decimalSeparator = escapeRegExp(decimalSeparator);
-    return new RegExp(`(?:^-?\\d+(?:${decimalSeparator}?\\d*(?:e\\d+)?)?|^-?${decimalSeparator}\\d+)(?!\\w|!)`);
+    return new RegExp(`(?:^-?\\d+(?:${decimalSeparator}?\\d*(?:e(\\+|-)?\\d+)?)?|^-?${decimalSeparator}\\d+)(?!\\w|!)`);
 });
 const getNumberRegex = memoize(function getNumberRegex(locale) {
     const decimalSeparator = escapeRegExp(locale.decimalSeparator);
@@ -5211,6 +5211,13 @@ function getDuplicateSheetName(nameToDuplicate, existingNames) {
     }
     return name;
 }
+function isSheetNameEqual(name1, name2) {
+    if (name1 === undefined || name2 === undefined) {
+        return false;
+    }
+    return (getUnquotedSheetName(name1.trim().toUpperCase()) ===
+        getUnquotedSheetName(name2.trim().toUpperCase()));
+}
 
 function computeTextLinesHeight(textLineHeight, numberOfLines = 1) {
     return numberOfLines * (textLineHeight + MIN_CELL_TEXT_MARGIN) - MIN_CELL_TEXT_MARGIN;
@@ -6512,10 +6519,9 @@ const AGGREGATOR_NAMES = {
     avg: _t("Average"),
     sum: _t("Sum"),
 };
-const NUMBER_CHAR_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
 const AGGREGATORS_BY_FIELD_TYPE = {
-    integer: NUMBER_CHAR_AGGREGATORS,
-    char: NUMBER_CHAR_AGGREGATORS,
+    integer: ["max", "min", "avg", "sum", "count_distinct", "count"],
+    char: ["count_distinct", "count"],
     boolean: ["count_distinct", "count", "bool_and", "bool_or"],
 };
 const AGGREGATORS = {};
@@ -6729,8 +6735,11 @@ class CellClipboardHandler extends AbstractCellClipboardHandler {
                 const evaluatedCell = this.getters.getEvaluatedCell(position);
                 const pivotId = this.getters.getPivotIdFromPosition(position);
                 const spreader = this.getters.getArrayFormulaSpreadingOn(position);
-                if (pivotId) {
-                    if (spreader && (!deepEquals(spreader, position) || !isCopyingOneCell)) {
+                if (pivotId && spreader) {
+                    const pivotZone = this.getters.getSpreadZone(spreader);
+                    if ((!deepEquals(spreader, position) || !isCopyingOneCell) &&
+                        pivotZone &&
+                        !data.zones.some((z) => isZoneInside(pivotZone, z))) {
                         const pivotCell = this.getters.getPivotCellFromPosition(position);
                         const formulaPivotId = this.getters.getPivotFormulaId(pivotId);
                         const pivotFormula = createPivotFormula(formulaPivotId, pivotCell);
@@ -9452,7 +9461,10 @@ function proxifyStoreMutation(store, callback) {
                 const functionProxy = new Proxy(value, {
                     // trap the function call
                     apply(target, thisArg, argArray) {
-                        Reflect.apply(target, thisStore, argArray);
+                        const res = Reflect.apply(target, thisStore, argArray);
+                        if (res === "noStateChange") {
+                            return;
+                        }
                         callback();
                     },
                 });
@@ -9474,7 +9486,7 @@ function getDependencyContainer(env) {
 const ModelStore = createAbstractStore("Model");
 
 class RendererStore {
-    mutators = ["register", "unRegister"];
+    mutators = ["register", "unRegister", "drawLayer"];
     renderers = {};
     register(renderer) {
         if (!renderer.renderingLayers.length) {
@@ -9494,14 +9506,14 @@ class RendererStore {
     }
     drawLayer(context, layer) {
         const renderers = this.renderers[layer];
-        if (!renderers) {
-            return;
-        }
-        for (const renderer of renderers) {
-            context.ctx.save();
-            renderer.drawLayer(context, layer);
-            context.ctx.restore();
+        if (renderers) {
+            for (const renderer of renderers) {
+                context.ctx.save();
+                renderer.drawLayer(context, layer);
+                context.ctx.restore();
+            }
         }
+        return "noStateChange";
     }
 }
 
@@ -10114,7 +10126,7 @@ class ComposerStore extends SpreadsheetStore {
             .find((token) => {
             const { xc, sheetName: sheet } = splitReference(token.value);
             const sheetName = sheet || this.getters.getSheetName(this.sheetId);
-            if (this.getters.getSheetName(activeSheetId) !== sheetName) {
+            if (!isSheetNameEqual(this.getters.getSheetName(activeSheetId), sheetName)) {
                 return false;
             }
             const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
@@ -10419,27 +10431,30 @@ class ComposerFocusStore extends SpreadsheetStore {
     }
     focusTopBarComposer(selection) {
         if (this.getters.isReadonly()) {
-            return;
+            return "noStateChange";
         }
         this.topBarFocus = "contentFocus";
         this.gridFocusMode = "inactive";
-        this.setComposerContent({ selection } || {});
+        this.setComposerContent({ selection });
+        return;
     }
     focusGridComposerContent() {
         if (this.getters.isReadonly()) {
-            return;
+            return "noStateChange";
         }
         this.topBarFocus = "inactive";
         this.gridFocusMode = "contentFocus";
         this.setComposerContent({});
+        return;
     }
     focusGridComposerCell(content, selection) {
         if (this.getters.isReadonly()) {
-            return;
+            return "noStateChange";
         }
         this.topBarFocus = "inactive";
         this.gridFocusMode = "cellFocus";
-        this.setComposerContent({ content, selection } || {});
+        this.setComposerContent({ content, selection });
+        return;
     }
     /**
      * Start the edition or update the content if it's already started.
@@ -20324,6 +20339,9 @@ function isEmpty(data) {
     return data === undefined || data.value === null;
 }
 const getNeutral = { number: 0, string: "", boolean: false };
+function areAlmostEqual(value1, value2, epsilon = 2e-16) {
+    return Math.abs(value1 - value2) < epsilon;
+}
 const EQ = {
     description: _t("Equal."),
     args: [
@@ -20345,6 +20363,9 @@ const EQ = {
         if (isEvaluationError(_value2)) {
             throw value2;
         }
+        if (typeof _value1 === "number" && typeof _value2 === "number") {
+            return areAlmostEqual(_value1, _value2);
+        }
         return _value1 === _value2;
     },
 };
@@ -20384,6 +20405,9 @@ const GT = {
     ],
     compute: function (value1, value2) {
         return applyRelationalOperator(value1, value2, (v1, v2) => {
+            if (typeof v1 === "number" && typeof v2 === "number") {
+                return !areAlmostEqual(v1, v2) && v1 > v2;
+            }
             return v1 > v2;
         });
     },
@@ -20399,6 +20423,9 @@ const GTE = {
     ],
     compute: function (value1, value2) {
         return applyRelationalOperator(value1, value2, (v1, v2) => {
+            if (typeof v1 === "number" && typeof v2 === "number") {
+                return areAlmostEqual(v1, v2) || v1 > v2;
+            }
             return v1 >= v2;
         });
     },
@@ -21499,10 +21526,18 @@ autoCompleteProviders.add("functions", {
 });
 
 class DOMFocusableElementStore {
-    mutators = ["setFocusableElement"];
+    mutators = ["setFocusableElement", "focus"];
     focusableElement = undefined;
     setFocusableElement(element) {
         this.focusableElement = element;
+        return "noStateChange";
+    }
+    focus() {
+        if (this.focusableElement === document.activeElement) {
+            return "noStateChange";
+        }
+        this.focusableElement?.focus();
+        return;
     }
 }
 
@@ -21759,12 +21794,20 @@ class HoveredCellStore extends SpreadsheetStore {
         }
     }
     hover(position) {
+        if (position.col === this.col && position.row === this.row) {
+            return "noStateChange";
+        }
         this.col = position.col;
         this.row = position.row;
+        return;
     }
     clear() {
+        if (this.col === undefined && this.row === undefined) {
+            return "noStateChange";
+        }
         this.col = undefined;
         this.row = undefined;
+        return;
     }
 }
 
@@ -21786,7 +21829,11 @@ class CellPopoverStore extends SpreadsheetStore {
         this.persistentPopover = { col, row, sheetId, type };
     }
     close() {
+        if (!this.persistentPopover) {
+            return "noStateChange";
+        }
         this.persistentPopover = undefined;
+        return;
     }
     get persistentCellPopover() {
         return ((this.persistentPopover && { isOpen: true, ...this.persistentPopover }) || { isOpen: false });
@@ -37028,7 +37075,9 @@ function compareDimensionValues(dimension, a, b) {
         return dimension.order === "asc" ? -1 : 1;
     }
     if (dimension.type === "integer" || dimension.type === "date") {
-        return dimension.order === "asc" ? Number(a) - Number(b) : Number(b) - Number(a);
+        return dimension.order === "asc"
+            ? toNumber(a, DEFAULT_LOCALE) - toNumber(b, DEFAULT_LOCALE)
+            : toNumber(b, DEFAULT_LOCALE) - toNumber(a, DEFAULT_LOCALE);
     }
     return dimension.order === "asc" ? a.localeCompare(b) : b.localeCompare(a);
 }
@@ -37462,7 +37511,12 @@ class SpreadsheetPivot {
                     entry[field.name] = { value: null, type: CellValueType.empty };
                 }
                 else {
-                    entry[field.name] = cell;
+                    if (field.type === "char") {
+                        entry[field.name] = { ...cell, value: cell.formattedValue || null };
+                    }
+                    else {
+                        entry[field.name] = cell;
+                    }
                 }
             }
             entry["__count"] = { value: 1, type: CellValueType.number };
@@ -39657,7 +39711,7 @@ class GridComposer extends owl.Component {
             this.isEditing = isEditing;
             if (!isEditing) {
                 this.rect = this.defaultRect;
-                this.DOMFocusableElementStore.focusableElement?.focus();
+                this.DOMFocusableElementStore.focus();
                 return;
             }
             const position = this.env.model.getters.getActivePosition();
@@ -42093,10 +42147,6 @@ function useGridDrawing(refName, model, canvasSize) {
         ctx.scale(dpr, dpr);
         for (const layer of OrderedLayers()) {
             model.drawLayer(renderingContext, layer);
-            // @ts-ignore 'drawLayer' is not declated as a mutator because:
-            // it does not mutate anything. Most importantly it's used
-            // during rendering. Invoking a mutator during rendering would
-            // trigger another rendering, ultimately resulting in an infinite loop.
             rendererStore.drawLayer(renderingContext, layer);
         }
     }
@@ -42719,7 +42769,7 @@ class Grid extends owl.Component {
         this.cellPopovers = useStore(CellPopoverStore);
         owl.useEffect(() => {
             if (!this.sidePanel.isOpen) {
-                this.DOMFocusableElementStore.focusableElement?.focus();
+                this.DOMFocusableElementStore.focus();
             }
         }, () => [this.sidePanel.isOpen]);
     }
@@ -42923,7 +42973,7 @@ class Grid extends owl.Component {
     focusDefaultElement() {
         if (!this.env.model.getters.getSelectedFigureId() &&
             this.composerStore.editionMode === "inactive") {
-            this.DOMFocusableElementStore.focusableElement?.focus();
+            this.DOMFocusableElementStore.focus();
         }
     }
     get gridEl() {
@@ -44660,7 +44710,7 @@ function getRangeSize(reference, defaultSheetIndex, data) {
     ({ xc, sheetName } = splitReference(reference));
     let rangeSheetIndex;
     if (sheetName) {
-        const index = data.sheets.findIndex((sheet) => sheet.name === sheetName);
+        const index = data.sheets.findIndex((sheet) => isSheetNameEqual(sheet.name, sheetName));
         if (index < 0) {
             throw new Error("Unable to find a sheet with the name " + sheetName);
         }
@@ -44881,7 +44931,7 @@ function convertFormula(formula, data) {
     formula = formula.replace(externalReferenceRegex, (match, externalRefId, sheetName, cellRef) => {
         externalRefId = Number(externalRefId) - 1;
         cellRef = cellRef.replace(/\$/g, "");
-        const sheetIndex = data.externalBooks[externalRefId].sheetNames.findIndex((name) => name === sheetName);
+        const sheetIndex = data.externalBooks[externalRefId].sheetNames.findIndex((name) => isSheetNameEqual(name, sheetName));
         if (sheetIndex === -1) {
             return match;
         }
@@ -45210,7 +45260,7 @@ function convertPivotTableConfig(pivotTable) {
  */
 function convertTableFormulaReferences(convertedSheets, xlsxSheets) {
     for (let tableSheet of convertedSheets) {
-        const tables = xlsxSheets.find((s) => s.sheetName === tableSheet.name).tables;
+        const tables = xlsxSheets.find((s) => isSheetNameEqual(s.sheetName, tableSheet.name)).tables;
         for (let table of tables) {
             const tabRef = table.name + "[";
             for (let sheet of convertedSheets) {
@@ -50887,7 +50937,7 @@ class RangeAdapter {
                     if (range.sheetId === cmd.sheetId) {
                         return { changeType: "CHANGE", range };
                     }
-                    if (cmd.name && range.invalidSheetName === cmd.name) {
+                    if (isSheetNameEqual(range.invalidSheetName, cmd.name)) {
                         const invalidSheetName = undefined;
                         const sheetId = cmd.sheetId;
                         const newRange = range.clone({ sheetId, invalidSheetName });
@@ -51458,7 +51508,7 @@ class SheetPlugin extends CorePlugin {
         if (name) {
             const unquotedName = getUnquotedSheetName(name);
             for (const key in this.sheetIdsMapName) {
-                if (key.toUpperCase() === unquotedName.toUpperCase()) {
+                if (isSheetNameEqual(key, unquotedName)) {
                     return this.sheetIdsMapName[key];
                 }
             }
@@ -51706,7 +51756,7 @@ class SheetPlugin extends CorePlugin {
         }
         const { orderedSheetIds, sheets } = this;
         const name = cmd.name && cmd.name.trim().toLowerCase();
-        if (orderedSheetIds.find((id) => sheets[id]?.name.toLowerCase() === name && id !== cmd.sheetId)) {
+        if (orderedSheetIds.find((id) => isSheetNameEqual(sheets[id]?.name, name) && id !== cmd.sheetId)) {
             return "DuplicatedSheetName" /* CommandResult.DuplicatedSheetName */;
         }
         if (FORBIDDEN_SHEETNAME_CHARS_IN_EXCEL_REGEX.test(name)) {
@@ -63038,11 +63088,11 @@ class BottomBarSheet extends owl.Component {
         if (ev.key === "Enter") {
             ev.preventDefault();
             this.stopEdition();
-            this.DOMFocusableElementStore.focusableElement?.focus();
+            this.DOMFocusableElementStore.focus();
         }
         if (ev.key === "Escape") {
             this.cancelEdition();
-            this.DOMFocusableElementStore.focusableElement?.focus();
+            this.DOMFocusableElementStore.focus();
         }
     }
     onMouseEventSheetName(ev) {
@@ -69515,6 +69565,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.4.34";
-__info__.date = "2025-05-12T05:23:37.387Z";
-__info__.hash = "e3ac48a";
+__info__.version = "17.4.36";
+__info__.date = "2025-05-20T05:54:11.995Z";
+__info__.hash = "fabd931";

package/dist/o-spreadsheet.d.ts

@@ -7553,7 +7553,7 @@ declare class CellPopoverStore extends SpreadsheetStore {
     };
     handle(cmd: Command): void;
     open({ col, row }: Position$1, type: CellPopoverType): void;
-    close(): void;
+    close(): "noStateChange" | undefined;
     get persistentCellPopover(): OpenCellPopover | ClosedCellPopover;
     get isOpen(): boolean;
     get cellPopover(): ClosedCellPopover | PositionedCellPopoverComponent;
@@ -7711,9 +7711,9 @@ declare class ComposerFocusStore extends SpreadsheetStore {
     private gridFocusMode;
     get topBarComposerFocus(): Omit<ComposerFocusType, "cellFocus">;
     get gridComposerFocus(): ComposerFocusType;
-    focusTopBarComposer(selection: ComposerSelection): void;
-    focusGridComposerContent(): void;
-    focusGridComposerCell(content?: string, selection?: ComposerSelection): void;
+    focusTopBarComposer(selection: ComposerSelection): "noStateChange" | undefined;
+    focusGridComposerContent(): "noStateChange" | undefined;
+    focusGridComposerCell(content?: string, selection?: ComposerSelection): "noStateChange" | undefined;
     /**
      * Start the edition or update the content if it's already started.
      */
@@ -8902,8 +8902,8 @@ declare class HoveredCellStore extends SpreadsheetStore {
     col: number | undefined;
     row: number | undefined;
     handle(cmd: Command): void;
-    hover(position: Position$1): void;
-    clear(): void;
+    hover(position: Position$1): "noStateChange" | undefined;
+    clear(): "noStateChange" | undefined;
 }
 
 /**
@@ -9614,11 +9614,11 @@ interface Renderer {
     renderingLayers: Readonly<LayerName[]>;
 }
 declare class RendererStore {
-    mutators: readonly ["register", "unRegister"];
+    mutators: readonly ["register", "unRegister", "drawLayer"];
     private renderers;
     register(renderer: Renderer): void;
     unRegister(renderer: Renderer): void;
-    drawLayer(context: GridRenderingContext, layer: LayerName): void;
+    drawLayer(context: GridRenderingContext, layer: LayerName): string;
 }
 
 interface RippleProps {