@odoo/o-spreadsheet 16.4.21 → 16.4.24

package/dist/o-spreadsheet.iife.js

@@ -702,18 +702,18 @@
       return true;
   }
   class JetSet extends Set {
-      add(...iterable) {
+      addMany(iterable) {
           for (const element of iterable) {
               super.add(element);
           }
           return this;
       }
-      delete(...iterable) {
-          let deleted = false;
+      deleteMany(iterable) {
+          let wasDeleted = false;
           for (const element of iterable) {
-              deleted ||= super.delete(element);
+              wasDeleted ||= super.delete(element);
           }
-          return deleted;
+          return wasDeleted;
       }
   }
   /**
@@ -1839,6 +1839,9 @@
   function formatValue(value, { format, locale }) {
       switch (typeof value) {
           case "string":
+              if (value.includes('\\"')) {
+                  return value.replace(/\\"/g, '"');
+              }
               return value;
           case "boolean":
               return value ? "TRUE" : "FALSE";
@@ -15236,6 +15239,9 @@
       if (locale.formulaArgSeparator === locale.decimalSeparator) {
           return false;
       }
+      if (locale.thousandsSeparator === locale.decimalSeparator) {
+          return false;
+      }
       try {
           formatValue(1, { locale, format: "#,##0.00" });
           formatValue(1, { locale, format: locale.dateFormat });
@@ -15326,7 +15332,7 @@
       if (locale.decimalSeparator === "." || !isNumber(content, locale)) {
           return content;
       }
-      return content.replace(locale.decimalSeparator, ".");
+      return content.replace(locale.thousandsSeparator, "").replace(locale.decimalSeparator, ".");
   }
   /**
    * Change a content string from the given locale to its canonical form (en_US locale). Also convert date string.
@@ -18628,6 +18634,12 @@
       let { col, row } = env.model.getters.getActivePosition();
       env.model.dispatch("OPEN_CELL_POPOVER", { col, row, popoverType: "LinkEditor" });
   };
+  const INSERT_LINK_NAME = (env) => {
+      const sheetId = env.model.getters.getActiveSheetId();
+      const { col, row } = env.model.getters.getActivePosition();
+      const cell = env.model.getters.getEvaluatedCell({ sheetId, col, row });
+      return cell && cell.link ? _lt("Edit link") : _lt("Insert link");
+  };
   //------------------------------------------------------------------------------
   // Filters action
   //------------------------------------------------------------------------------
@@ -19168,7 +19180,7 @@
   })
       .add("insert_link", {
       ...insertLink,
-      name: _lt("Insert link"),
+      name: INSERT_LINK_NAME,
       sequence: 150,
       separator: true,
   });
@@ -20656,7 +20668,7 @@
               : this.props.ranges()
                   ? this.props.ranges().map((xc, id) => ({
                       xc,
-                      id,
+                      id: id + 1,
                       isFocused: false,
                   }))
                   : [];
@@ -24079,6 +24091,7 @@
       static components = { TextValueProvider, FunctionDescriptionProvider };
       static defaultProps = {
           inputStyle: "",
+          isDefaultFocus: false,
       };
       composerRef = owl.useRef("o_composer");
       contentHelper = new ContentEditableHelper(this.composerRef.el);
@@ -24131,7 +24144,6 @@
           F2: () => console.warn("Not implemented"),
           F4: this.processF4Key,
           Tab: (ev) => this.processTabKey(ev),
-          " ": (ev) => this.processSpaceKey(ev),
       };
       keyCodeMapping = {
           NumpadDecimal: this.processNumpadDecimal,
@@ -24139,11 +24151,11 @@
       setup() {
           owl.onMounted(() => {
               const el = this.composerRef.el;
+              if (this.props.isDefaultFocus) {
+                  this.env.focusableElement.setFocusableElement(el);
+              }
               this.contentHelper.updateEl(el);
           });
-          owl.onWillUnmount(() => {
-              this.props.onComposerUnmounted?.();
-          });
           owl.useEffect(() => {
               this.processContent();
           });
@@ -24152,7 +24164,8 @@
       // Handlers
       // ---------------------------------------------------------------------------
       processArrowKeys(ev) {
-          if (this.env.model.getters.isSelectingForComposer()) {
+          if (this.env.model.getters.isSelectingForComposer() ||
+              this.env.model.getters.getEditionMode() === "inactive") {
               this.functionDescriptionState.showDescription = false;
               // Prevent the default content editable behavior which moves the cursor
               ev.preventDefault();
@@ -24191,25 +24204,19 @@
       processTabKey(ev) {
           ev.preventDefault();
           ev.stopPropagation();
-          if (this.autoCompleteState.showProvider) {
-              const autoCompleteValue = this.autoCompleteState.values[this.autoCompleteState.selectedIndex]?.text;
-              if (autoCompleteValue) {
-                  this.autoComplete(autoCompleteValue);
-                  return;
+          if (this.env.model.getters.getEditionMode() !== "inactive") {
+              if (this.autoCompleteState.showProvider) {
+                  const autoCompleteValue = this.autoCompleteState.values[this.autoCompleteState.selectedIndex]?.text;
+                  if (autoCompleteValue) {
+                      this.autoComplete(autoCompleteValue);
+                      return;
+                  }
               }
+              this.env.model.dispatch("STOP_EDITION");
           }
           const direction = ev.shiftKey ? "left" : "right";
-          this.env.model.dispatch("STOP_EDITION");
           this.env.model.selection.moveAnchorCell(direction, 1);
       }
-      processSpaceKey(ev) {
-          if (ev.ctrlKey) {
-              ev.preventDefault();
-              ev.stopPropagation();
-              this.showAutocomplete("");
-              this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
-          }
-      }
       processEnterKey(ev) {
           ev.preventDefault();
           ev.stopPropagation();
@@ -24261,6 +24268,9 @@
           this.compositionActive = false;
       }
       onKeydown(ev) {
+          if (this.env.model.getters.getEditionMode() === "inactive") {
+              return;
+          }
           let handler = this.keyMapping[ev.key] || this.keyCodeMapping[ev.code];
           if (handler) {
               handler.call(this, ev);
@@ -24269,14 +24279,33 @@
               ev.stopPropagation();
           }
       }
+      onPaste(ev) {
+          if (this.env.model.getters.getEditionMode() !== "inactive") {
+              ev.stopPropagation();
+          }
+      }
       /*
        * Triggered automatically by the content-editable between the keydown and key up
        * */
       onInput(ev) {
-          if (this.props.focus === "inactive" || !this.shouldProcessInputEvents) {
+          if (!this.shouldProcessInputEvents) {
               return;
           }
-          let content = this.contentHelper.getText();
+          if (ev.inputType === "insertFromPaste" &&
+              this.env.model.getters.getEditionMode() === "inactive") {
+              return;
+          }
+          ev.stopPropagation();
+          let content;
+          if (this.env.model.getters.getEditionMode() === "inactive") {
+              content = ev.data || "";
+          }
+          else {
+              content = this.contentHelper.getText();
+          }
+          if (this.props.focus === "inactive") {
+              return this.props.onComposerCellFocused?.(content);
+          }
           let selection = this.contentHelper.getCurrentSelection();
           if (ev.inputType === "insertParagraph") {
               const start = Math.min(selection.start, selection.end);
@@ -24354,9 +24383,8 @@
           }
           const newSelection = this.contentHelper.getCurrentSelection();
           this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
-          if (this.props.focus === "inactive") {
-              this.props.onComposerContentFocused(newSelection);
-          }
+          this.props.onComposerContentFocused();
+          if (this.props.focus === "inactive") ;
           this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", newSelection);
           this.processTokenAtCursor();
       }
@@ -24523,7 +24551,7 @@
           const highlights = this.env.model.getters.getHighlights();
           const refSheet = sheetName
               ? this.env.model.getters.getSheetIdByName(sheetName)
-              : this.env.model.getters.getCurrentEditedCell().sheetId;
+              : this.env.model.getters.getCurrentEditedCell()?.sheetId;
           const highlight = highlights.find((highlight) => {
               if (highlight.sheetId !== refSheet)
                   return false;
@@ -24603,12 +24631,13 @@
       }
   }
   Composer.props = {
-      focus: { validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value) },
-      onComposerContentFocused: Function,
       inputStyle: { type: String, optional: true },
       rect: { type: Object, optional: true },
       delimitation: { type: Object, optional: true },
-      onComposerUnmounted: { type: Function, optional: true },
+      focus: { validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value) },
+      onComposerCellFocused: { type: Function, optional: true },
+      onComposerContentFocused: Function,
+      isDefaultFocus: { type: Boolean, optional: true },
   };
 
   const COMPOSER_BORDER_WIDTH = 3 * 0.4 * window.devicePixelRatio || 1;
@@ -24642,51 +24671,26 @@
   class GridComposer extends owl.Component {
       static template = "o-spreadsheet-GridComposer";
       static components = { Composer };
-      gridComposerRef;
-      zone;
-      rect;
+      // TODORAR see if we can keep it undefined
+      rect = this.defaultRect;
+      isEditing = false;
       isCellReferenceVisible;
-      composerState;
+      get defaultRect() {
+          return { x: 0, y: 0, width: 0, height: 0 };
+      }
       setup() {
-          this.gridComposerRef = owl.useRef("gridComposer");
-          this.composerState = owl.useState({
-              rect: undefined,
-              delimitation: undefined,
-          });
-          const { sheetId, col, row } = this.env.model.getters.getActivePosition();
-          this.zone = this.env.model.getters.expandZone(sheetId, positionToZone({ col, row }));
-          this.rect = this.env.model.getters.getVisibleRect(this.zone);
-          this.isCellReferenceVisible = false;
-          owl.onMounted(() => {
-              const el = this.gridComposerRef.el;
-              this.composerState.rect = {
-                  x: this.rect.x,
-                  y: this.rect.y,
-                  width: el.clientWidth,
-                  height: el.clientHeight,
-              };
-              this.composerState.delimitation = {
-                  width: this.props.gridDims.width,
-                  height: this.props.gridDims.height,
-              };
-          });
           owl.onWillUpdateProps(() => {
-              if (this.isCellReferenceVisible) {
-                  return;
-              }
-              const sheetId = this.env.model.getters.getActiveSheetId();
-              const zone = this.env.model.getters.getSelectedZone();
-              const rect = this.env.model.getters.getVisibleRect(zone);
-              if (!deepEquals(rect, this.rect) ||
-                  sheetId !== this.env.model.getters.getCurrentEditedCell().sheetId) {
-                  this.isCellReferenceVisible = true;
-              }
+              this.updateComponentPosition();
+              this.updateCellReferenceVisibility();
           });
       }
       get shouldDisplayCellReference() {
           return this.isCellReferenceVisible;
       }
       get cellReference() {
+          if (!this.env.model.getters.getCurrentEditedCell()) {
+              return "";
+          }
           const { col, row, sheetId } = this.env.model.getters.getCurrentEditedCell();
           const prefixSheet = sheetId !== this.env.model.getters.getActiveSheetId();
           return `${prefixSheet ? getCanonicalSheetName(this.env.model.getters.getSheetName(sheetId)) + "!" : ""}${toXC(col, row)}`;
@@ -24698,7 +24702,27 @@
               top: `${top - GRID_CELL_REFERENCE_TOP_OFFSET}px`,
           });
       }
