@odoo/o-spreadsheet 16.2.29 → 16.2.32

package/dist/o-spreadsheet.iife.js

@@ -1692,6 +1692,9 @@
   function formatValue(value, format) {
       switch (typeof value) {
           case "string":
+              if (value.includes('\\"')) {
+                  return value.replace(/\\"/g, '"');
+              }
               return value;
           case "boolean":
               return value ? "TRUE" : "FALSE";
@@ -6272,14 +6275,8 @@
                       : undefined));
               }
           }
-          else if (zone.left === zone.right && zone.top === zone.bottom) {
-              // A single cell. If it's only the title, the dataset is not added.
-              if (!dataSetsHaveTitle) {
-                  dataSets.push(createDataSet(getters, dataSetSheetId, zone, undefined));
-              }
-          }
           else {
-              /* 1 row or 1 column */
+              /* 1 cell, 1 row or 1 column */
               dataSets.push(createDataSet(getters, dataSetSheetId, zone, dataSetsHaveTitle
                   ? {
                       top: zone.top,
@@ -6329,8 +6326,10 @@
       }
       const dataRange = ds.dataRange.clone({ zone: dataZone });
       return {
-          label: ds.labelCell ? getters.getRangeString(ds.labelCell, "forceSheetReference") : undefined,
-          range: getters.getRangeString(dataRange, "forceSheetReference"),
+          label: ds.labelCell
+              ? getters.getRangeString(ds.labelCell, "forceSheetReference", true)
+              : undefined,
+          range: getters.getRangeString(dataRange, "forceSheetReference", true),
       };
   }
   /**
@@ -6855,6 +6854,9 @@
               .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
           return {
               ...this.getDefinition(),
+              labelRange: this.labelRange
+                  ? this.getters.getRangeString(this.labelRange, this.sheetId, true)
+                  : undefined,
               backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
               fontColor: toXlsxHexColor(chartFontColor(this.background)),
               dataSets,
@@ -7419,6 +7421,9 @@
               .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
           return {
               ...this.getDefinition(),
+              labelRange: this.labelRange
+                  ? this.getters.getRangeString(this.labelRange, this.sheetId, true)
+                  : undefined,
               backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
               fontColor: toXlsxHexColor(chartFontColor(this.background)),
               dataSets,
@@ -7692,6 +7697,9 @@
               .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
           return {
               ...this.getDefinition(),
+              labelRange: this.labelRange
+                  ? this.getters.getRangeString(this.labelRange, this.sheetId, true)
+                  : undefined,
               backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
               fontColor: toXlsxHexColor(chartFontColor(this.background)),
               verticalAxisPosition: "left",
@@ -9135,6 +9143,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
   //------------------------------------------------------------------------------
@@ -9272,7 +9286,7 @@
       action: DELETE_CELL_SHIFT_LEFT,
   })
       .add("insert_link", {
-      name: _lt("Insert link"),
+      name: INSERT_LINK_NAME,
       separator: true,
       sequence: 150,
       action: INSERT_LINK,
@@ -19958,14 +19972,13 @@
       setup() {
           owl.onMounted(() => {
               const el = this.composerRef.el;
+              if (this.props.isDefaultFocus) {
+                  this.env.focusableElement.setFocusableElement(el);
+              }
               this.contentHelper.updateEl(el);
               this.processContent();
               this.contentHelper.scrollSelectionIntoView();
           });
-          owl.onWillUnmount(() => {
-              var _a, _b;
-              (_b = (_a = this.props).onComposerUnmounted) === null || _b === void 0 ? void 0 : _b.call(_a);
-          });
           owl.onPatched(() => {
               if (!this.isKeyStillDown) {
                   this.processContent();
@@ -19976,7 +19989,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();
@@ -20017,21 +20031,23 @@
           var _a;
           ev.preventDefault();
           ev.stopPropagation();
-          if (this.autoCompleteState.showProvider) {
-              const autoCompleteValue = (_a = this.autoCompleteState.values[this.autoCompleteState.selectedIndex]) === null || _a === void 0 ? void 0 : _a.text;
-              if (autoCompleteValue) {
-                  this.autoComplete(autoCompleteValue);
-                  return;
+          if (this.env.model.getters.getEditionMode() !== "inactive") {
+              if (this.autoCompleteState.showProvider) {
+                  const autoCompleteValue = (_a = this.autoCompleteState.values[this.autoCompleteState.selectedIndex]) === null || _a === void 0 ? void 0 : _a.text;
+                  if (autoCompleteValue) {
+                      this.autoComplete(autoCompleteValue);
+                      return;
+                  }
               }
-          }
-          else {
-              // when completing with tab, if there is no value to complete, the active cell will be moved to the right.
-              // we can't let the model think that it is for a ref selection.
-              // todo: check if this can be removed someday
-              this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
+              else {
+                  // when completing with tab, if there is no value to complete, the active cell will be moved to the right.
+                  // we can't let the model think that it is for a ref selection.
+                  // todo: check if this can be removed someday
+                  this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
+              }
+              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);
       }
       processEnterKey(ev) {
@@ -20076,6 +20092,9 @@
           this.compositionActive = false;
       }
       onKeydown(ev) {
+          if (this.env.model.getters.getEditionMode() === "inactive") {
+              return;
+          }
           let handler = this.keyMapping[ev.key];
           if (handler) {
               handler.call(this, ev);
@@ -20086,22 +20105,45 @@
           }
       }
       updateCursorIfNeeded() {
-          if (!this.env.model.getters.isSelectingForComposer()) {
+          const moveCursor = !this.env.model.getters.isSelectingForComposer() &&
+              !(this.env.model.getters.getEditionMode() === "inactive");
+          if (moveCursor) {
               const { start, end } = this.contentHelper.getCurrentSelection();
               this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
               this.isKeyStillDown = true;
           }
       }
+      onPaste(ev) {
+          if (this.env.model.getters.getEditionMode() !== "inactive") {
+              ev.stopPropagation();
+          }
+      }
       /*
        * Triggered automatically by the content-editable between the keydown and key up
        * */
-      onInput() {
-          if (this.props.focus === "inactive" || !this.shouldProcessInputEvents) {
+      onInput(ev) {
+          var _a, _b;
+          if (!this.shouldProcessInputEvents) {
+              return;
+          }
+          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 (_b = (_a = this.props).onComposerCellFocused) === null || _b === void 0 ? void 0 : _b.call(_a, content);
+          }
           this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
           this.env.model.dispatch("SET_CURRENT_CONTENT", {
-              content: this.contentHelper.getText(),
+              content,
               selection: this.contentHelper.getCurrentSelection(),
           });
       }
@@ -20172,9 +20214,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();
       }
@@ -20398,14 +20439,16 @@
   Composer.components = { TextValueProvider, FunctionDescriptionProvider };
   Composer.defaultProps = {
       inputStyle: "",
+      isDefaultFocus: false,
   };
   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;
@@ -20437,46 +20480,28 @@
    * It also applies the style of the cell to the composer input.
    */
   class GridComposer extends owl.Component {
+      constructor() {
+          super(...arguments);
+          // TODORAR see if we can keep it undefined
+          this.rect = this.defaultRect;
+          this.isEditing = false;
+      }
+      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: el.parentElement.clientWidth,
-                  height: el.parentElement.clientHeight,
-              };
-          });
           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 ? getComposerSheetName(this.env.model.getters.getSheetName(sheetId)) + "!" : ""}${toXC(col, row)}`;
@@ -20488,7 +20513,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();
@@ -20508,6 +20553,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
@@ -20519,6 +20566,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`,
@@ -20528,22 +20577,40 @@
               "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.template = "o-spreadsheet-GridComposer";
   GridComposer.components = { Composer };
   GridComposer.props = {
       focus: { validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value) },
