Change effective area obtaining in ListItemRenderer

DEVSIX-7049

Author: dmitry.radchuk

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

@@ -46,8 +46,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.tagging.StandardRoles;
 import com.itextpdf.layout.element.ListItem;
 import com.itextpdf.layout.element.Paragraph;
@@ -227,7 +225,8 @@ public void draw(DrawContext drawContext) {
             }
 
             // consider page area without margins
-            Rectangle effectiveArea = obtainEffectiveArea(drawContext);
+            RootRenderer root = getRootRenderer();
+            Rectangle effectiveArea = root.getCurrentArea().getBBox();
 
             // symbols are not drawn here, because they are in page margins
             if (!isRtl && symbolRenderer.getOccupiedArea().getBBox().getRight() > effectiveArea.getLeft()
@@ -347,36 +346,4 @@ private float[] calculateAscenderDescender() {
         }
         return new float[] {0, 0};
     }
-
-    private Rectangle obtainEffectiveArea(DrawContext drawContext) {
-        PdfDocument pdfDocument = drawContext.getDocument();
-
-        // for the time being iText creates a single symbol renderer for a list.
-        // This renderer will be used for all the items across all the pages, which mean that it could
-        // be layouted at page i and used at page j, j>i.
-        int pageNumber = parent.getOccupiedArea().getPageNumber();
-        Rectangle pageSize;
-        if (pageNumber != 0) {
-            PdfPage page = pdfDocument.getPage(pageNumber);
-            pageSize = page.getPageSize();
-        } else {
-            pageSize = pdfDocument.getDefaultPageSize();
-        }
-
-        RootRenderer rootRenderer = this.getRootRenderer();
-        //TODO DEVSIX-6372 Obtaining DocumentRenderer's margins results in a ClassCastException
-        Float[] margins = new Float[] {rootRenderer.<Float>getProperty(Property.MARGIN_TOP),
-                rootRenderer.<Float>getProperty(Property.MARGIN_RIGHT),
-                rootRenderer.<Float>getProperty(Property.MARGIN_BOTTOM),
-                rootRenderer.<Float>getProperty(Property.MARGIN_LEFT)};
-        for (int i = 0; i < margins.length; i++) {
-            margins[i] = replaceIfNull(margins[i], 0f);
-        }
-        return new Rectangle(pageSize)
-                .applyMargins((float) margins[0], (float) margins[1], (float) margins[2], (float) margins[3], false);
-    }
-
-    private static float replaceIfNull(Float value, float defaultValue) {
-        return (float) (null == value ? defaultValue : value);
-    }
 }

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

@@ -0,0 +1,66 @@
+package com.itextpdf.layout;
+
+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.element.Cell;
+import com.itextpdf.layout.element.ListItem;
+import com.itextpdf.layout.element.Table;
+import com.itextpdf.layout.layout.LayoutArea;
+import com.itextpdf.layout.layout.LayoutResult;
+import com.itextpdf.layout.layout.RootLayoutArea;
+import com.itextpdf.layout.renderer.DocumentRenderer;
+import com.itextpdf.test.ExtendedITextTest;
+import com.itextpdf.test.annotations.type.IntegrationTest;
+
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(IntegrationTest.class)
+public class CustomCurrentAreaTest extends ExtendedITextTest {
+    public static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/layout/CustomCurrentAreaTest/";
+    public static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/layout/CustomCurrentAreaTest/";
+
+    @BeforeClass
+    public static void beforeClass() {
+        createDestinationFolder(DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void longListItemTest() throws IOException, InterruptedException {
+        String outFileName = DESTINATION_FOLDER + "longListItemTest.pdf";
+        String cmpFileName = SOURCE_FOLDER + "cmp_longListItemTest.pdf";
+        Rectangle customArea = new Rectangle(0, 15, 586, 723);
+        try(PdfDocument pdf = new PdfDocument(new PdfWriter(outFileName));Document document = new Document(pdf)) {
+            ClauseRenderer renderer = new ClauseRenderer(document, customArea);
+            document.setRenderer(renderer);
+
+            com.itextpdf.layout.element.List list = new com.itextpdf.layout.element.List();
+            list.setListSymbol("1.");
+            list.add(new ListItem(
+                    "It is a long established fact that a reader will be distracted by the readable content of a page"
+                            + " when looking at its layout."));
+            document.add(new Table(1).addCell(new Cell().add(list)));
+        }
+        Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, DESTINATION_FOLDER, "diff"));
+    }
+
+    private static class ClauseRenderer extends DocumentRenderer {
+        protected Rectangle column;
+
+        public ClauseRenderer(Document document, Rectangle rect) {
+            super(document, false);
+            this.column = rect;
+        }
+
+        @Override
+        protected LayoutArea updateCurrentArea(LayoutResult overflowResult) {
+            super.updateCurrentArea(overflowResult);
+            return (currentArea = new RootLayoutArea(currentArea.getPageNumber(), column.clone()));
+        }
+    }
+}