@odoo/o-spreadsheet 16.2.22 → 16.2.24

package/dist/o-spreadsheet.iife.js

@@ -604,13 +604,6 @@
   }
 
   //------------------------------------------------------------------------------
-  /**
-   * Stringify an object, like JSON.stringify, except that the first level of keys
-   * is ordered.
-   */
-  function stringify(obj) {
-      return JSON.stringify(obj, Object.keys(obj).sort());
-  }
   /**
    * Remove quotes from a quoted string
    * ```js
@@ -910,7 +903,7 @@
    */
   function getItemId(item, itemsDic) {
       for (let [key, value] of Object.entries(itemsDic)) {
-          if (stringify(value) === stringify(item)) {
+          if (deepEquals(value, item)) {
               return parseInt(key, 10);
           }
       }
@@ -976,6 +969,22 @@
       lazyValue.map = (callback) => lazy(() => callback(lazyValue()));
       return lazyValue;
   }
+  /**
+   * Creates a version of the function that's memoized on the value of its first
+   * argument, if any.
+   */
+  function memoize(func) {
+      const cache = new Map();
+      const funcName = func.name ? func.name + " (memoized)" : "memoized";
+      return {
+          [funcName](...args) {
+              if (!cache.has(args[0])) {
+                  cache.set(args[0], func(...args));
+              }
+              return cache.get(args[0]);
+          },
+      }[funcName];
+  }
   /**
    * Find the next defined value after the given index in an array of strings. If there is no defined value
    * after the index, return the closest defined value before the index. Return an empty string if no
@@ -1354,8 +1363,10 @@
   const cellReference = new RegExp(/\$?([A-Z]{1,3})\$?([0-9]{1,7})/, "i");
   // Same as above, but matches the exact string (nothing before or after)
   const singleCellReference = new RegExp(/^\$?([A-Z]{1,3})\$?([0-9]{1,7})$/, "i");
-  /** Reference of a column header (eg. A, AB) */
-  const colHeader = new RegExp(/^([A-Z]{1,3})+$/, "i");
+  /** Reference of a column header (eg. A, AB, $A) */
+  const colHeader = new RegExp(/^\$?([A-Z]{1,3})+$/, "i");
+  /** Reference of a row header (eg. 1, $1) */
+  const rowHeader = new RegExp(/^\$?([0-9]{1,7})+$/, "i");
   /** Reference of a column (eg. A, $CA, Sheet1!B) */
   const colReference = new RegExp(/^\s*('.+'!|[^']+!)?\$?([A-Z]{1,3})$/, "i");
   /** Reference of a row (eg. 1, 59, Sheet1!9) */
@@ -1385,6 +1396,9 @@
   function isColHeader(str) {
       return colHeader.test(str);
   }
+  function isRowHeader(str) {
+      return rowHeader.test(str);
+  }
   /**
    * Return true if the given xc is the reference of a single cell,
    * without any specified sheet (e.g. A1)
@@ -2174,18 +2188,10 @@
           if (isFullCol) {
               parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
               parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-              if (zone.left === zone.right) {
-                  parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
-                  parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-              }
           }
           if (isFullRow) {
               parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
               parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-              if (zone.top === zone.bottom) {
-                  parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-                  parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-              }
           }
           return parts;
       }
@@ -3573,12 +3579,12 @@
       }
   }
   /** Normalize string by setting it to lowercase and replacing accent letters with plain letters */
-  function normalizeString(str) {
+  const normalizeString = memoize(function normalizeString(str) {
       return str
           .toLowerCase()
           .normalize("NFD")
           .replace(/[\u0300-\u036f]/g, "");
-  }
+  });
   /**
    * Normalize a value.
    * If the cell value is a string, this will set it to lowercase and replacing accent letters with plain letters
@@ -4302,6 +4308,7 @@
       CommandResult[CommandResult["ChartDoesNotExist"] = 85] = "ChartDoesNotExist";
       CommandResult[CommandResult["InvalidHeaderIndex"] = 86] = "InvalidHeaderIndex";
       CommandResult[CommandResult["InvalidQuantity"] = 87] = "InvalidQuantity";
+      CommandResult[CommandResult["NoChanges"] = 88] = "NoChanges";
   })(exports.CommandResult || (exports.CommandResult = {}));
 
   function isMatrix(x) {
@@ -5083,6 +5090,9 @@
   }
   function getOpenedMenus() {
       return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
+  }
+  function isMacOS() {
+      return navigator.userAgent.toUpperCase().indexOf("MAC") >= 0;
   }
 
   /**
@@ -21126,6 +21136,7 @@
               draggerShadowThickness: 0,
               delta: 0,
               base: 0,
+              position: "before",
           });
       }
       _computeHandleDisplay(ev) {
@@ -21251,11 +21262,13 @@
                       this.state.draggerLinePosition = dimensions.start;
                       this.state.draggerShadowPosition = dimensions.start;
                       this.state.base = elementIndex;
+                      this.state.position = "before";
                   }
                   else if (this._getSelectedZoneEnd() < elementIndex) {
                       this.state.draggerLinePosition = dimensions.end;
                       this.state.draggerShadowPosition = dimensions.end - this.state.draggerShadowThickness;
-                      this.state.base = elementIndex + 1;
+                      this.state.base = elementIndex;
+                      this.state.position = "after";
                   }
                   else {
                       this.state.draggerLinePosition = startDimensions.start;
@@ -21436,6 +21449,7 @@
               dimension: "COL",
               base: this.state.base,
               elements,
+              position: this.state.position,
           });
           if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
               this.env.raiseError(MergeErrorMessage);
@@ -21608,6 +21622,7 @@
               dimension: "ROW",
               base: this.state.base,
               elements,
+              position: this.state.position,
           });
           if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
               this.env.raiseError(MergeErrorMessage);
@@ -21716,8 +21731,8 @@
           return val * (deltaMode === 0 ? 1 : DEFAULT_CELL_HEIGHT);
       }
       const onMouseWheel = (ev) => {
-          const deltaX = normalize(ev.shiftKey ? ev.deltaY : ev.deltaX, ev.deltaMode);
-          const deltaY = normalize(ev.shiftKey ? ev.deltaX : ev.deltaY, ev.deltaMode);
+          const deltaX = normalize(ev.shiftKey && !isMacOS() ? ev.deltaY : ev.deltaX, ev.deltaMode);
+          const deltaY = normalize(ev.shiftKey && !isMacOS() ? ev.deltaX : ev.deltaY, ev.deltaMode);
           handler(deltaX, deltaY);
       };
       return onMouseWheel;
@@ -24305,7 +24320,7 @@
           SPACE: goTo(State.RightRef),
           NUMBER: goTo(State.Found),
           REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
-          SYMBOL: goTo(State.Found, (token) => isColHeader(token.value)),
+          SYMBOL: goTo(State.Found, (token) => isColHeader(token.value) || isRowHeader(token.value)),
       },
       [State.RightColumnRef]: {
           SPACE: goTo(State.RightColumnRef),
@@ -24316,6 +24331,7 @@
           SPACE: goTo(State.RightRowRef),
           NUMBER: goTo(State.Found),
           REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
+          SYMBOL: goTo(State.Found, (token) => isRowHeader(token.value)),
       },
       [State.Found]: {},
   };
@@ -27517,6 +27533,14 @@
       // ---------------------------------------------------------------------------
       // Command Handling
       // ---------------------------------------------------------------------------
+      allowDispatch(cmd) {
+          switch (cmd.type) {
+              case "SET_BORDER":
+                  return this.checkBordersUnchanged(cmd);
+              default:
+                  return 0 /* CommandResult.Success */;
+          }
+      }
       handle(cmd) {
           switch (cmd.type) {
               case "ADD_MERGE":
@@ -27912,6 +27936,15 @@
               this.setBorders(sheetId, [{ ...zone, left: right }], "right");
           }
       }
+      checkBordersUnchanged(cmd) {
+          var _a, _b, _c, _d;
+          const currentBorder = this.getCellBorder(cmd);
+          const areAllNewBordersUndefined = !((_a = cmd.border) === null || _a === void 0 ? void 0 : _a.bottom) && !((_b = cmd.border) === null || _b === void 0 ? void 0 : _b.left) && !((_c = cmd.border) === null || _c === void 0 ? void 0 : _c.right) && !((_d = cmd.border) === null || _d === void 0 ? void 0 : _d.top);
+          if ((!currentBorder && areAllNewBordersUndefined) || deepEquals(currentBorder, cmd.border)) {
+              return 88 /* CommandResult.NoChanges */;
+          }
+          return 0 /* CommandResult.Success */;
+      }
       // ---------------------------------------------------------------------------
       // Import/Export
       // ---------------------------------------------------------------------------
@@ -27947,7 +27980,7 @@
            */
           function getBorderId(border) {
               for (let [key, value] of Object.entries(borders)) {
-                  if (stringify(value) === stringify(border)) {
+                  if (deepEquals(value, border)) {
                       return parseInt(key, 10);
                   }
               }
@@ -28014,8 +28047,9 @@
       allowDispatch(cmd) {
           switch (cmd.type) {
               case "UPDATE_CELL":
+                  return this.checkCellOutOfSheet(cmd);
               case "CLEAR_CELL":
-                  return this.checkCellOutOfSheet(cmd.sheetId, cmd.col, cmd.row);
+                  return this.checkValidations(cmd, this.chainValidations(this.checkCellOutOfSheet, this.checkUselessClearCell));
               default:
                   return 0 /* CommandResult.Success */;
           }
@@ -28174,14 +28208,9 @@
        */
       getCellById(cellId) {
           // this must be as fast as possible
-          for (const sheetId in this.cells) {
-              const sheet = this.cells[sheetId];
-              const cell = sheet[cellId];
-              if (cell) {
-                  return cell;
-              }
-          }
-          return undefined;
+          const position = this.getters.getCellPosition(cellId);
+          const sheet = this.cells[position.sheetId];
+          return sheet[cellId];
       }
       /*
        * Reconstructs the original formula string based on a normalized form and its dependencies
@@ -28419,13 +28448,23 @@
               dependencies: [],
           };
       }
-      checkCellOutOfSheet(sheetId, col, row) {
+      checkCellOutOfSheet(cmd) {
+          const { sheetId, col, row } = cmd;
           const sheet = this.getters.tryGetSheet(sheetId);
           if (!sheet)
               return 27 /* CommandResult.InvalidSheetId */;
           const sheetZone = this.getters.getSheetZone(sheetId);
           return isInside(col, row, sheetZone) ? 0 /* CommandResult.Success */ : 18 /* CommandResult.TargetOutOfSheet */;
       }
+      checkUselessClearCell(cmd) {
+          const cell = this.getters.getCell(cmd);
+          if (!cell)
+              return 88 /* CommandResult.NoChanges */;
+          if (!cell.content && !cell.style && !cell.format) {
+              return 88 /* CommandResult.NoChanges */;
+          }
+          return 0 /* CommandResult.Success */;
+      }
   }
   CellPlugin.getters = [
       "zoneToXC",
@@ -30895,7 +30934,7 @@
                   const elements = cmd.dimension === "COL"
                       ? this.getNumberCols(cmd.sheetId)
                       : this.getNumberRows(cmd.sheetId);
-                  if (cmd.base < 0 || cmd.base > elements) {
+                  if (cmd.base < 0 || cmd.base >= elements) {
                       return 86 /* CommandResult.InvalidHeaderIndex */;
                   }
                   else if (cmd.quantity <= 0) {
@@ -31491,10 +31530,13 @@
           // begin with the end.
           rows.sort((a, b) => b - a);
           for (let group of groupConsecutive(rows)) {
+              // indexes are sorted in the descending order
+              const from = group[group.length - 1];
+              const to = group[0];
               // Move the cells.
-              this.moveCellOnRowsDeletion(sheet, group[group.length - 1], group[0]);
-              // Effectively delete the element and recompute the left-right/top-bottom.
-              group.map((row) => this.updateRowsStructureOnDeletion(row, sheet));
+              this.moveCellOnRowsDeletion(sheet, from, to);
+              // Effectively delete the rows
+              this.updateRowsStructureOnDeletion(sheet, from, to);
           }
           const count = rows.filter((row) => row < sheet.panes.ySplit).length;
           if (count) {
@@ -31516,8 +31558,6 @@
           this.addEmptyRows(sheet, quantity);
           // Move the cells.
           this.moveCellsOnAddition(sheet, index, quantity, "rows");
-          // Recompute the left-right/top-bottom.
-          this.updateRowsStructureOnAddition(sheet, row, quantity);
           if (index < sheet.panes.ySplit) {
               this.setPaneDivisions(sheet.id, sheet.panes.ySplit + quantity, "ROW");
           }
@@ -31618,35 +31658,20 @@
               }
           }
       }
-      updateRowsStructureOnDeletion(index, sheet) {
+      updateRowsStructureOnDeletion(sheet, deleteFromRow, deleteToRow) {
           const rows = [];
-          const cellsQueue = sheet.rows.map((row) => row.cells);
+          const cellsQueue = sheet.rows.map((row) => row.cells).reverse();
           for (let i in sheet.rows) {
-              if (Number(i) === index) {
+              const row = Number(i);
+              if (row >= deleteFromRow && row <= deleteToRow) {
                   continue;
               }
               rows.push({
-                  cells: cellsQueue.shift(),
+                  cells: cellsQueue.pop(),
               });
           }
           this.history.update("sheets", sheet.id, "rows", rows);
       }
-      /**
-       * Update the rows of the sheet after an addition:
-       * - Rename the rows
-       *
-       * @param sheet Sheet on which the deletion occurs
-       * @param addedRow Index of the added row
-       * @param rowsToAdd Number of the rows to add
-       */
-      updateRowsStructureOnAddition(sheet, addedRow, rowsToAdd) {
-          const rows = [];
-          const cellsQueue = sheet.rows.map((row) => row.cells);
-          sheet.rows.forEach(() => rows.push({
-              cells: cellsQueue.shift(),
-          }));
-          this.history.update("sheets", sheet.id, "rows", rows);
-      }
       /**
        * Add empty rows at the end of the rows
        *
@@ -32130,6 +32155,7 @@
               }
               return evaluatedCell;
           };
+          const rangeCache = {};
           /**
            * Return the values of the cell(s) used in reference, but always in the format of a range even
            * if a single cell is referenced. It is a list of col values. This is useful for the formulas that describe parameters as
@@ -32146,21 +32172,26 @@
               // Performance issue: Avoid fetching data on positions that are out of the spreadsheet
               // e.g. A1:ZZZ9999 in a sheet with 10 cols and 10 rows should ignore everything past J10 and return a 10x10 array
               const sheetZone = getters.getSheetZone(sheetId);
-              const result = [];
               const zone = intersection(range.zone, sheetZone);
               if (!zone) {
-                  result.push([]);
-                  return result;
+                  return [[]];
+              }
+              const { top, left, bottom, right } = zone;
+              const cacheKey = `${sheetId}-${top}-${left}-${bottom}-${right}`;
+              if (cacheKey in rangeCache) {
+                  return rangeCache[cacheKey];
               }
+              const result = new Array(right - left + 1);
               // Performance issue: nested loop is faster than a map here
-              for (let col = zone.left; col <= zone.right; col++) {
-                  const rowValues = [];
-                  for (let row = zone.top; row <= zone.bottom; row++) {
+              for (let col = left; col <= right; col++) {
+                  const rowValues = new Array(bottom - top + 1);
+                  for (let row = top; row <= bottom; row++) {
                       const cell = evalContext.getters.getCell({ sheetId: range.sheetId, col, row });
-                      rowValues.push(cell ? getEvaluatedCell(cell) : undefined);
+                      rowValues[row - top] = cell ? getEvaluatedCell(cell) : undefined;
                   }
-                  result.push(rowValues);
+                  result[col - left] = rowValues;
               }
+              rangeCache[cacheKey] = result;
               return result;
           }
           /**
@@ -34068,24 +34099,27 @@
        * autofiller
        */
       autofillAuto() {
+          var _a, _b;
           const zone = this.getters.getSelectedZone();
           const sheetId = this.getters.getActiveSheetId();
           let col = zone.left;
           let row = zone.bottom;
           if (col > 0) {
-              let left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
-              while (left.type !== CellValueType.empty) {
+              let leftPosition = { sheetId, col: col - 1, row };
+              while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
+                  ((_a = this.getters.getCell(leftPosition)) === null || _a === void 0 ? void 0 : _a.content)) {
                   row += 1;
-                  left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
+                  leftPosition = { sheetId, col: col - 1, row };
               }
           }
           if (row === zone.bottom) {
               col = zone.right;
               if (col <= this.getters.getNumberCols(sheetId)) {
-                  let right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
-                  while (right.type !== CellValueType.empty) {
+                  let rightPosition = { sheetId, col: col + 1, row };
+                  while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
+                      ((_b = this.getters.getCell(rightPosition)) === null || _b === void 0 ? void 0 : _b.content)) {
                       row += 1;
-                      right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                      rightPosition = { sheetId, col: col + 1, row };
                   }
               }
           }
@@ -38403,6 +38437,10 @@
               return xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
           case "colrow":
               indexOfNumber = xc.search(/[0-9]/);
+              if (indexOfNumber === -1 || indexOfNumber === 0) {
+                  // no row number (eg. A) or no column (eg. 1)
+                  return "$" + xc;
+              }
               xc = xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
               return "$" + xc;
           case "none":
@@ -39544,7 +39582,7 @@
               sheetId: cmd.sheetId,
               base: cmd.base,
               quantity: thickness,
-              position: "before",
+              position: cmd.position,
           });
           const isCol = cmd.dimension === "COL";
           const start = cmd.elements[0];
@@ -39561,12 +39599,13 @@
               },
           ];
           const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+          const base = isBasedBefore ? cmd.base : cmd.base + 1;
           const pasteTarget = [
               {
-                  left: isCol ? cmd.base : 0,
-                  right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                  top: !isCol ? cmd.base : 0,
-                  bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+                  left: isCol ? base : 0,
+                  right: isCol ? base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                  top: !isCol ? base : 0,
+                  bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
               },
           ];
           state.paste(pasteTarget, { selectTarget: true });
@@ -39603,6 +39642,11 @@
               doesElementsHaveCommonMerges(id, cmd.base - 1, cmd.base)) {
               return 2 /* CommandResult.WillRemoveExistingMerge */;
           }
+          const headers = [cmd.base, ...cmd.elements];
+          const maxHeaderValue = isCol ? this.getters.getNumberCols(id) : this.getters.getNumberRows(id);
+          if (headers.some((h) => h < 0 || h >= maxHeaderValue)) {
+              return 86 /* CommandResult.InvalidHeaderIndex */;
+          }
           return 0 /* CommandResult.Success */;
       }
       //-------------------------------------------
@@ -42687,9 +42731,9 @@
    * Apply the changes of the given HistoryChange to the state
    */
   function applyChange(change, target) {
-      let val = change.root;
-      let key = change.path[change.path.length - 1];
-      for (let pathIndex = 0; pathIndex < change.path.slice(0, -1).length; pathIndex++) {
+      let val = change.path[0];
+      const key = change.path[change.path.length - 1];
+      for (let pathIndex = 1; pathIndex < change.path.slice(0, -1).length; pathIndex++) {
           const p = change.path[pathIndex];
           if (val[p] === undefined) {
               const nextPath = change.path[pathIndex + 1];
@@ -43446,13 +43490,14 @@
       }
       addChange(...args) {
           const val = args.pop();
-          const [root, ...path] = args;
+          const root = args[0];
           let value = root;
-          let key = path[path.length - 1];
-          for (let pathIndex = 0; pathIndex <= path.length - 2; pathIndex++) {
-              const p = path[pathIndex];
+          let key = args[args.length - 1];
+          const pathLength = args.length - 2;
+          for (let pathIndex = 1; pathIndex <= pathLength; pathIndex++) {
+              const p = args[pathIndex];
               if (value[p] === undefined) {
-                  const nextPath = path[pathIndex + 1];
+                  const nextPath = args[pathIndex + 1];
                   value[p] = createEmptyStructure(nextPath);
               }
               value = value[p];
@@ -43461,8 +43506,7 @@
               return;
           }
           this.changes.push({
-              root,
-              path,
+              path: args,
               before: value[key],
               after: val,
           });
@@ -45314,7 +45358,10 @@
        */
       checkDispatchAllowed(command) {
           const results = this.handlers.map((handler) => handler.allowDispatch(command));
-          return new DispatchResult(results.flat());
+          if (results.some((r) => r !== 0 /* CommandResult.Success */)) {
+              return new DispatchResult(results.flat());
+          }
+          return DispatchResult.Success;
       }
       finalize() {
           this.status = 3 /* Status.Finalizing */;
@@ -45543,9 +45590,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.2.22';
-  __info__.date = '2023-11-16T11:57:01.482Z';
-  __info__.hash = 'b78d5dd';
+  __info__.version = '16.2.24';
+  __info__.date = '2023-12-05T09:37:14.992Z';
+  __info__.hash = '7b1a35c';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);