@odoo/o-spreadsheet 18.1.3 → 18.1.5

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 18.1.3
- * @date 2025-01-27T10:50:23.000Z
- * @hash 7ffac1e
+ * @version 18.1.5
+ * @date 2025-01-31T08:00:10.263Z
+ * @hash 97acb8b
  */
 
 (function (exports, owl) {
@@ -3349,11 +3349,11 @@
    * number from the point of view of the isNumber function.
    */
   function parseNumber(str, locale) {
+      // remove invaluable characters
+      str = str.replace(getInvaluableSymbolsRegexp(locale), "");
       if (locale.decimalSeparator !== ".") {
           str = str.replace(locale.decimalSeparator, ".");
       }
-      // remove invaluable characters
-      str = str.replace(getInvaluableSymbolsRegexp(locale), "");
       let n = Number(str);
       if (isNaN(n) && str.includes("%")) {
           n = Number(str.split("%")[0]);
@@ -9657,13 +9657,13 @@ stores.inject(MyMetaStore, storeInstance);
       else if (ds.labelCell) {
           label = {
               reference: getters.getRangeString(ds.labelCell, "forceSheetReference", {
-                  useFixedReference: true,
+                  useBoundedReference: true,
               }),
           };
       }
       return {
           label,
-          range: getters.getRangeString(dataRange, "forceSheetReference", { useFixedReference: true }),
+          range: getters.getRangeString(dataRange, "forceSheetReference", { useBoundedReference: true }),
           backgroundColor: ds.backgroundColor,
           rightYAxis: ds.rightYAxis,
       };
@@ -9678,7 +9678,7 @@ stores.inject(MyMetaStore, storeInstance);
           zone.top = zone.top + 1;
       }
       const range = labelRange.clone({ zone });
-      return getters.getRangeString(range, "forceSheetReference", { useFixedReference: true });
+      return getters.getRangeString(range, "forceSheetReference", { useBoundedReference: true });
   }
   /**
    * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -40368,6 +40368,12 @@ stores.inject(MyMetaStore, storeInstance);
               }
               this.contentHelper.updateEl(el);
           });
+          this.env.model.selection.observe(this, {
+              handleEvent: () => this.autoCompleteState.hide(),
+          });
+          owl.onWillUnmount(() => {
+              this.env.model.selection.detachObserver(this);
+          });
           owl.useEffect(() => {
               this.processContent();
               if (document.activeElement === this.contentHelper.el &&
@@ -53312,7 +53318,7 @@ stores.inject(MyMetaStore, storeInstance);
       /*
        * Reconstructs the original formula string based on new dependencies
        */
-      getFormulaString(sheetId, tokens, dependencies, useFixedReference = false) {
+      getFormulaString(sheetId, tokens, dependencies, useBoundedReference = false) {
           if (!dependencies.length) {
               return concat(tokens.map((token) => token.value));
           }
@@ -53320,7 +53326,7 @@ stores.inject(MyMetaStore, storeInstance);
           return concat(tokens.map((token) => {
               if (token.type === "REFERENCE") {
                   const range = dependencies[rangeIndex++];
-                  return this.getters.getRangeString(range, sheetId, { useFixedReference });
+                  return this.getters.getRangeString(range, sheetId, { useBoundedReference });
               }
               return token.value;
           }));
@@ -53600,7 +53606,7 @@ stores.inject(MyMetaStore, storeInstance);
               if (token.type === "REFERENCE") {
                   const index = rangeIndex++;
                   return this.getRangeString(this.compiledFormula.dependencies[index], this.sheetId, {
-                      useFixedReference: true,
+                      useBoundedReference: true,
                   });
               }
               return token.value;
@@ -53937,7 +53943,7 @@ stores.inject(MyMetaStore, storeInstance);
           if (data.sheets) {
               for (let sheet of data.sheets) {
                   if (this.cfRules[sheet.id]) {
-                      sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                      sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useBoundedReference: true }));
                   }
               }
           }
@@ -54006,9 +54012,9 @@ stores.inject(MyMetaStore, storeInstance);
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
-      mapToConditionalFormat(sheetId, cf, { useFixedReference } = { useFixedReference: false }) {
+      mapToConditionalFormat(sheetId, cf, { useBoundedReference } = { useBoundedReference: false }) {
           const ranges = cf.ranges.map((range) => {
-              return this.getters.getRangeString(range, sheetId, { useFixedReference });
+              return this.getters.getRangeString(range, sheetId, { useBoundedReference });
           });
           if (cf.rule.type !== "DataBarRule") {
               return {
@@ -54023,7 +54029,7 @@ stores.inject(MyMetaStore, storeInstance);
                   ...cf.rule,
                   rangeValues: cf.rule.rangeValues &&
                       this.getters.getRangeString(cf.rule.rangeValues, sheetId, {
-                          useFixedReference,
+                          useBoundedReference,
                       }),
               },
               ranges,
@@ -54464,10 +54470,20 @@ stores.inject(MyMetaStore, storeInstance);
           for (const sheet of data.sheets) {
               sheet.dataValidationRules = [];
               for (const rule of this.rules[sheet.id]) {
-                  sheet.dataValidationRules.push({
-                      ...rule,
-                      ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useFixedReference: true })),
-                  });
+                  const excelRule = {
+                      ...deepCopy(rule),
+                      ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useBoundedReference: true })),
+                  };
+                  if (rule.criterion.type === "isValueInRange") {
+                      excelRule.criterion.values = rule.criterion.values.map((value) => {
+                          const range = this.getters.getRangeFromSheetXC(sheet.id, value);
+                          return this.getters.getRangeString(range, sheet.id, {
+                              useBoundedReference: true,
+                              useFixedReference: true,
+                          });
+                      });
+                  }
+                  sheet.dataValidationRules.push(excelRule);
               }
           }
       }
