multiple fixes: code review, margin collapse issues during float elements splitting and some other minor issues.

DEVSIX-1267

Author: pavel-morozov-duallab

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

@@ -317,6 +317,13 @@ static boolean isRendererFloating(IRenderer renderer, FloatPropertyValue kidFloa
         return notAbsolutePos && kidFloatPropertyVal != null && !kidFloatPropertyVal.equals(FloatPropertyValue.NONE);
     }
 
+    static boolean isFloatAffectedByClear(FloatPropertyValue floatPropertyValue, ClearPropertyValue clearPropertyValue) {
+        return !(clearPropertyValue == null || clearPropertyValue.equals(ClearPropertyValue.NONE)) &&
+                (clearPropertyValue.equals(ClearPropertyValue.BOTH) || (floatPropertyValue.equals(FloatPropertyValue.LEFT) &&
+                        clearPropertyValue.equals(ClearPropertyValue.LEFT)) || (floatPropertyValue.equals(FloatPropertyValue.RIGHT) &&
+                        clearPropertyValue.equals(ClearPropertyValue.RIGHT)));
+    }
+
     private static void adjustBoxForFloatRight(Rectangle layoutBox, float blockWidth) {
         layoutBox.setX(layoutBox.getRight() - blockWidth);
         layoutBox.setWidth(blockWidth);

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

@@ -213,6 +213,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
             if (Boolean.TRUE.equals(getPropertyAsBoolean(Property.FORCED_PLACEMENT))) {
                 isPlacingForced = true;
             } else {
+                occupiedArea.getBBox().setHeight(initialOccupiedAreaBBox.getHeight());
                 return new MinMaxWidthLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this);
             }
         }

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

@@ -44,19 +44,18 @@ This file is part of the iText (R) project.
 package com.itextpdf.layout.renderer;
 
 import com.itextpdf.io.LogMessageConstant;
+import com.itextpdf.io.util.MessageFormatUtil;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.layout.layout.LayoutArea;
 import com.itextpdf.layout.layout.LayoutContext;
 import com.itextpdf.layout.layout.LayoutPosition;
 import com.itextpdf.layout.layout.LayoutResult;
 import com.itextpdf.layout.margincollapse.MarginsCollapseHandler;
 import com.itextpdf.layout.margincollapse.MarginsCollapseInfo;
