Fix resolving display:none css style not correctly for flex children

AnhelinaM · iText-CI · commit 014b202ac526 · 2022-04-25T10:04:09.000Z
DEVSIX-6547

Autoported commit.
Original commit hash: [6fff5bea6]
diff --git a/itext.tests/itext.html2pdf.tests/itext/html2pdf/css/DisplayFlexTest.cs b/itext.tests/itext.html2pdf.tests/itext/html2pdf/css/DisplayFlexTest.cs
@@ -419,6 +419,11 @@ public virtual void MarginsCollapseInsideFlexItemTest() {
             ConvertToPdfAndCompare("marginsCollapseInsideFlexItem", SOURCE_FOLDER, DESTINATION_FOLDER);
         }
 
+        [NUnit.Framework.Test]
+        public virtual void ResolveStylesIfParentHasDisplayFlexStyleTest() {
+            ConvertToPdfAndCompare("displayNoneTest", SOURCE_FOLDER, DESTINATION_FOLDER);
+        }
+
         private static void AssertDiv(IElement element, String text) {
             NUnit.Framework.Assert.IsTrue(element is Div);
             NUnit.Framework.Assert.AreEqual(1, ((Div)element).GetChildren().Count);
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/DisplayFlexTest/cmp_displayNoneTest.pdf b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/DisplayFlexTest/cmp_displayNoneTest.pdf
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/DisplayFlexTest/displayNoneTest.html b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/DisplayFlexTest/displayNoneTest.html
@@ -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>
diff --git a/itext/itext.html2pdf/itext/html2pdf/css/resolve/DefaultCssResolver.cs b/itext/itext.html2pdf/itext/html2pdf/css/resolve/DefaultCssResolver.cs
@@ -163,10 +163,11 @@ private IDictionary<String, String> ResolveStyles(INode element, CssContext cont
                         elementStyles = StyleUtil.MergeParentStyleDeclaration(elementStyles, entry.Key, entry.Value, parentStyles.
                             Get(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))) {
+                        String currentElementDisplay = elementStyles.Get(CssConstants.DISPLAY);
+                        if (IsFlexItem(entry, currentElementDisplay) && !CommonCssConstants.NONE.Equals(currentElementDisplay)) {
                             elementStyles.Put(CssConstants.DISPLAY, CssConstants.BLOCK);
                         }
                     }
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-2f98eedd3d5fe0f906b628657badbddb7ce3e0b5
+6fff5bea6e841e6ad359986f736185145e48f141

Original file line number	Diff line number	Diff line change
`@@ -163,10 +163,11 @@ private IDictionary<String, String> ResolveStyles(INode element, CssContext cont`
`163`	`163`	`elementStyles = StyleUtil.MergeParentStyleDeclaration(elementStyles, entry.Key, entry.Value, parentStyles.`
`164`	`164`	`Get(CommonCssConstants.FONT_SIZE), inheritanceRules);`
`165`	`165`	`// If the parent has display: flex, the flex item is blockified`
`166`		`- // no matter what display value is set for it.`
	`166`	`+ // no matter what display value is set for it (except 'none' value).`
`167`	`167`	`// See CSS Flexible Box Layout Module Level 1,`
`168`	`168`	`// W3C Candidate Recommendation, 19 November 2018: 4. Flex Items.`
`169`		`- if (IsFlexItem(entry, elementStyles.Get(CssConstants.DISPLAY))) {`
	`169`	`+ String currentElementDisplay = elementStyles.Get(CssConstants.DISPLAY);`
	`170`	`+ if (IsFlexItem(entry, currentElementDisplay) && !CommonCssConstants.NONE.Equals(currentElementDisplay)) {`
`170`	`171`	`elementStyles.Put(CssConstants.DISPLAY, CssConstants.BLOCK);`
`171`	`172`	`}`
`172`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2f98eedd3d5fe0f906b628657badbddb7ce3e0b5`
	`1`	`+6fff5bea6e841e6ad359986f736185145e48f141`