@odoo/o-spreadsheet 16.2.8 → 16.2.10

package/dist/o-spreadsheet.esm.js

@@ -707,12 +707,20 @@ function getDefaultCellHeight(cell) {
     return computeTextLinesHeight(fontSize, numberOfLines) + 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 fontSizeInPixels(fontSize) {
     return Math.round((fontSize * 96) / 72);
 }
@@ -1722,27 +1730,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 };
 }
@@ -16949,6 +16966,7 @@ css /* scss */ `
     .o-color-picker-toggler {
       display: flex;
       .o-color-picker-toggler-sign {
+        display: flex;
         margin: auto auto;
         width: 55%;
         height: 55%;
@@ -19843,6 +19861,7 @@ class Composer extends Component {
                     (this.autoCompleteState.selectedIndex + 1) % this.autoCompleteState.values.length;
             }
         }
+        this.updateCursorIfNeeded();
     }
     processTabKey(ev) {
         var _a;
@@ -19913,10 +19932,12 @@ class Composer extends Component {
         }
         else {
             ev.stopPropagation();
+            this.updateCursorIfNeeded();
         }
-        const { start, end } = this.contentHelper.getCurrentSelection();
-        if (!this.env.model.getters.isSelectingForComposer() &&
-            !(ev.key === "Enter" && (ev.altKey || ev.ctrlKey))) {
+    }
+    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;
         }
@@ -19974,7 +19995,12 @@ class Composer extends Component {
             };
         });
         if (searchTerm) {
-            values = fuzzyLookup(searchTerm, values, (t) => t.text);
+            if (searchTerm.toLowerCase() === "true" || searchTerm.toLowerCase() === "false") {
+                values = [];
+            }
+            else {
+                values = fuzzyLookup(searchTerm, values, (t) => t.text);
+            }
         }
         else {
             // alphabetical order
@@ -29109,7 +29135,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);
@@ -32686,6 +32719,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 = [];
@@ -32701,20 +32735,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);
@@ -35743,15 +35777,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
     // ---------------------------------------------------------------------------
@@ -40827,11 +40861,9 @@ TopBarComposer.props = {
     onComposerContentFocused: Function,
 };
 
-// -----------------------------------------------------------------------------
-// TopBar
-// -----------------------------------------------------------------------------
 css /* scss */ `
   .o-font-size-editor {
+    height: calc(100% - 4px);
     input.o-font-size {
       height: 20px;
       width: 23px;
@@ -40909,6 +40941,7 @@ FontSizeEditor.components = {};
 FontSizeEditor.props = {
     onToggle: Function,
     dropdownStyle: String,
+    class: String,
 };
 
 const FORMATS = [
@@ -44352,15 +44385,10 @@ function addAutoFilter(table) {
   `;
 }
 function addFilterColumns(table) {
-    const tableZone = toZone(table.range);
     const columns = [];
-    for (const i of range(0, zoneToDimension(tableZone).numberOfCols)) {
-        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>
       `;
@@ -44369,9 +44397,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>
 `;
@@ -45318,6 +45347,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, links, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.2.8';
-__info__.date = '2023-06-02T10:12:43.068Z';
-__info__.hash = 'b474e62';
+__info__.version = '16.2.10';
+__info__.date = '2023-06-26T14:33:27.213Z';
+__info__.hash = '1d3f47c';

package/dist/o-spreadsheet.iife.js

@@ -708,12 +708,20 @@
       return computeTextLinesHeight(fontSize, numberOfLines) + 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 fontSizeInPixels(fontSize) {
       return Math.round((fontSize * 96) / 72);
   }
@@ -1723,27 +1731,36 @@
       }
       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 };
   }
@@ -16950,6 +16967,7 @@
     .o-color-picker-toggler {
       display: flex;
       .o-color-picker-toggler-sign {
+        display: flex;
         margin: auto auto;
         width: 55%;
         height: 55%;
@@ -19844,6 +19862,7 @@
                       (this.autoCompleteState.selectedIndex + 1) % this.autoCompleteState.values.length;
               }
           }
+          this.updateCursorIfNeeded();
       }
       processTabKey(ev) {
           var _a;
@@ -19914,10 +19933,12 @@
           }
           else {
               ev.stopPropagation();
+              this.updateCursorIfNeeded();
           }
-          const { start, end } = this.contentHelper.getCurrentSelection();
-          if (!this.env.model.getters.isSelectingForComposer() &&
-              !(ev.key === "Enter" && (ev.altKey || ev.ctrlKey))) {
+      }
+      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;
           }
@@ -19975,7 +19996,12 @@
               };
           });
           if (searchTerm) {
-              values = fuzzyLookup(searchTerm, values, (t) => t.text);
+              if (searchTerm.toLowerCase() === "true" || searchTerm.toLowerCase() === "false") {
+                  values = [];
+              }
+              else {
+                  values = fuzzyLookup(searchTerm, values, (t) => t.text);
+              }
           }
           else {
               // alphabetical order
@@ -29110,7 +29136,14 @@
                   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);
@@ -32687,6 +32720,7 @@
       }
       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 = [];
@@ -32702,20 +32736,20 @@
                       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);
@@ -35744,15 +35778,15 @@
    * 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
       // ---------------------------------------------------------------------------
@@ -40828,11 +40862,9 @@
       onComposerContentFocused: Function,
   };
 
-  // -----------------------------------------------------------------------------
-  // TopBar
-  // -----------------------------------------------------------------------------
   css /* scss */ `
   .o-font-size-editor {
+    height: calc(100% - 4px);
     input.o-font-size {
       height: 20px;
       width: 23px;
@@ -40910,6 +40942,7 @@
   FontSizeEditor.props = {
       onToggle: Function,
       dropdownStyle: String,
+      class: String,
   };
 
   const FORMATS = [
@@ -44353,15 +44386,10 @@
   `;
   }
   function addFilterColumns(table) {
-      const tableZone = toZone(table.range);
       const columns = [];
-      for (const i of range(0, zoneToDimension(tableZone).numberOfCols)) {
-          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>
       `;
@@ -44370,9 +44398,10 @@
       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>
 `;
@@ -45349,9 +45378,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.2.8';
-  __info__.date = '2023-06-02T10:12:43.068Z';
-  __info__.hash = 'b474e62';
+  __info__.version = '16.2.10';
+  __info__.date = '2023-06-26T14:33:27.213Z';
+  __info__.hash = '1d3f47c';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);