@odoo/o-spreadsheet 16.0.13 → 16.0.15

package/dist/o-spreadsheet.esm.js

@@ -1,4 +1,4 @@
-import { Component, useRef, onMounted, onPatched, onWillPatch, useState, onWillUpdateProps, useExternalListener, onWillUnmount, onWillStart, xml, useEffect, useSubEnv, EventBus as EventBus$1, markRaw } from '@odoo/owl';
+import { Component, useRef, onMounted, onPatched, onWillPatch, useState, onWillUpdateProps, useExternalListener, onWillUnmount, onWillStart, useEffect, xml, useSubEnv, EventBus as EventBus$1, markRaw } from '@odoo/owl';
 
 /*
  * usage: every string should be translated either with _lt if they are registered with a registry at
@@ -105,7 +105,7 @@ 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 DISABLED_TEXT_COLOR = "#CACACA";
 const DEFAULT_COLOR_SCALE_MIDPOINT_COLOR = 0xb6d7a8;
 const LINK_COLOR = "#01666b";
 const FILTERS_COLOR = "#188038";
@@ -719,12 +719,20 @@ function getDefaultCellHeight(style, 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 computeTextFont(style) {
     const italic = style.italic ? "italic " : "";
     const weight = style.bold ? "bold" : DEFAULT_FONT_WEIGHT;
@@ -3095,7 +3103,6 @@ const readonlyAllowedCommands = new Set([
     "SET_VIEWPORT_OFFSET",
     "SELECT_SEARCH_NEXT_MATCH",
     "SELECT_SEARCH_PREVIOUS_MATCH",
-    "REFRESH_SEARCH",
     "UPDATE_SEARCH",
     "CLEAR_SEARCH",
     "EVALUATE_CELLS",
@@ -4022,7 +4029,7 @@ css /* scss */ `
         }
       }
       &.disabled {
-        color: ${MENU_ITEM_DISABLED_COLOR};
+        color: ${DISABLED_TEXT_COLOR};
         cursor: not-allowed;
       }
     }
@@ -9976,11 +9983,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;
@@ -9998,10 +10010,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,
@@ -10020,10 +10028,6 @@ class FindAndReplacePanel extends Component {
             searchOptions: this.state.searchOptions,
         });
     }
-    debouncedUpdateSearch() {
-        clearTimeout(this.inDebounce);
-        this.inDebounce = setTimeout(() => this.updateSearch.call(this), 400);
-    }
     replace() {
         this.env.model.dispatch("REPLACE_SEARCH", {
             replaceWith: this.state.replaceWith,
@@ -21151,6 +21155,14 @@ class FiguresContainer extends Component {
             if (dirY < 0) {
                 this.dnd.y = dndInitialY - deltaY;
             }
+            if (this.dnd.x < 0) {
+                this.dnd.width += this.dnd.x;
+                this.dnd.x = 0;
+            }
+            if (this.dnd.y < 0) {
+                this.dnd.height += this.dnd.y;
+                this.dnd.y = 0;
+            }
         };
         const onMouseUp = (ev) => {
             if (!this.dnd.figId) {
@@ -28643,7 +28655,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);
@@ -33275,6 +33294,7 @@ class FindAndReplacePlugin extends UIPlugin {
             searchFormulas: false,
         };
         this.toSearch = "";
+        this.isSearchDirty = false;
     }
     // ---------------------------------------------------------------------------
     // Command Handling
@@ -33299,18 +33319,25 @@ class FindAndReplacePlugin extends UIPlugin {
             case "REPLACE_ALL_SEARCH":
                 this.replaceAll(cmd.replaceWith);
                 break;
+            case "EVALUATE_CELLS":
+            case "UPDATE_CELL":
+                this.isSearchDirty = true;
+                break;
             case "UNDO":
             case "REDO":
             case "REMOVE_COLUMNS_ROWS":
             case "ADD_COLUMNS_ROWS":
-                this.clearSearch();
-                break;
             case "ACTIVATE_SHEET":
-            case "REFRESH_SEARCH":
                 this.refreshSearch();
                 break;
         }
     }
+    finalize() {
+        if (this.isSearchDirty) {
+            this.refreshSearch();
+            this.isSearchDirty = false;
+        }
+    }
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
@@ -33360,11 +33387,17 @@ class FindAndReplacePlugin extends UIPlugin {
      * Find matches using the current regex
      */
     findMatches() {
-        const activeSheetId = this.getters.getActiveSheetId();
-        const cells = this.getters.getCells(activeSheetId);
+        const sheetId = this.getters.getActiveSheetId();
+        const cells = this.getters.getCells(sheetId);
         const matches = [];
         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.searchOptions.searchFormulas
@@ -35147,6 +35180,9 @@ SelectionInputPlugin.getters = [];
  * This plugin handles this internal state.
  */
 class SelectionInputsManagerPlugin extends UIPlugin {
+    get currentInput() {
+        return this.focusedInputId ? this.inputs[this.focusedInputId] : null;
+    }
     constructor(getters, state, dispatch, config, selection) {
         super(getters, state, dispatch, config, selection);
         this.state = state;
@@ -35154,9 +35190,6 @@ class SelectionInputsManagerPlugin extends UIPlugin {
         this.inputs = {};
         this.focusedInputId = null;
     }
-    get currentInput() {
-        return this.focusedInputId ? this.inputs[this.focusedInputId] : null;
-    }
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
@@ -37252,6 +37285,7 @@ class SortPlugin extends UIPlugin {
         const sortedIndexOfSortTypeCells = sortCells(sortingCells, sortDirection, Boolean(options.emptyCellAsZero));
         const sortedIndex = sortedIndexOfSortTypeCells.map((x) => x.index);
         const [width, height] = [cells.length, cells[0].length];
+        const cellUpdates = [];
         for (let c = 0; c < width; c++) {
             for (let r = 0; r < height; r++) {
                 let cell = cells[c][sortedIndex[r]];
@@ -37262,7 +37296,6 @@ class SortPlugin extends UIPlugin {
                     col: newCol,
                     row: newRow,
                     content: "",
-                    value: "",
                 };
                 if (cell) {
                     let content = cell.content;
@@ -37276,11 +37309,11 @@ class SortPlugin extends UIPlugin {
                     newCellValues.style = cell.style;
                     newCellValues.content = content;
                     newCellValues.format = cell.format;
-                    newCellValues.value = cell.evaluated.value;
                 }
-                this.dispatch("UPDATE_CELL", newCellValues);
+                cellUpdates.push(newCellValues);
             }
         }
+        cellUpdates.forEach((cmdPayload) => this.dispatch("UPDATE_CELL", cmdPayload));
     }
     /**
      * Return the distances between main merge cells in the zone.
@@ -38042,6 +38075,11 @@ css /* scss */ `
     .o-sidePanelButton:enabled {
       cursor: pointer;
     }
+
+    .o-sidePanelButton:disabled {
+      color: ${DISABLED_TEXT_COLOR};
+    }
+
     .o-sidePanelButton:last-child {
       margin-right: 0px;
     }
@@ -42785,6 +42823,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, cellTypes, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.0.13';
-__info__.date = '2023-06-12T13:44:11.940Z';
-__info__.hash = '3c9ec1e';
+__info__.version = '16.0.15';
+__info__.date = '2023-07-26T12:11:24.020Z';
+__info__.hash = '18da14b';

package/dist/o-spreadsheet.iife.js

@@ -106,7 +106,7 @@
   const HEADER_BORDER_COLOR = "#C0C0C0";
   const CELL_BORDER_COLOR = "#E2E3E3";
   const BACKGROUND_CHART_COLOR = "#FFFFFF";
-  const MENU_ITEM_DISABLED_COLOR = "#CACACA";
+  const DISABLED_TEXT_COLOR = "#CACACA";
   const DEFAULT_COLOR_SCALE_MIDPOINT_COLOR = 0xb6d7a8;
   const LINK_COLOR = "#01666b";
   const FILTERS_COLOR = "#188038";
@@ -720,12 +720,20 @@
           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;
@@ -3096,7 +3104,6 @@
       "SET_VIEWPORT_OFFSET",
       "SELECT_SEARCH_NEXT_MATCH",
       "SELECT_SEARCH_PREVIOUS_MATCH",
-      "REFRESH_SEARCH",
       "UPDATE_SEARCH",
       "CLEAR_SEARCH",
       "EVALUATE_CELLS",
@@ -4023,7 +4030,7 @@
         }
       }
       &.disabled {
-        color: ${MENU_ITEM_DISABLED_COLOR};
+        color: ${DISABLED_TEXT_COLOR};
         cursor: not-allowed;
       }
     }
@@ -9977,11 +9984,16 @@
       }
       setup() {
           this.showFormulaState = this.env.model.getters.shouldShowFormulas();
+          this.debouncedUpdateSearch = debounce(this.updateSearch.bind(this), 200);
           owl.onMounted(() => this.focusInput());
           owl.onWillUnmount(() => {
               this.env.model.dispatch("CLEAR_SEARCH");
               this.env.model.dispatch("SET_FORMULA_VISIBILITY", { show: this.showFormulaState });
           });
+          owl.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;
@@ -9999,10 +10011,6 @@
               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,
@@ -10021,10 +10029,6 @@
               searchOptions: this.state.searchOptions,
           });
       }
-      debouncedUpdateSearch() {
-          clearTimeout(this.inDebounce);
-          this.inDebounce = setTimeout(() => this.updateSearch.call(this), 400);
-      }
       replace() {
           this.env.model.dispatch("REPLACE_SEARCH", {
               replaceWith: this.state.replaceWith,
@@ -21152,6 +21156,14 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               if (dirY < 0) {
                   this.dnd.y = dndInitialY - deltaY;
               }
+              if (this.dnd.x < 0) {
+                  this.dnd.width += this.dnd.x;
+                  this.dnd.x = 0;
+              }
+              if (this.dnd.y < 0) {
+                  this.dnd.height += this.dnd.y;
+                  this.dnd.y = 0;
+              }
           };
           const onMouseUp = (ev) => {
               if (!this.dnd.figId) {
@@ -28644,7 +28656,14 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   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);
@@ -33276,6 +33295,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               searchFormulas: false,
           };
           this.toSearch = "";
+          this.isSearchDirty = false;
       }
       // ---------------------------------------------------------------------------
       // Command Handling
@@ -33300,18 +33320,25 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               case "REPLACE_ALL_SEARCH":
                   this.replaceAll(cmd.replaceWith);
                   break;
+              case "EVALUATE_CELLS":
+              case "UPDATE_CELL":
+                  this.isSearchDirty = true;
+                  break;
               case "UNDO":
               case "REDO":
               case "REMOVE_COLUMNS_ROWS":
               case "ADD_COLUMNS_ROWS":
-                  this.clearSearch();
-                  break;
               case "ACTIVATE_SHEET":
-              case "REFRESH_SEARCH":
                   this.refreshSearch();
                   break;
           }
       }
+      finalize() {
+          if (this.isSearchDirty) {
+              this.refreshSearch();
+              this.isSearchDirty = false;
+          }
+      }
       // ---------------------------------------------------------------------------
       // Getters
       // ---------------------------------------------------------------------------
@@ -33361,11 +33388,17 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
        * Find matches using the current regex
        */
       findMatches() {
-          const activeSheetId = this.getters.getActiveSheetId();
-          const cells = this.getters.getCells(activeSheetId);
+          const sheetId = this.getters.getActiveSheetId();
+          const cells = this.getters.getCells(sheetId);
           const matches = [];
           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.searchOptions.searchFormulas
@@ -35148,6 +35181,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
    * This plugin handles this internal state.
    */
   class SelectionInputsManagerPlugin extends UIPlugin {
+      get currentInput() {
+          return this.focusedInputId ? this.inputs[this.focusedInputId] : null;
+      }
       constructor(getters, state, dispatch, config, selection) {
           super(getters, state, dispatch, config, selection);
           this.state = state;
@@ -35155,9 +35191,6 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           this.inputs = {};
           this.focusedInputId = null;
       }
-      get currentInput() {
-          return this.focusedInputId ? this.inputs[this.focusedInputId] : null;
-      }
       // ---------------------------------------------------------------------------
       // Command Handling
       // ---------------------------------------------------------------------------
@@ -37253,6 +37286,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           const sortedIndexOfSortTypeCells = sortCells(sortingCells, sortDirection, Boolean(options.emptyCellAsZero));
           const sortedIndex = sortedIndexOfSortTypeCells.map((x) => x.index);
           const [width, height] = [cells.length, cells[0].length];
+          const cellUpdates = [];
           for (let c = 0; c < width; c++) {
               for (let r = 0; r < height; r++) {
                   let cell = cells[c][sortedIndex[r]];
@@ -37263,7 +37297,6 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                       col: newCol,
                       row: newRow,
                       content: "",
-                      value: "",
                   };
                   if (cell) {
                       let content = cell.content;
@@ -37277,11 +37310,11 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                       newCellValues.style = cell.style;
                       newCellValues.content = content;
                       newCellValues.format = cell.format;
-                      newCellValues.value = cell.evaluated.value;
                   }
-                  this.dispatch("UPDATE_CELL", newCellValues);
+                  cellUpdates.push(newCellValues);
               }
           }
+          cellUpdates.forEach((cmdPayload) => this.dispatch("UPDATE_CELL", cmdPayload));
       }
       /**
        * Return the distances between main merge cells in the zone.
@@ -38043,6 +38076,11 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
     .o-sidePanelButton:enabled {
       cursor: pointer;
     }
+
+    .o-sidePanelButton:disabled {
+      color: ${DISABLED_TEXT_COLOR};
+    }
+
     .o-sidePanelButton:last-child {
       margin-right: 0px;
     }
@@ -42816,9 +42854,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.13';
-  __info__.date = '2023-06-12T13:44:11.940Z';
-  __info__.hash = '3c9ec1e';
+  __info__.version = '16.0.15';
+  __info__.date = '2023-07-26T12:11:24.020Z';
+  __info__.hash = '18da14b';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);