@odoo/o-spreadsheet 17.0.21 → 17.0.23

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.0.21
- * @date 2024-05-07T10:39:36.750Z
- * @hash 998bea0
+ * @version 17.0.23
+ * @date 2024-05-24T11:27:27.416Z
+ * @hash 6c10fec
  */
 
 'use strict';
@@ -47,7 +47,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();
@@ -666,8 +666,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;
         }
@@ -7512,7 +7513,7 @@ function tokenizeString(chars) {
     }
     return null;
 }
-const separatorRegexp = /^[\w\.!\$]+/;
+const SYMBOL_CHARS = new Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.!$");
 /**
  * A "Symbol" is just basically any word-like element that can appear in a
  * formula, which is not a string. So:
@@ -7552,11 +7553,8 @@ function tokenizeSymbol(chars) {
             };
         }
     }
-    const match = chars.remaining().match(separatorRegexp);
-    if (match) {
-        const value = match[0];
-        result += value;
-        chars.advanceBy(value.length);
+    while (chars.current && SYMBOL_CHARS.has(chars.current)) {
+        result += chars.shift();
     }
     if (result.length) {
         const value = result;
@@ -26668,7 +26666,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),
     };
     keyCodeMapping = {
@@ -26773,9 +26771,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();
@@ -33582,7 +33581,7 @@ const machine = {
 function matchReference(tokens) {
     let head = 0;
     let transitions = machine[State.LeftRef];
-    const matchedTokens = [];
+    let matchedTokens = "";
     while (transitions !== undefined) {
         const token = tokens[head++];
         if (!token) {
@@ -33594,15 +33593,15 @@ function matchReference(tokens) {
             case undefined:
                 return null;
             case State.Found:
-                matchedTokens.push(token);
+                matchedTokens += token.value;
                 tokens.splice(0, head);
                 return {
                     type: "REFERENCE",
-                    value: concat(matchedTokens.map((token) => token.value)),
+                    value: matchedTokens,
                 };
             default:
                 transitions = machine[nextState];
-                matchedTokens.push(token);
+                matchedTokens += token.value;
                 break;
         }
     }
@@ -37967,7 +37966,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
@@ -48329,7 +48333,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);
@@ -48341,7 +48345,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) {
@@ -53524,6 +53528,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.onWillUpdateProps((nextProps) => {
             if (nextProps.model !== this.props.model) {
@@ -57407,6 +57415,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.21";
-__info__.date = "2024-05-07T10:39:36.750Z";
-__info__.hash = "998bea0";
+__info__.version = "17.0.23";
+__info__.date = "2024-05-24T11:27:27.416Z";
+__info__.hash = "6c10fec";

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.0.21
- * @date 2024-05-07T10:39:36.750Z
- * @hash 998bea0
+ * @version 17.0.23
+ * @date 2024-05-24T11:27:27.416Z
+ * @hash 6c10fec
  */
 
 import { Component, useRef, onMounted, useEffect, onWillPatch, useState, onWillUpdateProps, onPatched, useComponent, useExternalListener, onWillUnmount, onWillStart, xml, useChildSubEnv, useSubEnv, markRaw } from '@odoo/owl';
@@ -45,7 +45,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();
@@ -664,8 +664,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;
         }
@@ -7510,7 +7511,7 @@ function tokenizeString(chars) {
     }
     return null;
 }
