@odoo/o-spreadsheet 16.3.30 → 16.3.33

package/dist/o-spreadsheet.iife.js

@@ -1017,7 +1017,7 @@
       }
       // Generate new Id if the item didn't exist in the dictionary
       const ids = Object.keys(itemsDic);
-      const maxId = ids.length === 0 ? 0 : Math.max(...ids.map((id) => parseInt(id, 10)));
+      const maxId = ids.length === 0 ? 0 : largeMax(ids.map((id) => parseInt(id, 10)));
       itemsDic[maxId + 1] = item;
       return maxId + 1;
   }
@@ -1124,7 +1124,7 @@
       if (typeof o1 !== typeof o2)
           return false;
       if (typeof o1 !== "object")
-          return o1 === o2;
+          return false;
       // Objects can have different keys if the values are undefined
       const keys = new Set();
       Object.keys(o1).forEach((key) => keys.add(key));
@@ -1209,6 +1209,34 @@
           }
       }
       return true;
+  }
+  /**
+   * Alternative to Math.max that works with large arrays.
+   * Typically useful for arrays bigger than 100k elements.
+   */
+  function largeMax(array) {
+      let len = array.length;
+      if (len < 100000)
+          return Math.max(...array);
+      let max = -Infinity;
+      while (len--) {
+          max = array[len] > max ? array[len] : max;
+      }
+      return max;
+  }
+  /**
+   * Alternative to Math.min that works with large arrays.
+   * Typically useful for arrays bigger than 100k elements.
+   */
+  function largeMin(array) {
+      let len = array.length;
+      if (len < 100000)
+          return Math.min(...array);
+      let min = +Infinity;
+      while (len--) {
+          min = array[len] < min ? array[len] : min;
+      }
+      return min;
   }
 
   const RBA_REGEX = /rgba?\(|\s+|\)/gi;
@@ -6255,6 +6283,7 @@
                       this.save();
                   }
                   ev.stopPropagation();
+                  ev.preventDefault();
                   break;
               case "Escape":
                   this.cancel();
@@ -6820,10 +6849,10 @@
           }
       }
       return {
-          labels: Object.keys(labelMap),
+          labels: Array.from(labelSet),
           dataSetsValues: datasets.map((dataset, indexOfDataset) => ({
               ...dataset,
-              data: Object.values(labelMap).map((dataOfLabel) => dataOfLabel[indexOfDataset]),
+              data: Array.from(labelSet).map((label) => labelMap[label][indexOfDataset]),
           })),
       };
   }
@@ -7540,7 +7569,7 @@
           return undefined;
       }
       const labelsTimestamps = labelDates.map((date) => date.getTime());