-      onComposerUnmounted: Function,
       onComposerContentFocused: Function,
       gridDims: Object,
+      onComposerCellFocused: Function,
   };
 
   const CSS$1 = css /* scss */ `
@@ -21134,7 +21201,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 });
       }
@@ -22361,17 +22427,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;
@@ -22394,13 +22459,12 @@
           if (this.env.model.getters.hasOpenedPopover()) {
               this.closeOpenedPopover();
           }
-          this.focus();
+          this.focusDefaultElement();
       }
-      focus() {
-          var _a;
+      focusDefaultElement() {
           if (!this.env.model.getters.getSelectedFigureId() &&
               this.env.model.getters.getEditionMode() === "inactive") {
-              (_a = this.hiddenInput.el) === null || _a === void 0 ? void 0 : _a.focus();
+              this.env.focusableElement.focus();
           }
       }
       get gridEl() {
@@ -22545,19 +22609,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
       // ---------------------------------------------------------------------------
@@ -22654,7 +22705,7 @@
       }
       closeMenu() {
           this.menuState.isOpen = false;
-          this.focus();
+          this.focusDefaultElement();
       }
   }
   Grid.template = "o-spreadsheet-Grid";
@@ -27006,7 +27057,7 @@
    * a breaking change is made in the way the state is handled, and an upgrade
    * function should be defined
    */
-  const CURRENT_VERSION = 12;
+  const CURRENT_VERSION = 12.5;
   const INITIAL_SHEET_ID = "Sheet1";
   /**
    * This function tries to load anything that could look like a valid
@@ -27272,6 +27323,31 @@
               return data;
           },
       },
+      {
+          description: "Fix datafilter duplication",
+          from: 12,
+          to: 12.5,
+          applyMigration(data) {
+              for (let sheet of data.sheets || []) {
+                  let knownDataFilterZones = [];
+                  for (let filterTable of sheet.filterTables || []) {
+                      const zone = toZone(filterTable.range);
+                      // See commit message for the 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;
+          },
+      },
   ];
   /**
    * This function is used to repair faulty data independently of the migration.
@@ -28124,9 +28200,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 */;
           }
@@ -28292,13 +28368,13 @@
       /*
        * Reconstructs the original formula string based on a normalized form and its dependencies
        */
-      buildFormulaContent(sheetId, cell, dependencies) {
+      buildFormulaContent(sheetId, cell, dependencies, useFixedZone = false) {
           const ranges = dependencies || cell.dependencies;
           let rangeIndex = 0;
           return concat(cell.compiledFormula.tokens.map((token) => {
               if (token.type === "REFERENCE") {
                   const range = ranges[rangeIndex++];
-                  return this.getters.getRangeString(range, sheetId);
+                  return this.getters.getRangeString(range, sheetId, useFixedZone);
               }
               return token.value;
           }));
@@ -28421,7 +28497,7 @@
           else {
               style = before ? before.style : undefined;
           }
-          let format = ("format" in after ? after.format : before && before.format) || detectFormat(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
@@ -28465,7 +28541,7 @@
               id,
               content,
               style,
-              format,
+              format: format || detectFormat(content),
               isFormula: false,
           };
       }
@@ -28542,6 +28618,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 === null || cell === void 0 ? void 0 : cell.content) === cmd.content) &&
+              (!hasStyle || deepEquals(cell === null || cell === void 0 ? void 0 : cell.style, cmd.style)) &&
+              (!hasFormat || (cell === null || cell === void 0 ? void 0 : cell.format) === cmd.format)) {
+              return 89 /* CommandResult.NoChanges */;
+          }
+          return 0 /* CommandResult.Success */;
+      }
   }
   CellPlugin.getters = [
       "zoneToXC",
@@ -28868,7 +28956,13 @@
           }
       }
       exportForExcel(data) {
-          this.export(data);
+          if (data.sheets) {
+              for (let sheet of data.sheets) {
+                  if (this.cfRules[sheet.id]) {
+                      sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                  }
+              }
+          }
       }
       // ---------------------------------------------------------------------------
       // Getters
@@ -28918,11 +29012,11 @@
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
-      mapToConditionalFormat(sheetId, cf) {
+      mapToConditionalFormat(sheetId, cf, options = { useFixedReference: false }) {
           return {
               ...cf,
               ranges: cf.ranges.map((range) => {
-                  return this.getters.getRangeString(range, sheetId);
+                  return this.getters.getRangeString(range, sheetId, options.useFixedReference);
               }),
           };
       }
@@ -30851,8 +30945,9 @@
        *
        * @param range the range (received from getRangeFromXC or getRangeFromZone)
        * @param forSheetId the id of the sheet where the range string is supposed to be used.
+       * @param [useFixedZone=false] if true, the range will be returned with fixed row and column
        */
-      getRangeString(range, forSheetId) {
+      getRangeString(range, forSheetId, useFixedZone = false) {
           if (!range) {
               return INCORRECT_RANGE_STRING;
           }
@@ -30879,7 +30974,7 @@
           if (prefixSheet && !sheetName) {
               return INCORRECT_RANGE_STRING;
           }
-          let rangeString = this.getRangePartString(rangeImpl, 0);
+          let rangeString = this.getRangePartString(rangeImpl, 0, useFixedZone);
           if (rangeImpl.parts && rangeImpl.parts.length === 2) {
               // this if converts A2:A2 into A2 except if any part of the original range had fixed row or column (with $)
               if (rangeImpl.zone.top !== rangeImpl.zone.bottom ||
@@ -30889,7 +30984,7 @@
                   rangeImpl.parts[1].rowFixed ||
                   rangeImpl.parts[1].colFixed) {
                   rangeString += ":";
-                  rangeString += this.getRangePartString(rangeImpl, 1);
+                  rangeString += this.getRangePartString(rangeImpl, 1, useFixedZone);
               }
           }
           return `${prefixSheet ? sheetName + "!" : ""}${rangeString}`;
@@ -30919,14 +31014,14 @@
       /**
        * Get a Xc string that represent a part of a range
        */
-      getRangePartString(range, part) {
+      getRangePartString(range, part, useFixedZone = false) {
           var _a, _b;
           const colFixed = range.parts && ((_a = range.parts[part]) === null || _a === void 0 ? void 0 : _a.colFixed) ? "$" : "";
           const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
           const rowFixed = range.parts && ((_b = range.parts[part]) === null || _b === void 0 ? void 0 : _b.rowFixed) ? "$" : "";
           const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
           let str = "";
-          if (range.isFullCol) {
+          if (range.isFullCol && !useFixedZone) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -30934,7 +31029,7 @@
                   str = colFixed + col;
               }
           }
-          else if (range.isFullRow) {
+          else if (range.isFullRow && !useFixedZone) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -32323,6 +32418,10 @@
                       if (cell.format !== evaluatedCell.format) {
                           exportedCellData.computedFormat = evaluatedCell.format;
                       }
+                      // 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) {
+                          exportedCellData.content = this.getters.buildFormulaContent(sheet.id, cell, cell.dependencies, true);
+                      }
                   }
               }
           }
@@ -34185,8 +34284,7 @@
           let row = zone.bottom;
           if (col > 0) {
               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)) {
+              while ((_a = this.getters.getCell(leftPosition)) === null || _a === void 0 ? void 0 : _a.content) {
                   row += 1;
                   leftPosition = { sheetId, col: col - 1, row };
               }
@@ -34195,8 +34293,7 @@
               col = zone.right;
               if (col <= this.getters.getNumberCols(sheetId)) {
                   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)) {
+                  while ((_b = this.getters.getCell(rightPosition)) === null || _b === void 0 ? void 0 : _b.content) {
                       row += 1;
                       rightPosition = { sheetId, col: col + 1, row };
                   }
@@ -39914,6 +40011,19 @@
       }
   }
 
+  class FocusableElement {
+      constructor() {
+          this.focusableElement = undefined;
+      }
+      setFocusableElement(element) {
+          this.focusableElement = element;
+      }
+      focus() {
+          var _a;
+          (_a = this.focusableElement) === null || _a === void 0 ? void 0 : _a.focus();
+      }
+  }
+
   const RIPPLE_KEY_FRAMES = [
       { transform: "scale(0)" },
       { transform: "scale(0.8)", offset: 0.33 },
@@ -41889,6 +41999,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));
@@ -41987,17 +42098,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;
@@ -43459,11 +43571,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) {
@@ -43473,7 +43584,7 @@
                   currentPosition.row === nextCellPosition.row) {
                   break;
               }
-              const isNextCellEmpty = this.isCellEmpty(nextCellPosition, sheet.id);
+              const isNextCellEmpty = this.isEvaluatedCellEmpty(nextCellPosition);
               if (mode === "endOfCluster" && isNextCellEmpty) {
                   break;
               }
@@ -43487,14 +43598,25 @@
           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.
+       * Check 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;
       }
+      /**
+       * 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 }) {
+          var _a;
+          const sheetId = this.getters.getActiveSheetId();
+          const position = this.getters.getMainCellPosition({ sheetId, col, row });
+          return !((_a = this.getters.getCell(position)) === null || _a === void 0 ? void 0 : _a.content);
+      }
       /** Computes the next cell position in the given direction by crossing through merges and skipping hidden cells.
        *
        * This has the same behaviour as getNextAvailablePosition() for certain arguments, but use this method instead
@@ -43973,12 +44095,7 @@
               attrs.push(["t", "str"]);
               cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
           }
-          node = escapeXml /*xml*/ `
-      <f>
-        ${XlsxFormula}
-      </f>
-      ${cycle}
-    `;
+          node = escapeXml /*xml*/ `<f> ${XlsxFormula} </f> ${cycle}`;
           return { attrs, node };
       }
       else {
@@ -44774,11 +44891,10 @@
                       ({ attrs: additionalAttrs, node: cellNode } = addContent(cell.content, construct.sharedStrings, isTableHeader));
                   }
                   attributes.push(...additionalAttrs);
-                  cellNodes.push(escapeXml /*xml*/ `
-          <c ${formatAttributes(attributes)}>
-            ${cellNode}
-          </c>
-        `);
+                  // prettier-ignore
+                  cellNodes.push(escapeXml /*xml*/ `<c ${formatAttributes(attributes)}>
+  ${cellNode}
+</c>`);
               }
           }
           if (cellNodes.length || row.size !== DEFAULT_CELL_HEIGHT || row.isHidden) {
@@ -45674,9 +45790,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.2.29';
-  __info__.date = '2024-01-29T13:49:36.240Z';
-  __info__.hash = '27b2ec1';
+  __info__.version = '16.2.32';
+  __info__.date = '2024-02-16T14:17:18.471Z';
+  __info__.hash = 'd5e57e6';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);