-import com.itextpdf.layout.property.FloatPropertyValue;
 import com.itextpdf.layout.property.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.itextpdf.io.util.MessageFormatUtil;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -80,7 +79,7 @@ public void addChild(IRenderer renderer) {
         int numberOfPositionedChildRenderers = positionedRenderers.size();
         super.addChild(renderer);
         List<IRenderer> addedRenderers = new ArrayList<>(1);
-        if (currentArea != null && currentArea.getPageNumber() > 1) {
+        if (currentArea != null && currentArea.isEmptyArea()) {
             addedRenderers.addAll(waitingRenderers);
             waitingRenderers.clear();
         }
@@ -117,14 +116,14 @@ public void addChild(IRenderer renderer) {
             if (marginsCollapsingEnabled && currentArea != null && renderer != null) {
                 childMarginsInfo = marginsCollapseHandler.startChildMarginsHandling(renderer, currentArea.getBBox());
             }
-            FloatPropertyValue floatPropertyValue = renderer.getProperty(Property.FLOAT);
-            boolean rendererIsFloat = floatPropertyValue != null && !floatPropertyValue.equals(FloatPropertyValue.NONE);
+            boolean rendererIsFloat = FloatingHelper.isRendererFloating(renderer);
             while (currentArea != null && renderer != null && (result = renderer.setParent(this).layout(
                     new LayoutContext(currentArea.clone(), childMarginsInfo, floatRendererAreas)))
                     .getStatus() != LayoutResult.FULL) {
                 if (result.getStatus() == LayoutResult.PARTIAL) {
                     if (rendererIsFloat) {
                         waitingRenderers.add(result.getOverflowRenderer());
+                        floatRendererAreas.add(renderer.getOccupiedArea().getBBox());
                     } else if (result.getOverflowRenderer() instanceof ImageRenderer) {
                         ((ImageRenderer) result.getOverflowRenderer()).autoScale(currentArea);
                     } else {
@@ -139,13 +138,17 @@ public void addChild(IRenderer renderer) {
                     }
                 } else if (result.getStatus() == LayoutResult.NOTHING) {
                     if (result.getOverflowRenderer() instanceof ImageRenderer) {
-                        if (currentArea.getBBox().getHeight() < ((ImageRenderer) result.getOverflowRenderer()).imageHeight && !currentArea.isEmptyArea()) {
+                        if (currentArea.getBBox().getHeight() < ((ImageRenderer) result.getOverflowRenderer()).getOccupiedArea().getBBox().getHeight() && !currentArea.isEmptyArea()
+                                && !rendererIsFloat) {
                             updateCurrentAndInitialArea(result);
+                        } else if (rendererIsFloat) {
+                            waitingRenderers.add(result.getOverflowRenderer());
+                        } else {
+                            ((ImageRenderer) result.getOverflowRenderer()).autoScale(currentArea);
+                            result.getOverflowRenderer().setProperty(Property.FORCED_PLACEMENT, true);
+                            Logger logger = LoggerFactory.getLogger(RootRenderer.class);
+                            logger.warn(MessageFormatUtil.format(LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, ""));
                         }
-                        ((ImageRenderer)result.getOverflowRenderer()).autoScale(currentArea);
-                        result.getOverflowRenderer().setProperty(Property.FORCED_PLACEMENT, true);
-                        Logger logger = LoggerFactory.getLogger(RootRenderer.class);
-                        logger.warn(MessageFormatUtil.format(LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, ""));
                     } else {
                         if (currentArea.isEmptyArea() && result.getAreaBreak() == null) {
                             if (Boolean.TRUE.equals(result.getOverflowRenderer().getModelElement().<Boolean>getProperty(Property.KEEP_TOGETHER))) {
@@ -185,9 +188,9 @@ public void addChild(IRenderer renderer) {
                         }
                     }
                 }
-                if (rendererIsFloat && result.getStatus() != LayoutResult.NOTHING) {
+                if (rendererIsFloat && (result.getStatus() != LayoutResult.NOTHING || renderer instanceof ImageRenderer)) {
                     renderer = null;
-                    continue;
+                    break;
                 }
                 if (!waitingRenderers.isEmpty()) {
                     renderer = waitingRenderers.remove(0);
@@ -276,6 +279,16 @@ public void flush() {
      * and when no consequent element has been added. This method addresses such situations.
      */
     public void close() {
+        List<IRenderer> waitingFloatRenderers = new ArrayList<>(waitingRenderers);
+        while (!waitingFloatRenderers.isEmpty()) {
+            marginsCollapseHandler = new MarginsCollapseHandler(this, null);
+            waitingRenderers.clear();
+            updateCurrentAndInitialArea(null);
+            for (IRenderer renderer : waitingFloatRenderers) {
+                addChild(renderer);
+            }
+            waitingFloatRenderers = new ArrayList<>(waitingRenderers);
+        }
         if (keepWithNextHangingRenderer != null) {
             keepWithNextHangingRenderer.setProperty(Property.KEEP_WITH_NEXT, false);
             IRenderer rendererToBeAdded = keepWithNextHangingRenderer;

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

@@ -283,7 +283,6 @@ public void floatingImageInCell() throws IOException, InterruptedException {
     }
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
     public void floatingImageToNextPage() throws IOException, InterruptedException {
         String cmpFileName = sourceFolder + "cmp_floatingImageToNextPage.pdf";
         String outFile = destinationFolder + "floatingImageToNextPage.pdf";