-      const period = Math.max(...labelsTimestamps) - Math.min(...labelsTimestamps);
+      const period = largeMax(labelsTimestamps) - largeMin(labelsTimestamps);
       const minUnit = getFormatMinDisplayUnit(format);
       if (UNIT_LENGTH.second >= UNIT_LENGTH[minUnit] && Milliseconds.inSeconds(period) < 180) {
           return "second";
@@ -7980,7 +8009,7 @@
   }
   function getPieColors(colors, dataSetsValues) {
       const pieColors = [];
-      const maxLength = Math.max(...dataSetsValues.map((ds) => ds.data.length));
+      const maxLength = largeMax(dataSetsValues.map((ds) => ds.data.length));
       for (let i = 0; i <= maxLength; i++) {
           pieColors.push(colors.next());
       }
@@ -8943,8 +8972,8 @@
       let last;
       const activesRows = env.model.getters.getActiveRows();
       if (activesRows.size !== 0) {
-          first = Math.min(...activesRows);
-          last = Math.max(...activesRows);
+          first = largeMin([...activesRows]);
+          last = largeMax([...activesRows]);
       }
       else {
           const zone = env.model.getters.getSelectedZones()[0];
@@ -8972,8 +9001,8 @@
       let last;
       const activeCols = env.model.getters.getActiveCols();
       if (activeCols.size !== 0) {
-          first = Math.min(...activeCols);
-          last = Math.max(...activeCols);
+          first = largeMin([...activeCols]);
+          last = largeMax([...activeCols]);
       }
       else {
           const zone = env.model.getters.getSelectedZones()[0];
@@ -9001,8 +9030,8 @@
       let last;
       const activesRows = env.model.getters.getActiveRows();
       if (activesRows.size !== 0) {
-          first = Math.min(...activesRows);
-          last = Math.max(...activesRows);
+          first = largeMin([...activesRows]);
+          last = largeMax([...activesRows]);
       }
       else {
           const zone = env.model.getters.getSelectedZones()[0];
@@ -9043,8 +9072,8 @@
       let last;
       const activeCols = env.model.getters.getActiveCols();
       if (activeCols.size !== 0) {
-          first = Math.min(...activeCols);
-          last = Math.max(...activeCols);
+          first = largeMin([...activeCols]);
+          last = largeMax([...activeCols]);
       }
       else {
           const zone = env.model.getters.getSelectedZones()[0];
@@ -9127,7 +9156,7 @@
       let row;
       let quantity;
       if (activeRows.size) {
-          row = Math.min(...activeRows);
+          row = largeMin([...activeRows]);
           quantity = activeRows.size;
       }
       else {
@@ -9159,7 +9188,7 @@
       let row;
       let quantity;
       if (activeRows.size) {
-          row = Math.max(...activeRows);
+          row = largeMax([...activeRows]);
           quantity = activeRows.size;
       }
       else {
@@ -9204,7 +9233,7 @@
       let column;
       let quantity;
       if (activeCols.size) {
-          column = Math.min(...activeCols);
+          column = largeMin([...activeCols]);
           quantity = activeCols.size;
       }
       else {
@@ -9238,7 +9267,7 @@
       let column;
       let quantity;
       if (activeCols.size) {
-          column = Math.max(...activeCols);
+          column = largeMax([...activeCols]);
           quantity = activeCols.size;
       }
       else {
@@ -9443,9 +9472,12 @@
   // Filters action
   //------------------------------------------------------------------------------
   const FILTERS_CREATE_FILTER_TABLE = (env) => {
+      const zones = env.model.getters.getSelectedZones();
+      if (zones.length === 1 && getZoneArea(zones[0]) === 1) {
+          env.model.selection.selectTableAroundSelection();
+      }
       const sheetId = env.model.getters.getActiveSheetId();
-      const selection = env.model.getters.getSelection().zones;
-      interactiveAddFilter(env, sheetId, selection);
+      interactiveAddFilter(env, sheetId, env.model.getters.getSelectedZones());
   };
   const FILTERS_REMOVE_FILTER_TABLE = (env) => {
       const sheetId = env.model.getters.getActiveSheetId();
@@ -21309,6 +21341,11 @@
       onBlur() {
           this.isKeyStillDown = false;
       }
+      onContextMenu(ev) {
+          if (this.env.model.getters.getEditionMode() === "inactive") {
+              this.props.onInputContextMenu?.(ev);
+          }
+      }
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
@@ -21530,6 +21567,7 @@
       onComposerCellFocused: { type: Function, optional: true },
       onComposerContentFocused: Function,
       isDefaultFocus: { type: Boolean, optional: true },
+      onInputContextMenu: { type: Function, optional: true },
   };
 
   const COMPOSER_BORDER_WIDTH = 3 * 0.4 * window.devicePixelRatio || 1;
@@ -21606,6 +21644,7 @@
               isDefaultFocus: true,
               onComposerContentFocused: this.props.onComposerContentFocused,
               onComposerCellFocused: this.props.onComposerCellFocused,
+              onInputContextMenu: this.props.onInputContextMenu,
           };
       }
       get containerStyle() {
@@ -21694,6 +21733,7 @@
       onComposerContentFocused: Function,
       gridDims: Object,
       onComposerCellFocused: Function,
+      onInputContextMenu: Function,
   };
 
   const CSS$1 = css /* scss */ `
@@ -24029,8 +24069,8 @@
           else if (this.env.model.getters.getActiveRows().has(row)) {
               type = "ROW";
           }
-          const { x, y, width, height } = this.env.model.getters.getVisibleRect(lastZone);
-          this.toggleContextMenu(type, x + width, y + height);
+          const { x, y, width } = this.env.model.getters.getVisibleRect(lastZone);
+          this.toggleContextMenu(type, this.canvasPosition.x + x + width, this.canvasPosition.y + y);
       }
       onCellRightClicked(col, row, { x, y }) {
           const zones = this.env.model.getters.getSelectedZones();
@@ -26357,29 +26397,12 @@
           return width;
       return Math.round((width / WIDTH_FACTOR) * 100) / 100;
   }
-  function convertBorderDescr(descr) {
-      if (!descr) {
-          return undefined;
-      }
-      return {
-          style: descr.style,
-          color: { rgb: descr.color },
-      };
-  }
   function extractStyle(cell, data) {
       let style = {};
       if (cell.style) {
           style = data.styles[cell.style];
       }
       const format = extractFormat(cell, data);
-      const exportedBorder = {};
-      if (cell.border) {
-          const border = data.borders[cell.border];
-          exportedBorder.left = convertBorderDescr(border.left);
-          exportedBorder.right = convertBorderDescr(border.right);
-          exportedBorder.bottom = convertBorderDescr(border.bottom);
-          exportedBorder.top = convertBorderDescr(border.top);
-      }
       const styles = {
           font: {
               size: style?.fontSize || DEFAULT_FONT_SIZE,
@@ -26393,7 +26416,7 @@
               }
               : { reservedAttribute: "none" },
           numFmt: format ? { format: format, id: 0 /* id not used for export */ } : undefined,
-          border: exportedBorder || {},
+          border: cell.border || 0,
           alignment: {
               horizontal: style.align,
               vertical: style.verticalAlign
@@ -26425,15 +26448,12 @@
       return undefined;
   }
   function normalizeStyle(construct, styles) {
-      const { id: fontId } = pushElement(styles["font"], construct.fonts);
-      const { id: fillId } = pushElement(styles["fill"], construct.fills);
-      const { id: borderId } = pushElement(styles["border"], construct.borders);
       // Normalize this
       const numFmtId = convertFormat(styles["numFmt"], construct.numFmts);
       const style = {
-          fontId,
-          fillId,
-          borderId,
+          fontId: pushElement(styles.font, construct.fonts),
+          fillId: pushElement(styles.fill, construct.fills),
+          borderId: styles.border,
           numFmtId,
           alignment: {
               vertical: styles.alignment.vertical,
@@ -26441,8 +26461,7 @@
               wrapText: styles.alignment.wrapText,
           },
       };
-      const { id } = pushElement(style, construct.styles);
-      return id;
+      return pushElement(style, construct.styles);
   }
   function convertFormat(format, numFmtStructure) {
       if (!format) {
@@ -26450,8 +26469,7 @@
       }
       let formatId = XLSX_FORMAT_MAP[format.format];
       if (!formatId) {
-          const { id } = pushElement(format, numFmtStructure);
-          formatId = id + FIRST_NUMFMT_ID;
+          formatId = pushElement(format, numFmtStructure) + FIRST_NUMFMT_ID;
       }
       return formatId;
   }
@@ -26476,20 +26494,15 @@
       return id;
   }
   function pushElement(property, propertyList) {
-      for (let [key, value] of Object.entries(propertyList)) {
-          if (JSON.stringify(value) === JSON.stringify(property)) {
-              return { id: parseInt(key, 10), list: propertyList };
+      let len = propertyList.length;
+      const operator = typeof property === "object" ? deepEquals : (a, b) => a === b;
+      for (let i = 0; i < len; i++) {
+          if (operator(property, propertyList[i])) {
+              return i;
           }
       }
-      let elemId = propertyList.findIndex((elem) => JSON.stringify(elem) === JSON.stringify(property));
-      if (elemId === -1) {
-          propertyList.push(property);
-          elemId = propertyList.length - 1;
-      }
-      return {
-          id: elemId,
-          list: propertyList,
-      };
+      propertyList[propertyList.length] = property;
+      return propertyList.length - 1;
   }
   const chartIds = [];
   /**
@@ -26926,7 +26939,7 @@
   function getSheetDims(sheet) {
       const dims = [0, 0];
       for (let row of sheet.rows) {
-          dims[0] = Math.max(dims[0], ...row.cells.map((cell) => toCartesian(cell.xc).col));
+          dims[0] = Math.max(dims[0], largeMax(row.cells.map((cell) => toCartesian(cell.xc).col)));
           dims[1] = Math.max(dims[1], row.index);
       }
       dims[0] = Math.max(dims[0], EXCEL_IMPORT_DEFAULT_NUMBER_OF_COLS);
@@ -27195,7 +27208,25 @@
       }
       return document;
   }
-  function getDefaultXLSXStructure() {
+  function convertBorderDescr(descr) {
+      if (!descr) {
+          return undefined;
+      }
+      return {
+          style: descr.style,
+          color: { rgb: descr.color },
+      };
+  }
+  function getDefaultXLSXStructure(data) {
+      const xlsxBorders = Object.values(data.borders).map((border) => {
+          return {
+              left: convertBorderDescr(border.left),
+              right: convertBorderDescr(border.right),
+              bottom: convertBorderDescr(border.bottom),
+              top: convertBorderDescr(border.top),
+          };
+      });
+      const borders = [{}, ...xlsxBorders];
       return {
           relsFiles: [],
           sharedStrings: [],
@@ -27218,7 +27249,7 @@
               },
           ],
           fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-          borders: [{}],
+          borders,
           numFmts: [],
           dxfs: [],
       };
@@ -31169,7 +31200,17 @@
           }
       }
       exportForExcel(data) {
-          this.export(data);
+          for (const sheet of data.sheets) {
+              for (const filterTable of this.getFilterTables(sheet.id)) {
+                  if (zoneToDimension(filterTable.zone).numberOfRows === 1) {
+                      continue;
+                  }
+                  sheet.filterTables.push({
+                      range: zoneToXc(filterTable.zone),
+                      filters: [],
+                  });
+              }
+          }
       }
   }
 
@@ -31213,7 +31254,7 @@
                   for (let headerIndex of [...cmd.elements].sort((a, b) => b - a)) {
                       sizes.splice(headerIndex, 1);
                   }
-                  const min = Math.min(...cmd.elements);
+                  const min = largeMin(cmd.elements);
                   sizes = sizes.map((size, row) => {
                       if (cmd.dimension === "ROW" && row >= min) {
                           // invalidate sizes
@@ -31440,7 +31481,7 @@
                   if (hiddenElements.size >= elements) {
                       return 67 /* CommandResult.TooManyHiddenElements */;
                   }
-                  else if (Math.min(...cmd.elements) < 0 || Math.max(...cmd.elements) > elements) {
+                  else if (largeMin(cmd.elements) < 0 || largeMax(cmd.elements) > elements) {
                       return 87 /* CommandResult.InvalidHeaderIndex */;
                   }
                   else {
@@ -32213,8 +32254,8 @@
                       let newRange = range;
                       let changeType = "NONE";
                       for (let group of groups) {
-                          const min = Math.min(...group);
-                          const max = Math.max(...group);
+                          const min = largeMin(group);
+                          const max = largeMax(group);
                           if (range.zone[start] <= min && min <= range.zone[end]) {
                               const toRemove = Math.min(range.zone[end], max) - min + 1;
                               changeType = "RESIZE";
@@ -32645,7 +32686,7 @@
                   const elements = cmd.dimension === "COL"
                       ? this.getNumberCols(cmd.sheetId)
                       : this.getNumberRows(cmd.sheetId);
-                  if (Math.min(...cmd.elements) < 0 || Math.max(...cmd.elements) > elements) {
+                  if (largeMin(cmd.elements) < 0 || largeMax(cmd.elements) > elements) {
                       return 87 /* CommandResult.InvalidHeaderIndex */;
                   }
                   else if (this.checkElementsIncludeAllNonFrozenHeaders(cmd.sheetId, cmd.dimension, cmd.elements)) {
@@ -34147,13 +34188,13 @@
               .map((cell) => cell.value);
           switch (threshold.type) {
               case "value":
-                  const result = functionName === "max" ? Math.max(...rangeValues) : Math.min(...rangeValues);
+                  const result = functionName === "max" ? largeMax(rangeValues) : largeMin(rangeValues);
                   return result;
               case "number":
                   return Number(threshold.value);
               case "percentage":
-                  const min = Math.min(...rangeValues);
-                  const max = Math.max(...rangeValues);
+                  const min = largeMin(rangeValues);
+                  const max = largeMax(rangeValues);
                   const delta = max - min;
                   return min + (delta * Number(threshold.value)) / 100;
               case "percentile":
@@ -35037,12 +35078,13 @@
               case "AlterZone":
                   break;
               case "ZonesSelected":
+                  const sheetId = this.getters.getActiveSheetId();
                   let { col, row } = findCellInNewZone(event.previousAnchor.zone, event.anchor.zone);
                   if (event.mode === "updateAnchor") {
                       const oldZone = event.previousAnchor.zone;
                       const newZone = event.anchor.zone;
                       // altering a zone should not move the viewport in a dimension that wasn't changed
-                      const { top, bottom, left, right } = this.getters.getActiveMainViewport();
+                      const { top, bottom, left, right } = this.getMainInternalViewport(sheetId);
                       if (oldZone.left === newZone.left && oldZone.right === newZone.right) {
                           col = left > col || col > right ? left : col;
                       }
@@ -35050,10 +35092,9 @@
                           row = top > row || row > bottom ? top : row;
                       }
                   }
-                  const sheetId = this.getters.getActiveSheetId();
                   col = Math.min(col, this.getters.getNumberCols(sheetId) - 1);
                   row = Math.min(row, this.getters.getNumberRows(sheetId) - 1);
-                  this.refreshViewport(this.getters.getActiveSheetId(), { col, row });
+                  this.refreshViewport(sheetId, { col, row });
                   break;
           }
       }
@@ -35077,16 +35118,16 @@
                   this.setSheetViewOffset(cmd.offsetX, cmd.offsetY);
                   break;
               case "SHIFT_VIEWPORT_DOWN":
-                  const { top } = this.getActiveMainViewport();
                   const sheetId = this.getters.getActiveSheetId();
-                  const shiftedOffsetY = this.clipOffsetY(this.getters.getRowDimensions(sheetId, top).start + this.sheetViewHeight);
-                  this.shiftVertically(shiftedOffsetY);
+                  const { top, viewportHeight, offsetCorrectionY } = this.getMainInternalViewport(sheetId);
+                  const topRowDims = this.getters.getRowDimensions(sheetId, top);
+                  this.shiftVertically(topRowDims.start + viewportHeight - offsetCorrectionY);
                   break;
               case "SHIFT_VIEWPORT_UP": {
-                  const { top } = this.getActiveMainViewport();
                   const sheetId = this.getters.getActiveSheetId();
-                  const shiftedOffsetY = this.clipOffsetY(this.getters.getRowDimensions(sheetId, top).end - this.sheetViewHeight);
-                  this.shiftVertically(shiftedOffsetY);
+                  const { top, viewportHeight, offsetCorrectionY } = this.getMainInternalViewport(sheetId);
+                  const topRowDims = this.getters.getRowDimensions(sheetId, top);
+                  this.shiftVertically(topRowDims.end - offsetCorrectionY - viewportHeight);
                   break;
               }
               case "REMOVE_COLUMNS_ROWS":
@@ -35448,17 +35489,6 @@
           const { maxOffsetX, maxOffsetY } = this.getMaximumSheetOffset();
           Object.values(this.getSubViewports(sheetId)).forEach((viewport) => viewport.setViewportOffset(clip(offsetX, 0, maxOffsetX), clip(offsetY, 0, maxOffsetY)));
       }
-      /**
-       * Clip the vertical offset within the allowed range.
-       * Not above the sheet, nor below the sheet.
-       */
-      clipOffsetY(offsetY) {
-          const { height } = this.getMainViewportRect();
-          const maxOffset = height - this.sheetViewHeight;
-          offsetY = Math.min(offsetY, maxOffset);
-          offsetY = Math.max(offsetY, 0);
-          return offsetY;
-      }
       getViewportOffset(sheetId) {
           return {
               x: this.viewports[sheetId]?.bottomRight.offsetScrollbarX || 0,
@@ -35514,12 +35544,15 @@
        * viewport top.
        */
       shiftVertically(offset) {
-          const { top } = this.getActiveMainViewport();
+          const sheetId = this.getters.getActiveSheetId();
+          const { top } = this.getMainInternalViewport(sheetId);
           const { scrollX } = this.getActiveSheetScrollInfo();
           this.setSheetViewOffset(scrollX, offset);
           const { anchor } = this.getters.getSelection();
-          const deltaRow = this.getActiveMainViewport().top - top;
-          this.selection.selectCell(anchor.cell.col, anchor.cell.row + deltaRow);
+          if (anchor.cell.row >= this.getters.getPaneDivisions(sheetId).ySplit) {
+              const deltaRow = this.getMainInternalViewport(sheetId).top - top;
+              this.selection.selectCell(anchor.cell.col, anchor.cell.row + deltaRow);
+          }
       }
       getVisibleFigures() {
           const sheetId = this.getters.getActiveSheetId();
@@ -36103,13 +36136,13 @@
           const cells = this.getters.getEvaluatedCellsInZone(sheet.id, zone);
           const cellPositions = range(end, -1, -1);
           const invalidCells = cellPositions.filter((position) => cells[position] && !cells[position].isAutoSummable);
-          const maxValidPosition = Math.max(...invalidCells);
+          const maxValidPosition = largeMax(invalidCells);
           const numberSequences = groupConsecutive(cellPositions.filter((position) => this.isNumber(cells[position])));
           const firstSequence = numberSequences[0] || [];
-          if (Math.max(...firstSequence) < maxValidPosition) {
+          if (largeMax(firstSequence) < maxValidPosition) {
               return Infinity;
           }
-          return Math.min(...firstSequence);
+          return largeMin(firstSequence);
       }
       shouldFindData(sheetId, zone) {
           return this.getters.isEmpty(sheetId, zone) || this.getters.isSingleCellOrMerge(sheetId, zone);
@@ -37694,7 +37727,7 @@
        * column of the current viewport
        */
       getColDimensionsInViewport(sheetId, col) {
-          const left = Math.min(...this.getters.getSheetViewVisibleCols());
+          const left = largeMin(this.getters.getSheetViewVisibleCols());
           const start = this.getters.getColRowOffsetInViewport("COL", left, col);
           const size = this.getters.getColSize(sheetId, col);
           const isColHidden = this.getters.isColHidden(sheetId, col);
@@ -37709,7 +37742,7 @@
        * of the current viewport
        */
       getRowDimensionsInViewport(sheetId, row) {
-          const top = Math.min(...this.getters.getSheetViewVisibleRows());
+          const top = largeMin(this.getters.getSheetViewVisibleRows());
           const start = this.getters.getColRowOffsetInViewport("ROW", top, row);
           const size = this.getters.getRowSize(sheetId, row);
           const isRowHidden = this.getters.isRowHidden(sheetId, row);
@@ -39237,7 +39270,7 @@
       getColMaxWidth(sheetId, index) {
           const cellsPositions = positions(this.getters.getColsZone(sheetId, index, index));
           const sizes = cellsPositions.map((position) => this.getCellWidth({ sheetId, ...position }));
-          return Math.max(0, ...sizes);
+          return Math.max(0, largeMax(sizes));
       }
       splitWordToSpecificWidth(ctx, word, width, style) {
           const wordWidth = computeTextWidth(ctx, word, style);
@@ -42500,12 +42533,14 @@
           this.editionState = "initializing";
       }
       stopEdition() {
-          if (!this.state.isEditing)
+          const input = this.sheetNameRef.el;
+          if (!this.state.isEditing || !input)
               return;
           this.state.isEditing = false;
           this.editionState = "initializing";
-          this.sheetNameRef.el?.blur();
+          input.blur();
           const inputValue = this.getInputContent() || "";
+          input.innerText = inputValue;
           interactiveRenameSheet(this.env, this.props.sheetId, inputValue, () => this.startEdition());
       }
       cancelEdition() {
@@ -42966,7 +43001,7 @@
           this.sheetListRef.el.scrollTo({ top: 0, left: scroll, behavior: "smooth" });
       }
       onSheetMouseDown(sheetId, event) {
-          if (event.button !== 0)
+          if (event.button !== 0 || this.env.model.getters.isReadonly())
               return;
           this.closeMenu();
           const mouseX = event.clientX;
@@ -43067,7 +43102,6 @@
     cursor: pointer;
   }
 `;
-  let tKey = 1;
   class SpreadsheetDashboard extends owl.Component {
       static template = "o-spreadsheet-SpreadsheetDashboard";
       static components = {
@@ -43145,13 +43179,9 @@
                       coordinates: rect,
                       position: { col, row },
                       action,
-                      // we can't rely on position only because a row or a column could
-                      // be inserted at any time.
-                      tKey: `${tKey}-${col}-${row}`,
                   });
               }
           }
-          tKey++;
           return cells;
       }
       getClickableAction(position) {
@@ -46140,7 +46170,7 @@
   }
   function addDoughnutChart(chart, chartSheetIndex, data, { holeSize } = { holeSize: 50 }) {
       const colors = new ChartColors();
-      const maxLength = Math.max(...chart.dataSets.map((ds) => getRangeSize(ds.range, chartSheetIndex, data)));
+      const maxLength = largeMax(chart.dataSets.map((ds) => getRangeSize(ds.range, chartSheetIndex, data)));
       const doughnutColors = range(0, maxLength).map(() => toXlsxHexColor(colors.next()));
       const dataSetsNodes = [];
       for (const [dsIndex, dataset] of Object.entries(chart.dataSets).reverse()) {
@@ -46289,8 +46319,7 @@
           attrs.push(["t", "b"]);
       }
       else if (forceString || !isNumber(value)) {
-          const { id } = pushElement(content, sharedStrings);
-          value = id.toString();
+          value = pushElement(content, sharedStrings);
           attrs.push(["t", "s"]);
       }
       return { attrs, node: escapeXml /*xml*/ `<v>${value}</v>` };
@@ -46415,8 +46444,7 @@
       if (rule.style.fillColor) {
           dxf.fill = { fgColor: { rgb: rule.style.fillColor } };
       }
-      const { id } = pushElement(dxf, dxfs);
-      ruleAttributes.push(["dxfId", id]);
+      ruleAttributes.push(["dxfId", pushElement(dxf, dxfs)]);
       return escapeXml /*xml*/ `
     <conditionalFormatting sqref="${cf.ranges.join(" ")}">
       <cfRule ${formatAttributes(ruleAttributes)}>
@@ -47220,7 +47248,7 @@
    */
   function getXLSX(data) {
       const files = [];
-      const construct = getDefaultXLSXStructure();
+      const construct = getDefaultXLSXStructure(data);
       files.push(createWorkbook(data, construct));
       files.push(...createWorksheets(data, construct));
       files.push(createStylesSheet(construct));
@@ -48063,9 +48091,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.3.30';
-  __info__.date = '2024-03-25T09:36:48.685Z';
-  __info__.hash = '0d2ee33';
+  __info__.version = '16.3.33';
+  __info__.date = '2024-04-18T16:36:40.811Z';
+  __info__.hash = '89f04ea';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);