Fix layout table min width calculation in case of predefined width

DEVSIX-9301

Author: introfog

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

@@ -1331,15 +1331,9 @@ public MinMaxWidth getMinMaxWidth() {
         if (isOriginalNonSplitRenderer) {
             initializeTableLayoutBorders();
         }
+
         float rightMaxBorder = bordersHandler.getRightBorderMaxWidth();
         float leftMaxBorder = bordersHandler.getLeftBorderMaxWidth();
-        TableWidths tableWidths = new TableWidths(this, MinMaxWidthUtils.getInfWidth(), true, rightMaxBorder, leftMaxBorder);
-        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.error(MessageFormatUtil.format(IoLogMessageConstant.PROPERTY_IN_PERCENTS_NOT_SUPPORTED,
@@ -1350,8 +1344,25 @@ public MinMaxWidth getMinMaxWidth() {
             LOGGER.error(MessageFormatUtil.format(IoLogMessageConstant.PROPERTY_IN_PERCENTS_NOT_SUPPORTED,
                     Property.MARGIN_LEFT));
         }
-        float additionalWidth = marginLefttUV.getValue() + marginRightUV.getValue() + rightMaxBorder / 2 + leftMaxBorder / 2;
-        return new MinMaxWidth(minWidth, maxColTotalWidth, additionalWidth);
+        float additionalWidth =
+                marginLefttUV.getValue() + marginRightUV.getValue() + rightMaxBorder / 2 + leftMaxBorder / 2;
+
+        MinMaxWidth minMaxWidth = new MinMaxWidth(additionalWidth);
+        if (!setMinMaxWidthBasedOnFixedWidth(minMaxWidth)) {
+            TableWidths tableWidths = new TableWidths(this, MinMaxWidthUtils.getInfWidth(), true, rightMaxBorder,
+                    leftMaxBorder);
+            float maxColTotalWidth = 0;
+            float[] columns = isOriginalNonSplitRenderer ? tableWidths.layout() : countedColumnWidth;
+            for (float column : columns) {
+                maxColTotalWidth += column;
+            }
+            float minWidth = isOriginalNonSplitRenderer ? tableWidths.getMinWidth() : maxColTotalWidth;
+
+            minMaxWidth.setChildrenMinWidth(minWidth);
+            minMaxWidth.setChildrenMaxWidth(maxColTotalWidth);
+        }
+
+        return minMaxWidth;
     }
 
     @Override

layout/src/test/java/com/itextpdf/layout/renderer/TableRendererTest.java

@@ -22,27 +22,43 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.layout.renderer;
 
+import com.itextpdf.io.image.ImageDataFactory;
 import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.io.source.ByteArrayOutputStream;
+import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfWriter;
+import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.layout.Document;
+import com.itextpdf.layout.borders.SolidBorder;
 import com.itextpdf.layout.element.Cell;
+import com.itextpdf.layout.element.Image;
+import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Table;
 import com.itextpdf.layout.minmaxwidth.MinMaxWidth;
 import com.itextpdf.layout.properties.Property;
 import com.itextpdf.layout.properties.UnitValue;
 import com.itextpdf.test.ExtendedITextTest;
+import com.itextpdf.test.TestUtil;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
+import java.io.IOException;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 @Tag("IntegrationTest")
 public class TableRendererTest extends ExtendedITextTest {
+    private static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/layout/TableRendererTest/";
+    private static final String DESTINATION_FOLDER = TestUtil.getOutputPath() + "/layout/TableRendererTest/";
+
+    @BeforeAll
+    public static void beforeClass() {
+        createDestinationFolder(DESTINATION_FOLDER);
+    }
 
     @Test
     @LogMessages(messages = {
@@ -96,4 +112,43 @@ public void testIsOriginalNonSplitRenderer() {
 
         Assertions.assertFalse(grandChildren[0].isOriginalNonSplitRenderer);
     }
+
+    @Test
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = IoLogMessageConstant.TABLE_WIDTH_IS_MORE_THAN_EXPECTED_DUE_TO_MIN_WIDTH),
+    })
+    public void nestedTableWithSpecifiedWidthTest() throws IOException, InterruptedException {
+        String outFileName = DESTINATION_FOLDER + "nestedTableWithSpecifiedWidth.pdf";
+        String cmpFileName = SOURCE_FOLDER + "cmp_nestedTableWithSpecifiedWidth.pdf";
+
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName));
+        Document doc = new Document(pdfDoc);
+
+        Table table = new Table(2);
+
+        Cell cell1 = new Cell(1, 1);
+        cell1.setBorder(new SolidBorder(ColorConstants.GRAY, 1.5f));
+
+        Table nestedTable = new Table(1);
+        nestedTable.setWidth(422.25f);
+        nestedTable.setHeight(52.5f);
+        Paragraph paragraph = new Paragraph("Hello");
+        paragraph.setBorder(new SolidBorder(ColorConstants.GREEN, 1.5f));
+        nestedTable.addCell(paragraph);
+        cell1.add(nestedTable);
+        table.addCell(cell1);
+
+        Cell cell2 = new Cell(2, 1);
+        cell2.setBorder(new SolidBorder(ColorConstants.YELLOW, 1.5f));
+        Image image = new Image(ImageDataFactory.create(SOURCE_FOLDER + "itis.jpg"));
+        image.setWidth(406.5f);
+        image.setHeight(7.5f);
+        cell2.add(image);
+        table.addCell(cell2);
+
+        doc.add(table);
+        doc.close();
+
+        Assertions.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, DESTINATION_FOLDER));
+    }
 }