Add html mode check for LineRenderer childs

DEVSIX-3837

Author: ar3em

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

@@ -125,9 +125,12 @@ public LayoutResult layout(LayoutContext layoutContext) {
 
         occupiedArea = new LayoutArea(layoutContext.getArea().getPageNumber(), layoutBox.clone().moveUp(layoutBox.getHeight()).setHeight(0).setWidth(0));
 
+        updateChildrenParent();
+
         float curWidth = 0;
         if (RenderingMode.HTML_MODE.equals(this.<RenderingMode>getProperty(Property.RENDERING_MODE))
-                && hasProperty(Property.LINE_HEIGHT)) {
+                && hasProperty(Property.LINE_HEIGHT)
+                && hasChildRendererInHtmlMode()) {
             float[] ascenderDescender = LineHeightHelper.getActualAscenderDescender(this);
             maxAscent = ascenderDescender[0];
             maxDescent = ascenderDescender[1];
@@ -150,8 +153,6 @@ && hasProperty(Property.LINE_HEIGHT)) {
             widthHandler = new MaxSumWidthHandler(minMaxWidth);
         }
 
-        updateChildrenParent();
-
         resolveChildrenFonts();
 
         int totalNumberOfTrimmedGlyphs = trimFirst();
@@ -922,6 +923,15 @@ public MinMaxWidth getMinMaxWidth() {
         return result.getMinMaxWidth();
     }
 
+    boolean hasChildRendererInHtmlMode() {
+        for (IRenderer childRenderer : childRenderers) {
+            if (RenderingMode.HTML_MODE.equals(childRenderer.<RenderingMode>getProperty(Property.RENDERING_MODE))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     float getTopLeadingIndent(Leading leading) {
         switch (leading.getType()) {
             case Leading.FIXED:

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

@@ -53,19 +53,19 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.layout.LayoutContext;
 import com.itextpdf.layout.layout.LayoutResult;
 import com.itextpdf.layout.property.FloatPropertyValue;
+import com.itextpdf.layout.property.LineHeight;
 import com.itextpdf.layout.property.Property;
 import com.itextpdf.layout.property.RenderingMode;
 import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.UnitTest;
 
+import java.util.Arrays;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.util.Arrays;
-
 @Category(UnitTest.class)
 public class LineRendererUnitTest extends AbstractRendererUnitTest {
 
@@ -181,4 +181,102 @@ public void adjustChildrenYLineImageChildHtmlModeTest() {
         Assert.assertEquals(50f, lineRenderer.getOccupiedAreaBBox().getBottom(), EPS);
         Assert.assertEquals(150.0, childImageRenderer.getOccupiedAreaBBox().getBottom(), EPS);
     }
+
+    @Test
+    public void hasChildRendererInHtmlModeTest() {
+        LineRenderer lineRenderer = new LineRenderer();
+
+        TextRenderer textRenderer1 = new TextRenderer(new Text("text1"));
+
+        TextRenderer textRenderer2 = new TextRenderer(new Text("text2"));
+        textRenderer2.setProperty(Property.RENDERING_MODE, RenderingMode.HTML_MODE);
+
+        lineRenderer.addChild(textRenderer1);
+        lineRenderer.addChild(textRenderer2);
+
+        Assert.assertTrue(lineRenderer.hasChildRendererInHtmlMode());
+    }
+
+    @Test
+    public void childRendererInDefaultModeTest() {
+        LineRenderer lineRenderer = new LineRenderer();
+
+        TextRenderer textRenderer1 = new TextRenderer(new Text("text1"));
+
+        TextRenderer textRenderer2 = new TextRenderer(new Text("text2"));
+        textRenderer2.setProperty(Property.RENDERING_MODE, RenderingMode.DEFAULT_LAYOUT_MODE);
+
+        lineRenderer.addChild(textRenderer1);
+        lineRenderer.addChild(textRenderer2);
+
+        Assert.assertFalse(lineRenderer.hasChildRendererInHtmlMode());
+    }
+
+    @Test
+    public void hasChildRendererInHtmlModeNoChildrenTest() {
+        LineRenderer lineRenderer = new LineRenderer();
+        Assert.assertFalse(lineRenderer.hasChildRendererInHtmlMode());
+    }
+
+    @Test
+    public void lineRendererLayoutInHtmlModeWithLineHeightAndNoChildrenTest() {
+        Document document = createDocument();
+
+        LineRenderer lineRenderer = new LineRenderer();
+        lineRenderer.setParent(document.getRenderer());
+        lineRenderer.setProperty(Property.RENDERING_MODE, RenderingMode.HTML_MODE);
+        lineRenderer.setProperty(Property.LINE_HEIGHT, LineHeight.createNormalValue());
+
+        lineRenderer.layout(new LayoutContext(createLayoutArea(1000, 1000)));
+
+        Assert.assertEquals(0f, lineRenderer.maxAscent, 0f);
+        Assert.assertEquals(0f, lineRenderer.maxDescent, 0f);
+    }
+
+    @Test
+    public void lineRendererLayoutInHtmlModeWithLineHeightAndChildrenInDefaultModeTest() {
+        Document document = createDocument();
+
+        LineRenderer lineRenderer = new LineRenderer();
+        lineRenderer.setParent(document.getRenderer());
+        lineRenderer.setProperty(Property.RENDERING_MODE, RenderingMode.HTML_MODE);
+        lineRenderer.setProperty(Property.LINE_HEIGHT, LineHeight.createFixedValue(50));
+
+        TextRenderer textRenderer1 = new TextRenderer(new Text("text"));
+        textRenderer1.setProperty(Property.RENDERING_MODE, RenderingMode.DEFAULT_LAYOUT_MODE);
+
+        TextRenderer textRenderer2 = new TextRenderer(new Text("text"));
+        textRenderer2.setProperty(Property.RENDERING_MODE, RenderingMode.DEFAULT_LAYOUT_MODE);
+
+        lineRenderer.addChild(textRenderer1);
+        lineRenderer.addChild(textRenderer2);
+
+        lineRenderer.layout(new LayoutContext(createLayoutArea(1000, 1000)));
+
+        Assert.assertEquals(10.3392f, lineRenderer.maxAscent, EPS);
+        Assert.assertEquals(-2.98079f, lineRenderer.maxDescent, EPS);
+    }
+
+    @Test
+    public void lineRendererLayoutInHtmlModeWithLineHeightAndChildInHtmlModeTest() {
+        Document document = createDocument();
+
+        LineRenderer lineRenderer = new LineRenderer();
+        lineRenderer.setParent(document.getRenderer());
+        lineRenderer.setProperty(Property.RENDERING_MODE, RenderingMode.HTML_MODE);
+        lineRenderer.setProperty(Property.LINE_HEIGHT, LineHeight.createFixedValue(50));
+
+        TextRenderer textRenderer1 = new TextRenderer(new Text("text"));
+        textRenderer1.setProperty(Property.RENDERING_MODE, RenderingMode.HTML_MODE);
+
+        TextRenderer textRenderer2 = new TextRenderer(new Text("text"));
+
+        lineRenderer.addChild(textRenderer1);
+        lineRenderer.addChild(textRenderer2);
+
+        lineRenderer.layout(new LayoutContext(createLayoutArea(1000, 1000)));
+
+        Assert.assertEquals(28.67920f, lineRenderer.maxAscent, EPS);
+        Assert.assertEquals(-21.32080f, lineRenderer.maxDescent, EPS);
+    }
 }