Skip to content

Commit 05b99fa

Browse files
Alexandr FedoroviText-CI
Alexandr Fedorov
authored and
iText-CI
committed
Flex: wrong items order in nested flex container with flex-wrap: wrap-reverse
DEVSIX-9449 Autoported commit. Original commit hash: [35ad09c1d]
1 parent 49b670b commit 05b99fa

14 files changed

+245
-4
lines changed

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/flex/FlexContainerTest.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,5 +622,20 @@ public virtual void FlexWrapReverseTest() {
622622
public virtual void HeaderArticleNestedTest() {
623623
ConvertToPdfAndCompare("headerArticleNested", SOURCE_FOLDER, DESTINATION_FOLDER);
624624
}
625+
626+
[NUnit.Framework.Test]
627+
public virtual void FlexThirdLevelNestingSplitTest() {
628+
ConvertToPdfAndCompare("flexThirdLevelNestingSplit", SOURCE_FOLDER, DESTINATION_FOLDER);
629+
}
630+
631+
[NUnit.Framework.Test]
632+
public virtual void SeveralFlexNestedSplitTest() {
633+
ConvertToPdfAndCompare("severalFlexNestedSplit", SOURCE_FOLDER, DESTINATION_FOLDER);
634+
}
635+
636+
[NUnit.Framework.Test]
637+
public virtual void SeveralFlexThirdLevelNestingSplitTest() {
638+
ConvertToPdfAndCompare("severalFlexThirdLevelNestingSplit", SOURCE_FOLDER, DESTINATION_FOLDER);
639+
}
625640
}
626641
}

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/flex/FlexJustifyContentTest.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public virtual void InheritSpaceValuesTest() {
5757

5858
[NUnit.Framework.Test]
5959
public virtual void InheritWrapTest() {
60-
// TODO DEVSIX-9449 Flex: wrong items order in nested flex container with flex-wrap: wrap-reverse
6160
ConvertToPdfAndCompare("inheritWrap", SOURCE_FOLDER, DESTINATION_FOLDER);
6261
}
6362

@@ -208,10 +207,16 @@ public virtual void RevertLayerTest() {
208207
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
209208
Count = 6)]
210209
public virtual void RevertWrapTest() {
211-
// TODO DEVSIX-9449 Flex: wrong items order in nested flex container with flex-wrap: wrap-reverse
212210
ConvertToPdfAndCompare("revertWrap", SOURCE_FOLDER, DESTINATION_FOLDER);
213211
}
214212

