Support collapsing margins for flex-items' children

DEVSIX-5196

Author: introfog

src/main/java/com/itextpdf/html2pdf/css/apply/util/FlexApplierUtil.java

@@ -63,7 +63,6 @@ private FlexApplierUtil() {
      */
     public static void applyFlexItemProperties(Map<String, String> cssProps, ProcessorContext context,
             IPropertyContainer element) {
-        element.setProperty(Property.COLLAPSING_MARGINS, null);
 
         logWarningIfThereAreNotSupportedPropertyValues(createSupportedFlexItemPropertiesAndValuesMap(), cssProps);
 

src/test/java/com/itextpdf/html2pdf/css/flex/DisplayFlexTest.java

@@ -476,17 +476,31 @@ public void marginsCollapseInsideFlexContainerTest() throws IOException, Interru
         convertToPdfAndCompare("marginsCollapseInsideFlexContainer", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
+    @Test
+    public void marginsCollapseInsideFlexContainer2Test() throws IOException, InterruptedException {
+        convertToPdfAndCompare("marginsCollapseInsideFlexContainer2", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
     @Test
     public void marginsCollapseFlexContainerAndItsChildTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("marginsCollapseFlexContainerAndItsChild", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
-    // TODO DEVSIX-5196 Support collapsing margins for flex item's children
     public void marginsCollapseInsideFlexItemTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("marginsCollapseInsideFlexItem", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
+    @Test
+    public void marginsCollapseInsideFlexItem2Test() throws IOException, InterruptedException {
+        convertToPdfAndCompare("marginsCollapseInsideFlexItem2", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void marginsCollapseInsideFlexItemBiggerThanItemTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("marginsCollapseInsideFlexItemBiggerThanItem", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
     @Test
     public void resolveStylesIfParentHasDisplayFlexStyleTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("displayNoneTest", SOURCE_FOLDER, DESTINATION_FOLDER);
@@ -646,12 +660,9 @@ public void inlineBlockInsideFlexWithFixedWidthOnlySiblingTest() throws IOExcept
     }
 
     @Test
-    // TODO DEVSIX-9266 NPE flex on header: Cannot read field "maxPositiveMargin" because "marginsCollapse" is null
-    public void displayFlexOnHeaderTagTest() {
-        String html = "displayFlexOnHeaderTag";
-        File htmlFile = new File(SOURCE_FOLDER + html + ".html");
-        File output = new File(DESTINATION_FOLDER + html + ".pdf");
-        Assertions.assertThrows(Exception.class, () -> HtmlConverter.convertToPdf(htmlFile, output));
+    // TODO DEVSIX-7402 Add display:flex support for all relevant tags
+    public void displayFlexOnHeaderTagTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("displayFlexOnHeaderTag", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test

src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexboxCollapsedItemHoriz001Test.java

@@ -23,11 +23,9 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css.w3c.css_flexbox;
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
-import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
-import com.itextpdf.test.annotations.LogMessage;
-import com.itextpdf.test.annotations.LogMessages;
 
-//TODO DEVSIX-5196 change after collapse is supported on flex items
+// TODO DEVSIX-2090 Support CSS property visibility
+// TODO DEVSIX-7603 Flex container float property is ignored
 public class FlexboxCollapsedItemHoriz001Test extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexboxCollapsedItemHoriz002Test.java

@@ -24,7 +24,7 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
 
-//TODO DEVSIX-5196 change after collapse is supported on flex items
+// TODO DEVSIX-7603 Flex container float property is ignored
 public class FlexboxCollapsedItemHoriz002Test extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexboxCollapsedItemHoriz003Test.java

@@ -24,7 +24,6 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
 
-//TODO DEVSIX-5196 change after collapse is supported on flex items
 public class FlexboxCollapsedItemHoriz003Test extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexboxVisibilityCollapseLineWrappingTest.java

@@ -24,7 +24,7 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
 
-//TODO DEVSIX-5196 change after collapse is supported on flex items
+// TODO DEVSIX-2090 Support CSS property visibility
 public class FlexboxVisibilityCollapseLineWrappingTest extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexboxVisibilityCollapseTest.java

@@ -24,7 +24,7 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
 
-//TODO DEVSIX-5196 change after collapse is supported on flex items
+// TODO DEVSIX-2090 Support CSS property visibility
 public class FlexboxVisibilityCollapseTest extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {