@odoo/o-spreadsheet 16.4.1 → 16.4.3

package/dist/o-spreadsheet.cjs.js

@@ -24067,13 +24067,18 @@ class Composer extends owl.Component {
         });
         this.processTokenAtCursor();
     }
-    onKeyup() {
+    onKeyup(ev) {
         if (this.contentHelper.el === document.activeElement) {
+            const isSelectingForComposer = this.env.model.getters.isSelectingForComposer();
+            if (isSelectingForComposer && ev.key?.startsWith("Arrow")) {
+                return;
+            }
             const { start: oldStart, end: oldEnd } = this.env.model.getters.getComposerSelection();
             const { start, end } = this.contentHelper.getCurrentSelection();
             if (start !== oldStart || end !== oldEnd) {
                 this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
             }
+            this.processTokenAtCursor();
         }
     }
     showAutocomplete(searchTerm) {
@@ -24689,6 +24694,15 @@ function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }
             y = initialFigure.y - deltaY;
         }
     }
+    // Restrict resizing if x or y reaches header boundaries
+    if (x < 0) {
+        width += x;
+        x = 0;
+    }
+    if (y < 0) {
+        height += y;
+        y = 0;
+    }
     return { ...initialFigure, x, y, width, height };
 }
 
@@ -38552,9 +38566,17 @@ class FindAndReplacePlugin extends UIPlugin {
             case "REPLACE_ALL_SEARCH":
                 this.replaceAll(cmd.replaceWith);
                 break;
+            case "EVALUATE_CELLS":
+            case "UPDATE_CELL":
+            case "REMOVE_FILTER_TABLE":
+            case "UPDATE_FILTER":
+                this.isSearchDirty = true;
+                break;
             case "UNDO":
             case "REDO":
             case "REMOVE_COLUMNS_ROWS":
+            case "HIDE_COLUMNS_ROWS":
+            case "UNHIDE_COLUMNS_ROWS":
             case "ADD_COLUMNS_ROWS":
             case "EVALUATE_CELLS":
             case "UPDATE_CELL":
@@ -38690,37 +38712,32 @@ class FindAndReplacePlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     // Replace
     // ---------------------------------------------------------------------------
-    /**
-     * Replace the value of the currently selected match
-     */
-    replace(replaceWith) {
-        if (this.selectedMatchIndex === null || !this.currentSearchRegex) {
+    replaceMatch(selectedMatch, replaceWith) {
+        if (!this.currentSearchRegex) {
             return;
         }
-        const matches = this.searchMatches;
-        const selectedMatch = matches[this.selectedMatchIndex];
         const sheetId = this.getters.getActiveSheetId();
         const cell = this.getters.getCell({ sheetId, ...selectedMatch });
+        const { col, row } = selectedMatch;
         if (cell?.isFormula && !this.searchOptions.searchFormulas) {
-            this.selectNextCell(Direction.next);
+            return;
         }
-        else {
-            const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
-            const toReplace = this.getSearchableString({
-                sheetId,
-                col: selectedMatch.col,
-                row: selectedMatch.row,
-            });
-            const newContent = toReplace.replace(replaceRegex, replaceWith);
-            this.dispatch("UPDATE_CELL", {
-                sheetId: this.getters.getActiveSheetId(),
-                col: selectedMatch.col,
-                row: selectedMatch.row,
-                content: canonicalizeContent(newContent, this.getters.getLocale()),
-            });
-            this.searchMatches.splice(this.selectedMatchIndex, 1);
-            this.selectNextCell(Direction.current);
+        const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
+        const toReplace = this.getSearchableString({ sheetId, col, row });
+        const content = toReplace.replace(replaceRegex, replaceWith);
+        const canonicalContent = canonicalizeContent(content, this.getters.getLocale());
+        this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
+    }
+    /**
+     * Replace the value of the currently selected match
+     */
+    replace(replaceWith) {
+        if (this.selectedMatchIndex === null) {
+            return;
         }
+        const selectedMatch = this.searchMatches[this.selectedMatchIndex];
+        this.replaceMatch(selectedMatch, replaceWith);
+        this.selectNextCell(Direction.next);
     }
     /**
      * Apply the replace function to all the matches one time.
@@ -38728,7 +38745,7 @@ class FindAndReplacePlugin extends UIPlugin {
     replaceAll(replaceWith) {
         const matchCount = this.searchMatches.length;
         for (let i = 0; i < matchCount; i++) {
-            this.replace(replaceWith);
+            this.replaceMatch(this.searchMatches[i], replaceWith);
         }
     }
     getSearchableString(position) {
@@ -42810,6 +42827,7 @@ class FilterEvaluationPlugin extends UIPlugin {
                 this.filterValues[cmd.sheetId] = {};
                 break;
             case "HIDE_COLUMNS_ROWS":
+            case "UNHIDE_COLUMNS_ROWS":
                 this.updateHiddenRows();
                 break;
             case "UPDATE_FILTER":
@@ -50528,6 +50546,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.1';
-__info__.date = '2023-07-26T12:13:04.992Z';
-__info__.hash = 'e687fa9';
+__info__.version = '16.4.3';
+__info__.date = '2023-08-09T09:08:41.454Z';
+__info__.hash = '1dbd302';

package/dist/o-spreadsheet.d.ts

@@ -1453,6 +1453,7 @@ declare class FindAndReplacePlugin extends UIPlugin {
      */
     private selectNextCell;
     private clearSearch;
+    private replaceMatch;
     /**
      * Replace the value of the currently selected match
      */
@@ -6705,7 +6706,7 @@ declare class Composer extends Component<ComposerProps, SpreadsheetChildEnv> {
     onCompositionEnd(): void;
     onKeydown(ev: KeyboardEvent): void;
     onInput(ev: InputEvent): void;
-    onKeyup(): void;
+    onKeyup(ev: KeyboardEvent): void;
     showAutocomplete(searchTerm: string): void;
     /**
      * This is required to ensure the content helper selection is

package/dist/o-spreadsheet.esm.js

@@ -24063,13 +24063,18 @@ class Composer extends Component {
         });
         this.processTokenAtCursor();
     }
-    onKeyup() {
+    onKeyup(ev) {
         if (this.contentHelper.el === document.activeElement) {
+            const isSelectingForComposer = this.env.model.getters.isSelectingForComposer();
+            if (isSelectingForComposer && ev.key?.startsWith("Arrow")) {
+                return;
+            }
             const { start: oldStart, end: oldEnd } = this.env.model.getters.getComposerSelection();
             const { start, end } = this.contentHelper.getCurrentSelection();
             if (start !== oldStart || end !== oldEnd) {
                 this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
             }
+            this.processTokenAtCursor();
         }
     }
     showAutocomplete(searchTerm) {
@@ -24685,6 +24690,15 @@ function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }
             y = initialFigure.y - deltaY;
         }
     }
+    // Restrict resizing if x or y reaches header boundaries
+    if (x < 0) {
+        width += x;
+        x = 0;
+    }
+    if (y < 0) {
+        height += y;
+        y = 0;
+    }
     return { ...initialFigure, x, y, width, height };
 }
 
@@ -38548,9 +38562,17 @@ class FindAndReplacePlugin extends UIPlugin {
             case "REPLACE_ALL_SEARCH":
                 this.replaceAll(cmd.replaceWith);
                 break;
+            case "EVALUATE_CELLS":
+            case "UPDATE_CELL":
+            case "REMOVE_FILTER_TABLE":
+            case "UPDATE_FILTER":
+                this.isSearchDirty = true;
+                break;
             case "UNDO":
             case "REDO":
             case "REMOVE_COLUMNS_ROWS":
+            case "HIDE_COLUMNS_ROWS":
+            case "UNHIDE_COLUMNS_ROWS":
             case "ADD_COLUMNS_ROWS":
             case "EVALUATE_CELLS":
             case "UPDATE_CELL":
@@ -38686,37 +38708,32 @@ class FindAndReplacePlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     // Replace
     // ---------------------------------------------------------------------------
-    /**
-     * Replace the value of the currently selected match
-     */
-    replace(replaceWith) {
-        if (this.selectedMatchIndex === null || !this.currentSearchRegex) {
+    replaceMatch(selectedMatch, replaceWith) {
+        if (!this.currentSearchRegex) {
             return;
         }
-        const matches = this.searchMatches;
-        const selectedMatch = matches[this.selectedMatchIndex];
         const sheetId = this.getters.getActiveSheetId();
         const cell = this.getters.getCell({ sheetId, ...selectedMatch });
+        const { col, row } = selectedMatch;
         if (cell?.isFormula && !this.searchOptions.searchFormulas) {
-            this.selectNextCell(Direction.next);
+            return;
         }
-        else {
-            const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
-            const toReplace = this.getSearchableString({
-                sheetId,
-                col: selectedMatch.col,
-                row: selectedMatch.row,
-            });
-            const newContent = toReplace.replace(replaceRegex, replaceWith);
-            this.dispatch("UPDATE_CELL", {
-                sheetId: this.getters.getActiveSheetId(),
-                col: selectedMatch.col,
-                row: selectedMatch.row,
-                content: canonicalizeContent(newContent, this.getters.getLocale()),
-            });
-            this.searchMatches.splice(this.selectedMatchIndex, 1);
-            this.selectNextCell(Direction.current);
+        const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
+        const toReplace = this.getSearchableString({ sheetId, col, row });
+        const content = toReplace.replace(replaceRegex, replaceWith);
+        const canonicalContent = canonicalizeContent(content, this.getters.getLocale());
+        this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
+    }
+    /**
+     * Replace the value of the currently selected match
+     */
+    replace(replaceWith) {
+        if (this.selectedMatchIndex === null) {
+            return;
         }
+        const selectedMatch = this.searchMatches[this.selectedMatchIndex];
+        this.replaceMatch(selectedMatch, replaceWith);
+        this.selectNextCell(Direction.next);
     }
     /**
      * Apply the replace function to all the matches one time.
@@ -38724,7 +38741,7 @@ class FindAndReplacePlugin extends UIPlugin {
     replaceAll(replaceWith) {
         const matchCount = this.searchMatches.length;
         for (let i = 0; i < matchCount; i++) {
-            this.replace(replaceWith);
+            this.replaceMatch(this.searchMatches[i], replaceWith);
         }
     }
     getSearchableString(position) {
@@ -42806,6 +42823,7 @@ class FilterEvaluationPlugin extends UIPlugin {
                 this.filterValues[cmd.sheetId] = {};
                 break;
             case "HIDE_COLUMNS_ROWS":
+            case "UNHIDE_COLUMNS_ROWS":
                 this.updateHiddenRows();
                 break;
             case "UPDATE_FILTER":
@@ -50492,6 +50510,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.4.1';
-__info__.date = '2023-07-26T12:13:04.992Z';
-__info__.hash = 'e687fa9';
+__info__.version = '16.4.3';
+__info__.date = '2023-08-09T09:08:41.454Z';
+__info__.hash = '1dbd302';

package/dist/o-spreadsheet.iife.js

@@ -24064,13 +24064,18 @@
           });
           this.processTokenAtCursor();
       }
-      onKeyup() {
+      onKeyup(ev) {
           if (this.contentHelper.el === document.activeElement) {
+              const isSelectingForComposer = this.env.model.getters.isSelectingForComposer();
+              if (isSelectingForComposer && ev.key?.startsWith("Arrow")) {
+                  return;
+              }
               const { start: oldStart, end: oldEnd } = this.env.model.getters.getComposerSelection();
               const { start, end } = this.contentHelper.getCurrentSelection();
               if (start !== oldStart || end !== oldEnd) {
                   this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
               }
+              this.processTokenAtCursor();
           }
       }
       showAutocomplete(searchTerm) {
@@ -24686,6 +24691,15 @@
               y = initialFigure.y - deltaY;
           }
       }
+      // Restrict resizing if x or y reaches header boundaries
+      if (x < 0) {
+          width += x;
+          x = 0;
+      }
+      if (y < 0) {
+          height += y;
+          y = 0;
+      }
       return { ...initialFigure, x, y, width, height };
   }
 
@@ -38549,9 +38563,17 @@
               case "REPLACE_ALL_SEARCH":
                   this.replaceAll(cmd.replaceWith);
                   break;
+              case "EVALUATE_CELLS":
+              case "UPDATE_CELL":
+              case "REMOVE_FILTER_TABLE":
+              case "UPDATE_FILTER":
+                  this.isSearchDirty = true;
+                  break;
               case "UNDO":
               case "REDO":
               case "REMOVE_COLUMNS_ROWS":
+              case "HIDE_COLUMNS_ROWS":
+              case "UNHIDE_COLUMNS_ROWS":
               case "ADD_COLUMNS_ROWS":
               case "EVALUATE_CELLS":
               case "UPDATE_CELL":
@@ -38687,37 +38709,32 @@
       // ---------------------------------------------------------------------------
       // Replace
       // ---------------------------------------------------------------------------
-      /**
-       * Replace the value of the currently selected match
-       */
-      replace(replaceWith) {
-          if (this.selectedMatchIndex === null || !this.currentSearchRegex) {
+      replaceMatch(selectedMatch, replaceWith) {
+          if (!this.currentSearchRegex) {
               return;
           }
-          const matches = this.searchMatches;
-          const selectedMatch = matches[this.selectedMatchIndex];
           const sheetId = this.getters.getActiveSheetId();
           const cell = this.getters.getCell({ sheetId, ...selectedMatch });
+          const { col, row } = selectedMatch;
           if (cell?.isFormula && !this.searchOptions.searchFormulas) {
-              this.selectNextCell(Direction.next);
+              return;
           }
-          else {
-              const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
-              const toReplace = this.getSearchableString({
-                  sheetId,
-                  col: selectedMatch.col,
-                  row: selectedMatch.row,
-              });
-              const newContent = toReplace.replace(replaceRegex, replaceWith);
-              this.dispatch("UPDATE_CELL", {
-                  sheetId: this.getters.getActiveSheetId(),
-                  col: selectedMatch.col,
-                  row: selectedMatch.row,
-                  content: canonicalizeContent(newContent, this.getters.getLocale()),
-              });
-              this.searchMatches.splice(this.selectedMatchIndex, 1);
-              this.selectNextCell(Direction.current);
+          const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
+          const toReplace = this.getSearchableString({ sheetId, col, row });
+          const content = toReplace.replace(replaceRegex, replaceWith);
+          const canonicalContent = canonicalizeContent(content, this.getters.getLocale());
+          this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
+      }
+      /**
+       * Replace the value of the currently selected match
+       */
+      replace(replaceWith) {
+          if (this.selectedMatchIndex === null) {
+              return;
           }
+          const selectedMatch = this.searchMatches[this.selectedMatchIndex];
+          this.replaceMatch(selectedMatch, replaceWith);
+          this.selectNextCell(Direction.next);
       }
       /**
        * Apply the replace function to all the matches one time.
@@ -38725,7 +38742,7 @@
       replaceAll(replaceWith) {
           const matchCount = this.searchMatches.length;
           for (let i = 0; i < matchCount; i++) {
-              this.replace(replaceWith);
+              this.replaceMatch(this.searchMatches[i], replaceWith);
           }
       }
       getSearchableString(position) {
@@ -42807,6 +42824,7 @@
                   this.filterValues[cmd.sheetId] = {};
                   break;
               case "HIDE_COLUMNS_ROWS":
+              case "UNHIDE_COLUMNS_ROWS":
                   this.updateHiddenRows();
                   break;
               case "UPDATE_FILTER":
@@ -50527,9 +50545,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.4.1';
-  __info__.date = '2023-07-26T12:13:04.992Z';
-  __info__.hash = 'e687fa9';
+  __info__.version = '16.4.3';
+  __info__.date = '2023-08-09T09:08:41.454Z';
+  __info__.hash = '1dbd302';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);