@odoo/o-spreadsheet 17.0.53 → 17.0.54

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.0.53
- * @date 2025-03-12T15:26:58.496Z
- * @hash 47dfd62
+ * @version 17.0.54
+ * @date 2025-03-19T08:14:16.001Z
+ * @hash 945b375
  */
 
 'use strict';
@@ -4494,11 +4494,13 @@ function getDefaultCellHeight(ctx, cell, colSize) {
     if (!cell || (!cell.isFormula && !cell.content)) {
         return DEFAULT_CELL_HEIGHT;
     }
-    const maxWidth = cell.style?.wrapping === "wrap" ? colSize - 2 * MIN_CELL_TEXT_MARGIN : undefined;
-    const numberOfLines = cell.isFormula
-        ? 1
-        : splitTextToWidth(ctx, cell.content, cell.style, maxWidth).length;
-    const fontSize = computeTextFontSizeInPixels(cell.style);
+    const content = cell.isFormula ? "" : cell.content;
+    return getCellContentHeight(ctx, content, cell.style, colSize);
+}
+function getCellContentHeight(ctx, content, style, colSize) {
+    const maxWidth = style?.wrapping === "wrap" ? colSize - 2 * MIN_CELL_TEXT_MARGIN : undefined;
+    const numberOfLines = splitTextToWidth(ctx, content, style, maxWidth).length;
+    const fontSize = computeTextFontSizeInPixels(style);
     return computeTextLinesHeight(fontSize, numberOfLines) + 2 * PADDING_AUTORESIZE_VERTICAL;
 }
 const textWidthCache = {};
