Skip to content

Commit 8a3ec0f

Browse files
vitali-priText-CI
authored andcommitted
Fix table with empty rows creation
DEVSIX-6094 Autoported commit. Original commit hash: [cb5a2bb37]
1 parent 8d1e478 commit 8a3ec0f

File tree

5 files changed

+22
-4
lines changed

5 files changed

+22
-4
lines changed

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/PageBreakTest.cs

+1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ public virtual void PageBreakInsideAvoidInTdWithParaTest() {
203203
}
204204

205205
[NUnit.Framework.Test]
206+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.LAST_ROW_IS_NOT_COMPLETE)]
206207
[LogMessage(LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)]
207208
public virtual void PageBreakInsideAvoidInTdWithTableTest() {
208209
// TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements

itext.tests/itext.html2pdf.tests/itext/html2pdf/element/TableTest.cs

+10
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,16 @@ public virtual void ThTagConvertToElementTest() {
580580
RunConvertToElements("thTagConvertToElement", false);
581581
}
582582

583+
[NUnit.Framework.Test]
584+
public virtual void EmptyRowsConvertToElementTest() {
585+
FileStream source = new FileStream(sourceFolder + "emptyRowsConvertToElement.html", FileMode.Open, FileAccess.Read
586+
);
587+
foreach (IElement element in HtmlConverter.ConvertToElements(source)) {
588+
NUnit.Framework.Assert.IsTrue(element is Table);
589+
NUnit.Framework.Assert.AreEqual(4, ((Table)element).GetNumberOfRows());
590+
}
591+
}
592+
583593
[NUnit.Framework.Test]
584594
public virtual void ThTagConvertToPdfTest() {
585595
RunTest("thTagConvertToPdf");
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<table>
2+
<tr></tr>
3+
<tr></tr>
4+
<tr></tr>
5+
<tr>
6+
<td>test #1</td>
7+
<td>test #2</td>
8+
</tr>
9+
</table>

itext/itext.html2pdf/itext/html2pdf/attach/wrapelement/TableWrapper.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,13 @@ public virtual Table ToTable(WaitingColgroupsHelper colgroupsHelper) {
242242
}
243243
if (rows != null) {
244244
for (int i = 0; i < rows.Count; i++) {
245+
table.StartNewRow();
245246
if (isRtl) {
246247
JavaCollectionsUtil.Reverse(rows[i]);
247248
}
248249
for (int j = 0; j < rows[i].Count; j++) {
249250
table.AddCell(rows[i][j].cell);
250251
}
251-
if (i != rows.Count - 1) {
252-
table.StartNewRow();
253-
}
254252
}
255253
}
256254
if (caption != null) {

port-hash

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dcc8edcdd048972846bbf290ce1465ecb844c24b
1+
cb5a2bb3757faac10c6fe911605a8a6e9f681f74

0 commit comments

Comments
 (0)