@odoo/o-spreadsheet 17.4.34 → 17.4.35

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.4.34
- * @date 2025-05-12T05:23:37.387Z
- * @hash e3ac48a
+ * @version 17.4.35
+ * @date 2025-05-13T17:49:44.553Z
+ * @hash 534c5f4
  */
 
 (function (exports, owl) {
@@ -1915,7 +1915,7 @@
    */
   const getFormulaNumberRegex = memoize(function getFormulaNumberRegex(decimalSeparator) {
       decimalSeparator = escapeRegExp(decimalSeparator);
-      return new RegExp(`(?:^-?\\d+(?:${decimalSeparator}?\\d*(?:e\\d+)?)?|^-?${decimalSeparator}\\d+)(?!\\w|!)`);
+      return new RegExp(`(?:^-?\\d+(?:${decimalSeparator}?\\d*(?:e(\\+|-)?\\d+)?)?|^-?${decimalSeparator}\\d+)(?!\\w|!)`);
   });
   const getNumberRegex = memoize(function getNumberRegex(locale) {
       const decimalSeparator = escapeRegExp(locale.decimalSeparator);
@@ -5210,6 +5210,13 @@
       }
       return name;
   }
+  function isSheetNameEqual(name1, name2) {
+      if (name1 === undefined || name2 === undefined) {
+          return false;
+      }
+      return (getUnquotedSheetName(name1.trim().toUpperCase()) ===
+          getUnquotedSheetName(name2.trim().toUpperCase()));
+  }
 
   function computeTextLinesHeight(textLineHeight, numberOfLines = 1) {
       return numberOfLines * (textLineHeight + MIN_CELL_TEXT_MARGIN) - MIN_CELL_TEXT_MARGIN;
@@ -6511,10 +6518,9 @@
       avg: _t("Average"),
       sum: _t("Sum"),
   };
-  const NUMBER_CHAR_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
   const AGGREGATORS_BY_FIELD_TYPE = {
-      integer: NUMBER_CHAR_AGGREGATORS,
-      char: NUMBER_CHAR_AGGREGATORS,
+      integer: ["max", "min", "avg", "sum", "count_distinct", "count"],
+      char: ["count_distinct", "count"],
       boolean: ["count_distinct", "count", "bool_and", "bool_or"],
   };
   const AGGREGATORS = {};
@@ -6728,8 +6734,11 @@
                   const evaluatedCell = this.getters.getEvaluatedCell(position);
                   const pivotId = this.getters.getPivotIdFromPosition(position);
                   const spreader = this.getters.getArrayFormulaSpreadingOn(position);
-                  if (pivotId) {
-                      if (spreader && (!deepEquals(spreader, position) || !isCopyingOneCell)) {
+                  if (pivotId && spreader) {
+                      const pivotZone = this.getters.getSpreadZone(spreader);
+                      if ((!deepEquals(spreader, position) || !isCopyingOneCell) &&
+                          pivotZone &&
+                          !data.zones.some((z) => isZoneInside(pivotZone, z))) {
                           const pivotCell = this.getters.getPivotCellFromPosition(position);
                           const formulaPivotId = this.getters.getPivotFormulaId(pivotId);
                           const pivotFormula = createPivotFormula(formulaPivotId, pivotCell);
@@ -9451,7 +9460,10 @@ stores.inject(MyMetaStore, storeInstance);
                   const functionProxy = new Proxy(value, {
                       // trap the function call
                       apply(target, thisArg, argArray) {
-                          Reflect.apply(target, thisStore, argArray);
+                          const res = Reflect.apply(target, thisStore, argArray);
+                          if (res === "noStateChange") {
+                              return;
+                          }
                           callback();
                       },
                   });
@@ -9473,7 +9485,7 @@ stores.inject(MyMetaStore, storeInstance);
   const ModelStore = createAbstractStore("Model");
 
   class RendererStore {
-      mutators = ["register", "unRegister"];
+      mutators = ["register", "unRegister", "drawLayer"];
       renderers = {};
       register(renderer) {
           if (!renderer.renderingLayers.length) {
@@ -9493,14 +9505,14 @@ stores.inject(MyMetaStore, storeInstance);
       }
       drawLayer(context, layer) {
           const renderers = this.renderers[layer];
-          if (!renderers) {
-              return;
-          }
-          for (const renderer of renderers) {
-              context.ctx.save();
-              renderer.drawLayer(context, layer);
-              context.ctx.restore();
+          if (renderers) {
+              for (const renderer of renderers) {
+                  context.ctx.save();
+                  renderer.drawLayer(context, layer);
+                  context.ctx.restore();
+              }
           }
+          return "noStateChange";
       }
   }
 
@@ -10113,7 +10125,7 @@ stores.inject(MyMetaStore, storeInstance);
               .find((token) => {
               const { xc, sheetName: sheet } = splitReference(token.value);
               const sheetName = sheet || this.getters.getSheetName(this.sheetId);
-              if (this.getters.getSheetName(activeSheetId) !== sheetName) {
+              if (!isSheetNameEqual(this.getters.getSheetName(activeSheetId), sheetName)) {
                   return false;
               }
               const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
@@ -10418,27 +10430,30 @@ stores.inject(MyMetaStore, storeInstance);
       }
       focusTopBarComposer(selection) {
           if (this.getters.isReadonly()) {
-              return;
+              return "noStateChange";
           }
           this.topBarFocus = "contentFocus";
           this.gridFocusMode = "inactive";
-          this.setComposerContent({ selection } || {});
+          this.setComposerContent({ selection });
+          return;
       }
       focusGridComposerContent() {
           if (this.getters.isReadonly()) {
-              return;
+              return "noStateChange";
           }
           this.topBarFocus = "inactive";
           this.gridFocusMode = "contentFocus";
           this.setComposerContent({});
+          return;
       }
       focusGridComposerCell(content, selection) {
           if (this.getters.isReadonly()) {
-              return;
+              return "noStateChange";
           }
           this.topBarFocus = "inactive";
           this.gridFocusMode = "cellFocus";
-          this.setComposerContent({ content, selection } || {});
+          this.setComposerContent({ content, selection });
+          return;
       }
       /**
        * Start the edition or update the content if it's already started.
@@ -20323,6 +20338,9 @@ stores.inject(MyMetaStore, storeInstance);
       return data === undefined || data.value === null;
   }
   const getNeutral = { number: 0, string: "", boolean: false };
+  function areAlmostEqual(value1, value2, epsilon = 2e-16) {
+      return Math.abs(value1 - value2) < epsilon;
+  }
   const EQ = {
       description: _t("Equal."),
       args: [
@@ -20344,6 +20362,9 @@ stores.inject(MyMetaStore, storeInstance);
           if (isEvaluationError(_value2)) {
               throw value2;
           }
+          if (typeof _value1 === "number" && typeof _value2 === "number") {
+              return areAlmostEqual(_value1, _value2);
+          }
           return _value1 === _value2;
       },
   };
@@ -20383,6 +20404,9 @@ stores.inject(MyMetaStore, storeInstance);
       ],
       compute: function (value1, value2) {
           return applyRelationalOperator(value1, value2, (v1, v2) => {
+              if (typeof v1 === "number" && typeof v2 === "number") {
+                  return !areAlmostEqual(v1, v2) && v1 > v2;
+              }
               return v1 > v2;
           });
       },
@@ -20398,6 +20422,9 @@ stores.inject(MyMetaStore, storeInstance);
       ],
       compute: function (value1, value2) {
           return applyRelationalOperator(value1, value2, (v1, v2) => {
+              if (typeof v1 === "number" && typeof v2 === "number") {
+                  return areAlmostEqual(v1, v2) || v1 > v2;
+              }
               return v1 >= v2;
           });
       },
@@ -21498,10 +21525,18 @@ stores.inject(MyMetaStore, storeInstance);
   });
 
   class DOMFocusableElementStore {
-      mutators = ["setFocusableElement"];
+      mutators = ["setFocusableElement", "focus"];
       focusableElement = undefined;
       setFocusableElement(element) {
           this.focusableElement = element;
+          return "noStateChange";
+      }
+      focus() {
+          if (this.focusableElement === document.activeElement) {
+              return "noStateChange";
+          }
+          this.focusableElement?.focus();
+          return;
       }
   }
 
@@ -21758,12 +21793,20 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       hover(position) {
+          if (position.col === this.col && position.row === this.row) {
+              return "noStateChange";
+          }
           this.col = position.col;
           this.row = position.row;
+          return;
       }
       clear() {
+          if (this.col === undefined && this.row === undefined) {
+              return "noStateChange";
+          }
           this.col = undefined;
           this.row = undefined;
+          return;
       }
   }
 
@@ -21785,7 +21828,11 @@ stores.inject(MyMetaStore, storeInstance);
           this.persistentPopover = { col, row, sheetId, type };
       }
       close() {
+          if (!this.persistentPopover) {
+              return "noStateChange";
+          }
           this.persistentPopover = undefined;
+          return;
       }
       get persistentCellPopover() {
           return ((this.persistentPopover && { isOpen: true, ...this.persistentPopover }) || { isOpen: false });
@@ -37461,7 +37508,12 @@ stores.inject(MyMetaStore, storeInstance);
                       entry[field.name] = { value: null, type: CellValueType.empty };
                   }
                   else {
-                      entry[field.name] = cell;
+                      if (field.type === "char") {
+                          entry[field.name] = { ...cell, value: cell.formattedValue || null };
+                      }
+                      else {
+                          entry[field.name] = cell;
+                      }
                   }
               }
               entry["__count"] = { value: 1, type: CellValueType.number };
@@ -39656,7 +39708,7 @@ stores.inject(MyMetaStore, storeInstance);
               this.isEditing = isEditing;
               if (!isEditing) {
                   this.rect = this.defaultRect;
-                  this.DOMFocusableElementStore.focusableElement?.focus();
+                  this.DOMFocusableElementStore.focus();
                   return;
               }
               const position = this.env.model.getters.getActivePosition();
@@ -42092,10 +42144,6 @@ stores.inject(MyMetaStore, storeInstance);
           ctx.scale(dpr, dpr);
           for (const layer of OrderedLayers()) {
               model.drawLayer(renderingContext, layer);
-              // @ts-ignore 'drawLayer' is not declated as a mutator because:
-              // it does not mutate anything. Most importantly it's used
-              // during rendering. Invoking a mutator during rendering would
-              // trigger another rendering, ultimately resulting in an infinite loop.
               rendererStore.drawLayer(renderingContext, layer);
           }
       }
@@ -42718,7 +42766,7 @@ stores.inject(MyMetaStore, storeInstance);
           this.cellPopovers = useStore(CellPopoverStore);
           owl.useEffect(() => {
               if (!this.sidePanel.isOpen) {
-                  this.DOMFocusableElementStore.focusableElement?.focus();
+                  this.DOMFocusableElementStore.focus();
               }
           }, () => [this.sidePanel.isOpen]);
       }
@@ -42922,7 +42970,7 @@ stores.inject(MyMetaStore, storeInstance);
       focusDefaultElement() {
           if (!this.env.model.getters.getSelectedFigureId() &&
               this.composerStore.editionMode === "inactive") {
-              this.DOMFocusableElementStore.focusableElement?.focus();
+              this.DOMFocusableElementStore.focus();
           }
       }
       get gridEl() {
@@ -44659,7 +44707,7 @@ stores.inject(MyMetaStore, storeInstance);
       ({ xc, sheetName } = splitReference(reference));
       let rangeSheetIndex;
       if (sheetName) {
-          const index = data.sheets.findIndex((sheet) => sheet.name === sheetName);
+          const index = data.sheets.findIndex((sheet) => isSheetNameEqual(sheet.name, sheetName));
           if (index < 0) {
               throw new Error("Unable to find a sheet with the name " + sheetName);
           }
@@ -44880,7 +44928,7 @@ stores.inject(MyMetaStore, storeInstance);
       formula = formula.replace(externalReferenceRegex, (match, externalRefId, sheetName, cellRef) => {
           externalRefId = Number(externalRefId) - 1;
           cellRef = cellRef.replace(/\$/g, "");
-          const sheetIndex = data.externalBooks[externalRefId].sheetNames.findIndex((name) => name === sheetName);
+          const sheetIndex = data.externalBooks[externalRefId].sheetNames.findIndex((name) => isSheetNameEqual(name, sheetName));
           if (sheetIndex === -1) {
               return match;
           }
@@ -45209,7 +45257,7 @@ stores.inject(MyMetaStore, storeInstance);
    */
   function convertTableFormulaReferences(convertedSheets, xlsxSheets) {
       for (let tableSheet of convertedSheets) {
-          const tables = xlsxSheets.find((s) => s.sheetName === tableSheet.name).tables;
+          const tables = xlsxSheets.find((s) => isSheetNameEqual(s.sheetName, tableSheet.name)).tables;
           for (let table of tables) {
               const tabRef = table.name + "[";
               for (let sheet of convertedSheets) {
@@ -50886,7 +50934,7 @@ stores.inject(MyMetaStore, storeInstance);
                       if (range.sheetId === cmd.sheetId) {
                           return { changeType: "CHANGE", range };
                       }
-                      if (cmd.name && range.invalidSheetName === cmd.name) {
+                      if (isSheetNameEqual(range.invalidSheetName, cmd.name)) {
                           const invalidSheetName = undefined;
                           const sheetId = cmd.sheetId;
                           const newRange = range.clone({ sheetId, invalidSheetName });
@@ -51457,7 +51505,7 @@ stores.inject(MyMetaStore, storeInstance);
           if (name) {
               const unquotedName = getUnquotedSheetName(name);
               for (const key in this.sheetIdsMapName) {
-                  if (key.toUpperCase() === unquotedName.toUpperCase()) {
+                  if (isSheetNameEqual(key, unquotedName)) {
                       return this.sheetIdsMapName[key];
                   }
               }
@@ -51705,7 +51753,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
           const { orderedSheetIds, sheets } = this;
           const name = cmd.name && cmd.name.trim().toLowerCase();
-          if (orderedSheetIds.find((id) => sheets[id]?.name.toLowerCase() === name && id !== cmd.sheetId)) {
+          if (orderedSheetIds.find((id) => isSheetNameEqual(sheets[id]?.name, name) && id !== cmd.sheetId)) {
               return "DuplicatedSheetName" /* CommandResult.DuplicatedSheetName */;
           }
           if (FORBIDDEN_SHEETNAME_CHARS_IN_EXCEL_REGEX.test(name)) {
@@ -63037,11 +63085,11 @@ stores.inject(MyMetaStore, storeInstance);
           if (ev.key === "Enter") {
               ev.preventDefault();
               this.stopEdition();
-              this.DOMFocusableElementStore.focusableElement?.focus();
+              this.DOMFocusableElementStore.focus();
           }
           if (ev.key === "Escape") {
               this.cancelEdition();
-              this.DOMFocusableElementStore.focusableElement?.focus();
+              this.DOMFocusableElementStore.focus();
           }
       }
       onMouseEventSheetName(ev) {
@@ -69514,9 +69562,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.4.34";
-  __info__.date = "2025-05-12T05:23:37.387Z";
-  __info__.hash = "e3ac48a";
+  __info__.version = "17.4.35";
+  __info__.date = "2025-05-13T17:49:44.553Z";
+  __info__.hash = "534c5f4";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);