@odoo/o-spreadsheet 16.3.3 → 16.3.5

package/dist/o-spreadsheet.esm.js

@@ -108,8 +108,8 @@ const SELECTION_BORDER_COLOR = "#3266ca";
 const HEADER_BORDER_COLOR = "#C0C0C0";
 const CELL_BORDER_COLOR = "#E2E3E3";
 const BACKGROUND_CHART_COLOR = "#FFFFFF";
-const MENU_ITEM_DISABLED_COLOR = "#CACACA";
 const BG_HOVER_COLOR = "#EBEBEB";
+const DISABLED_TEXT_COLOR = "#CACACA";
 const DEFAULT_COLOR_SCALE_MIDPOINT_COLOR = 0xb6d7a8;
 const LINK_COLOR = "#01666b";
 const FILTERS_COLOR = "#188038";
@@ -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);
 }
@@ -4210,7 +4218,6 @@ const readonlyAllowedCommands = new Set([
     "SET_VIEWPORT_OFFSET",
     "SELECT_SEARCH_NEXT_MATCH",
     "SELECT_SEARCH_PREVIOUS_MATCH",
-    "REFRESH_SEARCH",
     "UPDATE_SEARCH",
     "CLEAR_SEARCH",
     "EVALUATE_CELLS",
@@ -5531,7 +5538,7 @@ css /* scss */ `
         }
       }
       &.disabled {
-        color: ${MENU_ITEM_DISABLED_COLOR};
+        color: ${DISABLED_TEXT_COLOR};
         cursor: not-allowed;
       }
     }
@@ -9515,9 +9522,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 +9554,6 @@ function makeArg(str) {
             defaultValue = param.trim().slice(8);
         }
     }
-    let description = parts[3].trim();
     const result = {
         name,
         description,
@@ -16369,7 +16375,7 @@ const insertFunctionMin = {
 };
 const categorieFunctionAll = {
     name: _lt("All"),
-    children: allFunctionListMenuBuilder(),
+    children: [allFunctionListMenuBuilder],
 };
 function allFunctionListMenuBuilder() {
     const fnNames = functionRegistry.getKeys();
@@ -19636,6 +19642,7 @@ class FindAndReplacePanel extends Component {
     state = useState(this.initialState());
     debounceTimeoutId;
     showFormulaState = false;
+    debouncedUpdateSearch;
     findAndReplaceRef = useRef("findAndReplace");
     get hasSearchResult() {
         return this.env.model.getters.getCurrentSelectedMatchIndex() !== null;
@@ -19645,11 +19652,16 @@ class FindAndReplacePanel extends Component {
     }
     setup() {
         this.showFormulaState = this.env.model.getters.shouldShowFormulas();
+        this.debouncedUpdateSearch = debounce(this.updateSearch.bind(this), 200);
         onMounted(() => this.focusInput());
         onWillUnmount(() => {
             this.env.model.dispatch("CLEAR_SEARCH");
             this.env.model.dispatch("SET_FORMULA_VISIBILITY", { show: this.showFormulaState });
         });
+        useEffect(() => {
+            this.state.searchOptions.searchFormulas = this.env.model.getters.shouldShowFormulas();
+            this.searchFormulas();
+        }, () => [this.env.model.getters.shouldShowFormulas()]);
     }
     onInput(ev) {
         this.state.toSearch = ev.target.value;
@@ -19669,10 +19681,6 @@ class FindAndReplacePanel extends Component {
             this.replace();
         }
     }
-    onFocusSidePanel() {
-        this.state.searchOptions.searchFormulas = this.env.model.getters.shouldShowFormulas();
-        this.env.model.dispatch("REFRESH_SEARCH");
-    }
     searchFormulas() {
         this.env.model.dispatch("SET_FORMULA_VISIBILITY", {
             show: this.state.searchOptions.searchFormulas,
@@ -19691,13 +19699,6 @@ class FindAndReplacePanel extends Component {
             searchOptions: this.state.searchOptions,
         });
     }
-    debouncedUpdateSearch() {
-        clearTimeout(this.debounceTimeoutId);
-        this.debounceTimeoutId = setTimeout(() => {
-            this.updateSearch();
-            this.debounceTimeoutId = undefined;
-        }, 400);
-    }
     replace() {
         this.env.model.dispatch("REPLACE_SEARCH", {
             replaceWith: this.state.replaceWith,
@@ -20928,6 +20929,7 @@ class Composer extends Component {
                     (this.autoCompleteState.selectedIndex + 1) % this.autoCompleteState.values.length;
             }
         }
+        this.updateCursorIfNeeded();
     }
     processTabKey(ev) {
         ev.preventDefault();
@@ -20996,10 +20998,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 +21061,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 +30649,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 +34205,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 +34221,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);
@@ -36865,6 +36882,7 @@ class FindAndReplacePlugin extends UIPlugin {
         searchFormulas: false,
     };
     toSearch = "";
+    isSearchDirty = false;
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
@@ -36892,14 +36910,21 @@ class FindAndReplacePlugin extends UIPlugin {
             case "REDO":
             case "REMOVE_COLUMNS_ROWS":
             case "ADD_COLUMNS_ROWS":
-                this.clearSearch();
+            case "EVALUATE_CELLS":
+            case "UPDATE_CELL":
+                this.isSearchDirty = true;
                 break;
             case "ACTIVATE_SHEET":
-            case "REFRESH_SEARCH":
                 this.refreshSearch();
                 break;
         }
     }
+    finalize() {
+        if (this.isSearchDirty) {
+            this.refreshSearch();
+            this.isSearchDirty = false;
+        }
+    }
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
@@ -36955,6 +36980,11 @@ class FindAndReplacePlugin extends UIPlugin {
         if (this.toSearch) {
             for (const cell of Object.values(cells)) {
                 const { col, row } = this.getters.getCellPosition(cell.id);
+                const isColHidden = this.getters.isColHidden(sheetId, col);
+                const isRowHidden = this.getters.isRowHidden(sheetId, row);
+                if (isColHidden || isRowHidden) {
+                    continue;
+                }
                 if (cell &&
                     this.currentSearchRegex &&
                     this.currentSearchRegex.test(this.getSearchableString({ sheetId, col, row }))) {
@@ -38592,10 +38622,8 @@ class SortPlugin extends UIPlugin {
                 }
                 updateCellCommands.push(newCellValues);
             }
-            for (const cmd of updateCellCommands) {
-                this.dispatch("UPDATE_CELL", cmd);
-            }
         }
+        updateCellCommands.forEach((cmdPayload) => this.dispatch("UPDATE_CELL", cmdPayload));
     }
     /**
      * Return the distances between main merge cells in the zone.
@@ -42860,6 +42888,11 @@ css /* scss */ `
     .o-sidePanelButton:enabled {
       cursor: pointer;
     }
+
+    .o-sidePanelButton:disabled {
+      color: ${DISABLED_TEXT_COLOR};
+    }
+
     .o-sidePanelButton:last-child {
       margin-right: 0px;
     }
@@ -43289,11 +43322,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 +43337,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 +43408,7 @@ class FontSizeEditor extends Component {
 FontSizeEditor.props = {
     onToggle: Function,
     dropdownStyle: String,
+    class: String,
 };
 
 // -----------------------------------------------------------------------------
@@ -46545,15 +46577,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 +46589,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 +46711,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 +46726,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 +47611,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.5';
+__info__.date = '2023-07-26T12:10:02.115Z';
+__info__.hash = '328bce4';