Do not recalculate table's minmax width once the table has been split.

DEVSIX-3008

Author: ars18wrw

layout/src/main/java/com/itextpdf/layout/renderer/TableRenderer.java

@@ -1336,18 +1336,18 @@ protected Float retrieveWidth(float parentBoxWidth) {
 
     @Override
     public MinMaxWidth getMinMaxWidth() {
-        initializeTableLayoutBorders();
+        if (isOriginalNonSplitRenderer) {
+            initializeTableLayoutBorders();
+        }
         float rightMaxBorder = bordersHandler.getRightBorderMaxWidth();
         float leftMaxBorder = bordersHandler.getLeftBorderMaxWidth();
         TableWidths tableWidths = new TableWidths(this, MinMaxWidthUtils.getInfWidth(), true, rightMaxBorder, leftMaxBorder);
-        float[] columns = tableWidths.layout();
-        float minWidth = tableWidths.getMinWidth();
-        cleanTableLayoutBorders();
-
         float maxColTotalWidth = 0;
+        float[] columns = isOriginalNonSplitRenderer ? tableWidths.layout() : countedColumnWidth;
         for (float column : columns) {
             maxColTotalWidth += column;
         }
+        float minWidth = isOriginalNonSplitRenderer ? tableWidths.getMinWidth() : maxColTotalWidth;
         UnitValue marginRightUV = this.getPropertyAsUnitValue(Property.MARGIN_RIGHT);
         if (!marginRightUV.isPointValue()) {
             Logger logger = LoggerFactory.getLogger(TableRenderer.class);
@@ -1390,17 +1390,6 @@ private void initializeTableLayoutBorders() {
         correctRowRange();
     }
 
-    private void cleanTableLayoutBorders() {
-        footerRenderer = null;
-        headerRenderer = null;
-        // we may have deleted empty rows and now need to update table's rowrange
-        this.rowRange = new Table.RowRange(rowRange.getStartRow(), bordersHandler.getFinishRow());
-        //TODO do we need it?
-        // delete set properties
-        deleteOwnProperty(Property.BORDER_BOTTOM);
-        deleteOwnProperty(Property.BORDER_TOP);
-    }
-
     private void correctRowRange() {
         if (rows.size() < rowRange.getFinishRow() - rowRange.getStartRow() + 1) {
             rowRange = new Table.RowRange(rowRange.getStartRow(), rowRange.getStartRow() + rows.size() - 1);

layout/src/test/java/com/itextpdf/layout/FloatTest.java

@@ -2962,4 +2962,35 @@ public void floatOverflowAlongWithNewContent02() throws IOException, Interrupted
 
         Assert.assertNull(new CompareTool().compareByContent(outFile, cmpFileName, destinationFolder, "diff_overflowNewContent02_"));
     }
+
+    @Test
+    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.TABLE_WIDTH_IS_MORE_THAN_EXPECTED_DUE_TO_MIN_WIDTH))
+    public void floatTableTest01() throws IOException, InterruptedException {
+        String cmpFileName = sourceFolder + "cmp_floatTableTest01.pdf";
+        String outFile = destinationFolder + "floatTableTest01.pdf";
+
+        PdfWriter writer = new PdfWriter(outFile);
+        PdfDocument pdfDoc = new PdfDocument(writer);
+        Document doc = new Document(pdfDoc);
+
+        Div div = new Div();
+        div.setWidth(38);
+
+        Div floatDiv = new Div();
+        floatDiv.setProperty(Property.FLOAT, FloatPropertyValue.LEFT);
+
+        Table table = new Table(2);
+        for (int i = 0; i < 26; i++) {
+            table.addCell(new Cell().add(new Paragraph("abba a")));
+            table.addCell(new Cell().add(new Paragraph("ab ab ab")));
+        }
+
+        floatDiv.add(table);
+        div.add(floatDiv);
+
+        doc.add(div);
+        doc.close();
+
+        Assert.assertNull(new CompareTool().compareByContent(outFile, cmpFileName, destinationFolder, "diff03_"));
+    }
 }

layout/src/test/java/com/itextpdf/layout/TableTest.java

@@ -47,6 +47,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.util.UrlUtil;
 import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.geom.PageSize;
+import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.pdf.xobject.PdfImageXObject;
@@ -63,6 +64,10 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Table;
 import com.itextpdf.layout.element.Text;
+import com.itextpdf.layout.layout.LayoutArea;
+import com.itextpdf.layout.layout.LayoutContext;
+import com.itextpdf.layout.layout.LayoutResult;
+import com.itextpdf.layout.minmaxwidth.MinMaxWidth;
 import com.itextpdf.layout.property.BorderCollapsePropertyValue;
 import com.itextpdf.layout.property.CaptionSide;
 import com.itextpdf.layout.property.HorizontalAlignment;
@@ -82,6 +87,7 @@ This file is part of the iText (R) project.
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 @Category(IntegrationTest.class)
@@ -2432,6 +2438,59 @@ public void tableMinMaxWidthTest06() throws IOException, InterruptedException {
         Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, destinationFolder, testName + "_diff"));
     }
 
