Skip to content

Commit

Permalink
Merge pull request #559 from wangfengming/master
Browse files Browse the repository at this point in the history 
:fix: `rowSpan` can't work when column index out of range
  • Loading branch information
@dolanmiu
dolanmiu authored Jul 9, 2020
2 parents ba3d551 + 40dc90e commit 49eadb0
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 29 deletions.
44 changes: 38 additions & 6 deletions demo/32-merge-and-shade-table-cells.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ const table7 = new Table({
}),
new TableCell({
children: [new Paragraph("0,3")],
rowSpan: 3,
}),
],
}),
Expand All @@ -296,9 +297,6 @@ const table7 = new Table({
children: [new Paragraph("1,0")],
columnSpan: 2,
}),
new TableCell({
children: [new Paragraph("1,3")],
}),
],
}),
new TableRow({
Expand All @@ -311,9 +309,6 @@ const table7 = new Table({
children: [new Paragraph("2,2")],
rowSpan: 2,
}),
new TableCell({
children: [new Paragraph("2,3")],
}),
],
}),
new TableRow({
Expand All @@ -336,6 +331,41 @@ const table7 = new Table({
},
});

const table8 = new Table({
rows: [
new TableRow({
children: [
new TableCell({ children: [new Paragraph("1,1")] }),
new TableCell({ children: [new Paragraph("1,2")] }),
new TableCell({ children: [new Paragraph("1,3")] }),
new TableCell({ children: [new Paragraph("1,4")], rowSpan: 4, borders }),
],
}),
new TableRow({
children: [
new TableCell({ children: [new Paragraph("2,1")] }),
new TableCell({ children: [new Paragraph("2,2")] }),
new TableCell({ children: [new Paragraph("2,3")], rowSpan: 3 }),
],
}),
new TableRow({
children: [
new TableCell({ children: [new Paragraph("3,1")] }),
new TableCell({ children: [new Paragraph("3,2")], rowSpan: 2 }),
],
}),
new TableRow({
children: [
new TableCell({ children: [new Paragraph("4,1")] }),
],
}),
],
width: {
size: 100,
type: WidthType.PERCENTAGE,
},
});

doc.addSection({
children: [
table,
Expand All @@ -357,6 +387,8 @@ doc.addSection({
table6,
new Paragraph("Merging columns 4"),
table7,
new Paragraph("Merging columns 5"),
table8,
],
});

Expand Down
7 changes: 3 additions & 4 deletions src/file/table/table-cell/table-cell.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ export class TableCell extends XmlComponent {

if (options.verticalMerge) {
this.properties.addVerticalMerge(options.verticalMerge);
} else if (options.rowSpan && options.rowSpan > 1) {
// if cell already have a `verticalMerge`, don't handle `rowSpan`
this.properties.addVerticalMerge(VerticalMergeType.RESTART);
}

if (options.margins) {
Expand All @@ -84,10 +87,6 @@ export class TableCell extends XmlComponent {
this.properties.addGridSpan(options.columnSpan);
}

if (options.rowSpan && options.rowSpan > 1) {
this.properties.addVerticalMerge(VerticalMergeType.RESTART);
}

if (options.width) {
this.properties.setWidth(options.width.size, options.width.type);
}
Expand Down
3 changes: 2 additions & 1 deletion src/file/table/table-row/table-row.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ describe("TableRow", () => {
});

expect(tableRow.columnIndexToRootIndex(8, true)).to.equal(5);
expect(() => tableRow.columnIndexToRootIndex(9, true)).to.throw(`cell 'columnIndex' should not great than 8`);
// for column 10, just place the new cell at the end of row
expect(tableRow.columnIndexToRootIndex(10, true)).to.equal(5);
});
});
});
10 changes: 7 additions & 3 deletions src/file/table/table-row/table-row.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,14 @@ export class TableRow extends XmlComponent {
let colIdx = 0;
// Offset because properties is also in root.
let rootIdx = 1;
const endRootIndex = allowEndNewCell ? this.root.length : this.root.length - 1;
while (colIdx <= columnIndex) {
if (rootIdx > endRootIndex) {
throw new Error(`cell 'columnIndex' should not great than ${colIdx - 1}`);
if (rootIdx >= this.root.length) {
if (allowEndNewCell) {
// for inserting verticalMerge CONTINUE cell at end of row
return this.root.length;
} else {
throw new Error(`cell 'columnIndex' should not great than ${colIdx - 1}`);
}
}
const cell = this.root[rootIdx] as TableCell;
rootIdx += 1;
Expand Down
31 changes: 16 additions & 15 deletions src/file/table/table.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,25 +79,26 @@ export class Table extends XmlComponent {
}

rows.forEach((row, rowIndex) => {
row.cells.forEach((cell, cellIndex) => {
if (rowIndex === rows.length - 1) {
// don't process the end row
return;
}
let columnIndex = 0;
row.cells.forEach((cell) => {
// Row Span has to be added in this method and not the constructor because it needs to know information about the column which happens after Table Cell construction
// Row Span of 1 will crash word as it will add RESTART and not a corresponding CONTINUE
if (cell.options.rowSpan && cell.options.rowSpan > 1) {
const columnIndex = row.rootIndexToColumnIndex(cellIndex + 1);
const startRowIndex = rowIndex + 1;
const endRowIndex = rowIndex + (cell.options.rowSpan - 1);
for (let i = startRowIndex; i <= endRowIndex; i++) {
rows[i].addCellToColumnIndex(
new TableCell({
columnSpan: cell.options.columnSpan,
borders: cell.options.borders,
children: [],
verticalMerge: VerticalMergeType.CONTINUE,
}),
columnIndex,
);
}
const continueCell = new TableCell({
// the inserted CONTINUE cell has rowSpan, and will be handled when process the next row
rowSpan: cell.options.rowSpan - 1,
columnSpan: cell.options.columnSpan,
borders: cell.options.borders,
children: [],
verticalMerge: VerticalMergeType.CONTINUE,
});
rows[rowIndex + 1].addCellToColumnIndex(continueCell, columnIndex);
}
columnIndex += cell.options.columnSpan || 1;
});
});

Expand Down

0 comments on commit 49eadb0

Please sign in to comment.