@odoo/o-spreadsheet 16.3.3 → 16.3.4

package/dist/o-spreadsheet.esm.js

@@ -750,12 +750,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);
 }
@@ -9515,9 +9523,9 @@ const ARG_TYPES = [
     "META",
 ];
 function arg(definition, description = "") {
-    return makeArg(`${definition} ${description}`);
+    return makeArg(definition, description);
 }
-function makeArg(str) {
+function makeArg(str, description) {
     let parts = str.match(ARG_REGEXP);
     let name = parts[1].trim();
     let types = [];
@@ -9547,7 +9555,6 @@ function makeArg(str) {
             defaultValue = param.trim().slice(8);
         }
     }
-    let description = parts[3].trim();
     const result = {
         name,
         description,
@@ -20928,6 +20935,7 @@ class Composer extends Component {
                     (this.autoCompleteState.selectedIndex + 1) % this.autoCompleteState.values.length;
             }
         }
+        this.updateCursorIfNeeded();
     }
     processTabKey(ev) {
         ev.preventDefault();
@@ -20996,10 +21004,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;
         }
@@ -21057,7 +21067,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
@@ -30640,7 +30655,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);
@@ -34189,6 +34211,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 = [];
@@ -34204,20 +34227,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);
@@ -43289,11 +43312,9 @@ TopBarComposer.props = {
     onComposerContentFocused: Function,
 };
 
-// -----------------------------------------------------------------------------
-// TopBar
-// -----------------------------------------------------------------------------
 css /* scss */ `
   .o-font-size-editor {
+    height: calc(100% - 4px);
     input.o-font-size {
       outline-color: ${SELECTION_BORDER_COLOR};
       height: 20px;
@@ -43306,13 +43327,13 @@ css /* scss */ `
     input::-webkit-inner-spin-button {
       -webkit-appearance: none;
     }
-
-    .o-text-options > div {
-      line-height: 26px;
-      padding: 3px 12px;
-      &:hover {
-        background-color: rgba(0, 0, 0, 0.08);
-      }
+  }
+  .o-text-options > div {
+    cursor: pointer;
+    line-height: 26px;
+    padding: 3px 12px;
+    &:hover {
+      background-color: rgba(0, 0, 0, 0.08);
     }
   }
 `;
@@ -43377,6 +43398,7 @@ class FontSizeEditor extends Component {
 FontSizeEditor.props = {
     onToggle: Function,
     dropdownStyle: String,
+    class: String,
 };
 
 // -----------------------------------------------------------------------------
@@ -46545,15 +46567,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>
       `;
@@ -46562,9 +46579,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>
 `;
@@ -46683,8 +46701,13 @@ function addHyperlinks(construct, data, sheetIndex) {
                 const sheetId = parseSheetUrl(url);
                 const sheet = data.sheets.find((sheet) => sheet.id === sheetId);
                 const location = sheet ? `${sheet.name}!A1` : INCORRECT_RANGE_STRING;
+                const hyperlinkAttributes = [
+                    ["display", label],
+                    ["location", location],
+                    ["ref", xc],
+                ];
                 linkNodes.push(escapeXml /*xml*/ `
-          <hyperlink display="${label}" location="${location}" ref="${xc}"/>
+          <hyperlink ${formatAttributes(hyperlinkAttributes)}/>
         `);
             }
             else {
@@ -46693,8 +46716,12 @@ function addHyperlinks(construct, data, sheetIndex) {
                     type: XLSX_RELATION_TYPE.hyperlink,
                     targetMode: "External",
                 });
+                const hyperlinkAttributes = [
+                    ["r:id", linkRelId],
+                    ["ref", xc],
+                ];
                 linkNodes.push(escapeXml /*xml*/ `
