@odoo/o-spreadsheet 16.1.13 → 16.1.15

package/dist/o-spreadsheet.cjs.js

@@ -726,12 +726,20 @@ function getDefaultCellHeight(style) {
     return computeTextLinesHeight(fontSize) + 2 * PADDING_AUTORESIZE_VERTICAL;
 }
 function computeTextWidth(context, text, style) {
-    context.save();
-    context.font = computeTextFont(style);
-    const textWidth = context.measureText(text).width;
-    context.restore();
-    return textWidth;
+    const font = computeTextFont(style);
+    if (!textWidthCache[font]) {
+        textWidthCache[font] = {};
+    }
+    if (textWidthCache[font][text] === undefined) {
+        context.save();
+        context.font = font;
+        const textWidth = context.measureText(text).width;
+        context.restore();
+        textWidthCache[font][text] = textWidth;
+    }
+    return textWidthCache[font][text];
 }
+const textWidthCache = {};
 function computeTextFont(style) {
     const italic = style.italic ? "italic " : "";
     const weight = style.bold ? "bold" : DEFAULT_FONT_WEIGHT;
@@ -1707,27 +1715,36 @@ function removeTrailingZeroes(numberString) {
     }
     return numberString.slice(0, i + 1) || undefined;
 }
+const leadingZeroesRegexp = /^0+/;
 /**
  * Limit the size of the decimal part of a number to the given number of digits.
  */
 function limitDecimalDigits(decimalDigits, maxDecimals) {
+    var _a;
     let integerDigits = "0";
     let resultDecimalDigits = decimalDigits;
     // Note : we'd want to simply use number.toFixed() to handle the max digits & rounding,
     // but it has very strange behaviour. Ex: 12.345.toFixed(2) => "12.35", but 1.345.toFixed(2) => "1.34"
     let slicedDecimalDigits = decimalDigits.slice(0, maxDecimals);
     const i = maxDecimals;
-    if (Number(Number(decimalDigits[i]) < 5)) {
+    if (Number(decimalDigits[i]) < 5) {
         return { integerDigits, decimalDigits: slicedDecimalDigits };
     }
     // round up
+    const leadingZeroes = ((_a = slicedDecimalDigits.match(leadingZeroesRegexp)) === null || _a === void 0 ? void 0 : _a[0]) || "";
     const slicedRoundedUp = (Number(slicedDecimalDigits) + 1).toString();
-    if (slicedRoundedUp.length > slicedDecimalDigits.length) {
-        integerDigits = (Number(integerDigits) + 1).toString();
+    const withoutLeadingZeroes = slicedDecimalDigits.slice(leadingZeroes.length);
+    // e.g. carry over from 99 to 100
+    const carryOver = slicedRoundedUp.length > withoutLeadingZeroes.length;
+    if (carryOver && !leadingZeroes) {
+        integerDigits = "1";
         resultDecimalDigits = undefined;
     }
+    else if (carryOver) {
+        resultDecimalDigits = leadingZeroes.slice(0, -1) + slicedRoundedUp;
+    }
     else {
-        resultDecimalDigits = slicedRoundedUp;
+        resultDecimalDigits = leadingZeroes + slicedRoundedUp;
     }
     return { integerDigits, decimalDigits: resultDecimalDigits };
 }
@@ -17345,6 +17362,7 @@ class Composer extends owl.Component {
                     (this.autoCompleteState.selectedIndex + 1) % this.autoCompleteState.values.length;
             }
         }
+        this.updateCursorIfNeeded();
     }
     processTabKey(ev) {
         var _a;
@@ -17403,9 +17421,12 @@ class Composer extends owl.Component {
         }
         else {
             ev.stopPropagation();
+            this.updateCursorIfNeeded();
         }
-        const { start, end } = this.contentHelper.getCurrentSelection();
+    }
+    updateCursorIfNeeded() {
         if (!this.env.model.getters.isSelectingForComposer()) {
+            const { start, end } = this.contentHelper.getCurrentSelection();
             this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
             this.isKeyStillDown = true;
         }
@@ -20036,6 +20057,7 @@ css /* scss */ `
     .o-color-picker-toggler {
       display: flex;
       .o-color-picker-toggler-sign {
+        display: flex;
         margin: auto auto;
         width: 55%;
         height: 55%;
@@ -29546,7 +29568,14 @@ class FiltersPlugin extends CorePlugin {
                 this.history.update("tables", filterTables);
                 break;
             case "DUPLICATE_SHEET":
-                this.history.update("tables", cmd.sheetIdTo, deepCopy(this.tables[cmd.sheetId]));
+                const tables = {};
+                for (const filterTable of Object.values(this.tables[cmd.sheetId] || {})) {
+                    if (filterTable) {
+                        const newFilterTable = deepCopy(filterTable);
+                        tables[newFilterTable.id] = newFilterTable;
+                    }
+                }
+                this.history.update("tables", cmd.sheetIdTo, tables);
                 break;
             case "ADD_COLUMNS_ROWS":
                 this.onAddColumnsRows(cmd);
@@ -33090,6 +33119,7 @@ class FilterEvaluationPlugin extends UIPlugin {
     }
     exportForExcel(data) {
         for (const sheetData of data.sheets) {
+            const sheetId = sheetData.id;
             for (const tableData of sheetData.filterTables) {
                 const tableZone = toZone(tableData.range);
                 const filters = [];
@@ -33105,20 +33135,20 @@ class FilterEvaluationPlugin extends UIPlugin {
                     if (!filter)
                         continue;
                     const valuesInFilterZone = filter.filteredZone
-                        ? positions(filter.filteredZone)
-                            .map(({ col, row }) => this.getters.getEvaluatedCell({ sheetId: sheetData.id, col, row }))
-                            .filter((cell) => cell.type !== CellValueType.empty)
-                            .map((cell) => cell.formattedValue)
+                        ? positions(filter.filteredZone).map((position) => this.getters.getEvaluatedCell({ sheetId, ...position }).formattedValue)
                         : [];
-                    // In xlsx, filtered values = values that are displayed, not values that are hidden
-                    const xlsxFilteredValues = valuesInFilterZone.filter((val) => !filteredValues.includes(val));
-                    filters.push({ colId: i, filteredValues: [...new Set(xlsxFilteredValues)] });
-                    // In xlsx, filter header should ALWAYS be a string and should be unique
-                    const headerPosition = {
-                        col: filter.col,
-                        row: filter.zoneWithHeaders.top,
-                        sheetId: sheetData.id,
-                    };
+                    if (filteredValues.length) {
+                        const xlsxDisplayedValues = valuesInFilterZone
+                            .filter((val) => val)
+                            .filter((val) => !filteredValues.includes(val));
+                        filters.push({
+                            colId: i,
+                            displayedValues: [...new Set(xlsxDisplayedValues)],
+                            displayBlanks: !filteredValues.includes("") && valuesInFilterZone.some((val) => !val),
+                        });
+                    }
+                    // In xlsx, filter header should ALWAYS be a string and should be unique in the table
+                    const headerPosition = { col: filter.col, row: filter.zoneWithHeaders.top, sheetId };
                     const headerString = this.getters.getEvaluatedCell(headerPosition).formattedValue;
                     const headerName = this.getUniqueColNameForExcel(i, headerString, headerNames);
                     headerNames.push(headerName);
@@ -36147,15 +36177,15 @@ SelectionInputPlugin.getters = [];
  * This plugin handles this internal state.
  */
 class SelectionInputsManagerPlugin extends UIPlugin {
+    get currentInput() {
+        return this.focusedInputId ? this.inputs[this.focusedInputId] : null;
+    }
     constructor(config) {
         super(config);
         this.config = config;
         this.inputs = {};
         this.focusedInputId = null;
     }
-    get currentInput() {
-        return this.focusedInputId ? this.inputs[this.focusedInputId] : null;
-    }
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
@@ -43286,15 +43316,10 @@ function addAutoFilter(table) {
   `;
 }
 function addFilterColumns(table) {
-    const tableZone = toZone(table.range);
     const columns = [];
-    for (const i of range(0, zoneToDimension(tableZone).width)) {
-        const filter = table.filters[i];
-        if (!filter || !filter.filteredValues.length) {
-            continue;
-        }
+    for (const filter of table.filters) {
         const colXml = escapeXml /*xml*/ `
-      <filterColumn ${formatAttributes([["colId", i]])}>
+      <filterColumn ${formatAttributes([["colId", filter.colId]])}>
         ${addFilter(filter)}
       </filterColumn>
       `;
@@ -43303,9 +43328,10 @@ function addFilterColumns(table) {
     return columns;
 }
 function addFilter(filter) {
-    const filterValues = filter.filteredValues.map((val) => escapeXml /*xml*/ `<filter ${formatAttributes([["val", val]])}/>`);
+    const filterValues = filter.displayedValues.map((val) => escapeXml /*xml*/ `<filter ${formatAttributes([["val", val]])}/>`);
+    const filterAttributes = filter.displayBlanks ? [["blank", 1]] : [];
     return escapeXml /*xml*/ `
-  <filters>
+  <filters ${formatAttributes(filterAttributes)}>
       ${joinXmlNodes(filterValues)}
   </filters>
 `;
@@ -44258,6 +44284,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.1.13';
-__info__.date = '2023-06-02T10:12:21.173Z';
-__info__.hash = '5386a5b';
+__info__.version = '16.1.15';
+__info__.date = '2023-06-26T14:33:07.859Z';
+__info__.hash = '2b264ad';