@odoo/o-spreadsheet 17.1.15 → 17.1.16

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.1.15
- * @date 2024-05-15T09:22:23.258Z
- * @hash fc959fe
+ * @version 17.1.16
+ * @date 2024-05-24T11:27:23.083Z
+ * @hash 3a41c3a
  */
 
 'use strict';
@@ -567,8 +567,9 @@ function deepEquals(o1, o2, ignoreFunctions) {
                 return false;
         }
         else {
-            if (ignoreFunctions && typeOfO1Key === "function")
-                return true;
+            if (ignoreFunctions && typeOfO1Key === "function") {
+                continue;
+            }
             if (o1[key] !== o2[key])
                 return false;
         }
@@ -1802,7 +1803,7 @@ class LazyTranslatedString extends String {
     }
     valueOf() {
         const str = super.valueOf();
-        return _loaded() ? sprintf(_translate(str), ...this.values) : str;
+        return _loaded() ? sprintf(_translate(str), ...this.values) : sprintf(str, ...this.values);
     }
     toString() {
         return this.valueOf();
@@ -27177,7 +27178,7 @@ class Composer extends owl.Component {
         "Ctrl+Enter": this.processNewLineEvent,
         Escape: this.processEscapeKey,
         F2: () => console.warn("Not implemented"),
-        F4: this.processF4Key,
+        F4: (ev) => this.processF4Key(ev),
         Tab: (ev) => this.processTabKey(ev, "right"),
         "Shift+Tab": (ev) => this.processTabKey(ev, "left"),
     };
@@ -27291,9 +27292,10 @@ class Composer extends owl.Component {
     processEscapeKey() {
         this.env.model.dispatch("CANCEL_EDITION");
     }
-    processF4Key() {
+    processF4Key(ev) {
         this.env.model.dispatch("CYCLE_EDITION_REFERENCES");
         this.processContent();
+        ev.stopPropagation();
     }
     processNumpadDecimal(ev) {
         ev.stopPropagation();
@@ -38454,7 +38456,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
@@ -48813,7 +48820,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);
@@ -48825,7 +48832,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) {
@@ -53896,6 +53903,10 @@ class Spreadsheet extends owl.Component {
         }, () => [this.env.model.getters.getActiveSheetId()]);
         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.onWillUpdateProps((nextProps) => {
             if (nextProps.model !== this.props.model) {
@@ -57731,6 +57742,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.1.15";
-__info__.date = "2024-05-15T09:22:23.258Z";
-__info__.hash = "fc959fe";
+__info__.version = "17.1.16";
+__info__.date = "2024-05-24T11:27:23.083Z";
+__info__.hash = "3a41c3a";

package/dist/o-spreadsheet.esm.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.1.15
- * @date 2024-05-15T09:22:23.258Z
- * @hash fc959fe
+ * @version 17.1.16
+ * @date 2024-05-24T11:27:23.083Z
+ * @hash 3a41c3a
  */
 
 import { Component, useRef, onMounted, onWillUnmount, useEffect, onWillPatch, useState, onWillUpdateProps, onPatched, useComponent, useExternalListener, onWillStart, xml, useChildSubEnv, useSubEnv, markRaw } from '@odoo/owl';
@@ -565,8 +565,9 @@ function deepEquals(o1, o2, ignoreFunctions) {
                 return false;
         }
         else {
-            if (ignoreFunctions && typeOfO1Key === "function")
-                return true;
+            if (ignoreFunctions && typeOfO1Key === "function") {
+                continue;
+            }
             if (o1[key] !== o2[key])
                 return false;
         }
@@ -1800,7 +1801,7 @@ class LazyTranslatedString extends String {
     }
     valueOf() {
         const str = super.valueOf();
-        return _loaded() ? sprintf(_translate(str), ...this.values) : str;
+        return _loaded() ? sprintf(_translate(str), ...this.values) : sprintf(str, ...this.values);
     }
     toString() {
         return this.valueOf();
@@ -27175,7 +27176,7 @@ class Composer extends Component {
         "Ctrl+Enter": this.processNewLineEvent,
         Escape: this.processEscapeKey,
         F2: () => console.warn("Not implemented"),
-        F4: this.processF4Key,
+        F4: (ev) => this.processF4Key(ev),
         Tab: (ev) => this.processTabKey(ev, "right"),
         "Shift+Tab": (ev) => this.processTabKey(ev, "left"),
     };
@@ -27289,9 +27290,10 @@ class Composer extends Component {
     processEscapeKey() {
         this.env.model.dispatch("CANCEL_EDITION");
     }
-    processF4Key() {
+    processF4Key(ev) {
         this.env.model.dispatch("CYCLE_EDITION_REFERENCES");
         this.processContent();
+        ev.stopPropagation();
     }
     processNumpadDecimal(ev) {
         ev.stopPropagation();
@@ -38452,7 +38454,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
@@ -48811,7 +48818,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);
@@ -48823,7 +48830,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) {
@@ -53894,6 +53901,10 @@ class Spreadsheet extends Component {
         }, () => [this.env.model.getters.getActiveSheetId()]);
         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();
         onWillUpdateProps((nextProps) => {
             if (nextProps.model !== this.props.model) {
@@ -57693,6 +57704,6 @@ const constants = {
 export { AbstractChart, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = "17.1.15";
-__info__.date = "2024-05-15T09:22:23.258Z";
-__info__.hash = "fc959fe";
+__info__.version = "17.1.16";
+__info__.date = "2024-05-24T11:27:23.083Z";
+__info__.hash = "3a41c3a";

package/dist/o-spreadsheet.iife.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.1.15
- * @date 2024-05-15T09:22:23.258Z
- * @hash fc959fe
+ * @version 17.1.16
+ * @date 2024-05-24T11:27:23.083Z
+ * @hash 3a41c3a
  */
 
 (function (exports, owl) {
@@ -566,8 +566,9 @@
                   return false;
           }
           else {
-              if (ignoreFunctions && typeOfO1Key === "function")
-                  return true;
+              if (ignoreFunctions && typeOfO1Key === "function") {
+                  continue;
+              }
               if (o1[key] !== o2[key])
                   return false;
           }
@@ -1801,7 +1802,7 @@
       }
       valueOf() {
           const str = super.valueOf();
-          return _loaded() ? sprintf(_translate(str), ...this.values) : str;
+          return _loaded() ? sprintf(_translate(str), ...this.values) : sprintf(str, ...this.values);
       }
       toString() {
           return this.valueOf();
@@ -27176,7 +27177,7 @@
           "Ctrl+Enter": this.processNewLineEvent,
           Escape: this.processEscapeKey,
           F2: () => console.warn("Not implemented"),
-          F4: this.processF4Key,
+          F4: (ev) => this.processF4Key(ev),
           Tab: (ev) => this.processTabKey(ev, "right"),
           "Shift+Tab": (ev) => this.processTabKey(ev, "left"),
       };
@@ -27290,9 +27291,10 @@
       processEscapeKey() {
           this.env.model.dispatch("CANCEL_EDITION");
       }
-      processF4Key() {
+      processF4Key(ev) {
           this.env.model.dispatch("CYCLE_EDITION_REFERENCES");
           this.processContent();
+          ev.stopPropagation();
       }
       processNumpadDecimal(ev) {
           ev.stopPropagation();
@@ -38453,7 +38455,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
@@ -48812,7 +48819,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);
@@ -48824,7 +48831,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) {
@@ -53895,6 +53902,10 @@
           }, () => [this.env.model.getters.getActiveSheetId()]);
           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.onWillUpdateProps((nextProps) => {
               if (nextProps.model !== this.props.model) {
@@ -57730,9 +57741,9 @@
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.1.15";
-  __info__.date = "2024-05-15T09:22:23.258Z";
-  __info__.hash = "fc959fe";
+  __info__.version = "17.1.16";
+  __info__.date = "2024-05-24T11:27:23.083Z";
+  __info__.hash = "3a41c3a";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);