+    @Test
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = LogMessageConstant.TABLE_WIDTH_IS_MORE_THAN_EXPECTED_DUE_TO_MIN_WIDTH)
+    })
+    public void splitTableMinMaxWidthTest01() {
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
+        Document doc = new Document(pdfDoc);
+
+        Table table = new Table(2);
+        for (int i = 0; i < 26; i++) {
+            table.addCell(new Cell().add(new Paragraph("abba a")));
+            table.addCell(new Cell().add(new Paragraph("ab ab ab")));
+        }
+
+        // not enough to place even if min-width approach is used
+        float areaWidth = 20;
+
+        LayoutResult result = table.createRendererSubTree().setParent(doc.getRenderer())
+                .layout(new LayoutContext(new LayoutArea(1, new Rectangle(areaWidth, 100))));
+        TableRenderer overflowRenderer = (TableRenderer) result.getOverflowRenderer();
+
+        MinMaxWidth minMaxWidth = overflowRenderer.getMinMaxWidth();
+
+        Assert.assertEquals(result.getOccupiedArea().getBBox().getWidth(), minMaxWidth.getMaxWidth(), 0.0001);
+        Assert.assertEquals(minMaxWidth.getMaxWidth(), minMaxWidth.getMinWidth(), 0.0001);
+
+        // not enough to place using max-width approach, but more than required for min-width approach
+        areaWidth = 70;
+
+        result = table.createRendererSubTree().setParent(doc.getRenderer())
+                .layout(new LayoutContext(new LayoutArea(1, new Rectangle(areaWidth, 100))));
+        overflowRenderer = (TableRenderer) result.getOverflowRenderer();
+
+        minMaxWidth = overflowRenderer.getMinMaxWidth();
+
+        Assert.assertEquals(result.getOccupiedArea().getBBox().getWidth(), minMaxWidth.getMaxWidth(), 0.0001);
+        Assert.assertEquals(minMaxWidth.getMaxWidth(), minMaxWidth.getMinWidth(), 0.0001);
+
+
+        // enough to place using max-width approach
+        areaWidth = 400f;
+
+        result = table.createRendererSubTree().setParent(doc.getRenderer())
+                .layout(new LayoutContext(new LayoutArea(1, new Rectangle(areaWidth, 100))));
+        overflowRenderer = (TableRenderer) result.getOverflowRenderer();
+
+        minMaxWidth = overflowRenderer.getMinMaxWidth();
+
+        Assert.assertEquals(result.getOccupiedArea().getBBox().getWidth(), minMaxWidth.getMaxWidth(), 0.0001);
+        Assert.assertEquals(minMaxWidth.getMaxWidth(), minMaxWidth.getMinWidth(), 0.0001);
+    }
+
+
     @Test
     public void marginPaddingTest01() throws IOException, InterruptedException {
         String testName = "marginPaddingTest01.pdf";