+      get composerProps() {
+          const { width, height } = this.env.model.getters.getSheetViewDimensionWithHeaders();
+          return {
+              rect: { ...this.rect },
+              delimitation: {
+                  width,
+                  height,
+              },
+              focus: this.props.focus,
+              isDefaultFocus: true,
+              onComposerContentFocused: this.props.onComposerContentFocused,
+              onComposerCellFocused: this.props.onComposerCellFocused,
+          };
+      }
       get containerStyle() {
+          if (this.env.model.getters.getEditionMode() === "inactive" || !this.rect) {
+              return `
+        position: absolute;
+        z-index: -1000;
+      `;
+          }
           const isFormula = this.env.model.getters.getCurrentContent().startsWith("=");
           const cell = this.env.model.getters.getActiveCell();
           const position = this.env.model.getters.getActivePosition();
@@ -24718,6 +24742,8 @@
           if (!isFormula) {
               textAlign = style.align || cell.defaultAlign;
           }
+          const maxHeight = this.props.gridDims.height - this.rect.y;
+          const maxWidth = this.props.gridDims.width - this.rect.x;
           /**
            * min-size is on the container, not the composer element, because we want to have the same size as the cell by default,
            * including all the paddings/margins of the composer
@@ -24729,6 +24755,8 @@
               top: `${top}px`,
               "min-width": `${width + 1}px`,
               "min-height": `${height + 1}px`,
+              "max-width": `${maxWidth}px`,
+              "max-height": `${maxHeight}px`,
               background,
               color,
               "font-size": `${fontSizeInPixels(fontSize)}px`,
@@ -24738,20 +24766,38 @@
               "text-align": textAlign,
           });
       }
-      get composerStyle() {
-          const maxHeight = this.props.gridDims.height - this.rect.y;
-          const maxWidth = this.props.gridDims.width - this.rect.x;
-          return cssPropertiesToCss({
-              "max-width": `${maxWidth}px`,
-              "max-height": `${maxHeight}px`,
-          });
+      updateComponentPosition() {
+          const isEditing = this.env.model.getters.getEditionMode() !== "inactive";
+          if (this.isEditing !== isEditing) {
+              this.isEditing = isEditing;
+              if (!isEditing) {
+                  this.rect = this.defaultRect;
+                  this.env.focusableElement.focus();
+                  return;
+              }
+              const position = this.env.model.getters.getActivePosition();
+              const zone = this.env.model.getters.expandZone(position.sheetId, positionToZone(position));
+              this.rect = this.env.model.getters.getVisibleRect(zone);
+          }
+      }
+      updateCellReferenceVisibility() {
+          if (this.isCellReferenceVisible || this.env.model.getters.getEditionMode() === "inactive") {
+              return;
+          }
+          const sheetId = this.env.model.getters.getActiveSheetId();
+          const zone = this.env.model.getters.getSelectedZone();
+          const rect = this.env.model.getters.getVisibleRect(zone);
+          if (!deepEquals(rect, this.rect) ||
+              sheetId !== this.env.model.getters.getCurrentEditedCell().sheetId) {
+              this.isCellReferenceVisible = true;
+          }
       }
   }
   GridComposer.props = {
       focus: { validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value) },
-      onComposerUnmounted: Function,
       onComposerContentFocused: Function,
       gridDims: Object,
+      onComposerCellFocused: Function,
   };
 
   const CSS$1 = css /* scss */ `
@@ -25632,7 +25678,6 @@
           this.props.onCellDoubleClicked(col, row);
       }
       onContextMenu(ev) {
-          ev.preventDefault();
           const [col, row] = this.getCartesianCoordinates(ev);
           this.props.onCellRightClicked(col, row, { x: ev.clientX, y: ev.clientY });
       }
@@ -26725,7 +26770,6 @@
       HEADER_WIDTH = HEADER_WIDTH;
       menuState;
       gridRef;
-      hiddenInput;
       onMouseWheel;
       canvasPosition;
       hoveredCell;
@@ -26736,17 +26780,16 @@
               menuItems: [],
           });
           this.gridRef = owl.useRef("grid");
-          this.hiddenInput = owl.useRef("hiddenInput");
           this.canvasPosition = useAbsoluteBoundingRect(this.gridRef);
           this.hoveredCell = owl.useState({ col: undefined, row: undefined });
           owl.useChildSubEnv({ getPopoverContainerRect: () => this.getGridRect() });
           owl.useExternalListener(document.body, "cut", this.copy.bind(this, true));
           owl.useExternalListener(document.body, "copy", this.copy.bind(this, false));
           owl.useExternalListener(document.body, "paste", this.paste);
-          owl.onMounted(() => this.focus());
-          this.props.exposeFocus(() => this.focus());
+          owl.onMounted(() => this.focusDefaultElement());
+          this.props.exposeFocus(() => this.focusDefaultElement());
           useGridDrawing("canvas", this.env.model, () => this.env.model.getters.getSheetViewDimensionWithHeaders());
-          owl.useEffect(() => this.focus(), () => [this.env.model.getters.getActiveSheetId()]);
+          owl.useEffect(() => this.focusDefaultElement(), () => [this.env.model.getters.getActiveSheetId()]);
           this.onMouseWheel = useWheelHandler((deltaX, deltaY) => {
               this.moveCanvas(deltaX, deltaY);
               this.hoveredCell.col = undefined;
@@ -26769,7 +26812,7 @@
           if (this.env.model.getters.hasOpenedPopover()) {
               this.closeOpenedPopover();
           }
-          this.focus();
+          this.focusDefaultElement();
       }
       // this map will handle most of the actions that should happen on key down. The arrow keys are managed in the key
       // down itself
@@ -26942,10 +26985,10 @@
           PAGEUP: () => this.env.model.dispatch("SHIFT_VIEWPORT_UP"),
           "CTRL+K": () => INSERT_LINK(this.env),
       };
-      focus() {
+      focusDefaultElement() {
           if (!this.env.model.getters.getSelectedFigureId() &&
               this.env.model.getters.getEditionMode() === "inactive") {
-              this.hiddenInput.el?.focus();
+              this.env.focusableElement.focus();
           }
       }
       get gridEl() {
@@ -27089,19 +27132,6 @@
               return;
           }
       }
-      onInput(ev) {
-          // the user meant to paste in the sheet, not open the composer with the pasted content
-          if (!ev.isComposing && ev.inputType === "insertFromPaste") {
-              return;
-          }
-          if (ev.data) {
-              // if the user types a character on the grid, it means he wants to start composing the selected cell with that
-              // character
-              ev.preventDefault();
-              ev.stopPropagation();
-              this.props.onGridComposerCellFocused(ev.data);
-          }
-      }
       // ---------------------------------------------------------------------------
       // Context Menu
       // ---------------------------------------------------------------------------
@@ -27214,7 +27244,7 @@
       }
       closeMenu() {
           this.menuState.isOpen = false;
-          this.focus();
+          this.focusDefaultElement();
       }
   }
   Grid.props = {
@@ -30875,8 +30905,16 @@
           },
       },
       {
-          description: "Change Border description structure",
+          description: "Fix datafilter duplication",
           from: 12,
+          to: 12.5,
+          applyMigration(data) {
+              return fixOverlappingFilters(data);
+          },
+      },
+      {
+          description: "Change Border description structure",
+          from: 12.5,
           to: 13,
           applyMigration(data) {
               for (const borderId in data.borders) {
@@ -30907,6 +30945,14 @@
               return data;
           },
       },
+      {
+          description: "Fix datafilter duplication (post saas-16.4)",
+          from: 14,
+          to: 14.5,
+          applyMigration(data) {
+              return fixOverlappingFilters(data);
+          },
+      },
   ];
   /**
    * This function is used to repair faulty data independently of the migration.
@@ -31064,6 +31110,26 @@
       }
       return messages;
   }
+  function fixOverlappingFilters(data) {
+      for (let sheet of data.sheets || []) {
+          let knownDataFilterZones = [];
+          for (let filterTable of sheet.filterTables || []) {
+              const zone = toZone(filterTable.range);
+              // See commit message of https://github.com/odoo/o-spreadsheet/pull/3632 of more details
+              const intersectZoneIndex = knownDataFilterZones.findIndex((knownZone) => overlap(knownZone, zone));
+              if (intersectZoneIndex !== -1) {
+                  knownDataFilterZones[intersectZoneIndex] = zone;
+              }
+              else {
+                  knownDataFilterZones.push(zone);
+              }
+          }
+          sheet.filterTables = knownDataFilterZones.map((zone) => ({
+              range: zoneToXc(zone),
+          }));
+      }
+      return data;
+  }
   // -----------------------------------------------------------------------------
   // Helpers
   // -----------------------------------------------------------------------------
@@ -31793,9 +31859,9 @@
       allowDispatch(cmd) {
           switch (cmd.type) {
               case "UPDATE_CELL":
-                  return this.checkCellOutOfSheet(cmd);
+                  return this.checkValidations(cmd, this.checkCellOutOfSheet, this.checkUselessUpdateCell);
               case "CLEAR_CELL":
-                  return this.checkValidations(cmd, this.chainValidations(this.checkCellOutOfSheet, this.checkUselessClearCell));
+                  return this.checkValidations(cmd, this.checkCellOutOfSheet, this.checkUselessClearCell);
               default:
                   return 0 /* CommandResult.Success */;
           }
@@ -31927,10 +31993,6 @@
                       format: cell.format ? getItemId(cell.format, formats) : undefined,
                       content: cell.content || undefined,
                   };
-                  // if there is a formula but no dependencies (maybe because the cell is in error), no need to recompute the formula text
-                  if (cell.isFormula && cell.dependencies.length) {
-                      cells[xc].content = this.buildFormulaContent(_sheet.id, cell, cell.dependencies, true);
-                  }
               }
               _sheet.cells = cells;
           }
@@ -32093,10 +32155,7 @@
           else {
               style = before ? before.style : undefined;
           }
-          const locale = this.getters.getLocale();
-          let format = ("format" in after ? after.format : before && before.format) ||
-              detectDateFormat(afterContent, locale) ||
-              detectNumberFormat(afterContent);
+          const format = "format" in after ? after.format : before && before.format;
           /* Read the following IF as:
            * we need to remove the cell if it is completely empty, but we can know if it completely empty if:
            * - the command says the new content is empty and has no border/format/style
@@ -32137,12 +32196,11 @@
       }
       createLiteralCell(id, content, format, style) {
           const locale = this.getters.getLocale();
-          content = parseLiteral(content, locale).toString();
           return {
               id,
-              content,
+              content: parseLiteral(content, locale).toString(),
               style,
-              format,
+              format: format || detectDateFormat(content, locale) || detectNumberFormat(content),
               isFormula: false,
           };
       }
@@ -32203,6 +32261,18 @@
           }
           return 0 /* CommandResult.Success */;
       }
+      checkUselessUpdateCell(cmd) {
+          const cell = this.getters.getCell(cmd);
+          const hasContent = "content" in cmd || "formula" in cmd;
+          const hasStyle = "style" in cmd;
+          const hasFormat = "format" in cmd;
+          if ((!hasContent || cell?.content === cmd.content) &&
+              (!hasStyle || deepEquals(cell?.style, cmd.style)) &&
+              (!hasFormat || cell?.format === cmd.format)) {
+              return 98 /* CommandResult.NoChanges */;
+          }
+          return 0 /* CommandResult.Success */;
+      }
   }
   class FormulaCellWithDependencies {
       id;
@@ -36343,7 +36413,15 @@
           if (!this.rTrees[sheetId]) {
               return;
           }
-          this.rTrees[sheetId].remove(item, deepEquals);
+          this.rTrees[sheetId].remove(item, this.rtreeItemComparer);
+      }
+      rtreeItemComparer(left, right) {
+          return (left.data == right.data &&
+              left.boundingBox.sheetId === right.boundingBox.sheetId &&
+              left.boundingBox?.zone.left === right.boundingBox.zone.left &&
+              left.boundingBox?.zone.top === right.boundingBox.zone.top &&
+              left.boundingBox?.zone.right === right.boundingBox.zone.right &&
+              left.boundingBox?.zone.bottom === right.boundingBox.zone.bottom);
       }
   }
   /**
@@ -36421,7 +36499,7 @@
           const queue = Array.from(ranges).reverse();
           while (queue.length > 0) {
               const range = queue.pop();
-              visited.add(...this.encoder.encodeBoundingBox(range));
+              visited.addMany(this.encoder.encodeBoundingBox(range));
               const impactedPositionIds = this.rTree.search(range).map((dep) => dep.data);
               for (const positionId of impactedPositionIds) {
                   if (!visited.has(positionId)) {
@@ -36429,7 +36507,7 @@
                   }
               }
           }
-          visited.delete(...ranges.flatMap((r) => this.encoder.encodeBoundingBox(r)));
+          visited.deleteMany(ranges.flatMap((r) => this.encoder.encodeBoundingBox(r)));
           return visited;
       }
   }
@@ -36560,9 +36638,9 @@
           const cells = positions.map((p) => this.encoder.encode(p));
           const cellsToCompute = new JetSet(cells);
           const arrayFormulasPositionIds = this.getArrayFormulasImpactedByChangesOf(cells);
-          cellsToCompute.add(...this.getCellsDependingOn(cells));
-          cellsToCompute.add(...arrayFormulasPositionIds);
-          cellsToCompute.add(...this.getCellsDependingOn(arrayFormulasPositionIds));
+          cellsToCompute.addMany(this.getCellsDependingOn(cells));
+          cellsToCompute.addMany(arrayFormulasPositionIds);
+          cellsToCompute.addMany(this.getCellsDependingOn(arrayFormulasPositionIds));
           this.evaluate(cellsToCompute);
       }
       getArrayFormulasImpactedByChangesOf(positionIds) {
@@ -36576,7 +36654,7 @@
               }
               if (!content) {
                   // The previous content could have blocked some array formulas
-                  impactedPositionIds.add(...this.getArrayFormulasBlockedByOrSpreadingOn(positionId));
+                  impactedPositionIds.addMany(this.getArrayFormulasBlockedByOrSpreadingOn(positionId));
               }
           }
           return impactedPositionIds;
@@ -36624,7 +36702,7 @@
           }
           const arrayFormulas = this.spreadingRelations.getFormulaPositionsSpreadingOn(positionId);
           const cells = new JetSet(arrayFormulas);
-          cells.add(...this.getCellsDependingOn(arrayFormulas));
+          cells.addMany(this.getCellsDependingOn(arrayFormulas));
           return cells;
       }
       nextPositionsToUpdate = new JetSet();
@@ -36775,7 +36853,7 @@
               this.setEvaluatedCell(positionId, evaluatedCell);
               // check if formula dependencies present in the spread zone
               // if so, they need to be recomputed
-              this.nextPositionsToUpdate.add(...this.getCellsDependingOn([positionId]));
+              this.nextPositionsToUpdate.addMany(this.getCellsDependingOn([positionId]));
           };
       }
       invalidateSpreading(positionId) {
@@ -36790,8 +36868,8 @@
                   continue;
               }
               this.evaluatedCells.delete(child);
-              this.nextPositionsToUpdate.add(...this.getCellsDependingOn([child]));
-              this.nextPositionsToUpdate.add(...this.getArrayFormulasBlockedByOrSpreadingOn(child));
+              this.nextPositionsToUpdate.addMany(this.getCellsDependingOn([child]));
+              this.nextPositionsToUpdate.addMany(this.getArrayFormulasBlockedByOrSpreadingOn(child));
           }
           this.spreadingRelations.removeNode(positionId);
       }
@@ -37151,7 +37229,13 @@
               const format = newFormat
                   ? getItemId(newFormat, data.formats)
                   : exportedCellData.format;
-              const content = !isExported ? newContent : exportedCellData.content;
+              let content;
+              if (formulaCell instanceof FormulaCellWithDependencies) {
+                  content = this.getters.buildFormulaContent(exportedSheetData.id, formulaCell, formulaCell.dependencies, true);
+              }
+              else {
+                  content = !isExported ? newContent : exportedCellData.content;
+              }
               exportedSheetData.cells[xc] = { ...exportedCellData, value, isFormula, content, format };
           }
       }
@@ -40974,14 +41058,12 @@
                   break;
               case "FOCUS_RANGE":
               case "CHANGE_RANGE":
-                  if (cmd.id !== this.focusedInputId) {
-                      const input = this.inputs[cmd.id];
-                      const range = input.ranges.find((range) => range.id === cmd.rangeId);
-                      if (this.isRangeValid(range?.xc || "A1")) {
-                          const sheetId = this.getters.getActiveSheetId();
-                          const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
-                          this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
-                      }
+                  const input = this.inputs[cmd.id];
+                  const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                  if (range) {
+                      const sheetId = this.getters.getActiveSheetId();
+                      const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
+                      this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
                       this.focusedInputId = cmd.id;
                   }
                   break;
@@ -43670,7 +43752,7 @@
           this.replaceText(ref, this.selectionInitialStart, this.selectionEnd);
       }
       getZoneReference(zone) {
-          const inputSheetId = this.getters.getCurrentEditedCell().sheetId;
+          const inputSheetId = this.getters.getCurrentEditedCell()?.sheetId || this.getters.getActiveSheetId();
           const sheetId = this.getters.getActiveSheetId();
           const range = this.getters.getRangeFromZone(sheetId, zone);
           return this.getters.getSelectionRangeString(range, inputSheetId);
@@ -43684,7 +43766,7 @@
               _fixedParts.pop();
           }
           const newRange = range.clone({ parts: _fixedParts });
-          return this.getters.getSelectionRangeString(newRange, this.getters.getCurrentEditedCell().sheetId);
+          return this.getters.getSelectionRangeString(newRange, this.getters.getCurrentEditedCell()?.sheetId || this.getters.getActiveSheetId());
       }
       /**
        * Replace the current selection by a new text.
@@ -43717,7 +43799,7 @@
           if (!this.currentContent.startsWith("=") || this.mode === "inactive") {
               return;
           }
-          const editionSheetId = this.getters.getCurrentEditedCell().sheetId;
+          const editionSheetId = this.getters.getCurrentEditedCell()?.sheetId || this.getters.getActiveSheetId();
           const XCs = this.getReferencedRanges().map((range) => this.getters.getRangeString(range, editionSheetId));
           const colorsToKeep = {};
           for (const xc of XCs) {
@@ -43746,7 +43828,7 @@
           if (!this.currentContent.startsWith("=") || this.mode === "inactive") {
               return [];
           }
-          const editionSheetId = this.getters.getCurrentEditedCell().sheetId;
+          const editionSheetId = this.getters.getCurrentEditedCell()?.sheetId || this.getters.getActiveSheetId();
           const rangeColor = (rangeString) => {
               const colorIndex = this.colorIndexByRange[rangeString];
               return colors$1[colorIndex % colors$1.length];
@@ -43764,7 +43846,7 @@
        * Return ranges currently referenced in the composer
        */
       getReferencedRanges() {
-          const editionSheetId = this.getters.getCurrentEditedCell().sheetId;
+          const editionSheetId = this.getters.getCurrentEditedCell()?.sheetId || this.getters.getActiveSheetId();
           const referenceRanges = this.currentTokens
               .filter((token) => token.type === "REFERENCE")
               .map((token) => this.getters.getRangeFromSheetXC(editionSheetId, token.value));
@@ -45728,6 +45810,16 @@
       }
   }
 
+  class FocusableElement {
+      focusableElement = undefined;
+      setFocusableElement(element) {
+          this.focusableElement = element;
+      }
+      focus() {
+          this.focusableElement?.focus();
+      }
+  }
+
   const RIPPLE_KEY_FRAMES = [
       { transform: "scale(0)" },
       { transform: "scale(0.8)", offset: 0.33 },
@@ -47770,6 +47862,7 @@
               _t: Spreadsheet._t,
               clipboard: this.env.clipboard || instantiateClipboard(),
               startCellEdition: (content) => this.onGridComposerCellFocused(content),
+              focusableElement: new FocusableElement(),
           });
           owl.useExternalListener(window, "resize", () => this.render(true));
           owl.useExternalListener(window, "beforeunload", this.unbindModelEvents.bind(this));
@@ -47876,17 +47969,18 @@
           this.model.dispatch("UNFOCUS_SELECTION_INPUT");
           this.composer.topBarFocus = "contentFocus";
           this.composer.gridFocusMode = "inactive";
-          this.setComposerContent({ selection } || {});
+          this.setComposerContent({ selection });
       }
-      onGridComposerContentFocused() {
+      onGridComposerContentFocused(selection) {
           if (this.model.getters.isReadonly()) {
               return;
           }
           this.model.dispatch("UNFOCUS_SELECTION_INPUT");
           this.composer.topBarFocus = "inactive";
           this.composer.gridFocusMode = "contentFocus";
-          this.setComposerContent({});
+          this.setComposerContent({ selection });
       }
+      // TODO: either both are defined or none of them. change those args to an object
       onGridComposerCellFocused(content, selection) {
           if (this.model.getters.isReadonly()) {
               return;
@@ -49298,11 +49392,10 @@
        * next cluster if the given cell is outside a cluster or at the border of a cluster in the given direction.
        */
       getEndOfCluster(startPosition, dim, dir) {
-          const sheet = this.getters.getActiveSheet();
           let currentPosition = startPosition;
           // If both the current cell and the next cell are not empty, we want to go to the end of the cluster
           const nextCellPosition = this.getNextCellPosition(startPosition, dim, dir);
-          let mode = !this.isCellEmpty(currentPosition, sheet.id) && !this.isCellEmpty(nextCellPosition, sheet.id)
+          let mode = !this.isEvaluatedCellEmpty(currentPosition) && !this.isEvaluatedCellEmpty(nextCellPosition)
               ? "endOfCluster"
               : "nextCluster";
           while (true) {
@@ -49312,7 +49405,7 @@
                   currentPosition.row === nextCellPosition.row) {
                   break;
               }
-              const isNextCellEmpty = this.isCellEmpty(nextCellPosition, sheet.id);
+              const isNextCellEmpty = this.isEvaluatedCellEmpty(nextCellPosition);
               if (mode === "endOfCluster" && isNextCellEmpty) {
                   break;
               }
@@ -49326,10 +49419,20 @@
           return dim === "cols" ? currentPosition.col : currentPosition.row;
       }
       /**
-       * Check if a cell is empty or undefined in the model. If the cell is part of a merge,
-       * check if the merge containing the cell is empty.
+       * Checks if a cell is empty (i.e. does not have a content). If the cell is part of a merge,
+       * the check applies to the main cell of the merge.
+       */
+      isCellEmpty({ col, row }) {
+          const sheetId = this.getters.getActiveSheetId();
+          const position = this.getters.getMainCellPosition({ sheetId, col, row });
+          return !(this.getters.getCorrespondingFormulaCell(position) || this.getters.getCell(position)?.content);
+      }
+      /**
+       * Checks if a cell evaluated value is empty. If the cell is part of a merge,
+       * the check applies to the main cell of the merge.
        */
-      isCellEmpty({ col, row }, sheetId = this.getters.getActiveSheetId()) {
+      isEvaluatedCellEmpty({ col, row }) {
+          const sheetId = this.getters.getActiveSheetId();
           const position = this.getters.getMainCellPosition({ sheetId, col, row });
           const cell = this.getters.getEvaluatedCell(position);
           return cell.type === CellValueType.empty;
@@ -51612,9 +51715,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.4.21';
-  __info__.date = '2024-02-02T13:45:48.276Z';
-  __info__.hash = '73662b1';
+  __info__.version = '16.4.24';
+  __info__.date = '2024-02-28T12:27:32.683Z';
+  __info__.hash = '90c74d1';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);