@odoo/o-spreadsheet 16.3.35 → 16.3.36

package/dist/o-spreadsheet.cjs.js

@@ -21088,7 +21088,7 @@ class Composer extends owl.Component {
         Enter: this.processEnterKey,
         Escape: this.processEscapeKey,
         F2: () => console.warn("Not implemented"),
-        F4: this.processF4Key,
+        F4: (ev) => this.processF4Key(ev),
         Tab: (ev) => this.processTabKey(ev),
     };
     setup() {
@@ -21205,9 +21205,10 @@ class Composer extends owl.Component {
     processEscapeKey() {
         this.env.model.dispatch("STOP_EDITION", { cancel: true });
     }
-    processF4Key() {
+    processF4Key(ev) {
         this.env.model.dispatch("CYCLE_EDITION_REFERENCES");
         this.processContent();
+        ev.stopPropagation();
     }
     onCompositionStart() {
         this.compositionActive = true;
@@ -31898,7 +31899,12 @@ class MergePlugin extends CorePlugin {
      * if they have at least a common cell
      */
     doesIntersectMerge(sheetId, zone) {
-        return positions(zone).some(({ col, row }) => this.getMerge({ sheetId, col, row }) !== undefined);
+        for (const merge of this.getMerges(sheetId)) {
+            if (overlap(zone, merge)) {
+                return true;
+            }
+        }
+        return false;
     }
     /**
      * Returns true if two columns have at least one merge in common
@@ -40608,7 +40614,7 @@ class ClipboardPlugin extends UIPlugin {
             case "ADD_COLUMNS_ROWS": {
                 this.status = "invisible";
                 // If we add a col/row inside or before the cut area, we invalidate the clipboard
-                if (this.state?.operation !== "CUT") {
+                if (this.state?.operation !== "CUT" || cmd.sheetId !== this.state?.sheetId) {
                     return;
                 }
                 const isClipboardDirty = this.state.isColRowDirtyingClipboard(cmd.position === "before" ? cmd.base : cmd.base + 1, cmd.dimension);
@@ -40620,7 +40626,7 @@ class ClipboardPlugin extends UIPlugin {
             case "REMOVE_COLUMNS_ROWS": {
                 this.status = "invisible";
                 // If we remove a col/row inside or before the cut area, we invalidate the clipboard
-                if (this.state?.operation !== "CUT") {
+                if (this.state?.operation !== "CUT" || cmd.sheetId !== this.state?.sheetId) {
                     return;
                 }
                 for (let el of cmd.elements) {
@@ -44270,6 +44276,10 @@ class Spreadsheet extends owl.Component {
         });
         owl.useExternalListener(window, "resize", () => this.render(true));
         owl.useExternalListener(window, "beforeunload", this.unbindModelEvents.bind(this));
+        // For some reason, the wheel event is not properly registered inside templates
+        // in Chromium-based browsers based on chromium 125
+        // This hack ensures the event declared in the template is properly registered/working
+        owl.useExternalListener(document.body, "wheel", () => { });
         this.bindModelEvents();
         owl.onMounted(() => {
             this.checkViewportSize();
@@ -48093,6 +48103,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.3.35';
-__info__.date = '2024-05-15T09:15:19.399Z';
-__info__.hash = '255caa0';
+__info__.version = '16.3.36';
+__info__.date = '2024-05-24T11:25:00.243Z';
+__info__.hash = 'b038fad';

package/dist/o-spreadsheet.esm.js

@@ -21084,7 +21084,7 @@ class Composer extends Component {
         Enter: this.processEnterKey,
         Escape: this.processEscapeKey,
         F2: () => console.warn("Not implemented"),
-        F4: this.processF4Key,
+        F4: (ev) => this.processF4Key(ev),
         Tab: (ev) => this.processTabKey(ev),
     };
     setup() {
@@ -21201,9 +21201,10 @@ class Composer extends Component {
     processEscapeKey() {
         this.env.model.dispatch("STOP_EDITION", { cancel: true });
     }
-    processF4Key() {
+    processF4Key(ev) {
         this.env.model.dispatch("CYCLE_EDITION_REFERENCES");
         this.processContent();
+        ev.stopPropagation();
     }
     onCompositionStart() {
         this.compositionActive = true;
@@ -31894,7 +31895,12 @@ class MergePlugin extends CorePlugin {
      * if they have at least a common cell
      */
     doesIntersectMerge(sheetId, zone) {
-        return positions(zone).some(({ col, row }) => this.getMerge({ sheetId, col, row }) !== undefined);
+        for (const merge of this.getMerges(sheetId)) {
+            if (overlap(zone, merge)) {
+                return true;
+            }
+        }
+        return false;
     }
     /**
      * Returns true if two columns have at least one merge in common
@@ -40604,7 +40610,7 @@ class ClipboardPlugin extends UIPlugin {
             case "ADD_COLUMNS_ROWS": {
                 this.status = "invisible";
                 // If we add a col/row inside or before the cut area, we invalidate the clipboard
-                if (this.state?.operation !== "CUT") {
+                if (this.state?.operation !== "CUT" || cmd.sheetId !== this.state?.sheetId) {
                     return;
                 }
                 const isClipboardDirty = this.state.isColRowDirtyingClipboard(cmd.position === "before" ? cmd.base : cmd.base + 1, cmd.dimension);
@@ -40616,7 +40622,7 @@ class ClipboardPlugin extends UIPlugin {
             case "REMOVE_COLUMNS_ROWS": {
                 this.status = "invisible";
                 // If we remove a col/row inside or before the cut area, we invalidate the clipboard
-                if (this.state?.operation !== "CUT") {
+                if (this.state?.operation !== "CUT" || cmd.sheetId !== this.state?.sheetId) {
                     return;
                 }
                 for (let el of cmd.elements) {
@@ -44266,6 +44272,10 @@ class Spreadsheet extends Component {
         });
         useExternalListener(window, "resize", () => this.render(true));
         useExternalListener(window, "beforeunload", this.unbindModelEvents.bind(this));
+        // For some reason, the wheel event is not properly registered inside templates
+        // in Chromium-based browsers based on chromium 125
+        // This hack ensures the event declared in the template is properly registered/working
+        useExternalListener(document.body, "wheel", () => { });
         this.bindModelEvents();
         onMounted(() => {
             this.checkViewportSize();
@@ -48061,6 +48071,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.35';
-__info__.date = '2024-05-15T09:15:19.399Z';
-__info__.hash = '255caa0';
+__info__.version = '16.3.36';
+__info__.date = '2024-05-24T11:25:00.243Z';
+__info__.hash = 'b038fad';

package/dist/o-spreadsheet.iife.js

@@ -21085,7 +21085,7 @@
           Enter: this.processEnterKey,
           Escape: this.processEscapeKey,
           F2: () => console.warn("Not implemented"),
-          F4: this.processF4Key,
+          F4: (ev) => this.processF4Key(ev),
           Tab: (ev) => this.processTabKey(ev),
       };
       setup() {
@@ -21202,9 +21202,10 @@
       processEscapeKey() {
           this.env.model.dispatch("STOP_EDITION", { cancel: true });
       }
-      processF4Key() {
+      processF4Key(ev) {
           this.env.model.dispatch("CYCLE_EDITION_REFERENCES");
           this.processContent();
+          ev.stopPropagation();
       }
       onCompositionStart() {
           this.compositionActive = true;
@@ -31895,7 +31896,12 @@
        * if they have at least a common cell
        */
       doesIntersectMerge(sheetId, zone) {
-          return positions(zone).some(({ col, row }) => this.getMerge({ sheetId, col, row }) !== undefined);
+          for (const merge of this.getMerges(sheetId)) {
+              if (overlap(zone, merge)) {
+                  return true;
+              }
+          }
+          return false;
       }
       /**
        * Returns true if two columns have at least one merge in common
@@ -40605,7 +40611,7 @@
               case "ADD_COLUMNS_ROWS": {
                   this.status = "invisible";
                   // If we add a col/row inside or before the cut area, we invalidate the clipboard
-                  if (this.state?.operation !== "CUT") {
+                  if (this.state?.operation !== "CUT" || cmd.sheetId !== this.state?.sheetId) {
                       return;
                   }
                   const isClipboardDirty = this.state.isColRowDirtyingClipboard(cmd.position === "before" ? cmd.base : cmd.base + 1, cmd.dimension);
@@ -40617,7 +40623,7 @@
               case "REMOVE_COLUMNS_ROWS": {
                   this.status = "invisible";
                   // If we remove a col/row inside or before the cut area, we invalidate the clipboard
-                  if (this.state?.operation !== "CUT") {
+                  if (this.state?.operation !== "CUT" || cmd.sheetId !== this.state?.sheetId) {
                       return;
                   }
                   for (let el of cmd.elements) {
@@ -44267,6 +44273,10 @@
           });
           owl.useExternalListener(window, "resize", () => this.render(true));
           owl.useExternalListener(window, "beforeunload", this.unbindModelEvents.bind(this));
+          // For some reason, the wheel event is not properly registered inside templates
+          // in Chromium-based browsers based on chromium 125
+          // This hack ensures the event declared in the template is properly registered/working
+          owl.useExternalListener(document.body, "wheel", () => { });
           this.bindModelEvents();
           owl.onMounted(() => {
               this.checkViewportSize();
@@ -48092,9 +48102,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.3.35';
-  __info__.date = '2024-05-15T09:15:19.399Z';
-  __info__.hash = '255caa0';
+  __info__.version = '16.3.36';
+  __info__.date = '2024-05-24T11:25:00.243Z';
+  __info__.hash = 'b038fad';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);