@@ -55888,9 +55904,10 @@ stores.inject(MyMetaStore, storeInstance);
        * @param range the range (received from getRangeFromXC or getRangeFromZone)
        * @param forSheetId the id of the sheet where the range string is supposed to be used.
        * @param options
+       * @param options.useBoundedReference if true, the range will be returned with bounded row and column
        * @param options.useFixedReference if true, the range will be returned with fixed row and column
        */
-      getRangeString(range, forSheetId, options = { useFixedReference: false }) {
+      getRangeString(range, forSheetId, options = { useBoundedReference: false, useFixedReference: false }) {
           if (!range) {
               return CellErrorType.InvalidReference;
           }
@@ -55993,13 +56010,13 @@ stores.inject(MyMetaStore, storeInstance);
       /**
        * Get a Xc string that represent a part of a range
        */
-      getRangePartString(range, part, options = { useFixedReference: false }) {
-          const colFixed = range.parts && range.parts[part]?.colFixed ? "$" : "";
+      getRangePartString(range, part, options = { useBoundedReference: false, useFixedReference: false }) {
+          const colFixed = range.parts[part]?.colFixed || options.useFixedReference ? "$" : "";
           const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
-          const rowFixed = range.parts && range.parts[part]?.rowFixed ? "$" : "";
+          const rowFixed = range.parts[part]?.rowFixed || options.useFixedReference ? "$" : "";
           const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
           let str = "";
-          if (range.isFullCol && !options.useFixedReference) {
+          if (range.isFullCol && !options.useBoundedReference) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -56007,7 +56024,7 @@ stores.inject(MyMetaStore, storeInstance);
                   str = colFixed + col;
               }
           }
-          else if (range.isFullRow && !options.useFixedReference) {
+          else if (range.isFullRow && !options.useBoundedReference) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -61308,7 +61325,7 @@ stores.inject(MyMetaStore, storeInstance);
                       const symbolIndex = rowDomain.findIndex((row) => row.field === symbolName);
                       return this.getPivotHeaderValueAndFormat(rowDomain.slice(0, symbolIndex + 1));
                   }
-                  return this._getPivotCellValueAndFormat(symbolName, domain);
+                  return this.getPivotCellValueAndFormat(symbolName, domain);
               };
               const result = this.getters.evaluateCompiledFormula(measure.computedBy.sheetId, formula, getSymbolValue);
               if (isMatrix(result)) {
@@ -63186,6 +63203,7 @@ stores.inject(MyMetaStore, storeInstance);
       waitingUndoRedoAck = false;
       isReplayingInitialRevisions = false;
       processedRevisions = new Set();
+      lastRevisionMessage = undefined;
       uuidGenerator = new UuidGenerator();
       lastLocalOperation;
       /**
@@ -63286,7 +63304,10 @@ stores.inject(MyMetaStore, storeInstance);
        * Notify the server that the user client left the collaborative session
        */
       async leave(data) {
-          if (data && Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
+          if (data &&
+              Object.keys(this.clients).length === 1 &&
+              this.lastRevisionMessage &&
+              this.lastRevisionMessage?.type !== "SNAPSHOT_CREATED") {
               await this.snapshot(data());
           }
           delete this.clients[this.clientId];
@@ -63507,6 +63528,7 @@ stores.inject(MyMetaStore, storeInstance);
                   this.pendingMessages = this.pendingMessages.filter((msg) => msg.nextRevisionId !== message.nextRevisionId);
                   this.serverRevisionId = message.nextRevisionId;
                   this.processedRevisions.add(message.nextRevisionId);
+                  this.lastRevisionMessage = message;
                   this.sendPendingMessage();
                   break;
           }
@@ -64474,14 +64496,12 @@ stores.inject(MyMetaStore, storeInstance);
                   }
                   break;
               case "AUTORESIZE_ROWS":
-                  for (let row of cmd.rows) {
-                      this.dispatch("RESIZE_COLUMNS_ROWS", {
-                          elements: [row],
-                          dimension: "ROW",
-                          size: null,
-                          sheetId: cmd.sheetId,
-                      });
-                  }
+                  this.dispatch("RESIZE_COLUMNS_ROWS", {
+                      elements: cmd.rows,
+                      dimension: "ROW",
+                      size: null,
+                      sheetId: cmd.sheetId,
+                  });
                   break;
           }
       }
@@ -71505,6 +71525,9 @@ stores.inject(MyMetaStore, storeInstance);
       observe(owner, callbacks) {
           this.observers.set(owner, { owner, callbacks });
       }
+      detachObserver(owner) {
+          this.observers.delete(owner);
+      }
       /**
        * Capture the stream for yourself
        */
@@ -71597,6 +71620,9 @@ stores.inject(MyMetaStore, storeInstance);
       observe(owner, callbacks) {
           this.stream.observe(owner, callbacks);
       }
+      detachObserver(owner) {
+          this.stream.detachObserver(owner);
+      }
       release(owner) {
           if (this.stream.isListening(owner)) {
               this.stream.release(owner);
@@ -75016,9 +75042,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.1.3";
-  __info__.date = "2025-01-27T10:50:23.000Z";
-  __info__.hash = "7ffac1e";
+  __info__.version = "18.1.5";
+  __info__.date = "2025-01-31T08:00:10.263Z";
+  __info__.hash = "97acb8b";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);