@@ -7769,7 +7771,7 @@ function isValidLocale(locale) {
  */
 function canonicalizeNumberContent(content, locale) {
     return content.startsWith("=")
-        ? canonicalizeFormula$1(content, locale)
+        ? canonicalizeFormula(content, locale)
         : canonicalizeNumberLiteral(content, locale);
 }
 /**
@@ -7784,7 +7786,7 @@ function canonicalizeNumberContent(content, locale) {
  */
 function canonicalizeContent(content, locale) {
     return content.startsWith("=")
-        ? canonicalizeFormula$1(content, locale)
+        ? canonicalizeFormula(content, locale)
         : canonicalizeLiteral(content, locale);
 }
 /**
@@ -7800,15 +7802,21 @@ function localizeContent(content, locale) {
         ? localizeFormula(content, locale)
         : localizeLiteral(content, locale);
 }
+/** Change a number string to its canonical form (en_US locale) */
+function canonicalizeNumberValue(content, locale) {
+    return content.startsWith("=")
+        ? canonicalizeFormula(content, locale)
+        : canonicalizeNumberLiteral(content, locale);
+}
 /** Change a formula to its canonical form (en_US locale) */
-function canonicalizeFormula$1(formula, locale) {
-    return _localizeFormula$1(formula, locale, DEFAULT_LOCALE);
+function canonicalizeFormula(formula, locale) {
+    return _localizeFormula(formula, locale, DEFAULT_LOCALE);
 }
 /** Change a formula from the canonical form to the given locale */
 function localizeFormula(formula, locale) {
-    return _localizeFormula$1(formula, DEFAULT_LOCALE, locale);
+    return _localizeFormula(formula, DEFAULT_LOCALE, locale);
 }
-function _localizeFormula$1(formula, fromLocale, toLocale) {
+function _localizeFormula(formula, fromLocale, toLocale) {
     if (fromLocale.formulaArgSeparator === toLocale.formulaArgSeparator &&
         fromLocale.decimalSeparator === toLocale.decimalSeparator) {
         return formula;
@@ -24292,6 +24300,7 @@ class RemoveDuplicatesPanel extends owl.Component {
         columns: {},
     });
     setup() {
+        this.updateColumns();
         owl.onWillUpdateProps(() => this.updateColumns());
     }
     toggleHasHeader() {
@@ -45470,12 +45479,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
                     continue;
                 }
                 const position = { col: col + c, row: row + r, sheetId: sheetId };
-                // TODO: refactor this part. the "Paste merge" action is also executed with
-                // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
-                // is not appropriate
-                if (this.operation !== "CUT") {
-                    this.pasteMergeIfExist(origin.position, position);
-                }
+                this.pasteMergeIfExist(origin.position, position, this.operation);
                 this.pasteCell(origin, position, this.operation, clipboardOptions);
                 if (shouldPasteCF) {
                     this.pasteCf(origin.position, position);
@@ -45532,7 +45536,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
      * If the origin position given is the top left of a merge, merge the target
      * position.
      */
-    pasteMergeIfExist(origin, target) {
+    pasteMergeIfExist(origin, target, operation) {
         let { sheetId, col, row } = origin;
         const { col: mainCellColOrigin, row: mainCellRowOrigin } = this.getters.getMainCellPosition(origin);
         if (mainCellColOrigin === col && mainCellRowOrigin === row) {
@@ -45540,6 +45544,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             if (!merge) {
                 return;
             }
+            if (operation === "CUT") {
+                this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+            }
             ({ sheetId, col, row } = target);
             this.dispatch("ADD_MERGE", {
                 sheetId,
@@ -47831,12 +47838,7 @@ class SheetUIPlugin extends UIPlugin {
                 }
                 break;
             case "AUTORESIZE_ROWS":
-                this.dispatch("RESIZE_COLUMNS_ROWS", {
-                    elements: cmd.rows,
-                    dimension: "ROW",
-                    size: null,
-                    sheetId: cmd.sheetId,
-                });
+                this.autoResizeRows(cmd.sheetId, cmd.rows);
                 break;
         }
     }
@@ -47934,6 +47936,48 @@ class SheetUIPlugin extends UIPlugin {
         }
         return "Success" /* CommandResult.Success */;
     }
+    autoResizeRows(sheetId, rows) {
+        const rowSizes = [];
+        for (const row of rows) {
+            let evaluatedRowSize = 0;
+            for (const cellId of this.getters.getRowCells(sheetId, row)) {
+                const cell = this.getters.getCellById(cellId);
+                if (!cell) {
+                    continue;
+                }
+                const position = this.getters.getCellPosition(cell.id);
+                const colSize = this.getters.getColSize(sheetId, position.col);
+                if (cell.isFormula) {
+                    const content = this.getters.getEvaluatedCell(position).formattedValue;
+                    const evaluatedSize = getCellContentHeight(this.ctx, content, cell?.style, colSize);
+                    if (evaluatedSize > evaluatedRowSize && evaluatedSize > DEFAULT_CELL_HEIGHT) {
+                        evaluatedRowSize = evaluatedSize;
+                    }
+                }
+                else {
+                    const content = cell.content;
+                    const dynamicRowSize = getCellContentHeight(this.ctx, content, cell?.style, colSize);
+                    // Only keep the size of evaluated cells if it's bigger than the dynamic row size
+                    if (dynamicRowSize >= evaluatedRowSize && dynamicRowSize > DEFAULT_CELL_HEIGHT) {
+                        evaluatedRowSize = 0;
+                    }
+                }
+            }
+            rowSizes.push(evaluatedRowSize || null);
+        }
+        const groupedSizes = new Map(rowSizes.map((size) => [size, []]));
+        for (let i = 0; i < rowSizes.length; i++) {
+            groupedSizes.get(rowSizes[i])?.push(rows[i]);
+        }
+        for (const [size, rows] of groupedSizes) {
+            this.dispatch("RESIZE_COLUMNS_ROWS", {
+                elements: rows,
+                dimension: "ROW",
+                size,
+                sheetId,
+            });
+        }
+    }
 }
 
 const genericRepeatsTransforms = [
@@ -48583,37 +48627,6 @@ class ClipboardFigureImage {
     }
 }
 
-/** Change a number string to its canonical form (en_US locale) */
-function canonicalizeNumberValue(content, locale) {
-    return content.startsWith("=")
-        ? canonicalizeFormula(content, locale)
-        : canonicalizeNumberLiteral(content, locale);
-}
-/** Change a formula to its canonical form (en_US locale) */
-function canonicalizeFormula(formula, locale) {
-    return _localizeFormula(formula, locale, DEFAULT_LOCALE);
-}
-function _localizeFormula(formula, fromLocale, toLocale) {
-    if (fromLocale.formulaArgSeparator === toLocale.formulaArgSeparator &&
-        fromLocale.decimalSeparator === toLocale.decimalSeparator) {
-        return formula;
-    }
-    const tokens = tokenize(formula, fromLocale);
-    let localizedFormula = "";
-    for (const token of tokens) {
-        if (token.type === "NUMBER") {
-            localizedFormula += token.value.replace(fromLocale.decimalSeparator, toLocale.decimalSeparator);
-        }
-        else if (token.type === "ARG_SEPARATOR") {
-            localizedFormula += toLocale.formulaArgSeparator;
-        }
-        else {
-            localizedFormula += token.value;
-        }
-    }
-    return localizedFormula;
-}
-
 /** State of the clipboard when copying/cutting from the OS clipboard*/
 class ClipboardOsState extends ClipboardCellsAbstractState {
     values;
@@ -49190,8 +49203,8 @@ class EditionPlugin extends UIPlugin {
                 this.colorIndexByRange = {};
                 break;
             case "CANCEL_EDITION":
-                this.cancelEditionAndActivateSheet();
                 this.resetContent();
+                this.cancelEditionAndActivateSheet();
                 this.colorIndexByRange = {};
                 break;
             case "SET_CURRENT_CONTENT":
@@ -49202,8 +49215,8 @@ class EditionPlugin extends UIPlugin {
                 this.replaceSelection(cmd.text);
                 break;
             case "SELECT_FIGURE":
-                this.cancelEditionAndActivateSheet();
                 this.resetContent();
+                this.cancelEditionAndActivateSheet();
                 break;
             case "ADD_COLUMNS_ROWS":
                 this.onAddElements(cmd);
@@ -49246,8 +49259,8 @@ class EditionPlugin extends UIPlugin {
                 const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                 if (!sheetIdExists && this.mode !== "inactive") {
                     this.sheetId = this.getters.getActiveSheetId();
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                     this.ui.raiseBlockingErrorUI(CELL_DELETED_MESSAGE);
                 }
                 break;
@@ -58069,6 +58082,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.53";
-__info__.date = "2025-03-12T15:26:58.496Z";
-__info__.hash = "47dfd62";
+__info__.version = "17.0.54";
+__info__.date = "2025-03-19T08:14:16.001Z";
+__info__.hash = "945b375";

package/dist/o-spreadsheet.d.ts

@@ -4869,6 +4869,7 @@ declare class SheetUIPlugin extends UIPlugin {
      * not outside the sheet.
      */
     private checkZonesAreInSheet;
+    private autoResizeRows;
 }
 
 /**

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 17.0.53
- * @date 2025-03-12T15:26:58.496Z
- * @hash 47dfd62
+ * @version 17.0.54
+ * @date 2025-03-19T08:14:16.001Z
+ * @hash 945b375
  */
 
 import { Component, useRef, onMounted, useEffect, onWillPatch, useState, onWillUpdateProps, onPatched, useComponent, useExternalListener, onWillUnmount, onWillStart, xml, useChildSubEnv, useSubEnv, markRaw } from '@odoo/owl';
@@ -4492,11 +4492,13 @@ function getDefaultCellHeight(ctx, cell, colSize) {
     if (!cell || (!cell.isFormula && !cell.content)) {
         return DEFAULT_CELL_HEIGHT;
     }
-    const maxWidth = cell.style?.wrapping === "wrap" ? colSize - 2 * MIN_CELL_TEXT_MARGIN : undefined;
-    const numberOfLines = cell.isFormula
-        ? 1
-        : splitTextToWidth(ctx, cell.content, cell.style, maxWidth).length;
-    const fontSize = computeTextFontSizeInPixels(cell.style);
+    const content = cell.isFormula ? "" : cell.content;
+    return getCellContentHeight(ctx, content, cell.style, colSize);
+}
+function getCellContentHeight(ctx, content, style, colSize) {
+    const maxWidth = style?.wrapping === "wrap" ? colSize - 2 * MIN_CELL_TEXT_MARGIN : undefined;
+    const numberOfLines = splitTextToWidth(ctx, content, style, maxWidth).length;
+    const fontSize = computeTextFontSizeInPixels(style);
     return computeTextLinesHeight(fontSize, numberOfLines) + 2 * PADDING_AUTORESIZE_VERTICAL;
 }
 const textWidthCache = {};
@@ -7767,7 +7769,7 @@ function isValidLocale(locale) {
  */
 function canonicalizeNumberContent(content, locale) {
     return content.startsWith("=")
-        ? canonicalizeFormula$1(content, locale)
+        ? canonicalizeFormula(content, locale)
         : canonicalizeNumberLiteral(content, locale);
 }
 /**
@@ -7782,7 +7784,7 @@ function canonicalizeNumberContent(content, locale) {
  */
 function canonicalizeContent(content, locale) {
     return content.startsWith("=")
-        ? canonicalizeFormula$1(content, locale)
+        ? canonicalizeFormula(content, locale)
         : canonicalizeLiteral(content, locale);
 }
 /**
@@ -7798,15 +7800,21 @@ function localizeContent(content, locale) {
         ? localizeFormula(content, locale)
         : localizeLiteral(content, locale);
 }
+/** Change a number string to its canonical form (en_US locale) */
+function canonicalizeNumberValue(content, locale) {
+    return content.startsWith("=")
+        ? canonicalizeFormula(content, locale)
+        : canonicalizeNumberLiteral(content, locale);
+}
 /** Change a formula to its canonical form (en_US locale) */
-function canonicalizeFormula$1(formula, locale) {
-    return _localizeFormula$1(formula, locale, DEFAULT_LOCALE);
+function canonicalizeFormula(formula, locale) {
+    return _localizeFormula(formula, locale, DEFAULT_LOCALE);
 }
 /** Change a formula from the canonical form to the given locale */
 function localizeFormula(formula, locale) {
-    return _localizeFormula$1(formula, DEFAULT_LOCALE, locale);
+    return _localizeFormula(formula, DEFAULT_LOCALE, locale);
 }
-function _localizeFormula$1(formula, fromLocale, toLocale) {
+function _localizeFormula(formula, fromLocale, toLocale) {
     if (fromLocale.formulaArgSeparator === toLocale.formulaArgSeparator &&
         fromLocale.decimalSeparator === toLocale.decimalSeparator) {
         return formula;
@@ -24290,6 +24298,7 @@ class RemoveDuplicatesPanel extends Component {
         columns: {},
     });
     setup() {
+        this.updateColumns();
         onWillUpdateProps(() => this.updateColumns());
     }
     toggleHasHeader() {
@@ -45468,12 +45477,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
                     continue;
                 }
                 const position = { col: col + c, row: row + r, sheetId: sheetId };
-                // TODO: refactor this part. the "Paste merge" action is also executed with
-                // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
-                // is not appropriate
-                if (this.operation !== "CUT") {
-                    this.pasteMergeIfExist(origin.position, position);
-                }
+                this.pasteMergeIfExist(origin.position, position, this.operation);
                 this.pasteCell(origin, position, this.operation, clipboardOptions);
                 if (shouldPasteCF) {
                     this.pasteCf(origin.position, position);
@@ -45530,7 +45534,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
      * If the origin position given is the top left of a merge, merge the target
      * position.
      */
-    pasteMergeIfExist(origin, target) {
+    pasteMergeIfExist(origin, target, operation) {
         let { sheetId, col, row } = origin;
         const { col: mainCellColOrigin, row: mainCellRowOrigin } = this.getters.getMainCellPosition(origin);
         if (mainCellColOrigin === col && mainCellRowOrigin === row) {
@@ -45538,6 +45542,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             if (!merge) {
                 return;
             }
+            if (operation === "CUT") {
+                this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+            }
             ({ sheetId, col, row } = target);
             this.dispatch("ADD_MERGE", {
                 sheetId,
@@ -47829,12 +47836,7 @@ class SheetUIPlugin extends UIPlugin {
                 }
                 break;
             case "AUTORESIZE_ROWS":
-                this.dispatch("RESIZE_COLUMNS_ROWS", {
-                    elements: cmd.rows,
-                    dimension: "ROW",
-                    size: null,
-                    sheetId: cmd.sheetId,
-                });
+                this.autoResizeRows(cmd.sheetId, cmd.rows);
                 break;
         }
     }
@@ -47932,6 +47934,48 @@ class SheetUIPlugin extends UIPlugin {
         }
         return "Success" /* CommandResult.Success */;
     }
+    autoResizeRows(sheetId, rows) {
+        const rowSizes = [];
+        for (const row of rows) {
+            let evaluatedRowSize = 0;
+            for (const cellId of this.getters.getRowCells(sheetId, row)) {
+                const cell = this.getters.getCellById(cellId);
+                if (!cell) {
+                    continue;
+                }
+                const position = this.getters.getCellPosition(cell.id);
+                const colSize = this.getters.getColSize(sheetId, position.col);
+                if (cell.isFormula) {
+                    const content = this.getters.getEvaluatedCell(position).formattedValue;
+                    const evaluatedSize = getCellContentHeight(this.ctx, content, cell?.style, colSize);
+                    if (evaluatedSize > evaluatedRowSize && evaluatedSize > DEFAULT_CELL_HEIGHT) {
+                        evaluatedRowSize = evaluatedSize;
+                    }
+                }
+                else {
+                    const content = cell.content;
+                    const dynamicRowSize = getCellContentHeight(this.ctx, content, cell?.style, colSize);
+                    // Only keep the size of evaluated cells if it's bigger than the dynamic row size
+                    if (dynamicRowSize >= evaluatedRowSize && dynamicRowSize > DEFAULT_CELL_HEIGHT) {
+                        evaluatedRowSize = 0;
+                    }
+                }
+            }
+            rowSizes.push(evaluatedRowSize || null);
+        }
+        const groupedSizes = new Map(rowSizes.map((size) => [size, []]));
+        for (let i = 0; i < rowSizes.length; i++) {
+            groupedSizes.get(rowSizes[i])?.push(rows[i]);
+        }
+        for (const [size, rows] of groupedSizes) {
+            this.dispatch("RESIZE_COLUMNS_ROWS", {
+                elements: rows,
+                dimension: "ROW",
+                size,
+                sheetId,
+            });
+        }
+    }
 }
 
 const genericRepeatsTransforms = [
@@ -48581,37 +48625,6 @@ class ClipboardFigureImage {
     }
 }
 
-/** Change a number string to its canonical form (en_US locale) */
-function canonicalizeNumberValue(content, locale) {
-    return content.startsWith("=")
-        ? canonicalizeFormula(content, locale)
-        : canonicalizeNumberLiteral(content, locale);
-}
-/** Change a formula to its canonical form (en_US locale) */
-function canonicalizeFormula(formula, locale) {
-    return _localizeFormula(formula, locale, DEFAULT_LOCALE);
-}
-function _localizeFormula(formula, fromLocale, toLocale) {
-    if (fromLocale.formulaArgSeparator === toLocale.formulaArgSeparator &&
-        fromLocale.decimalSeparator === toLocale.decimalSeparator) {
-        return formula;
-    }
-    const tokens = tokenize(formula, fromLocale);
-    let localizedFormula = "";
-    for (const token of tokens) {
-        if (token.type === "NUMBER") {
-            localizedFormula += token.value.replace(fromLocale.decimalSeparator, toLocale.decimalSeparator);
-        }
-        else if (token.type === "ARG_SEPARATOR") {
-            localizedFormula += toLocale.formulaArgSeparator;
-        }
-        else {
-            localizedFormula += token.value;
-        }
-    }
-    return localizedFormula;
-}
-
 /** State of the clipboard when copying/cutting from the OS clipboard*/
 class ClipboardOsState extends ClipboardCellsAbstractState {
     values;
@@ -49188,8 +49201,8 @@ class EditionPlugin extends UIPlugin {
                 this.colorIndexByRange = {};
                 break;
             case "CANCEL_EDITION":
-                this.cancelEditionAndActivateSheet();
                 this.resetContent();
+                this.cancelEditionAndActivateSheet();
                 this.colorIndexByRange = {};
                 break;
             case "SET_CURRENT_CONTENT":
@@ -49200,8 +49213,8 @@ class EditionPlugin extends UIPlugin {
                 this.replaceSelection(cmd.text);
                 break;
             case "SELECT_FIGURE":
-                this.cancelEditionAndActivateSheet();
                 this.resetContent();
+                this.cancelEditionAndActivateSheet();
                 break;
             case "ADD_COLUMNS_ROWS":
                 this.onAddElements(cmd);
@@ -49244,8 +49257,8 @@ class EditionPlugin extends UIPlugin {
                 const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                 if (!sheetIdExists && this.mode !== "inactive") {
                     this.sheetId = this.getters.getActiveSheetId();
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                     this.ui.raiseBlockingErrorUI(CELL_DELETED_MESSAGE);
                 }
                 break;
@@ -58032,6 +58045,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = "17.0.53";
-__info__.date = "2025-03-12T15:26:58.496Z";
-__info__.hash = "47dfd62";
+__info__.version = "17.0.54";
+__info__.date = "2025-03-19T08:14:16.001Z";
+__info__.hash = "945b375";