-          <hyperlink r:id="${linkRelId}" ref="${xc}"/>
+          <hyperlink ${formatAttributes(hyperlinkAttributes)}/>
         `);
             }
         }
@@ -47574,6 +47601,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, 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, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.3.3';
-__info__.date = '2023-06-12T13:50:01.114Z';
-__info__.hash = 'd3ab96f';
+__info__.version = '16.3.4';
+__info__.date = '2023-06-26T14:34:27.019Z';
+__info__.hash = '94f9dcd';

package/dist/o-spreadsheet.iife.js

@@ -751,12 +751,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);
   }
@@ -9516,9 +9524,9 @@
       "META",
   ];
   function arg(definition, description = "") {
-      return makeArg(`${definition} ${description}`);
+      return makeArg(definition, description);
   }
-  function makeArg(str) {
+  function makeArg(str, description) {
       let parts = str.match(ARG_REGEXP);
       let name = parts[1].trim();
       let types = [];
@@ -9548,7 +9556,6 @@
               defaultValue = param.trim().slice(8);
           }
       }
-      let description = parts[3].trim();
       const result = {
           name,
           description,
@@ -20929,6 +20936,7 @@
                       (this.autoCompleteState.selectedIndex + 1) % this.autoCompleteState.values.length;
               }
           }
+          this.updateCursorIfNeeded();
       }
       processTabKey(ev) {
           ev.preventDefault();
@@ -20997,10 +21005,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;
           }
@@ -21058,7 +21068,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
@@ -30641,7 +30656,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);
@@ -34190,6 +34212,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 = [];
@@ -34205,20 +34228,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);
@@ -43290,11 +43313,9 @@
       onComposerContentFocused: Function,
   };
 
-  // -----------------------------------------------------------------------------
-  // TopBar
-  // -----------------------------------------------------------------------------
   css /* scss */ `
   .o-font-size-editor {
+    height: calc(100% - 4px);
     input.o-font-size {
       outline-color: ${SELECTION_BORDER_COLOR};
       height: 20px;
@@ -43307,13 +43328,13 @@
     input::-webkit-inner-spin-button {
       -webkit-appearance: none;
     }
-
-    .o-text-options > div {
-      line-height: 26px;
-      padding: 3px 12px;
-      &:hover {
-        background-color: rgba(0, 0, 0, 0.08);
-      }
+  }
+  .o-text-options > div {
+    cursor: pointer;
+    line-height: 26px;
+    padding: 3px 12px;
+    &:hover {
+      background-color: rgba(0, 0, 0, 0.08);
     }
   }
 `;
@@ -43378,6 +43399,7 @@
   FontSizeEditor.props = {
       onToggle: Function,
       dropdownStyle: String,
+      class: String,
   };
 
   // -----------------------------------------------------------------------------
@@ -46546,15 +46568,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>
       `;
@@ -46563,9 +46580,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>
 `;
@@ -46684,8 +46702,13 @@
                   const sheetId = parseSheetUrl(url);
                   const sheet = data.sheets.find((sheet) => sheet.id === sheetId);
                   const location = sheet ? `${sheet.name}!A1` : INCORRECT_RANGE_STRING;
+                  const hyperlinkAttributes = [
+                      ["display", label],
+                      ["location", location],
+                      ["ref", xc],
+                  ];
                   linkNodes.push(escapeXml /*xml*/ `
-          <hyperlink display="${label}" location="${location}" ref="${xc}"/>
+          <hyperlink ${formatAttributes(hyperlinkAttributes)}/>
         `);
               }
               else {
@@ -46694,8 +46717,12 @@
                       type: XLSX_RELATION_TYPE.hyperlink,
                       targetMode: "External",
                   });
+                  const hyperlinkAttributes = [
+                      ["r:id", linkRelId],
+                      ["ref", xc],
+                  ];
                   linkNodes.push(escapeXml /*xml*/ `
-          <hyperlink r:id="${linkRelId}" ref="${xc}"/>
+          <hyperlink ${formatAttributes(hyperlinkAttributes)}/>
         `);
               }
           }
@@ -47605,9 +47632,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.3.3';
-  __info__.date = '2023-06-12T13:50:01.114Z';
-  __info__.hash = 'd3ab96f';
+  __info__.version = '16.3.4';
+  __info__.date = '2023-06-26T14:34:27.019Z';
+  __info__.hash = '94f9dcd';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);