[RELEASE] iText 7 pdfHTML 4.0.3

Author: iText-CI

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.2.2</version>
+    <version>7.2.3</version>
     <relativePath />
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>4.0.2</version>
+  <version>4.0.3</version>
 
   <name>pdfHTML</name>
   <description>pdfHTML is an iText 7 add-on that lets you to parse (X)HTML snippets and the associated CSS and converts

src/main/java/com/itextpdf/html2pdf/actions/data/PdfHtmlProductData.java

@@ -30,7 +30,7 @@ This file is part of the iText (R) project.
  */
 public final class PdfHtmlProductData {
     private static final String PDF_HTML_PUBLIC_PRODUCT_NAME = "pdfHTML";
-    private static final String PDF_HTML_VERSION = "4.0.2";
+    private static final String PDF_HTML_VERSION = "4.0.3";
     private static final int PDF_HTML_COPYRIGHT_SINCE = 2000;
     private static final int PDF_HTML_COPYRIGHT_TO = 2022;
 

src/main/java/com/itextpdf/html2pdf/css/apply/impl/SpanTagCssApplier.java

@@ -95,7 +95,6 @@ public void apply(ProcessorContext context, IStylesContainer stylesContainer, IT
             }
         }
 
-        // TODO as for now spans are flattened, let's at least make kids of floating spans floating too
         String floatVal = cssStyles.get(CssConstants.FLOAT);
         if (floatVal != null && !CssConstants.NONE.equals(floatVal)) {
             for (IPropertyContainer elem : spanTagWorker.getAllElements()) {

src/main/java/com/itextpdf/html2pdf/css/resolve/CssContentPropertyResolver.java

@@ -222,7 +222,6 @@ static List<INode> resolveContent(Map<String, String> styles, INode contentConta
             } else if (token.getValue().startsWith("url(")) {
                 Map<String, String> attributes = new HashMap<>();
                 attributes.put(AttributeConstants.SRC, CssUtils.extractUrl(token.getValue()));
-                //TODO: probably should add user agent styles on CssContentElementNode creation, not here.
                 attributes.put(AttributeConstants.STYLE, CssConstants.DISPLAY + ":" + CssConstants.INLINE_BLOCK);
                 result.add(new CssContentElementNode(contentContainer, TagConstants.IMG, attributes));
             } else if (CssGradientUtil.isCssLinearGradientValue(token.getValue())) {

src/main/java/com/itextpdf/html2pdf/css/resolve/DefaultCssResolver.java

@@ -202,10 +202,12 @@ private Map<String, String> resolveStyles(INode element, CssContext context) {
                             CommonCssConstants.FONT_SIZE), inheritanceRules);
 
                     // If the parent has display: flex, the flex item is blockified
-                    // no matter what display value is set for it.
+                    // no matter what display value is set for it (except 'none' value).
                     // See CSS Flexible Box Layout Module Level 1,
                     // W3C Candidate Recommendation, 19 November 2018: 4. Flex Items.
-                    if (isFlexItem(entry, elementStyles.get(CssConstants.DISPLAY))) {
+                    final String currentElementDisplay = elementStyles.get(CssConstants.DISPLAY);
+                    if (isFlexItem(entry, currentElementDisplay) &&
+                            !CommonCssConstants.NONE.equals(currentElementDisplay)) {
                         elementStyles.put(CssConstants.DISPLAY, CssConstants.BLOCK);
                     }
                 }

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

@@ -485,6 +485,11 @@ public void marginsCollapseInsideFlexItemTest() throws IOException, InterruptedE
         convertToPdfAndCompare("marginsCollapseInsideFlexItem", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
+    @Test
+    public void resolveStylesIfParentHasDisplayFlexStyleTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("displayNoneTest", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
     private static void assertDiv(IElement element, String text) {
         Assert.assertTrue(element instanceof Div);
         Assert.assertEquals(1, ((Div) element).getChildren().size());

src/test/java/com/itextpdf/html2pdf/css/MarginTest.java

@@ -74,6 +74,12 @@ public void marginAutoImageInsideDiv02Test() throws IOException, InterruptedExce
         convertToPdfAndCompare("marginAutoImageInsideDiv02", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
+    @Test
+    //TODO DEVSIX-5002 pdfHTML: support 'margin: auto'
+    public void autoMarginTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("autoMargin", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
     @Test
     //TODO DEVSIX-1101 Layout + Html2pdf: Support margin value in percents
     @LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.MARGIN_VALUE_IN_PERCENT_NOT_SUPPORTED))

src/test/resources/com/itextpdf/html2pdf/css/DisplayFlexTest/cmp_displayNoneTest.pdf

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<style>
+		*[parent]:not([parent~="z"]) {
+			display: flex;
+		}
+		*[child1]:not([child1~="z"]) {
+			display: none;
+		}
+        *[child2]:not([child2~="z"]) {
+			display: block;
+		}
+	</style>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<div class="fieldLabel" parent="v"> FlexParent
+	<div class="fieldLabe2" child1="w"> , NoneChild </div>
+    <div class="fieldLabe2" child2="x"> , BlockChild </div>
+</div>
+<div class="fieldLabe3"> NoneChild should be unvisible </div>
+</body>
+</html>

src/test/resources/com/itextpdf/html2pdf/css/DisplayFlexTest/displayNoneTest.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="background-color: blue; position: absolute">
+    <div style="background-color: yellow; width: 100px; margin-left: auto">
+        should aligned right cause of margins<br/>
+    </div>
+    <div style="background-color: yellow; width: 200px">
+        should aligned left as default
+    </div>
+</div>
+</body>
+</html>