@odoo/o-spreadsheet 17.0.1 → 17.0.3

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.0.1
- * @date 2023-11-02T09:35:50.522Z
- * @hash 0887d5b
+ * @version 17.0.3
+ * @date 2023-11-16T11:59:49.524Z
+ * @hash 8bd0fb2
  */
 
 (function (exports, owl) {
@@ -4541,14 +4541,14 @@
       switch (context.textBaseline) {
           case "top":
               underlineY += boxHeight - 2 * strokeWidth;
-              strikeY += boxHeight - textHeight;
+              strikeY += boxHeight / 2 - strokeWidth;
               break;
           case "middle":
               underlineY += boxHeight / 2 - strokeWidth;
               break;
           case "alphabetic":
               underlineY += 2 * strokeWidth;
-              strikeY -= textHeight / 2 - strokeWidth / 2;
+              strikeY -= 3 * strokeWidth;
               break;
           case "bottom":
               underlineY = y;
@@ -5967,7 +5967,7 @@
               return { cellData: {} };
           }
           const sheetId = data.sheetId;
-          const content = getters.getTranslatedCellFormula(sheetId, x, y, cell.compiledFormula, cell.dependencies);
+          const content = getters.getTranslatedCellFormula(sheetId, x, y, cell.compiledFormula);
           return {
               cellData: {
                   border: data.border,
@@ -10694,6 +10694,17 @@
   const IS_ONLY_ONE_RANGE = (env) => {
       return env.model.getters.getSelectedZones().length === 1;
   };
+  const CAN_INSERT_HEADER = (env, dimension) => {
+      if (!IS_ONLY_ONE_RANGE(env)) {
+          return false;
+      }
+      const activeHeaders = dimension === "COL" ? env.model.getters.getActiveCols() : env.model.getters.getActiveRows();
+      const ortogonalActiveHeaders = dimension === "COL" ? env.model.getters.getActiveRows() : env.model.getters.getActiveCols();
+      const sheetId = env.model.getters.getActiveSheetId();
+      const zone = env.model.getters.getSelectedZone();
+      const allSheetSelected = isEqual(zone, env.model.getters.getSheetZone(sheetId));
+      return isConsecutive(activeHeaders) && (ortogonalActiveHeaders.size === 0 || allSheetSelected);
+  };
 
   const undo = {
       name: _t("Undo"),
@@ -19371,9 +19382,7 @@
           const number = getRowsNumber(env);
           return number === 1 ? _t("Insert row") : _t("Insert %s rows", number.toString());
       },
-      isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-          IS_ONLY_ONE_RANGE(env) &&
-          env.model.getters.getActiveCols().size === 0,
+      isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
       icon: "o-spreadsheet-Icon.INSERT_ROW",
   };
   const rowInsertRowBefore = {
@@ -19382,9 +19391,7 @@
           return number === 1 ? _t("Insert row above") : _t("Insert %s rows above", number.toString());
       },
       execute: INSERT_ROWS_BEFORE_ACTION,
-      isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-          IS_ONLY_ONE_RANGE(env) &&
-          env.model.getters.getActiveCols().size === 0,
+      isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
       icon: "o-spreadsheet-Icon.INSERT_ROW_BEFORE",
   };
   const topBarInsertRowsBefore = {
@@ -19415,9 +19422,7 @@
           const number = getRowsNumber(env);
           return number === 1 ? _t("Insert row below") : _t("Insert %s rows below", number.toString());
       },
-      isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-          IS_ONLY_ONE_RANGE(env) &&
-          env.model.getters.getActiveCols().size === 0,
+      isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
       icon: "o-spreadsheet-Icon.INSERT_ROW_AFTER",
   };
   const topBarInsertRowsAfter = {
@@ -19435,9 +19440,7 @@
           const number = getColumnsNumber(env);
           return number === 1 ? _t("Insert column") : _t("Insert %s columns", number.toString());
       },
-      isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-          IS_ONLY_ONE_RANGE(env) &&
-          env.model.getters.getActiveRows().size === 0,
+      isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
       icon: "o-spreadsheet-Icon.INSERT_COL",
   };
   const colInsertColsBefore = {
@@ -19448,9 +19451,7 @@
               : _t("Insert %s columns left", number.toString());
       },
       execute: INSERT_COLUMNS_BEFORE_ACTION,
