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

DEVSIX-3008

Autoported commit.
Original commit hash: [2ec5ebc58]

Author: ars18wrw

itext.tests/itext.layout.tests/itext/layout/FloatTest.cs

@@ -2626,5 +2626,32 @@ public virtual void FloatOverflowAlongWithNewContent02() {
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFile, cmpFileName, destinationFolder, 
                 "diff_overflowNewContent02_"));
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.TABLE_WIDTH_IS_MORE_THAN_EXPECTED_DUE_TO_MIN_WIDTH)]
+        public virtual void FloatTableTest01() {
+            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();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFile, cmpFileName, destinationFolder, 
+                "diff03_"));
+        }
     }
 }

itext.tests/itext.layout.tests/itext/layout/TableTest.cs

@@ -41,6 +41,7 @@ source product.
 address: [email protected]
 */
 using System;
+using System.IO;
 using iText.IO.Image;
 using iText.IO.Util;
 using iText.Kernel.Colors;
@@ -50,6 +51,8 @@ source product.
 using iText.Kernel.Utils;
 using iText.Layout.Borders;
 using iText.Layout.Element;
+using iText.Layout.Layout;
+using iText.Layout.Minmaxwidth;
 using iText.Layout.Properties;
 using iText.Layout.Renderer;
 using iText.Test;
@@ -2193,6 +2196,45 @@ public virtual void TableMinMaxWidthTest06() {
                 , testName + "_diff"));
         }
 
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.TABLE_WIDTH_IS_MORE_THAN_EXPECTED_DUE_TO_MIN_WIDTH)]
+        public virtual void SplitTableMinMaxWidthTest01() {
+            PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new MemoryStream()));
+            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();
+            NUnit.Framework.Assert.AreEqual(result.GetOccupiedArea().GetBBox().GetWidth(), minMaxWidth.GetMaxWidth(), 
+                0.0001);
+            NUnit.Framework.Assert.AreEqual(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();
+            NUnit.Framework.Assert.AreEqual(result.GetOccupiedArea().GetBBox().GetWidth(), minMaxWidth.GetMaxWidth(), 
+                0.0001);
+            NUnit.Framework.Assert.AreEqual(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();
+            NUnit.Framework.Assert.AreEqual(result.GetOccupiedArea().GetBBox().GetWidth(), minMaxWidth.GetMaxWidth(), 
+                0.0001);
+            NUnit.Framework.Assert.AreEqual(minMaxWidth.GetMaxWidth(), minMaxWidth.GetMinWidth(), 0.0001);
+        }
+
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]

itext.tests/itext.layout.tests/resources/itext/layout/FloatTest/cmp_floatTableTest01.pdf

@@ -1344,18 +1344,19 @@ protected internal virtual iText.Layout.Renderer.TableRenderer CreateOverflowRen
         }
 
         public override 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;
             foreach (float column in columns) {
                 maxColTotalWidth += column;
             }
+            float minWidth = isOriginalNonSplitRenderer ? tableWidths.GetMinWidth() : maxColTotalWidth;
             UnitValue marginRightUV = this.GetPropertyAsUnitValue(Property.MARGIN_RIGHT);
             if (!marginRightUV.IsPointValue()) {
                 ILog logger = LogManager.GetLogger(typeof(iText.Layout.Renderer.TableRenderer));
@@ -1398,17 +1399,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.Count < rowRange.GetFinishRow() - rowRange.GetStartRow() + 1) {
                 rowRange = new Table.RowRange(rowRange.GetStartRow(), rowRange.GetStartRow() + rows.Count - 1);

itext/itext.layout/itext/layout/renderer/TableRenderer.cs

@@ -1 +1 @@
-8f794faaa53e0a9947e9789e4a7769c56651238c
+2ec5ebc58553d147be174a03bf5305f53acc9659