@odoo/o-spreadsheet 17.1.15 → 17.1.17

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.17
+ * @date 2024-06-03T14:54:06.711Z
+ * @hash 7dedb2f
  */
 
 (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();
@@ -2605,7 +2606,7 @@
           return false;
       }
       if (typeof operand === "number" && operator === "=") {
-          return toString(value) === toString(operand);
+          return value.toString() === operand.toString();
       }
       if (operator === "<>" || operator === "=") {
           let result;
@@ -2665,14 +2666,13 @@
       if (countArg % 2 === 1) {
           throw new EvaluationError(_t("Function [[FUNCTION_NAME]] expects criteria_range and criterion to be in pairs."));
       }
-      const dimRow = args[0].length;
-      const dimCol = args[0][0].length;
+      const firstArg = toMatrix(args[0]);
+      const dimRow = firstArg.length;
+      const dimCol = firstArg[0].length;
       let predicates = [];
       for (let i = 0; i < countArg - 1; i += 2) {
-          const criteriaRange = args[i];
-          if (!isMatrix(criteriaRange) ||
-              criteriaRange.length !== dimRow ||
-              criteriaRange[0].length !== dimCol) {
+          const criteriaRange = toMatrix(args[i]);
+          if (criteriaRange.length !== dimRow || criteriaRange[0].length !== dimCol) {
               throw new EvaluationError(_t("Function [[FUNCTION_NAME]] expects criteria_range to have the same dimension"));
           }
           const description = toString(args[i + 1]);
@@ -2682,7 +2682,7 @@
           for (let j = 0; j < dimCol; j++) {
               let validatedPredicates = true;
               for (let k = 0; k < countArg - 1; k += 2) {
-                  const criteriaValue = args[k][i][j].value;
+                  const criteriaValue = toMatrix(args[k])[i][j].value;
                   const criterion = predicates[k / 2];
                   validatedPredicates = evaluatePredicate(criteriaValue ?? undefined, criterion);
                   if (!validatedPredicates) {
@@ -4370,8 +4370,11 @@
   /**
    * Create a range from a xc. If the xc is empty, this function returns undefined.
    */
-  function createRange(getters, sheetId, range) {
-      return range ? getters.getRangeFromSheetXC(sheetId, range) : undefined;
+  function createValidRange(getters, sheetId, xc) {
+      if (!xc)
+          return;
+      const range = getters.getRangeFromSheetXC(sheetId, xc);
+      return !(range.invalidSheetName || range.invalidXc) ? range : undefined;
   }
   /**
    * Spread multiple colrows zone to one row/col zone and add a many new input range as needed.
@@ -5302,8 +5305,8 @@
       type = "scorecard";
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
-          this.keyValue = createRange(getters, sheetId, definition.keyValue);
-          this.baseline = createRange(getters, sheetId, definition.baseline);
+          this.keyValue = createValidRange(getters, sheetId, definition.keyValue);
+          this.baseline = createValidRange(getters, sheetId, definition.baseline);
           this.baselineMode = definition.baselineMode;
           this.baselineDescr = definition.baselineDescr;
           this.background = definition.background;
@@ -8646,7 +8649,7 @@
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
           this.dataSets = createDataSets(getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-          this.labelRange = createRange(getters, sheetId, definition.labelRange);
+          this.labelRange = createValidRange(getters, sheetId, definition.labelRange);
           this.background = definition.background;
           this.verticalAxisPosition = definition.verticalAxisPosition;
           this.legendPosition = definition.legendPosition;
@@ -8889,7 +8892,7 @@
       type = "gauge";
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
-          this.dataRange = createRange(this.getters, this.sheetId, definition.dataRange);
+          this.dataRange = createValidRange(this.getters, this.sheetId, definition.dataRange);
           this.sectionRule = definition.sectionRule;
           this.background = definition.background;
       }
@@ -9223,7 +9226,7 @@
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
           this.dataSets = createDataSets(this.getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-          this.labelRange = createRange(this.getters, sheetId, definition.labelRange);
+          this.labelRange = createValidRange(this.getters, sheetId, definition.labelRange);
           this.background = definition.background;
           this.verticalAxisPosition = definition.verticalAxisPosition;
           this.legendPosition = definition.legendPosition;
@@ -9543,7 +9546,7 @@
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
           this.dataSets = createDataSets(getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-          this.labelRange = createRange(getters, sheetId, definition.labelRange);
+          this.labelRange = createValidRange(getters, sheetId, definition.labelRange);
           this.background = definition.background;
           this.legendPosition = definition.legendPosition;
           this.aggregated = definition.aggregated;
@@ -11187,6 +11190,9 @@
       if (types.some((t) => t.startsWith("RANGE"))) {
           result.acceptMatrix = true;
       }
+      if (types.every((t) => t.startsWith("RANGE"))) {
+          result.acceptMatrixOnly = true;
+      }
       return result;
   }
   /**
@@ -11468,11 +11474,16 @@
       compute: function (array, ...columns) {
           const _array = toMatrix(array);
           const _columns = flattenRowFirst(columns, (item) => toInteger(item?.value, this.locale));
-          assert(() => _columns.every((col) => col > 0 && col <= _array.length), _t("The columns arguments must be between 1 and %s (got %s).", _array.length.toString(), (_columns.find((col) => col <= 0 || col > _array.length) || 0).toString()));
+          const argOutOfRange = _columns.filter((col) => col === 0 || _array.length < Math.abs(col));
+          assert(() => argOutOfRange.length === 0, _t("The columns arguments must be between -%s and %s (got %s), excluding 0.", _array.length.toString(), _array.length.toString(), argOutOfRange.join(",")));
           const result = Array(_columns.length);
           for (let col = 0; col < _columns.length; col++) {
-              const colIndex = _columns[col] - 1; // -1 because columns arguments are 1-indexed
-              result[col] = _array[colIndex];
+              if (_columns[col] > 0) {
+                  result[col] = _array[_columns[col] - 1]; // -1 because columns arguments are 1-indexed
+              }
+              else {
+                  result[col] = _array[_array.length + _columns[col]];
+              }
           }
           return result;
       },
@@ -11493,8 +11504,14 @@
           const _array = toMatrix(array);
           const _rows = flattenRowFirst(rows, (item) => toInteger(item?.value, this.locale));
           const _nbColumns = _array.length;
-          assert(() => _rows.every((row) => row > 0 && row <= _array[0].length), _t("The rows arguments must be between 1 and %s (got %s).", _array[0].length.toString(), (_rows.find((row) => row <= 0 || row > _array[0].length) || 0).toString()));
-          return generateMatrix(_nbColumns, _rows.length, (col, row) => _array[col][_rows[row] - 1]); // -1 because rows arguments are 1-indexed
+          const argOutOfRange = _rows.filter((row) => row === 0 || _array[0].length < Math.abs(row));
+          assert(() => argOutOfRange.length === 0, _t("The rows arguments must be between -%s and %s (got %s), excluding 0.", _array[0].length.toString(), _array[0].length.toString(), argOutOfRange.join(",")));
+          return generateMatrix(_nbColumns, _rows.length, (col, row) => {
+              if (_rows[row] > 0) {
+                  return _array[col][_rows[row] - 1]; // -1 because columns arguments are 1-indexed
+              }
+              return _array[col][_array[col].length + _rows[row]];
+          });
       },
       isExported: true,
   };
@@ -12402,7 +12419,7 @@
       compute: function (range, ...args) {
           let uniqueValues = new Set();
           visitMatchingRanges(args, (i, j) => {
-              const data = range[i][j];
+              const data = range[i]?.[j];
               if (isDefined(data)) {
                   uniqueValues.add(data.value);
               }
@@ -13032,7 +13049,7 @@
           }
           let sum = 0;
           visitMatchingRanges([criteriaRange, criterion], (i, j) => {
-              const value = sumRange[i][j].value;
+              const value = sumRange[i]?.[j]?.value;
               if (typeof value === "number") {
                   sum += value;
               }
@@ -13057,7 +13074,7 @@
       compute: function (sumRange, ...criters) {
           let sum = 0;
           visitMatchingRanges(criters, (i, j) => {
-              const value = sumRange[i][j].value;
+              const value = sumRange[i]?.[j]?.value;
               if (typeof value === "number") {
                   sum += value;
               }
@@ -13604,7 +13621,7 @@
           let count = 0;
           let sum = 0;
           visitMatchingRanges([criteriaRange, criterion], (i, j) => {
-              const value = _averageRange[i][j].value;
+              const value = _averageRange[i]?.[j]?.value;
               if (typeof value === "number") {
                   count += 1;
                   sum += value;
@@ -13633,7 +13650,7 @@
           let count = 0;
           let sum = 0;
           visitMatchingRanges(args, (i, j) => {
-              const value = _averageRange[i][j].value;
+              const value = _averageRange[i]?.[j]?.value;
               if (typeof value === "number") {
                   count += 1;
                   sum += value;
@@ -13938,7 +13955,7 @@
       compute: function (range, ...args) {
           let result = -Infinity;
           visitMatchingRanges(args, (i, j) => {
-              const value = range[i][j].value;
+              const value = range[i]?.[j]?.value;
               if (typeof value === "number") {
                   result = result < value ? value : result;
               }
@@ -14021,7 +14038,7 @@
       compute: function (range, ...args) {
           let result = Infinity;
           visitMatchingRanges(args, (i, j) => {
-              const value = range[i][j].value;
+              const value = range[i]?.[j]?.value;
               if (typeof value === "number") {
                   result = result > value ? value : result;
               }
@@ -19798,6 +19815,9 @@
                   }
                   args[i] = arg[0][0];
               }
+              if (!isMatrix(arg) && argDefinition.acceptMatrixOnly) {
+                  throw new BadExpressionError(_t("Function [[FUNCTION_NAME]] expects the parameter '%s' to be reference to a cell or range.", (i + 1).toString()));
+              }
           }
           return descr.compute.apply(this, args);
       }
@@ -22150,7 +22170,7 @@
           }
           const getters = this.env.model.getters;
           const sheetId = getters.getActiveSheetId();
-          const labelRange = createRange(getters, sheetId, this.labelRange);
+          const labelRange = createValidRange(getters, sheetId, this.labelRange);
           const dataSets = createDataSets(getters, this.dataSeriesRanges, sheetId, this.props.definition.dataSetsHaveTitle);
           if (dataSets.length) {
               return dataSets[0].dataRange.zone.top + 1;
@@ -26273,14 +26293,14 @@
       }
       onKeyDown(ev) {
           const figure = this.props.figure;
-          switch (ev.key) {
+          const keyDownShortcut = keyboardEventToShortcutString(ev);
+          switch (keyDownShortcut) {
               case "Delete":
                   this.env.model.dispatch("DELETE_FIGURE", {
                       sheetId: this.env.model.getters.getActiveSheetId(),
                       id: figure.id,
                   });
                   this.props.onFigureDeleted();
-                  ev.stopPropagation();
                   ev.preventDefault();
                   ev.stopPropagation();
                   break;
@@ -26301,7 +26321,22 @@
                       x: figure.x + delta[0],
                       y: figure.y + delta[1],
                   });
+                  ev.preventDefault();
                   ev.stopPropagation();
+                  break;
+              case "Ctrl+A":
+                  // Maybe in the future we will implement a way to select all figures
+                  ev.preventDefault();
+                  ev.stopPropagation();
+                  break;
+              case "Ctrl+Y":
+              case "Ctrl+Z":
+                  if (keyDownShortcut === "Ctrl+Y") {
+                      this.env.model.dispatch("REQUEST_REDO");
+                  }
+                  else if (keyDownShortcut === "Ctrl+Z") {
+                      this.env.model.dispatch("REQUEST_UNDO");
+                  }
                   ev.preventDefault();
                   ev.stopPropagation();
                   break;
@@ -27176,7 +27211,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 +27325,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();
@@ -35761,12 +35797,6 @@
                   // detect when an argument need to be evaluated as a meta argument
                   const isMeta = argTypes.includes("META");
                   const hasRange = argTypes.some((t) => isRangeType(t));
-                  const isRangeOnly = argTypes.every((t) => isRangeType(t));
-                  if (isRangeOnly) {
-                      if (!isRangeInput(currentArg)) {
-                          throw new BadExpressionError(_t("Function %s expects the parameter %s to be reference to a cell or range, not a %s.", functionName, (i + 1).toString(), currentArg.type.toLowerCase()));
-                      }
-                  }
                   compiledArgs.push(compileAST(currentArg, isMeta, hasRange, {
                       functionName,
                       paramIndex: i + 1,
@@ -35937,16 +35967,6 @@
   function isRangeType(type) {
       return type.startsWith("RANGE");
   }
-  function isRangeInput(arg) {
-      if (arg.type === "REFERENCE") {
-          return true;
-      }
-      if (arg.type === "FUNCALL") {
-          const fnDef = functions$1[arg.value.toUpperCase()];
-          return fnDef && isRangeType(fnDef.returns[0]);
-      }
-      return false;
-  }
 
   /**
    * Add the following information on tokens:
@@ -38453,7 +38473,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
@@ -39054,6 +39079,9 @@
           if (range.invalidXc) {
               return range.invalidXc;
           }
+          if (!this.getters.tryGetSheet(range.sheetId)) {
+              return CellErrorType.InvalidReference;
+          }
           if (range.zone.bottom - range.zone.top < 0 || range.zone.right - range.zone.left < 0) {
               return CellErrorType.InvalidReference;
           }
@@ -42501,16 +42529,22 @@
               let newContent = undefined;
               let newFormat = undefined;
               let isExported = true;
+              const exportedSheetData = data.sheets.find((sheet) => sheet.id === position.sheetId);
               const formulaCell = this.getCorrespondingFormulaCell(position);
               if (formulaCell) {
                   isExported = isExportableToExcel(formulaCell.compiledFormula.tokens);
                   isFormula = isExported;
                   if (!isExported) {
-                      newContent = value.toString();
-                      newFormat = evaluatedCell.format;
+                      // If the cell contains a non-exported formula and that is evaluates to
+                      // nothing* ,we don't export it.
+                      // * non-falsy value are relevant and so are 0 and FALSE, which only leaves
+                      // the empty string.
+                      if (value !== "") {
+                          newContent = value.toString();
+                          newFormat = evaluatedCell.format;
+                      }
                   }
               }
-              const exportedSheetData = data.sheets.find((sheet) => sheet.id === position.sheetId);
               const exportedCellData = exportedSheetData.cells[xc] || {};
               const format = newFormat
                   ? getItemId(newFormat, data.formats)
@@ -48812,7 +48846,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 +48858,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) {
@@ -52007,9 +52041,11 @@
           if (ev.key === "Enter") {
               ev.preventDefault();
               this.stopEdition();
+              this.env.focusableElement.focus();
           }
           if (ev.key === "Escape") {
               this.cancelEdition();
+              this.env.focusableElement.focus();
           }
       }
       onClickSheetName(ev) {
@@ -53895,6 +53931,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) {
@@ -56700,7 +56740,11 @@
                   let cellNode = escapeXml ``;
                   // Either formula or static value inside the cell
                   if (cell.isFormula) {
-                      ({ attrs: additionalAttrs, node: cellNode } = addFormula(cell));
+                      const res = addFormula(cell);
+                      if (!res) {
+                          continue;
+                      }
+                      ({ attrs: additionalAttrs, node: cellNode } = res);
                   }
                   else if (cell.content && isMarkdownLink(cell.content)) {
                       const { label } = parseMarkdownLink(cell.content);
@@ -57730,9 +57774,9 @@
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.1.15";
-  __info__.date = "2024-05-15T09:22:23.258Z";
-  __info__.hash = "fc959fe";
+  __info__.version = "17.1.17";
+  __info__.date = "2024-06-03T14:54:06.711Z";
+  __info__.hash = "7dedb2f";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);