Skip to content

Fix rowSpan header verticalAlignment on repeated tables #2940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NadeemShadan wants to merge 1 commit into
base: master
Choose a base branch
from
+61 −1
Open

Fix rowSpan header verticalAlignment on repeated tables #2940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/LayoutBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@ class LayoutBuilder {
let rowTopPageY = this.cell._leftEndingCell._startingRowSpanY + this.cell._leftEndingCell._rowTopPageYPadding;
return this.cell._leftEndingCell._rowTopPageY - rowTopPageY + this.cell._leftEndingCell._bottomY;
} else {
if (this.cell.positions[0].pageNumber !== this.cell._leftEndingCell._lastPageNumber) {
if (this.cell._lastPageNumber !== this.cell._leftEndingCell._lastPageNumber) {
return this.bottomY - this.cell._leftEndingCell._bottomY;
}

Expand Down
60 changes: 60 additions & 0 deletions tests/integration/tables.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,4 +402,64 @@ describe('Integration test: tables', function () {
assert.ok(maxGap < 90, 'max gap between horizontal lines was ' + maxGap + 'pt, expected < 90pt');
});

it('keeps rowSpan header verticalAlignment stable on repeated tables (#2925)', function () {
function createReportTable() {
var rows = [
['D-001', '500', '480', '-20', 'In Progress'],
['D-002', '300', '350', '+50', 'Exceeded'],
['D-003', '750', '750', '0', 'Achieved'],
['D-004', '200', '180', '-20', 'Under Review'],
['D-005', '400', '410', '+10', 'Achieved']
];

return {
margin: [0, 5, 0, 15],
table: {
headerRows: 2,
widths: ['auto', '*', '*', '*', 'auto'],
body: [
[
{ text: 'Dept ID', style: 'tableHeader', rowSpan: 2, verticalAlignment: 'middle' },
{ text: 'Performance Indicators', style: 'tableHeader', colSpan: 3 },
{},
{},
{ text: 'Status', style: 'tableHeader', rowSpan: 2 }
],
[{}, { text: 'Target', style: 'tableHeader' }, { text: 'Actual', style: 'tableHeader' }, { text: 'Gap', style: 'tableHeader' }, {}],
...rows,
...rows,
...rows
]
}
};
}

var content = [];
for (var i = 1; i <= 3; i++) {
content.push({ text: 'Statistical Report - Page ' + i, style: 'header' });
content.push(createReportTable());
if (i < 3) {
content.push({ text: '', pageBreak: 'after' });
}
}

var pages = testHelper.renderPages('A4', {
content,
styles: {
header: { fontSize: 18, bold: true, alignment: 'center' },
tableHeader: { bold: true, fillColor: '#eeeeee' }
}
});

var viewHeights = pages.map(page => {
var verticalAlignmentMarker = page.items.find(node => node.type === 'beginVerticalAlignment');

return verticalAlignmentMarker.item.getViewHeight();
});

assert.equal(pages.length, 3);
assert.deepEqual(viewHeights, [viewHeights[0], viewHeights[0], viewHeights[0]]);
assert.ok(viewHeights[0] > 0, 'rowSpan header view height must remain positive');
});

});
Loading