Preserve QExcell sheet dimensions in XLSX

2026-06-01 17:35:06 +03:00
parent 3d4e1d51ef
commit f72c79d5e9
4 changed files with 186 additions and 6 deletions
@@ -4,6 +4,7 @@ import {
  buildChartXml,
  buildCellXml,
  buildAutoFilterXml,
+  buildColumnWidthsXml,
  buildHyperlinksXml,
  buildMergeCellsXml,
  buildSheetPrXml,
@@ -21,9 +22,11 @@ import {
  worksheetXmlToAutoFilter,
  worksheetXmlToCells,
  worksheetXmlToCellFormats,
+  worksheetXmlToColumnWidths,
  worksheetXmlToFrozenPane,
  worksheetXmlToHyperlinks,
  worksheetXmlToMergedCells,
+  worksheetXmlToRowHeights,
  worksheetXmlToTabColor,
  xlsxStylesXmlToCellFormatTable,
  xlsxThemeXmlToColors,
@@ -728,6 +731,61 @@ describe("excellOffice OOXML helpers", () => {
    expect(imported.sheets[0].tabColor).toBe("0F766E");
  });

+  it("читает и записывает размеры колонок и строк XLSX", async () => {
+    expect(
+      worksheetXmlToColumnWidths({
+        worksheet: {
+          cols: {
+            col: [
+              { min: "1", max: "2", width: "18.5" },
+              { min: "4", max: "4", width: "9.25" }
+            ]
+          }
+        }
+      })
+    ).toEqual({ A: 18.5, B: 18.5, D: 9.25 });
+    expect(
+      worksheetXmlToRowHeights({
+        worksheet: {
+          sheetData: {
+            row: [{ r: "1", ht: "24" }, { r: "4", ht: "30.5" }]
+          }
+        }
+      })
+    ).toEqual({ "1": 24, "4": 30.5 });
+    expect(buildColumnWidthsXml({ C: 9.25, A: 18.5, "1bad": 1 })).toBe(
+      '<cols><col min="1" max="1" width="18.5" customWidth="1"/><col min="3" max="3" width="9.25" customWidth="1"/></cols>'
+    );
+
+    const blob = await exportXlsxBlob({
+      id: "book-1",
+      title: "Sheet sizes.xlsx",
+      updatedAt: "2026-06-01T00:00:00.000Z",
+      activeSheet: "sheet-1",
+      sheets: [
+        {
+          id: "sheet-1",
+          name: "Sizes",
+          columnWidths: { A: 18.5, C: 9.25 },
+          rowHeights: { "1": 24, "4": 30.5 },
+          cells: { A1: "Header", C2: "Value" }
+        }
+      ]
+    });
+    const zip = await JSZip.loadAsync(await blob.arrayBuffer());
+    const sheetXml = (await zip.file("xl/worksheets/sheet1.xml")?.async("string")) ?? "";
+    const imported = await importXlsxFile(new File([blob], "Sheet sizes.xlsx", { type: blob.type }));
+
+    expect(sheetXml).toContain(
+      '<cols><col min="1" max="1" width="18.5" customWidth="1"/><col min="3" max="3" width="9.25" customWidth="1"/></cols>'
+    );
+    expect(sheetXml).toContain('<row r="1" ht="24" customHeight="1"><c r="A1" t="inlineStr"><is><t>Header</t></is></c></row>');
+    expect(sheetXml).toContain('<row r="4" ht="30.5" customHeight="1"/>');
+    expect(sheetXml.indexOf("<cols>")).toBeLessThan(sheetXml.indexOf("<sheetData>"));
+    expect(imported.sheets[0].columnWidths).toEqual({ A: 18.5, C: 9.25 });
+    expect(imported.sheets[0].rowHeights).toEqual({ "1": 24, "4": 30.5 });
+  });
+
  it("создает OOXML chart part для диаграммы XLSX", () => {
    const xml = buildChartXml(
      {
@@ -12,6 +12,8 @@ export interface ImportedExcellWorkbook {
    frozenPane?: SheetFrozenPane;
    autoFilter?: string;
    tabColor?: string;
+    columnWidths?: Record<string, number>;
+    rowHeights?: Record<string, number>;
    cells: Record<string, string>;
    mergedCells?: MergedCellRange[];
    hyperlinks?: Record<string, string>;
@@ -62,6 +64,8 @@ interface ParsedSheet {
  frozenPane?: SheetFrozenPane;
  autoFilter?: string;
  tabColor?: string;
+  columnWidths?: Record<string, number>;
+  rowHeights?: Record<string, number>;
  cells: Record<string, string>;
  mergedCells?: MergedCellRange[];
  hyperlinks?: Record<string, string>;
@@ -267,7 +271,9 @@ export async function exportXlsxBlob(workbook: Workbook): Promise<Blob> {
        drawingRelationshipId,
        sheet.frozenPane,
        sheet.autoFilter,
-        sheet.tabColor
+        sheet.tabColor,
+        sheet.columnWidths,
+        sheet.rowHeights
      )
    );
    const relationshipsXml = buildWorksheetRelationshipsXml(
@@ -303,6 +309,8 @@ export function parsedWorksheetToSheet(
  const frozenPane = worksheetXmlToFrozenPane(worksheetXml);
  const autoFilter = worksheetXmlToAutoFilter(worksheetXml);
  const tabColor = worksheetXmlToTabColor(worksheetXml, themeColors);
+  const columnWidths = worksheetXmlToColumnWidths(worksheetXml);
+  const rowHeights = worksheetXmlToRowHeights(worksheetXml);

  return {
    id: sheet.id || `sheet-${index + 1}`,
@@ -311,6 +319,8 @@ export function parsedWorksheetToSheet(
    ...(frozenPane ? { frozenPane } : {}),
    ...(autoFilter ? { autoFilter } : {}),
    ...(tabColor ? { tabColor } : {}),
+    ...(Object.keys(columnWidths).length > 0 ? { columnWidths } : {}),
+    ...(Object.keys(rowHeights).length > 0 ? { rowHeights } : {}),
    cells: worksheetXmlToCells(worksheetXml, sharedStrings),
    mergedCells: worksheetXmlToMergedCells(worksheetXml),
    hyperlinks: worksheetXmlToHyperlinks(worksheetXml, relationshipsXml),
@@ -441,6 +451,43 @@ export function worksheetXmlToTabColor(worksheetXml: unknown, themeColors: strin
  return colorRecordToHex(childRecord(sheetPr, "tabColor"), themeColors);
 }

+export function worksheetXmlToColumnWidths(worksheetXml: unknown): Record<string, number> {
+  const worksheet = childRecord(worksheetXml, "worksheet");
+  const cols = childRecord(worksheet, "cols");
+
+  return toArray(cols.col).reduce<Record<string, number>>((widths, col) => {
+    const record = asRecord(col);
+    const min = positiveIntegerAttribute(record.min);
+    const max = positiveIntegerAttribute(record.max) || min;
+    const width = positiveNumberAttribute(record.width);
+    if (!min || !max || !width || max < min) {
+      return widths;
+    }
+
+    for (let column = min; column <= max; column += 1) {
+      widths[columnName(column)] = width;
+    }
+
+    return widths;
+  }, {});
+}
+
+export function worksheetXmlToRowHeights(worksheetXml: unknown): Record<string, number> {
+  const worksheet = childRecord(worksheetXml, "worksheet");
+  const sheetData = childRecord(worksheet, "sheetData");
+
+  return toArray(sheetData.row).reduce<Record<string, number>>((heights, row, index) => {
+    const record = asRecord(row);
+    const rowNumber = positiveIntegerAttribute(record.r) || index + 1;
+    const height = positiveNumberAttribute(record.ht);
+    if (height) {
+      heights[String(rowNumber)] = height;
+    }
+
+    return heights;
+  }, {});
+}
+
 async function worksheetXmlToCharts(
  zip: ZipInstance,
  parser: InstanceType<XmlParserConstructor>,
@@ -614,8 +661,11 @@ export function buildWorksheetXml(
  drawingRelationshipId = "",
  frozenPane?: SheetFrozenPane,
  autoFilter?: string,
-  tabColor?: string
+  tabColor?: string,
+  columnWidths: Record<string, number> = {},
+  rowHeights: Record<string, number> = {}
 ) {
+  const normalizedRowHeights = normalizedSheetRowHeights(rowHeights);
  const rows = sortedWorksheetEntries(cells, cellFormats).reduce<Record<number, Array<[string, string]>>>((grouped, entry) => {
    const rowNumber = cellRowNumber(entry[0]);
    if (!grouped[rowNumber]) {
@@ -624,11 +674,18 @@ export function buildWorksheetXml(
    grouped[rowNumber].push(entry);
    return grouped;
  }, {});
+  Object.keys(normalizedRowHeights).forEach((rowNumber) => {
+    const row = positiveIntegerAttribute(rowNumber);
+    if (row && !rows[row]) {
+      rows[row] = [];
+    }
+  });

  const rowXml = Object.entries(rows)
    .map(([rowNumber, entries]) => {
      const cellXml = entries.map(([address, value]) => buildCellXml(address, value, cellStyleId(cellFormats[address], styleRegistry))).join("");
-      return `<row r="${rowNumber}">${cellXml}</row>`;
+      const rowAttributes = buildRowHeightAttributes(normalizedRowHeights[rowNumber]);
+      return cellXml ? `<row r="${rowNumber}"${rowAttributes}>${cellXml}</row>` : `<row r="${rowNumber}"${rowAttributes}/>`;
    })
    .join("");

@@ -638,9 +695,10 @@ export function buildWorksheetXml(
  const drawingXml = drawingRelationshipId ? `<drawing r:id="${escapeXmlAttribute(drawingRelationshipId)}"/>` : "";
  const sheetPrXml = buildSheetPrXml(tabColor);
  const sheetViewsXml = buildSheetViewsXml(frozenPane);
+  const colsXml = buildColumnWidthsXml(columnWidths);

  return xmlDeclaration(
-    `<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">${sheetPrXml}${sheetViewsXml}<sheetData>${rowXml}</sheetData>${autoFilterXml}${mergeCellsXml}${hyperlinksXml}${drawingXml}</worksheet>`
+    `<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">${sheetPrXml}${sheetViewsXml}${colsXml}<sheetData>${rowXml}</sheetData>${autoFilterXml}${mergeCellsXml}${hyperlinksXml}${drawingXml}</worksheet>`
  );
 }

@@ -721,6 +779,22 @@ export function buildSheetPrXml(tabColor?: string) {
  return color ? `<sheetPr><tabColor rgb="FF${color}"/></sheetPr>` : "";
 }

+export function buildColumnWidthsXml(columnWidths: Record<string, number> = {}) {
+  const columns = normalizedSheetColumnWidths(columnWidths);
+  if (columns.length === 0) {
+    return "";
+  }
+
+  const xml = columns
+    .map(
+      ({ column, width }) =>
+        `<col min="${column}" max="${column}" width="${formatSheetDimension(width)}" customWidth="1"/>`
+    )
+    .join("");
+
+  return `<cols>${xml}</cols>`;
+}
+
 export function buildAutoFilterXml(autoFilter?: string) {
  const ref = normalizeCellRange(autoFilter ?? "");
  return ref ? `<autoFilter ref="${escapeXmlAttribute(ref)}"/>` : "";
@@ -1410,6 +1484,47 @@ function numberAttribute(value: unknown) {
  return Number.isInteger(number) && number >= 0 ? number : 0;
 }

+function positiveIntegerAttribute(value: unknown) {
+  const number = Number(value);
+  return Number.isInteger(number) && number > 0 ? number : 0;
+}
+
+function positiveNumberAttribute(value: unknown) {
+  const number = Number(value);
+  return Number.isFinite(number) && number > 0 ? number : 0;
+}
+
+function normalizedSheetColumnWidths(columnWidths: Record<string, number> = {}) {
+  return Object.entries(columnWidths)
+    .map(([column, width]) => {
+      const columnNumber = columnAddressNumber(column);
+      const normalizedWidth = positiveNumberAttribute(width);
+      return columnNumber && normalizedWidth ? { column: columnNumber, width: normalizedWidth } : null;
+    })
+    .filter((entry): entry is { column: number; width: number } => Boolean(entry))
+    .sort((first, second) => first.column - second.column);
+}
+
+function normalizedSheetRowHeights(rowHeights: Record<string, number> = {}) {
+  return Object.entries(rowHeights).reduce<Record<string, number>>((heights, [row, height]) => {
+    const rowNumber = positiveIntegerAttribute(row);
+    const normalizedHeight = positiveNumberAttribute(height);
+    if (rowNumber && normalizedHeight) {
+      heights[String(rowNumber)] = normalizedHeight;
+    }
+
+    return heights;
+  }, {});
+}
+
+function buildRowHeightAttributes(height?: number) {
+  return height ? ` ht="${formatSheetDimension(height)}" customHeight="1"` : "";
+}
+
+function formatSheetDimension(value: number) {
+  return Number(value.toFixed(4)).toString();
+}
+
 function normalizedFrozenPane(pane?: SheetFrozenPane): NormalizedFrozenPane | null {
  const columns = paneSplitCount(pane?.columns);
  const rows = paneSplitCount(pane?.rows);
@@ -1624,6 +1739,11 @@ function normalizeCellAddress(address: string) {
  return isCellAddress(trimmed) ? trimmed : "";
 }

+function columnAddressNumber(column: string) {
+  const normalized = column.trim().toUpperCase();
+  return /^[A-Z]+$/.test(normalized) ? cellColumnNumber(`${normalized}1`) : 0;
+}
+
 function translateSharedFormula(formula: string, baseAddress: string, targetAddress: string) {
  const normalizedBase = normalizeCellAddress(baseAddress);
  const normalizedTarget = normalizeCellAddress(targetAddress);