-const separatorRegexp = /^[\w\.!\$]+/;
+const SYMBOL_CHARS = new Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.!$");
 /**
  * A "Symbol" is just basically any word-like element that can appear in a
  * formula, which is not a string. So:
@@ -7550,11 +7551,8 @@ function tokenizeSymbol(chars) {
             };
         }
     }
-    const match = chars.remaining().match(separatorRegexp);
-    if (match) {
-        const value = match[0];
-        result += value;
-        chars.advanceBy(value.length);
+    while (chars.current && SYMBOL_CHARS.has(chars.current)) {
+        result += chars.shift();
     }
     if (result.length) {
         const value = result;
@@ -26666,7 +26664,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),
     };
     keyCodeMapping = {
@@ -26771,9 +26769,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();
@@ -33580,7 +33579,7 @@ const machine = {
 function matchReference(tokens) {
     let head = 0;
     let transitions = machine[State.LeftRef];
-    const matchedTokens = [];
+    let matchedTokens = "";
     while (transitions !== undefined) {
         const token = tokens[head++];
         if (!token) {
@@ -33592,15 +33591,15 @@ function matchReference(tokens) {
             case undefined:
                 return null;
             case State.Found:
-                matchedTokens.push(token);
+                matchedTokens += token.value;
                 tokens.splice(0, head);
                 return {
                     type: "REFERENCE",
-                    value: concat(matchedTokens.map((token) => token.value)),
+                    value: matchedTokens,
                 };
             default:
                 transitions = machine[nextState];
-                matchedTokens.push(token);
+                matchedTokens += token.value;
                 break;
         }
     }
@@ -37965,7 +37964,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
@@ -48327,7 +48331,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);
@@ -48339,7 +48343,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) {
@@ -53522,6 +53526,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();
         onWillUpdateProps((nextProps) => {
             if (nextProps.model !== this.props.model) {
@@ -57370,6 +57378,6 @@ const constants = {
 export { AbstractChart, 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.0.21";
-__info__.date = "2024-05-07T10:39:36.750Z";
-__info__.hash = "998bea0";
+__info__.version = "17.0.23";
+__info__.date = "2024-05-24T11:27:27.416Z";
+__info__.hash = "6c10fec";

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.0.21
- * @date 2024-05-07T10:39:36.750Z
- * @hash 998bea0
+ * @version 17.0.23
+ * @date 2024-05-24T11:27:27.416Z
+ * @hash 6c10fec
  */
 
 (function (exports, owl) {
@@ -46,7 +46,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();
@@ -665,8 +665,9 @@
                   return false;
           }
           else {
-              if (ignoreFunctions && typeOfO1Key === "function")
-                  return true;
+              if (ignoreFunctions && typeOfO1Key === "function") {
+                  continue;
+              }
               if (o1[key] !== o2[key])
                   return false;
           }
@@ -7511,7 +7512,7 @@
       }
       return null;
   }
-  const separatorRegexp = /^[\w\.!\$]+/;
+  const SYMBOL_CHARS = new Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.!$");
   /**
    * A "Symbol" is just basically any word-like element that can appear in a
    * formula, which is not a string. So:
@@ -7551,11 +7552,8 @@
               };
           }
       }
-      const match = chars.remaining().match(separatorRegexp);
-      if (match) {
-          const value = match[0];
-          result += value;
-          chars.advanceBy(value.length);
+      while (chars.current && SYMBOL_CHARS.has(chars.current)) {
+          result += chars.shift();
       }
       if (result.length) {
           const value = result;
@@ -26667,7 +26665,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),
       };
       keyCodeMapping = {
@@ -26772,9 +26770,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();
@@ -33581,7 +33580,7 @@
   function matchReference(tokens) {
       let head = 0;
       let transitions = machine[State.LeftRef];
-      const matchedTokens = [];
+      let matchedTokens = "";
       while (transitions !== undefined) {
           const token = tokens[head++];
           if (!token) {
@@ -33593,15 +33592,15 @@
               case undefined:
                   return null;
               case State.Found:
-                  matchedTokens.push(token);
+                  matchedTokens += token.value;
                   tokens.splice(0, head);
                   return {
                       type: "REFERENCE",
-                      value: concat(matchedTokens.map((token) => token.value)),
+                      value: matchedTokens,
                   };
               default:
                   transitions = machine[nextState];
-                  matchedTokens.push(token);
+                  matchedTokens += token.value;
                   break;
           }
       }
@@ -37966,7 +37965,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
@@ -48328,7 +48332,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);
@@ -48340,7 +48344,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) {
@@ -53523,6 +53527,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.onWillUpdateProps((nextProps) => {
               if (nextProps.model !== this.props.model) {
@@ -57406,9 +57414,9 @@
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.0.21";
-  __info__.date = "2024-05-07T10:39:36.750Z";
-  __info__.hash = "998bea0";
+  __info__.version = "17.0.23";
+  __info__.date = "2024-05-24T11:27:27.416Z";
+  __info__.hash = "6c10fec";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);