@odoo/o-spreadsheet 16.2.9 → 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);
 }
@@ -29127,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);
@@ -32704,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 = [];
@@ -32719,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);
@@ -35761,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
     // ---------------------------------------------------------------------------
@@ -40845,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;
@@ -40927,6 +40941,7 @@ FontSizeEditor.components = {};
 FontSizeEditor.props = {
     onToggle: Function,
     dropdownStyle: String,
+    class: String,
 };
 
 const FORMATS = [
@@ -44370,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>
       `;
@@ -44387,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>
 `;
@@ -45336,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.9';
-__info__.date = '2023-06-12T13:49:57.216Z';
-__info__.hash = '37e2719';
+__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);
   }
@@ -29128,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);
@@ -32705,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 = [];
@@ -32720,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);
@@ -35762,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
       // ---------------------------------------------------------------------------
@@ -40846,11 +40862,9 @@
       onComposerContentFocused: Function,
   };
 
-  // -----------------------------------------------------------------------------
-  // TopBar
-  // -----------------------------------------------------------------------------
   css /* scss */ `
   .o-font-size-editor {
+    height: calc(100% - 4px);
     input.o-font-size {
       height: 20px;
       width: 23px;
@@ -40928,6 +40942,7 @@
   FontSizeEditor.props = {
       onToggle: Function,
       dropdownStyle: String,
+      class: String,
   };
 
   const FORMATS = [
@@ -44371,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>
       `;
@@ -44388,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>
 `;
@@ -45367,9 +45378,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.2.9';
-  __info__.date = '2023-06-12T13:49:57.216Z';
-  __info__.hash = '37e2719';
+  __info__.version = '16.2.10';
+  __info__.date = '2023-06-26T14:33:27.213Z';
+  __info__.hash = '1d3f47c';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);