@odoo/o-spreadsheet 16.0.63 → 16.0.65

package/dist/o-spreadsheet.iife.js

@@ -3581,10 +3581,13 @@
   })
       .add("increment_number", {
       condition: (cell) => cell.evaluated.type === CellValueType.number,
-      generateRule: (cell, cells) => {
+      generateRule: (cell, cells, direction) => {
           const group = getGroup(cell, cells);
           let increment = 1;
-          if (group.length == 2) {
+          if (group.length === 1 && ["up", "left"].includes(direction)) {
+              increment = -1;
+          }
+          else if (group.length == 2) {
               increment = (group[1] - group[0]) * 2;
           }
           else if (group.length > 2) {
@@ -19585,8 +19588,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   break;
               case "STOP_EDITION":
                   if (cmd.cancel) {
-                      this.cancelEditionAndActivateSheet();
                       this.resetContent();
+                      this.cancelEditionAndActivateSheet();
                   }
                   else {
                       this.stopEdition();
@@ -19601,8 +19604,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   this.replaceSelection(cmd.text);
                   break;
               case "SELECT_FIGURE":
-                  this.cancelEditionAndActivateSheet();
                   this.resetContent();
+                  this.cancelEditionAndActivateSheet();
                   break;
               case "ADD_COLUMNS_ROWS":
                   this.onAddElements(cmd);
@@ -19661,8 +19664,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                   if (!sheetIdExists && this.mode !== "inactive") {
                       this.sheetId = this.getters.getActiveSheetId();
-                      this.cancelEditionAndActivateSheet();
                       this.resetContent();
+                      this.cancelEditionAndActivateSheet();
                       this.ui.notifyUI({
                           type: "ERROR",
                           text: CELL_DELETED_MESSAGE,
@@ -22184,6 +22187,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           this.MAX_SIZE_MARGIN = 90;
           this.MIN_ELEMENT_SIZE = MIN_COL_WIDTH;
       }
+      get sheetId() {
+          return this.env.model.getters.getActiveSheetId();
+      }
       _getEvOffset(ev) {
           return ev.offsetX;
       }
@@ -22206,10 +22212,10 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           return this.env.model.getters.getEdgeScrollCol(position, position, position);
       }
       _getDimensionsInViewport(index) {
-          return this.env.model.getters.getColDimensionsInViewport(this.env.model.getters.getActiveSheetId(), index);
+          return this.env.model.getters.getColDimensionsInViewport(this.sheetId, index);
       }
       _getElementSize(index) {
-          return this.env.model.getters.getColSize(this.env.model.getters.getActiveSheetId(), index);
+          return this.env.model.getters.getColSize(this.sheetId, index);
       }
       _getMaxSize() {
           return this.colResizerRef.el.clientWidth;
@@ -22220,7 +22226,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           const cols = this.env.model.getters.getActiveCols();
           this.env.model.dispatch("RESIZE_COLUMNS_ROWS", {
               dimension: "COL",
-              sheetId: this.env.model.getters.getActiveSheetId(),
+              sheetId: this.sheetId,
               elements: cols.has(index) ? [...cols] : [index],
               size,
           });
@@ -22233,7 +22239,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               elements.push(colIndex);
           }
           const result = this.env.model.dispatch("MOVE_COLUMNS_ROWS", {
-              sheetId: this.env.model.getters.getActiveSheetId(),
+              sheetId: this.sheetId,
               dimension: "COL",
               base: this.state.base,
               elements,
@@ -22252,7 +22258,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       _fitElementSize(index) {
           const cols = this.env.model.getters.getActiveCols();
           this.env.model.dispatch("AUTORESIZE_COLUMNS", {
-              sheetId: this.env.model.getters.getActiveSheetId(),
+              sheetId: this.sheetId,
               cols: cols.has(index) ? [...cols] : [index],
           });
       }
@@ -22263,7 +22269,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           return this.env.model.getters.getActiveCols();
       }
       _getPreviousVisibleElement(index) {
-          const sheetId = this.env.model.getters.getActiveSheetId();
+          const sheetId = this.sheetId;
           let row;
           for (row = index - 1; row >= 0; row--) {
               if (!this.env.model.getters.isColHidden(sheetId, row)) {
@@ -22274,7 +22280,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
       unhide(hiddenElements) {
           this.env.model.dispatch("UNHIDE_COLUMNS_ROWS", {
-              sheetId: this.env.model.getters.getActiveSheetId(),
+              sheetId: this.sheetId,
               elements: hiddenElements,
               dimension: "COL",
           });
@@ -22291,7 +22297,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
     left: 0;
     right: 0;
     width: ${HEADER_WIDTH}px;
-    height: 100%;
+    height: calc(100% - ${HEADER_HEIGHT + SCROLLBAR_WIDTH}px);
     &.o-dragging {
       cursor: grabbing;
     }
@@ -22354,6 +22360,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           this.MAX_SIZE_MARGIN = 60;
           this.MIN_ELEMENT_SIZE = MIN_ROW_HEIGHT;
       }
+      get sheetId() {
+          return this.env.model.getters.getActiveSheetId();
+      }
       _getEvOffset(ev) {
           return ev.offsetY;
       }
@@ -22376,10 +22385,10 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           return this.env.model.getters.getEdgeScrollRow(position, position, position);
       }
       _getDimensionsInViewport(index) {
-          return this.env.model.getters.getRowDimensionsInViewport(this.env.model.getters.getActiveSheetId(), index);
+          return this.env.model.getters.getRowDimensionsInViewport(this.sheetId, index);
       }
       _getElementSize(index) {
-          return this.env.model.getters.getRowSize(this.env.model.getters.getActiveSheetId(), index);
+          return this.env.model.getters.getRowSize(this.sheetId, index);
       }
       _getMaxSize() {
           return this.rowResizerRef.el.clientHeight;
@@ -22390,7 +22399,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           const rows = this.env.model.getters.getActiveRows();
           this.env.model.dispatch("RESIZE_COLUMNS_ROWS", {
               dimension: "ROW",
-              sheetId: this.env.model.getters.getActiveSheetId(),
+              sheetId: this.sheetId,
               elements: rows.has(index) ? [...rows] : [index],
               size,
           });
@@ -22403,7 +22412,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               elements.push(rowIndex);
           }
           const result = this.env.model.dispatch("MOVE_COLUMNS_ROWS", {
-              sheetId: this.env.model.getters.getActiveSheetId(),
+              sheetId: this.sheetId,
               dimension: "ROW",
               base: this.state.base,
               elements,
@@ -22422,7 +22431,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       _fitElementSize(index) {
           const rows = this.env.model.getters.getActiveRows();
           this.env.model.dispatch("AUTORESIZE_ROWS", {
-              sheetId: this.env.model.getters.getActiveSheetId(),
+              sheetId: this.sheetId,
               rows: rows.has(index) ? [...rows] : [index],
           });
       }
@@ -22433,7 +22442,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           return this.env.model.getters.getActiveRows();
       }
       _getPreviousVisibleElement(index) {
-          const sheetId = this.env.model.getters.getActiveSheetId();
+          const sheetId = this.sheetId;
           let row;
           for (row = index - 1; row >= 0; row--) {
               if (!this.env.model.getters.isRowHidden(sheetId, row)) {
@@ -22444,7 +22453,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
       unhide(hiddenElements) {
           this.env.model.dispatch("UNHIDE_COLUMNS_ROWS", {
-              sheetId: this.env.model.getters.getActiveSheetId(),
+              sheetId: this.sheetId,
               dimension: "ROW",
               elements: hiddenElements,
           });
@@ -25522,29 +25531,33 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
    * In all the sheets, replace the table-only references in the formula cells with standard references.
    */
   function convertTableFormulaReferences(convertedSheets, xlsxSheets) {
-      for (let sheet of convertedSheets) {
-          const tables = xlsxSheets.find((s) => s.sheetName === sheet.name).tables;
+      for (let tableSheet of convertedSheets) {
+          const tables = xlsxSheets.find((s) => s.sheetName === tableSheet.name).tables;
           for (let table of tables) {
               const tabRef = table.name + "[";
-              for (let position of positions(toZone(table.ref))) {
-                  const xc = toXC(position.col, position.row);
-                  const cell = sheet.cells[xc];
-                  if (cell && cell.content && cell.content.startsWith("=")) {
-                      let refIndex;
-                      while ((refIndex = cell.content.indexOf(tabRef)) !== -1) {
-                          let reference = cell.content.slice(refIndex + tabRef.length);
-                          // Expression can either be tableName[colName] or tableName[[#This Row], [colName]]
-                          let endIndex = reference.indexOf("]");
-                          if (reference.startsWith(`[`)) {
-                              endIndex = reference.indexOf("]", endIndex + 1);
-                              endIndex = reference.indexOf("]", endIndex + 1);
+              for (let sheet of convertedSheets) {
+                  for (let xc in sheet.cells) {
+                      const cell = sheet.cells[xc];
+                      if (cell && cell.content && cell.content.startsWith("=")) {
+                          let refIndex;
+                          while ((refIndex = cell.content.indexOf(tabRef)) !== -1) {
+                              let endIndex = refIndex + tabRef.length;
+                              let openBrackets = 1;
+                              while (openBrackets > 0 && endIndex < cell.content.length) {
+                                  if (cell.content[endIndex] === "[") {
+                                      openBrackets++;
+                                  }
+                                  else if (cell.content[endIndex] === "]") {
+                                      openBrackets--;
+                                  }
+                                  endIndex++;
+                              }
+                              let reference = cell.content.slice(refIndex + tabRef.length, endIndex - 1);
+                              const sheetPrefix = tableSheet.id === sheet.id ? "" : tableSheet.name + "!";
+                              const convertedRef = convertTableReference(sheetPrefix, reference, table, xc);
+                              cell.content =
+                                  cell.content.slice(0, refIndex) + convertedRef + cell.content.slice(endIndex);
                           }
-                          reference = reference.slice(0, endIndex);
-                          const convertedRef = convertTableReference(reference, table, xc);
-                          cell.content =
-                              cell.content.slice(0, refIndex) +
-                                  convertedRef +
-                                  cell.content.slice(tabRef.length + refIndex + endIndex + 1);
                       }
                   }
               }
@@ -25552,11 +25565,17 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
   }
   /**
-   * Convert table-specific references in formulas into standard references.
+   * Convert table-specific references in formulas into standard references. A table reference is composed of columns names,
+   * and of keywords determining the rows of the table to reference.
    *
    * A reference in a table can have the form (only the part between brackets should be given to this function):
    *  - tableName[colName] : reference to the whole column "colName"
+   *  - tableName[#keyword] : reference to the whatever row the keyword refers to
    *  - tableName[[#keyword], [colName]] : reference to some of the element(s) of the column colName
+   *  - tableName[[#keyword], [colName]:[col2Name]] : reference to some of the element(s) of the columns colName to col2Name
+   *  - tableName[[#keyword1], [#keyword2], [colName]] : reference to all the rows referenced by the keywords in the column colName
+   *  - tableName[[#keyword1], [colName], [#keyword2]]: the keywords and colName can be in any order
+   *
    *
    * The available keywords are :
    * - #All : all the column (including totals)
@@ -25564,58 +25583,109 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
    * - #Headers : only the header of the column
    * - #Totals : only the totals of the column
    * - #This Row : only the element in the same row as the cell
+   *
+   * Note that the only valid combination of multiple keywords are #Data + #Totals and #Headers + #Data.
    */
-  function convertTableReference(expr, table, cellXc) {
-      const refElements = expr.split(",");
+  function convertTableReference(sheetPrefix, expr, table, cellXc) {
+      // TODO: Ideally we'd want to make a real tokenizer, this simple approach won't work if for example the column name
+      // contain # or , characters. But that's probably an edge case that we can ignore for now.
+      const parts = expr.split(",").map((part) => part.trim());
       const tableZone = toZone(table.ref);
-      const refZone = { ...tableZone };
-      let isReferencedZoneValid = true;
-      // Single column reference
-      if (refElements.length === 1) {
-          const colRelativeIndex = table.cols.findIndex((col) => col.name === refElements[0]);
-          refZone.left = refZone.right = colRelativeIndex + tableZone.left;
-          if (table.headerRowCount) {
-              refZone.top += table.headerRowCount;
-          }
-          if (table.totalsRowCount) {
-              refZone.bottom -= 1;
+      const colIndexes = [];
+      const rowIndexes = [];
+      const foundKeywords = [];
+      for (const part of parts) {
+          if (removeBrackets(part).startsWith("#")) {
+              const keyWord = removeBrackets(part);
+              foundKeywords.push(keyWord);
+              switch (keyWord) {
+                  case "#All":
+                      rowIndexes.push(tableZone.top, tableZone.bottom);
+                      break;
+                  case "#Data":
+                      const top = table.headerRowCount ? tableZone.top + table.headerRowCount : tableZone.top;
+                      const bottom = table.totalsRowCount
+                          ? tableZone.bottom - table.totalsRowCount
+                          : tableZone.bottom;
+                      rowIndexes.push(top, bottom);
+                      break;
+                  case "#This Row":
+                      rowIndexes.push(toCartesian(cellXc).row);
+                      break;
+                  case "#Headers":
+                      if (!table.headerRowCount) {
+                          return INCORRECT_RANGE_STRING;
+                      }
+                      rowIndexes.push(tableZone.top);
+                      break;
+                  case "#Totals":
+                      if (!table.totalsRowCount) {
+                          return INCORRECT_RANGE_STRING;
+                      }
+                      rowIndexes.push(tableZone.bottom);
+                      break;
+              }
           }
-      }
-      // Other references
-      else {
-          switch (refElements[0].slice(1, refElements[0].length - 1)) {
-              case "#All":
-                  refZone.top = table.headerRowCount ? tableZone.top + table.headerRowCount : tableZone.top;
-                  refZone.bottom = tableZone.bottom;
-                  break;
-              case "#Data":
-                  refZone.top = table.headerRowCount ? tableZone.top + table.headerRowCount : tableZone.top;
-                  refZone.bottom = table.totalsRowCount ? tableZone.bottom + 1 : tableZone.bottom;
-                  break;
-              case "#This Row":
-                  refZone.top = refZone.bottom = toCartesian(cellXc).row;
-                  break;
-              case "#Headers":
-                  refZone.top = refZone.bottom = tableZone.top;
-                  if (!table.headerRowCount) {
-                      isReferencedZoneValid = false;
-                  }
-                  break;
-              case "#Totals":
-                  refZone.top = refZone.bottom = tableZone.bottom;
-                  if (!table.totalsRowCount) {
-                      isReferencedZoneValid = false;
+          else {
+              const columns = part
+                  .split(":")
+                  .map((part) => part.trim())
+                  .map(removeBrackets);
+              if (colIndexes.length) {
+                  return INCORRECT_RANGE_STRING;
+              }
+              const colRelativeIndex = table.cols.findIndex((col) => col.name === columns[0]);
+              if (colRelativeIndex === -1) {
+                  return INCORRECT_RANGE_STRING;
+              }
+              colIndexes.push(colRelativeIndex + tableZone.left);
+              if (columns[1]) {
+                  const colRelativeIndex2 = table.cols.findIndex((col) => col.name === columns[1]);
+                  if (colRelativeIndex2 === -1) {
+                      return INCORRECT_RANGE_STRING;
                   }
-                  break;
+                  colIndexes.push(colRelativeIndex2 + tableZone.left);
+              }
           }
-          const colRef = refElements[1].slice(1, refElements[1].length - 1);
-          const colRelativeIndex = table.cols.findIndex((col) => col.name === colRef);
-          refZone.left = refZone.right = colRelativeIndex + tableZone.left;
       }
-      if (!isReferencedZoneValid) {
+      if (!areKeywordsCompatible(foundKeywords)) {
           return INCORRECT_RANGE_STRING;
       }
-      return refZone.top !== refZone.bottom ? zoneToXc(refZone) : toXC(refZone.left, refZone.top);
+      if (rowIndexes.length === 0) {
+          const top = table.headerRowCount ? tableZone.top + table.headerRowCount : tableZone.top;
+          const bottom = table.totalsRowCount
+              ? tableZone.bottom - table.totalsRowCount
+              : tableZone.bottom;
+          rowIndexes.push(top, bottom);
+      }
+      if (colIndexes.length === 0) {
+          colIndexes.push(tableZone.left, tableZone.right);
+      }
+      const refZone = {
+          top: Math.min(...rowIndexes),
+          left: Math.min(...colIndexes),
+          bottom: Math.max(...rowIndexes),
+          right: Math.max(...colIndexes),
+      };
+      return sheetPrefix + zoneToXc(refZone);
+  }
+  function removeBrackets(str) {
+      return str.startsWith("[") && str.endsWith("]") ? str.slice(1, str.length - 1) : str;
+  }
+  function areKeywordsCompatible(keywords) {
+      if (keywords.length < 2) {
+          return true;
+      }
+      else if (keywords.length > 2) {
+          return false;
+      }
+      else if (keywords.includes("#Data") && keywords.includes("#Totals")) {
+          return true;
+      }
+      else if (keywords.includes("#Headers") && keywords.includes("#Data")) {
+          return true;
+      }
+      return false;
   }
 
   // -------------------------------------
@@ -31593,7 +31663,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       getRule(cell, cells) {
           const rules = autofillRulesRegistry.getAll().sort((a, b) => a.sequence - b.sequence);
           const rule = rules.find((rule) => rule.condition(cell, cells));
-          return rule && rule.generateRule(cell, cells);
+          return rule && this.direction && rule.generateRule(cell, cells, this.direction);
       }
       /**
        * Create the generator to be able to autofill the next cells.
@@ -32376,12 +32446,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               for (let c = 0; c < width; c++) {
                   const origin = rowCells[c];
                   const position = { col: col + c, row: row + r, sheetId: sheetId };
-                  // TODO: refactor this part. the "Paste merge" action is also executed with
-                  // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
-                  // is not appropriate
-                  if (this.operation !== "CUT") {
-                      this.pasteMergeIfExist(origin.position, position);
-                  }
+                  this.pasteMergeIfExist(origin.position, position, this.operation);
                   this.pasteCell(origin, position, this.operation, clipboardOptions);
                   if (shouldPasteCF) {
                       this.dispatch("PASTE_CONDITIONAL_FORMAT", {
@@ -32460,7 +32525,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
        * If the origin position given is the top left of a merge, merge the target
        * position.
        */
-      pasteMergeIfExist(origin, target) {
+      pasteMergeIfExist(origin, target, operation) {
           let { sheetId, col, row } = origin;
           const { col: mainCellColOrigin, row: mainCellRowOrigin } = this.getters.getMainCellPosition(sheetId, col, row);
           if (mainCellColOrigin === col && mainCellRowOrigin === row) {
@@ -32468,6 +32533,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               if (!merge) {
                   return;
               }
+              if (operation === "CUT") {
+                  this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+              }
               ({ sheetId, col, row } = target);
               this.dispatch("ADD_MERGE", {
                   sheetId,
@@ -37495,7 +37563,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               ? this.getters.getSheetViewVisibleCols()
               : this.getters.getSheetViewVisibleRows();
           const startIndex = visibleHeaders.findIndex((header) => referenceHeaderIndex >= header);
-          const endIndex = visibleHeaders.findIndex((header) => targetHeaderIndex <= header);
+          let endIndex = visibleHeaders.findIndex((header) => targetHeaderIndex <= header);
+          endIndex = endIndex === -1 ? visibleHeaders.length : endIndex;
           const relevantIndexes = visibleHeaders.slice(startIndex, endIndex);
           let offset = 0;
           for (const i of relevantIndexes) {
@@ -43690,9 +43759,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.63';
-  __info__.date = '2025-02-25T05:54:41.386Z';
-  __info__.hash = 'b01aca6';
+  __info__.version = '16.0.65';
+  __info__.date = '2025-03-19T08:14:11.320Z';
+  __info__.hash = '4e495e9';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);