-      isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-          IS_ONLY_ONE_RANGE(env) &&
-          env.model.getters.getActiveRows().size === 0,
+      isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
       icon: "o-spreadsheet-Icon.INSERT_COL_BEFORE",
   };
   const topBarInsertColsBefore = {
@@ -19483,9 +19484,7 @@
               : _t("Insert %s columns right", number.toString());
       },
       execute: INSERT_COLUMNS_AFTER_ACTION,
-      isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-          IS_ONLY_ONE_RANGE(env) &&
-          env.model.getters.getActiveRows().size === 0,
+      isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
       icon: "o-spreadsheet-Icon.INSERT_COL_AFTER",
   };
   const topBarInsertColsAfter = {
@@ -23826,7 +23825,7 @@
       }
       .o-input-count {
         width: fit-content;
-        padding: 4 0 4 4;
+        padding: 4px 0 4px 4px;
       }
     }
   }
@@ -34947,6 +34946,9 @@
   // -----------------------------------------------------------------------------
   function compile(formula) {
       const tokens = rangeTokenize(formula);
+      return compileTokens(tokens);
+  }
+  function compileTokens(tokens) {
       const { dependencies, constantValues } = formulaArguments(tokens);
       const cacheKey = compilationCacheKey(tokens, dependencies, constantValues);
       if (!functionCache[cacheKey]) {
@@ -35313,11 +35315,11 @@
           for (const sheet of Object.keys(this.cells)) {
               for (const cell of Object.values(this.cells[sheet] || {})) {
                   if (cell.isFormula) {
-                      for (const range of cell.dependencies) {
+                      for (const range of cell.compiledFormula.dependencies) {
                           if (!sheetId || range.sheetId === sheetId) {
                               const change = applyChange(range);
                               if (change.changeType !== "NONE") {
-                                  this.history.update("cells", sheet, cell.id, "dependencies", cell.dependencies.indexOf(range), change.range);
+                                  this.history.update("cells", sheet, cell.id, "compiledFormula", "dependencies", cell.compiledFormula.dependencies.indexOf(range), change.range);
                               }
                           }
                       }
@@ -35513,10 +35515,10 @@
       /*
        * Reconstructs the original formula string based on a normalized form and its dependencies
        */
-      getFormulaCellContent(sheetId, cell, dependencies) {
-          const ranges = dependencies || cell.dependencies;
+      getFormulaCellContent(sheetId, compiledFormula, dependencies) {
+          const ranges = dependencies || compiledFormula.dependencies;
           let rangeIndex = 0;
-          return concat(cell.compiledFormula.tokens.map((token) => {
+          return concat(compiledFormula.tokens.map((token) => {
               if (token.type === "REFERENCE") {
                   const range = ranges[rangeIndex++];
                   return this.getters.getRangeString(range, sheetId);
@@ -35527,12 +35529,9 @@
       /*
        * Constructs a formula string based on an initial formula and a translation vector
        */
-      getTranslatedCellFormula(sheetId, offsetX, offsetY, compiledFormula, dependencies) {
-          const adaptedDependencies = this.getters.createAdaptedRanges(dependencies, offsetX, offsetY, sheetId);
-          return this.getFormulaCellContent(sheetId, {
-              compiledFormula,
-              dependencies: adaptedDependencies,
-          });
+      getTranslatedCellFormula(sheetId, offsetX, offsetY, compiledFormula) {
+          const adaptedDependencies = this.getters.createAdaptedRanges(compiledFormula.dependencies, offsetX, offsetY, sheetId);
+          return this.getFormulaCellContent(sheetId, compiledFormula, adaptedDependencies);
       }
       getCellStyle(position) {
           return this.getters.getCell(position)?.style || {};
@@ -35712,8 +35711,10 @@
               style,
               format,
               isFormula: true,
-              compiledFormula,
-              dependencies: [],
+              compiledFormula: {
+                  ...compiledFormula,
+                  dependencies: [],
+              },
           };
       }
       /**
@@ -35722,7 +35723,7 @@
        */
       createFormulaCellWithDependencies(id, compiledFormula, format, style, sheetId) {
           const dependencies = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-          return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getFormulaCellContent.bind(this));
+          return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getters.getRangeString.bind(this));
       }
       createErrorFormula(id, content, format, style, error) {
           return {
@@ -35732,13 +35733,12 @@
               format,
               isFormula: true,
               compiledFormula: {
-                  dependencies: [],
                   tokens: tokenize(content),
+                  dependencies: [],
                   execute: function () {
                       throw error;
                   },
               },
-              dependencies: [],
           };
       }
       checkCellOutOfSheet(sheetId, col, row) {
@@ -35751,27 +35751,44 @@
   }
   class FormulaCellWithDependencies {
       id;
-      compiledFormula;
       format;
       style;
-      dependencies;
       sheetId;
-      getFormulaCellContent;
+      getRangeString;
       isFormula = true;
-      constructor(id, compiledFormula, format, style, dependencies, sheetId, getFormulaCellContent) {
+      compiledFormula;
+      constructor(id, compiledFormula, format, style, dependencies, sheetId, getRangeString) {
           this.id = id;
-          this.compiledFormula = compiledFormula;
           this.format = format;
           this.style = style;
-          this.dependencies = dependencies;
           this.sheetId = sheetId;
-          this.getFormulaCellContent = getFormulaCellContent;
+          this.getRangeString = getRangeString;
+          let rangeIndex = 0;
+          const tokens = compiledFormula.tokens.map((token) => {
+              if (token.type === "REFERENCE") {
+                  const index = rangeIndex++;
+                  return new RangeReferenceToken(() => this.getRangeString(dependencies[index], this.sheetId));
+              }
+              return token;
+          });
+          this.compiledFormula = {
+              ...compiledFormula,
+              dependencies,
+              tokens,
+          };
       }
       get content() {
-          return this.getFormulaCellContent(this.sheetId, {
-              dependencies: this.dependencies,
-              compiledFormula: this.compiledFormula,
-          });
+          return concat(this.compiledFormula.tokens.map((token) => token.value));
+      }
+  }
+  class RangeReferenceToken {
+      getValue;
+      type = "REFERENCE";
+      constructor(getValue) {
+          this.getValue = getValue;
+      }
+      get value() {
+          return this.getValue();
       }
   }
 
@@ -36916,6 +36933,13 @@
       }
       onDeleteColumnsRows(cmd) {
           for (const table of this.getFilterTables(cmd.sheetId)) {
+              // Remove the filter tables whose data filter headers are in the removed rows.
+              if (cmd.dimension === "ROW" && cmd.elements.includes(table.zone.top)) {
+                  const tables = { ...this.tables[cmd.sheetId] };
+                  delete tables[table.id];
+                  this.history.update("tables", cmd.sheetId, tables);
+                  continue;
+              }
               const zone = reduceZoneOnDeletion(table.zone, cmd.dimension === "COL" ? "left" : "top", cmd.elements);
               if (!zone) {
                   const tables = { ...this.tables[cmd.sheetId] };
@@ -39964,6 +39988,13 @@
           return (this.evaluatedCells.get(this.encodePosition(position)) ||
               createEvaluatedCell("", { locale: this.getters.getLocale() }));
       }
+      getSpreadPositionsOf(position) {
+          const positionId = this.encodePosition(position);
+          if (!this.spreadingRelations.isArrayFormula(positionId)) {
+              return [];
+          }
+          return Array.from(this.spreadingRelations.getArrayResultPositionIds(positionId)).map(this.decodePosition.bind(this));
+      }
       getArrayFormulaSpreadingOn(position) {
           const positionId = this.encodePosition(position);
           const formulaPosition = this.getArrayFormulaSpreadingOnId(positionId);
@@ -40068,9 +40099,6 @@
           }
       }
       setEvaluatedCell(positionId, evaluatedCell) {
-          if (this.nextPositionsToUpdate.has(positionId)) {
-              this.nextPositionsToUpdate.delete(positionId);
-          }
           this.evaluatedCells.set(positionId, evaluatedCell);
       }
       computeCell(positionId) {
@@ -40125,7 +40153,7 @@
               const position = this.compilationParams[2].getters.getCellPosition(cellId);
               return toXC(position.col, position.row);
           };
-          const formulaReturn = cellData.compiledFormula.execute(cellData.dependencies, ...this.compilationParams);
+          const formulaReturn = cellData.compiledFormula.execute(cellData.compiledFormula.dependencies, ...this.compilationParams);
           if (!isMatrix(formulaReturn)) {
               return createEvaluatedCell(formulaReturn.value, {
                   format: cellData.format || formulaReturn.format,
@@ -40225,7 +40253,7 @@
               return [];
           }
           const dependencies = [];
-          for (const range of cell.dependencies) {
+          for (const range of cell.compiledFormula.dependencies) {
               if (range.invalidSheetName || range.invalidXc) {
                   continue;
               }
@@ -40431,6 +40459,7 @@
           "getEvaluatedCell",
           "getEvaluatedCells",
           "getEvaluatedCellsInZone",
+          "getSpreadPositionsOf",
       ];
       shouldRebuildDependenciesGraph = true;
       evaluator;
@@ -40540,6 +40569,9 @@
       getEvaluatedCellsInZone(sheetId, zone) {
           return positions(zone).map(({ col, row }) => this.getters.getEvaluatedCell({ sheetId, col, row }));
       }
+      getSpreadPositionsOf(position) {
+          return this.evaluator.getSpreadPositionsOf(position);
+      }
       // ---------------------------------------------------------------------------
       // Export
       // ---------------------------------------------------------------------------
@@ -40577,10 +40609,10 @@
        */
       getCorrespondingFormulaCell(position) {
           const cell = this.getters.getCell(position);
-          if (cell && cell.content) {
-              if (cell.isFormula && !isBadExpression(cell.content)) {
-                  return cell;
-              }
+          if (cell && cell.isFormula) {
+              return isBadExpression(cell.compiledFormula.tokens) ? undefined : cell;
+          }
+          else if (cell && cell.content) {
               return undefined;
           }
           const spreadingFormulaPosition = this.evaluator.getArrayFormulaSpreadingOn(position);
@@ -40597,9 +40629,9 @@
           return buildCompilationParameters(this.config.custom, this.getters, (position) => this.evaluator.getEvaluatedCell(position));
       }
   }
-  function isBadExpression(formula) {
+  function isBadExpression(tokens) {
       try {
-          compile(formula);
+          compileTokens(tokens);
           return false;
       }
       catch (error) {
@@ -40768,22 +40800,20 @@
               invalidateCFEvaluationCommands.has(cmd.type) ||
               cmd.type === "EVALUATE_CELLS" ||
               cmd.type === "UPDATE_CELL") {
-              if (cmd.type !== "UNDO" && cmd.type !== "REDO") {
-                  for (const chartId in this.charts) {
-                      this.history.update("charts", chartId, undefined);
-                  }
+              for (const chartId in this.charts) {
+                  this.charts[chartId] = undefined;
               }
           }
           switch (cmd.type) {
               case "UPDATE_CHART":
               case "CREATE_CHART":
               case "DELETE_FIGURE":
-                  this.history.update("charts", cmd.id, undefined);
+                  this.charts[cmd.id] = undefined;
                   break;
               case "DELETE_SHEET":
                   for (let chartId in this.charts) {
                       if (!this.getters.isChartDefined(chartId)) {
-                          this.history.update("charts", chartId, undefined);
+                          this.charts[chartId] = undefined;
                       }
                   }
                   break;
@@ -40795,8 +40825,7 @@
               if (!chart) {
                   throw new Error(`No chart for the given id: ${figureId}`);
               }
-              const runtime = this.createRuntimeChart(chart);
-              this.history.update("charts", figureId, runtime);
+              this.charts[figureId] = this.createRuntimeChart(chart);
           }
           return this.charts[figureId];
       }
@@ -40948,7 +40977,10 @@
                                       const values = cf.rule.values.map((value, i) => {
                                           const compiledFormula = formulas[i];
                                           if (compiledFormula) {
-                                              return this.getters.getTranslatedCellFormula(sheetId, col - zone.left, row - zone.top, compiledFormula, compiledFormula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)));
+                                              return this.getters.getTranslatedCellFormula(sheetId, col - zone.left, row - zone.top, {
+                                                  ...compiledFormula,
+                                                  dependencies: compiledFormula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)),
+                                              });
                                           }
                                           return value;
                                       });
@@ -41320,7 +41352,10 @@
               }
               try {
                   const formula = compile(value);
-                  const translatedFormula = this.getters.getTranslatedCellFormula(sheetId, offset.col, offset.row, formula, formula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)));
+                  const translatedFormula = this.getters.getTranslatedCellFormula(sheetId, offset.col, offset.row, {
+                      ...formula,
+                      dependencies: formula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)),
+                  });
                   const evaluated = this.getters.evaluateFormula(sheetId, translatedFormula);
                   return evaluated && !isMatrix(evaluated) ? evaluated.toString() : "";
               }
@@ -43572,7 +43607,7 @@
               }
               let content = origin.cell.content;
               if (origin.cell.isFormula && operation === "COPY") {
-                  content = this.getters.getTranslatedCellFormula(sheetId, col - origin.position.col, row - origin.position.row, origin.cell.compiledFormula, origin.cell.dependencies);
+                  content = this.getters.getTranslatedCellFormula(sheetId, col - origin.position.col, row - origin.position.row, origin.cell.compiledFormula);
               }
               this.dispatch("UPDATE_CELL", {
                   ...target,
@@ -44104,20 +44139,29 @@
           const sheetId = this.getters.getActiveSheetId();
           const cells = this.getters.getCells(sheetId);
           const matches = [];
-          if (this.toSearch) {
+          if (this.toSearch && this.currentSearchRegex) {
               for (const cell of Object.values(cells)) {
                   const { col, row } = this.getters.getCellPosition(cell.id);
+                  const cellPosition = { sheetId, col, row };
                   const isColHidden = this.getters.isColHidden(sheetId, col);
                   const isRowHidden = this.getters.isRowHidden(sheetId, row);
                   if (isColHidden || isRowHidden) {
                       continue;
                   }
-                  if (cell &&
-                      this.currentSearchRegex &&
-                      this.currentSearchRegex.test(this.getSearchableString({ sheetId, col, row }))) {
+                  if (this.currentSearchRegex.test(this.getSearchableString(cellPosition))) {
                       const match = { col, row, selected: false };
                       matches.push(match);
                   }
+                  for (const spreadPosition of this.getters.getSpreadPositionsOf(cellPosition)) {
+                      if (this.currentSearchRegex.test(this.getSearchableString(spreadPosition))) {
+                          const match = {
+                              col: spreadPosition.col,
+                              row: spreadPosition.row,
+                              selected: false,
+                          };
+                          matches.push(match);
+                      }
+                  }
               }
           }
           return matches.sort(this.sortByRowThenColumn);
@@ -44176,16 +44220,19 @@
               return;
           }
           const sheetId = this.getters.getActiveSheetId();
-          const cell = this.getters.getCell({ sheetId, ...selectedMatch });
-          const { col, row } = selectedMatch;
+          const position = { sheetId, ...selectedMatch };
+          const cell = this.getters.getCell(position);
+          if (!cell?.content) {
+              return;
+          }
           if (cell?.isFormula && !this.searchOptions.searchFormulas) {
               return;
           }
           const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
-          const toReplace = this.getSearchableString({ sheetId, col, row });
+          const toReplace = this.getSearchableString(position);
           const content = toReplace.replace(replaceRegex, replaceWith);
           const canonicalContent = canonicalizeNumberContent(content, this.getters.getLocale());
-          this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
+          this.dispatch("UPDATE_CELL", { ...position, content: canonicalContent });
       }
       /**
        * Replace the value of the currently selected match
@@ -45760,7 +45807,7 @@
                       if (cell.isFormula) {
                           const position = this.getters.getCellPosition(cell.id);
                           // we only have a vertical offset
-                          content = this.getters.getTranslatedCellFormula(sheetId, 0, newRow - position.row, cell.compiledFormula, cell.dependencies);
+                          content = this.getters.getTranslatedCellFormula(sheetId, 0, newRow - position.row, cell.compiledFormula);
                       }
                       newCellValues.style = cell.style;
                       newCellValues.content = content;
@@ -47823,6 +47870,8 @@
               case "EVALUATE_CELLS":
               case "ACTIVATE_SHEET":
               case "REMOVE_FILTER_TABLE":
+              case "ADD_COLUMNS_ROWS":
+              case "REMOVE_COLUMNS_ROWS":
                   this.isEvaluationDirty = true;
                   break;
               case "START":
@@ -55846,6 +55895,7 @@
   exports.addFunction = addFunction;
   exports.astToFormula = astToFormula;
   exports.compile = compile;
+  exports.compileTokens = compileTokens;
   exports.components = components;
   exports.constants = constants;
   exports.convertAstNodes = convertAstNodes;
@@ -55861,6 +55911,7 @@
   exports.links = links;
   exports.load = load;
   exports.parse = parse;
+  exports.parseTokens = parseTokens;
   exports.readonlyAllowedCommands = readonlyAllowedCommands;
   exports.registries = registries;
   exports.setDefaultSheetViewSize = setDefaultSheetViewSize;
@@ -55868,9 +55919,9 @@
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.0.1";
-  __info__.date = "2023-11-02T09:35:50.522Z";
-  __info__.hash = "0887d5b";
+  __info__.version = "17.0.3";
+  __info__.date = "2023-11-16T11:59:49.524Z";
+  __info__.hash = "8bd0fb2";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);