@odoo/o-spreadsheet 17.0.52 → 17.0.54

package/dist/o-spreadsheet.iife.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.52
- * @date 2025-03-07T10:30:04.783Z
- * @hash c19cd9a
+ * @version 17.0.54
+ * @date 2025-03-19T08:14:16.001Z
+ * @hash 945b375
  */
 
 (function (exports, owl) {
@@ -4493,11 +4493,13 @@
       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 = {};
@@ -7768,7 +7770,7 @@
    */
   function canonicalizeNumberContent(content, locale) {
       return content.startsWith("=")
-          ? canonicalizeFormula$1(content, locale)
+          ? canonicalizeFormula(content, locale)
           : canonicalizeNumberLiteral(content, locale);
   }
   /**
@@ -7783,7 +7785,7 @@
    */
   function canonicalizeContent(content, locale) {
       return content.startsWith("=")
-          ? canonicalizeFormula$1(content, locale)
+          ? canonicalizeFormula(content, locale)
           : canonicalizeLiteral(content, locale);
   }
   /**
@@ -7799,15 +7801,21 @@
           ? 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;
@@ -24291,6 +24299,7 @@
           columns: {},
       });
       setup() {
+          this.updateColumns();
           owl.onWillUpdateProps(() => this.updateColumns());
       }
       toggleHasHeader() {
@@ -45469,12 +45478,7 @@
                       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);
@@ -45531,7 +45535,7 @@
        * 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) {
@@ -45539,6 +45543,9 @@
               if (!merge) {
                   return;
               }
+              if (operation === "CUT") {
+                  this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+              }
               ({ sheetId, col, row } = target);
               this.dispatch("ADD_MERGE", {
                   sheetId,
@@ -47830,12 +47837,7 @@
                   }
                   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;
           }
       }
@@ -47933,6 +47935,48 @@
           }
           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 = [
@@ -48582,37 +48626,6 @@
       }
   }
 
-  /** 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;
@@ -49189,8 +49202,8 @@
                   this.colorIndexByRange = {};
                   break;
               case "CANCEL_EDITION":
-                  this.cancelEditionAndActivateSheet();
                   this.resetContent();
+                  this.cancelEditionAndActivateSheet();
                   this.colorIndexByRange = {};
                   break;
               case "SET_CURRENT_CONTENT":
@@ -49201,8 +49214,8 @@
                   this.replaceSelection(cmd.text);
                   break;
               case "SELECT_FIGURE":
-                  this.cancelEditionAndActivateSheet();
                   this.resetContent();
+                  this.cancelEditionAndActivateSheet();
                   break;
               case "ADD_COLUMNS_ROWS":
                   this.onAddElements(cmd);
@@ -49245,8 +49258,8 @@
                   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;
@@ -56834,7 +56847,7 @@
           }
           if (alignAttrs.length > 0) {
               attributes.push(["applyAlignment", "1"]); // for Libre Office
-              styleNodes.push(escapeXml /*xml*/ `<xf ${formatAttributes(attributes)}>${escapeXml /*xml*/ `<alignment ${formatAttributes(alignAttrs)} />`}</xf> `);
+              styleNodes.push(escapeXml /*xml*/ `<xf ${formatAttributes(attributes)}><alignment ${formatAttributes(alignAttrs)} /></xf> `);
           }
           else {
               styleNodes.push(escapeXml /*xml*/ `<xf ${formatAttributes(attributes)} />`);
@@ -58068,9 +58081,9 @@
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.0.52";
-  __info__.date = "2025-03-07T10:30:04.783Z";
-  __info__.hash = "c19cd9a";
+  __info__.version = "17.0.54";
+  __info__.date = "2025-03-19T08:14:16.001Z";
+  __info__.hash = "945b375";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);