213+
[NUnit.Framework.Test]
214+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
215+
Count = 5)]
216+
public virtual void NestedSplitOverflowRevertWrap() {
217+
ConvertToPdfAndCompare("nestedSplitOverflowRevertWrap", SOURCE_FOLDER, DESTINATION_FOLDER);
218+
}
219+
215220
[NUnit.Framework.Test]
216221
[LogMessage(Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, Count = 5)]
217222
public virtual void SafeCenterTest() {
@@ -286,7 +291,6 @@ public virtual void UnsetFlexDirTest() {
286291
[NUnit.Framework.Test]
287292
[LogMessage(Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, Count = 3)]
288293
public virtual void UnsetWrapTest() {
289-
// TODO DEVSIX-9449 Flex: wrong items order in nested flex container with flex-wrap: wrap-reverse
290294
ConvertToPdfAndCompare("unsetWrap", SOURCE_FOLDER, DESTINATION_FOLDER);
291295
}
292296

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/flex/FlexContainerTest/cmp_flexThirdLevelNestingSplit.pdf‎

3 KB
Binary file not shown.

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/flex/FlexContainerTest/cmp_severalFlexNestedSplit.pdf‎

2.83 KB
Binary file not shown.

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/flex/FlexContainerTest/cmp_severalFlexThirdLevelNestingSplit.pdf‎

2.94 KB
Binary file not shown.

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/flex/FlexContainerTest/flexThirdLevelNestingSplit.html‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>Flexbox justify-content inheritance & resets with parent containers</title>
5+
<style>
6+
body {
7+
font-family: sans-serif; margin: 20px;
8+
}
9+
.parent {
10+
display: flex; border: 2px solid #444; margin-bottom: 20px;
11+
}
12+
.container {
13+
display: flex; border: 1px solid #666; height: 250px; width: 300px;
14+
}
15+
.box {
16+
background: lightcoral; padding: 20px; border: 1px solid #333; width: 60px; text-align: center;
17+
}
18+
.wrap {
19+
flex-wrap: wrap;
20+
}
21+
.wrapreverse {
22+
flex-wrap: wrap-reverse;
23+
}
24+
.heightDiv {
25+
height: 800px;
26+
}
27+
</style>
28+
</head>
29+
<body>
30+
31+
<div class="heightDiv"></div>
32+
<div class="parent" style="justify-content: space-between;">
33+
<div class="container wrapreverse">
34+
<div class="box">1</div>
35+
<div class="box">2</div>
36+
<div class="box">3</div>
37+
<div class="box">4</div>
38+
<div class="box">5</div>
39+
<div class="box">6</div>
40+
<div class="box">7</div>
41+
</div>
42+
</div>
43+
44+
<div class="parent" style="justify-content: space-evenly;">
45+
<div class="container wrapreverse">
46+
<div class="container wrapreverse">
47+
<div class="box">1</div>
48+
<div class="box">2</div>
49+
<div class="box">3</div>
50+
<div class="box">4</div>
51+
<div class="box">5</div>
52+
<div class="box">6</div>
53+
<div class="box">7</div>
54+
</div>
55+
</div>
56+
</div>
57+
</body>
58+
</html>

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/flex/FlexContainerTest/severalFlexNestedSplit.html‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>Flexbox justify-content inheritance & resets with parent containers</title>
5+
<style>
6+
body {
7+
font-family: sans-serif; margin: 20px;
8+
}
9+
.parent {
10+
display: flex; border: 2px solid #444; margin-bottom: 20px;
11+
}
12+
.container {
13+
display: flex; border: 1px solid #666; height: 250px; width: 500;
14+
}
15+
.box {
16+
background: lightcoral; padding: 20px; border: 1px solid #333; width: 60px; text-align: center;
17+
}
18+
.wrap {
19+
flex-wrap: wrap;
20+
}
21+
.wrapreverse {
22+
flex-wrap: wrap-reverse;
23+
}
24+
.heightDiv {
25+
height: 650px;
26+
}
27+
</style>
28+
</head>
29+
<body>
30+
<div class="heightDiv"></div>
31+
32+
<div class="parent wrap" style="justify-content: space-between;">
33+
<div class="container wrapreverse">
34+
<div class="box">1</div>
35+
<div class="box">2</div>
36+
<div class="box">3</div>
37+
<div class="box">4</div>
38+
<div class="box">5</div>
39+
<div class="box">6</div>
40+
<div class="box">7</div>
41+
</div>
42+
<div class="container wrapreverse">
43+
<div class="container wrapreverse">
44+
<div class="box">1</div>
45+
<div class="box">2</div>
46+
<div class="box">3</div>
47+
<div class="box">4</div>
48+
<div class="box">5</div>
49+
<div class="box">6</div>
50+
<div class="box">7</div>
51+
</div>
52+
</div>
53+
</div>
54+
</body>
55+
</html>

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/flex/FlexContainerTest/severalFlexThirdLevelNestingSplit.html‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>Flexbox justify-content inheritance & resets with parent containers</title>
5+
<style>
6+
body {
7+
font-family: sans-serif; margin: 20px;
8+
}
9+
.parent {
10+
display: flex; border: 2px solid #444; margin-bottom: 20px;
11+
}
12+
.container {
13+
display: flex; border: 1px solid #666; height: 250px; width: 500;
14+
}
15+
.box {
16+
background: lightcoral; padding: 20px; border: 1px solid #333; width: 60px; text-align: center;
17+
}
18+
.wrap {
19+
flex-wrap: wrap;
20+
}
21+
.wrapreverse {
22+
flex-wrap: wrap-reverse;
23+
}
24+
.heightDiv {
25+
height: 650px;
26+
}
27+
</style>
28+
</head>
29+
<body>
30+
<div class="heightDiv"></div>
31+
32+
<div class="parent wrap" style="justify-content: space-between;">
33+
<div class="container wrapreverse">
34+
<div class="container wrapreverse">
35+
<div class="box">1</div>
36+
<div class="box">2</div>
37+
<div class="box">3</div>
38+
<div class="box">4</div>
39+
<div class="box">5</div>
40+
<div class="box">6</div>
41+
<div class="box">7</div>
42+
</div>
43+
</div>
44+
<div class="container wrapreverse">
45+
<div class="container wrapreverse">
46+
<div class="container wrapreverse">
47+
<div class="box">1</div>
48+
<div class="box">2</div>
49+
<div class="box">3</div>
50+
<div class="box">4</div>
51+
<div class="box">5</div>
52+
<div class="box">6</div>
53+
<div class="box">7</div>
54+
</div>
55+
</div>
56+
</div>
57+
</div>
58+
</body>
59+
</html>

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/flex/FlexJustifyContentTest/cmp_inheritWrap.pdf‎

0 Bytes
Binary file not shown.

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/flex/FlexJustifyContentTest/cmp_nestedSplitOverflowRevertWrap.pdf‎

2.58 KB
Binary file not shown.

0 commit comments

Comments
 (0)