@odoo/o-spreadsheet 18.0.19 → 18.0.21

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.19
- * @date 2025-03-12T15:33:28.300Z
- * @hash d8dea1b
+ * @version 18.0.21
+ * @date 2025-03-26T12:49:46.872Z
+ * @hash c687e1c
  */
 
 'use strict';
@@ -1113,7 +1113,10 @@ function rgbaStringToHex(color) {
     }
     else if (stringVals.length === 4) {
         const alpha = parseFloat(stringVals.pop() || "1");
-        alphaHex = Math.round((alpha || 1) * 255);
+        if (isNaN(alpha)) {
+            throw new Error("invalid alpha value");
+        }
+        alphaHex = Math.round(alpha * 255);
     }
     const vals = stringVals.map((val) => parseInt(val, 10));
     if (alphaHex !== 255) {
@@ -6109,11 +6112,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;
 }
 function getDefaultContextFont(fontSize, bold = false, italic = false) {
@@ -6835,7 +6840,7 @@ function isValidLocale(locale) {
  */
 function canonicalizeNumberContent(content, locale) {
     return content.startsWith("=")
-        ? canonicalizeFormula$1(content, locale)
+        ? canonicalizeFormula(content, locale)
         : canonicalizeNumberLiteral(content, locale);
 }
 /**
@@ -6850,7 +6855,7 @@ function canonicalizeNumberContent(content, locale) {
  */
 function canonicalizeContent(content, locale) {
     return content.startsWith("=")
-        ? canonicalizeFormula$1(content, locale)
+        ? canonicalizeFormula(content, locale)
         : canonicalizeLiteral(content, locale);
 }
 /**
@@ -6866,15 +6871,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;
@@ -7030,37 +7041,6 @@ function getDateTimeFormat(locale) {
     return locale.dateFormat + " " + locale.timeFormat;
 }
 
-/** 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;
-}
-
 function boolAnd(args) {
     let foundBoolean = false;
     let acc = true;
@@ -8276,13 +8256,6 @@ class CellClipboardHandler extends AbstractCellClipboardHandler {
         this.clearClippedZones(content);
         const selection = target[0];
         this.pasteZone(sheetId, selection.left, selection.top, content.cells, options);
-        this.dispatch("MOVE_RANGES", {
-            target: content.zones,
-            sheetId: content.sheetId,
-            targetSheetId: sheetId,
-            col: selection.left,
-            row: selection.top,
-        });
     }
     /**
      * Clear the clipped zones: remove the cells and clear the formatting
@@ -8791,14 +8764,15 @@ class MergeClipboardHandler extends AbstractCellClipboardHandler {
             }
             merges.push(mergesInRow);
         }
-        return { merges };
+        return { merges, sheetId };
     }
     /**
      * Paste the clipboard content in the given target
      */
     paste(target, content, options) {
         if (options.isCutOperation) {
-            return;
+            const copiedMerges = content.merges.flat().filter(isDefined);
+            this.dispatch("REMOVE_MERGE", { sheetId: content.sheetId, target: copiedMerges });
         }
         this.pasteFromCopy(target.sheetId, target.zones, content.merges, options);
     }
@@ -8833,6 +8807,27 @@ class MergeClipboardHandler extends AbstractCellClipboardHandler {
     }
 }
 
+class ReferenceClipboardHandler extends AbstractCellClipboardHandler {
+    copy(data) {
+        return {
+            zones: data.clippedZones,
+            sheetId: data.sheetId,
+        };
+    }
+    paste(target, content, options) {
+        if (options.isCutOperation) {
+            const selection = target.zones[0];
+            this.dispatch("MOVE_RANGES", {
+                target: content.zones,
+                sheetId: content.sheetId,
+                targetSheetId: target.sheetId,
+                col: selection.left,
+                row: selection.top,
+            });
+        }
+    }
+}
+
 class SheetClipboardHandler extends AbstractCellClipboardHandler {
     isPasteAllowed(sheetId, target, content, options) {
         if (!("cells" in content)) {
@@ -9000,7 +8995,8 @@ clipboardHandlersRegistries.cellHandlers
     .add("merge", MergeClipboardHandler)
     .add("border", BorderClipboardHandler)
     .add("table", TableClipboardHandler)
-    .add("conditionalFormat", ConditionalFormatClipboardHandler);
+    .add("conditionalFormat", ConditionalFormatClipboardHandler)
+    .add("references", ReferenceClipboardHandler);
 
 function transformZone(zone, executed) {
     if (executed.type === "REMOVE_COLUMNS_ROWS") {
@@ -10055,9 +10051,9 @@ const XLSX_CHART_TYPES = [
 /** In XLSX color format (no #)  */
 const AUTO_COLOR = "000000";
 const XLSX_ICONSET_MAP = {
-    arrow: "3Arrows",
+    arrows: "3Arrows",
     smiley: "3Symbols",
-    dot: "3TrafficLights1",
+    dots: "3TrafficLights1",
 };
 const NAMESPACE = {
     styleSheet: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
@@ -10729,6 +10725,7 @@ const ICON_SET_CONVERSION_MAP = {
 };
 /** Map between legend position in XLSX file and human readable position  */
 const DRAWING_LEGEND_POSITION_CONVERSION_MAP = {
+    none: "none",
     b: "bottom",
     t: "top",
     l: "left",
@@ -13485,7 +13482,7 @@ class XlsxChartExtractor extends XlsxBaseExtractor {
                     default: "ffffff",
                 }).asString(),
                 legendPosition: DRAWING_LEGEND_POSITION_CONVERSION_MAP[this.extractChildAttr(rootChartElement, "c:legendPos", "val", {
-                    default: "b",
+                    default: "none",
                 }).asString()],
                 stacked: barChartGrouping === "stacked",
                 fontColor: "000000",
@@ -13519,7 +13516,7 @@ class XlsxChartExtractor extends XlsxBaseExtractor {
                 default: "ffffff",
             }).asString(),
             legendPosition: DRAWING_LEGEND_POSITION_CONVERSION_MAP[this.extractChildAttr(chartElement, "c:legendPos", "val", {
-                default: "b",
+                default: "none",
             }).asString()],
             stacked: barChartGrouping === "stacked",
             fontColor: "000000",
@@ -16711,7 +16708,8 @@ function getChartLabelValues(getters, dataSets, labelRange) {
         }
     }
     else if (dataSets.length === 1) {
-        for (let i = 0; i < getData(getters, dataSets[0]).length; i++) {
+        const dataLength = getData(getters, dataSets[0]).length;
+        for (let i = 0; i < dataLength; i++) {
             labels.formattedValues.push("");
             labels.values.push("");
         }
@@ -25957,11 +25955,26 @@ const SEARCH = {
         const _searchFor = toString(searchFor).toLowerCase();
         const _textToSearch = toString(textToSearch).toLowerCase();
         const _startingAt = toNumber(startingAt, this.locale);
-        assert(() => _textToSearch !== "", _t("The text_to_search must be non-empty."));
-        assert(() => _startingAt >= 1, _t("The starting_at (%s) must be greater than or equal to 1.", _startingAt.toString()));
+        if (_textToSearch === "") {
+            return {
+                value: CellErrorType.GenericError,
+                message: _t("The text_to_search must be non-empty."),
+            };
+        }
+        if (_startingAt < 1) {
+            return {
+                value: CellErrorType.GenericError,
+                message: _t("The starting_at (%s) must be greater than or equal to 1.", _startingAt),
+            };
+        }
         const result = _textToSearch.indexOf(_searchFor, _startingAt - 1);
-        assert(() => result >= 0, _t("In [[FUNCTION_NAME]] evaluation, cannot find '%s' within '%s'.", _searchFor, _textToSearch));
-        return result + 1;
+        if (result === -1) {
+            return {
+                value: CellErrorType.GenericError,
+                message: _t("In [[FUNCTION_NAME]] evaluation, cannot find '%s' within '%s'.", _searchFor, _textToSearch),
+            };
+        }
+        return { value: result + 1 };
     },
     isExported: true,
 };
@@ -27811,11 +27824,14 @@ function compileTokens(tokens) {
     }
 }
 function compileTokensOrThrow(tokens) {
-    const { dependencies, constantValues, symbols } = formulaArguments(tokens);
-    const cacheKey = compilationCacheKey(tokens, dependencies, constantValues);
+    const { dependencies, literalValues, symbols } = formulaArguments(tokens);
+    const cacheKey = compilationCacheKey(tokens);
     if (!functionCache[cacheKey]) {
         const ast = parseTokens([...tokens]);
         const scope = new Scope();
+        let stringCount = 0;
+        let numberCount = 0;
+        let dependencyCount = 0;
         if (ast.type === "BIN_OPERATION" && ast.value === ":") {
             throw new BadExpressionError(_t("Invalid formula"));
         }
@@ -27888,16 +27904,15 @@ function compileTokensOrThrow(tokens) {
                 case "BOOLEAN":
                     return code.return(`{ value: ${ast.value} }`);
                 case "NUMBER":
-                    return code.return(`{ value: this.constantValues.numbers[${constantValues.numbers.indexOf(ast.value)}] }`);
+                    return code.return(`this.literalValues.numbers[${numberCount++}]`);
                 case "STRING":
-                    return code.return(`{ value: this.constantValues.strings[${constantValues.strings.indexOf(ast.value)}] }`);
+                    return code.return(`this.literalValues.strings[${stringCount++}]`);
                 case "REFERENCE":
-                    const referenceIndex = dependencies.indexOf(ast.value);
                     if ((!isMeta && ast.value.includes(":")) || hasRange) {
-                        return code.return(`range(deps[${referenceIndex}])`);
+                        return code.return(`range(deps[${dependencyCount++}])`);
                     }
                     else {
-                        return code.return(`ref(deps[${referenceIndex}], ${isMeta ? "true" : "false"})`);
+                        return code.return(`ref(deps[${dependencyCount++}], ${isMeta ? "true" : "false"})`);
                     }
                 case "FUNCALL":
                     const args = compileFunctionArgs(ast).map((arg) => arg.assignResultToVariable());
@@ -27929,7 +27944,7 @@ function compileTokensOrThrow(tokens) {
     const compiledFormula = {
         execute: functionCache[cacheKey],
         dependencies,
-        constantValues,
+        literalValues,
         symbols,
         tokens,
         isBadExpression: false,
@@ -27941,33 +27956,31 @@ function compileTokensOrThrow(tokens) {
  * References, numbers and strings are replaced with placeholders because
  * the compiled formula does not depend on their actual value.
  * Both `=A1+1+"2"` and `=A2+2+"3"` are compiled to the exact same function.
- *
  * Spaces are also ignored to compute the cache key.
  *
- * A formula `=A1+A2+SUM(2, 2, "2")` have the cache key `=|0|+|1|+SUM(|N0|,|N0|,|S0|)`
+ * A formula `=A1+A2+SUM(2, 2, "2")` have the cache key `=|C|+|C|+SUM(|N|,|N|,|S|)`
  */
-function compilationCacheKey(tokens, dependencies, constantValues, symbols) {
+function compilationCacheKey(tokens) {
     let cacheKey = "";
     for (const token of tokens) {
         switch (token.type) {
             case "STRING":
-                const value = removeStringQuotes(token.value);
-                cacheKey += `|S${constantValues.strings.indexOf(value)}|`;
+                cacheKey += "|S|";
                 break;
             case "NUMBER":
-                cacheKey += `|N${constantValues.numbers.indexOf(parseNumber(token.value, DEFAULT_LOCALE))}|`;
+                cacheKey += "|N|";
                 break;
             case "REFERENCE":
             case "INVALID_REFERENCE":
                 if (token.value.includes(":")) {
-                    cacheKey += `R|${dependencies.indexOf(token.value)}|`;
+                    cacheKey += "|R|";
                 }
                 else {
-                    cacheKey += `C|${dependencies.indexOf(token.value)}|`;
+                    cacheKey += "|C|";
                 }
                 break;
             case "SPACE":
-                cacheKey += "";
+                // ignore spaces
                 break;
             default:
                 cacheKey += token.value;
@@ -27980,7 +27993,7 @@ function compilationCacheKey(tokens, dependencies, constantValues, symbols) {
  * Return formula arguments which are references, strings and numbers.
  */
 function formulaArguments(tokens) {
-    const constantValues = {
+    const literalValues = {
         numbers: [],
         strings: [],
     };
@@ -27994,15 +28007,11 @@ function formulaArguments(tokens) {
                 break;
             case "STRING":
                 const value = removeStringQuotes(token.value);
-                if (!constantValues.strings.includes(value)) {
-                    constantValues.strings.push(value);
-                }
+                literalValues.strings.push({ value });
                 break;
             case "NUMBER": {
                 const value = parseNumber(token.value, DEFAULT_LOCALE);
-                if (!constantValues.numbers.includes(value)) {
-                    constantValues.numbers.push(value);
-                }
+                literalValues.numbers.push({ value });
                 break;
             }
             case "SYMBOL": {
@@ -28013,7 +28022,7 @@ function formulaArguments(tokens) {
     }
     return {
         dependencies,
-        constantValues,
+        literalValues,
         symbols,
     };
 }
@@ -28437,7 +28446,7 @@ autoCompleteProviders.add("pivot_group_values", {
                 text,
                 description: usedLabel,
                 htmlContent: [{ value: text, color }],
-                fuzzySearchKey: value + usedLabel,
+                fuzzySearchKey: text + usedLabel,
             };
         });
     },
@@ -38840,8 +38849,8 @@ class AbstractComposerStore extends SpreadsheetStore {
         this.updateRangeColor();
     }
     cancelEdition() {
-        this.cancelEditionAndActivateSheet();
         this.resetContent();
+        this.cancelEditionAndActivateSheet();
     }
     setCurrentContent(content, selection) {
         if (selection && !this.isSelectionValid(content.length, selection.start, selection.end)) {
@@ -38857,8 +38866,8 @@ class AbstractComposerStore extends SpreadsheetStore {
         switch (cmd.type) {
             case "SELECT_FIGURE":
                 if (cmd.id) {
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                 }
                 break;
             case "START_CHANGE_HIGHLIGHT":
@@ -44753,6 +44762,7 @@ class RemoveDuplicatesPanel extends owl.Component {
         columns: {},
     });
     setup() {
+        this.updateColumns();
         owl.onWillUpdateProps(() => this.updateColumns());
     }
     toggleHasHeader() {
@@ -46541,8 +46551,8 @@ class CellComposerStore extends AbstractComposerStore {
                 const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                 if (!sheetIdExists && this.editionMode !== "inactive") {
                     this.sheetId = this.getters.getActiveSheetId();
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                     this.notificationStore.raiseError(CELL_DELETED_MESSAGE);
                 }
                 break;
@@ -62898,12 +62908,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;
         }
     }
@@ -63068,6 +63073,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,
+            });
+        }
+    }
 }
 
 class TableComputedStylePlugin extends UIPlugin {
@@ -68243,7 +68290,9 @@ css /* scss */ `
     border: 1px solid;
     font-family: ${DEFAULT_FONT};
 
-    .o-composer:empty:not(:focus):not(.active)::before {
+    /* In readonly we always show the fx icon if the composer is empty, not matter the focus */
+    .o-composer:empty:not(:focus):not(.active)::before,
+    &.o-topbar-composer-readonly .o-composer:empty::before {
       content: url("data:image/svg+xml,${encodeURIComponent(FX_SVG)}");
       position: relative;
       top: 20%;
@@ -71604,10 +71653,14 @@ function addIconSetRule(cf, rule) {
             continue;
         }
         const cfValueObjectNodes = cfValueObject.map((attrs) => escapeXml /*xml*/ `<cfvo ${formatAttributes(attrs)} />`);
+        const iconSetAttrs = [["iconSet", getIconSet(rule.icons)]];
+        if (isIconSetReversed(rule.icons)) {
+            iconSetAttrs.push(["reverse", "1"]);
+        }
         conditionalFormats.push(escapeXml /*xml*/ `
       <conditionalFormatting sqref="${range}">
         <cfRule ${formatAttributes(ruleAttributes)}>
-          <iconSet iconSet="${getIconSet(rule.icons)}">
+          <iconSet ${formatAttributes(iconSetAttrs)}>
             ${joinXmlNodes(cfValueObjectNodes)}
           </iconSet>
         </cfRule>
@@ -71625,9 +71678,21 @@ function commonCfAttributes(cf) {
         ["stopIfTrue", cf.stopIfTrue ? 1 : 0],
     ];
 }
+function isIconSetReversed(iconSet) {
+    const defaultIconSet = ICON_SETS[detectIconsType(iconSet)];
+    return iconSet.upper === defaultIconSet.bad && iconSet.lower === defaultIconSet.good;
+}
 function getIconSet(iconSet) {
-    return XLSX_ICONSET_MAP[Object.keys(XLSX_ICONSET_MAP).find((key) => iconSet.upper.toLowerCase().startsWith(key)) ||
-        "dots"];
+    return XLSX_ICONSET_MAP[detectIconsType(iconSet)];
+}
+/**
+ * Partial detection based on "upper" point only.
+ * We support any arbitrary icon in the set, while excel doesn't allow
+ * mixing icons from different types.
+ */
+function detectIconsType(iconSet) {
+    const type = Object.keys(ICON_SETS).find((type) => Object.values(ICON_SETS[type]).includes(iconSet.upper)) || "dots";
+    return type;
 }
 function thresholdAttributes(threshold, position) {
     const type = getExcelThresholdType(threshold.type, position);
@@ -73551,6 +73616,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.0.19";
-__info__.date = "2025-03-12T15:33:28.300Z";
-__info__.hash = "d8dea1b";
+__info__.version = "18.0.21";
+__info__.date = "2025-03-26T12:49:46.872Z";
+__info__.hash = "c687e1c";

package/dist/o-spreadsheet.d.ts

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