Skip to content
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

Fixes issues 2069 2189 1545 668 997 1654 #2764

Merged
merged 1 commit into from
Aug 8, 2024
Merged

Fixes issues 2069 2189 1545 668 997 1654 #2764

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
19 changes: 6 additions & 13 deletions src/DocumentContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class DocumentContext extends EventEmitter {
this.page = -1;

this.snapshots = [];
this.endingCell = null;
this.backgroundLength = [];

this.addPage(pageSize);
Expand All @@ -38,7 +37,6 @@ class DocumentContext extends EventEmitter {
availableWidth: this.availableWidth,
page: this.page
},
endingCell: this.endingCell,
lastColumnWidth: this.lastColumnWidth
});

Expand All @@ -48,9 +46,8 @@ class DocumentContext extends EventEmitter {
beginColumn(width, offset, endingCell) {
let saved = this.snapshots[this.snapshots.length - 1];

this.calculateBottomMost(saved);
this.calculateBottomMost(saved, endingCell);

this.endingCell = endingCell;
this.page = saved.page;
this.x = this.x + this.lastColumnWidth + (offset || 0);
this.y = saved.y;
Expand All @@ -60,10 +57,9 @@ class DocumentContext extends EventEmitter {
this.lastColumnWidth = width;
}

calculateBottomMost(destContext) {
if (this.endingCell) {
this.saveContextInEndingCell(this.endingCell);
this.endingCell = null;
calculateBottomMost(destContext, endingCell) {
if (endingCell) {
this.saveContextInEndingCell(endingCell);
} else {
destContext.bottomMost = bottomMostContext(this, destContext.bottomMost);
}
Expand All @@ -89,12 +85,11 @@ class DocumentContext extends EventEmitter {
};
}

completeColumnGroup(height) {
completeColumnGroup(height, endingCell) {
let saved = this.snapshots.pop();

this.calculateBottomMost(saved);
this.calculateBottomMost(saved, endingCell);

this.endingCell = null;
this.x = saved.x;

let y = saved.bottomMost.y;
Expand Down Expand Up @@ -171,7 +166,6 @@ class DocumentContext extends EventEmitter {
availableHeight: this.availableHeight,
availableWidth: this.availableWidth,
page: this.page,
endingCell: this.endingCell,
lastColumnWidth: this.lastColumnWidth
});
}
Expand All @@ -184,7 +178,6 @@ class DocumentContext extends EventEmitter {
this.availableWidth = saved.availableWidth;
this.availableHeight = saved.availableHeight;
this.page = saved.page;
this.endingCell = saved.endingCell;
this.lastColumnWidth = saved.lastColumnWidth;
}

Expand Down
54 changes: 52 additions & 2 deletions src/LayoutBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,21 @@ class LayoutBuilder {
}
}

findStartingSpanCell(arr, i) {
let requiredColspan = 1;
for (let index = i - 1; index >= 0; index--) {
if (!arr[index]._span) {
if (arr[index].rowSpan > 1 && (arr[index].colSpan || 1) === requiredColspan) {
return arr[index];
} else {
return null;
}
}
requiredColspan++;
}
return null;
}

processRow(columns, widths, gaps, tableBody, tableRow, height) {
const storePageBreakData = data => {
let pageDesc;
Expand Down Expand Up @@ -535,17 +550,52 @@ class LayoutBuilder {
}
}

this.writer.context().beginColumn(width, leftOffset, getEndingCell(column, i));
// if rowspan starts in this cell, we retrieve the last cell affected by the rowspan
const endingCell = getEndingCell(column, i);
if (endingCell) {
// We store a reference of the ending cell in the first cell of the rowspan
column._endingCell = endingCell;
}

// Check if exists and retrieve the cell that started the rowspan in case we are in the cell just after
let startingSpanCell = this.findStartingSpanCell(columns, i);
let endingSpanCell = null;
if (startingSpanCell && startingSpanCell._endingCell) {
// Reference to the last cell of the rowspan
endingSpanCell = startingSpanCell._endingCell;
}

// We pass the endingSpanCell reference to store the context just after processing rowspan cell
this.writer.context().beginColumn(width, leftOffset, endingSpanCell);
if (!column._span) {
this.processNode(column);
addAll(positions, column.positions);
} else if (column._columnEndingContext) {
// row-span ending
// Recover the context after processing the rowspanned cell
this.writer.context().markEnding(column);
}
}

this.writer.context().completeColumnGroup(height);
// Check if last cell is part of a span
let endingSpanCell = null;
const lastColumn = columns.length > 0 ? columns[columns.length - 1] : null;
if (lastColumn) {
// Previous column cell has a rowspan
if (lastColumn._endingCell) {
endingSpanCell = lastColumn._endingCell;
// Previous column cell is part of a span
} else if (lastColumn._span === true) {
// We get the cell that started the span where we set a reference to the ending cell
const startingSpanCell = this.findStartingSpanCell(columns, columns.length);
if (startingSpanCell) {
// Context will be stored here (ending cell)
endingSpanCell = startingSpanCell._endingCell;
}
}
}

this.writer.context().completeColumnGroup(height, endingSpanCell);

this.writer.removeListener('pageChanged', storePageBreakData);

Expand Down
12 changes: 7 additions & 5 deletions tests/unit/DocumentContext.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,10 @@ describe('DocumentContext', function () {
it('should save context in endingCell if provided', function () {
var endingCell = {};
pc.beginColumnGroup();
pc.beginColumn(30, 0, endingCell);
pc.y = 150;
pc.page = 3;
pc.availableHeight = 123;
pc.beginColumn(30, 0);
pc.beginColumn(30, 0, endingCell);

assert.equal(endingCell._columnEndingContext.y, 150);
assert.equal(endingCell._columnEndingContext.page, 3);
Expand Down Expand Up @@ -109,10 +108,10 @@ describe('DocumentContext', function () {
var endingCell = {};

pc.beginColumnGroup();
pc.beginColumn(30, 0, endingCell);
pc.y = 150;
pc.page = 3;
pc.availableHeight = 123;
pc.beginColumn(30, 0, endingCell);
pc.beginColumn(30, 0);
pc.y = 100;
pc.page = 3;
Expand All @@ -131,6 +130,7 @@ describe('DocumentContext', function () {
// col1 spans over 2 rows
pc.beginColumn(30, 0, endingCell);
pc.y = 350;
// col 2
pc.beginColumn(40);
pc.y = 100;
// column3 contains a nested table
Expand All @@ -147,7 +147,9 @@ describe('DocumentContext', function () {
pc.completeColumnGroup();

//// bottom of all non-spanned columns
assert.equal(pc.y, 120);
assert.equal(pc.y, 180);
// Check context has been stored in ending cell
assert.equal(endingCell2._columnEndingContext.y, 120);

// second row (of nested table)
pc.beginColumnGroup();
Expand All @@ -165,7 +167,7 @@ describe('DocumentContext', function () {
pc.completeColumnGroup();

//// bottom of all non-spanned columns
assert.equal(pc.y, 180);
assert.equal(pc.y, 350);

// second row
pc.beginColumnGroup();
Expand Down
Loading