Add negative indexes support in grid layout

DEVSIX-8423

Author: Dmitry Radchuk

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

@@ -182,12 +182,13 @@ 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 (except 'none' value).
+                    // no matter what display value is set for it (except 'none' and 'grid' values).
                     // See CSS Flexible Box Layout Module Level 1,
                     // W3C Candidate Recommendation, 19 November 2018: 4. Flex Items.
                     final String currentElementDisplay = elementStyles.get(CssConstants.DISPLAY);
                     if (isFlexItem(entry, currentElementDisplay) &&
-                            !CommonCssConstants.NONE.equals(currentElementDisplay)) {
+                            !CommonCssConstants.NONE.equals(currentElementDisplay) &&
+                            !CommonCssConstants.GRID.equals(currentElementDisplay)) {
                         elementStyles.put(CssConstants.DISPLAY, CssConstants.BLOCK);
                     }
                 }

src/test/java/com/itextpdf/html2pdf/css/grid/GridItemPlacementTest.java

@@ -153,28 +153,63 @@ public void twoRowSpans3Test() throws IOException, InterruptedException {
     }
 
     @Test
-    public void invalid1Test() throws IOException, InterruptedException {
-        runTest("invalid1");
+    public void spanToNegativeStartTest() throws IOException, InterruptedException {
+        runTest("spanToNegativeStartTest");
     }
 
     @Test
-    public void invalid2Test() throws IOException, InterruptedException {
-        runTest("invalid2");
+    public void spanToNegativeStartWithExplicitTemplatesTest() throws IOException, InterruptedException {
+        runTest("spanToNegativeStartWithExplicitTemplatesTest");
     }
 
     @Test
-    public void invalid3Test() throws IOException, InterruptedException {
-        runTest("invalid3");
+    public void spanToNegativeStartWithoutTemplatesTest() throws IOException, InterruptedException {
+        runTest("spanToNegativeStartWithoutTemplatesTest");
     }
 
     @Test
-    public void invalid4Test() throws IOException, InterruptedException {
-        runTest("invalid4");
+    public void spanToNegativeStartWithoutTemplatesTest2() throws IOException, InterruptedException {
+        runTest("spanToNegativeStartWithoutTemplatesTest2");
     }
 
     @Test
-    public void invalid5Test() throws IOException, InterruptedException {
-        runTest("invalid5");
+    public void spanToNegativeStartWithSingleTemplateTest() throws IOException, InterruptedException {
+        runTest("spanToNegativeStartWithSingleTemplateTest");
+    }
+
+    @Test
+    public void columnSpanExpandsStartToNegativeTest() throws IOException, InterruptedException {
+        runTest("columnSpanExpandsStartToNegativeTest");
+    }
+
+    @Test
+    public void negativeIndexOutOfTemplateTest() throws IOException, InterruptedException {
+        runTest("negativeIndexOutOfTemplateTest");
+    }
+
+    @Test
+    public void negativeIndexWithImplicitLinesTest() throws IOException, InterruptedException {
+        runTest("negativeIndexWithImplicitLinesTest");
+    }
+
+    @Test
+    public void negativeIndexWithoutTemplateTest() throws IOException, InterruptedException {
+        runTest("negativeIndexWithoutTemplateTest");
+    }
+
+    @Test
+    public void negativeIndexShorthandTest() throws IOException, InterruptedException {
+        runTest("negativeIndexShorthandTest");
+    }
+
+    @Test
+    public void negativeAndPositiveIndexShorthandTest() throws IOException, InterruptedException {
+        runTest("negativeAndPositiveIndexShorthandTest");
+    }
+
+    @Test
+    public void spanToNegativeIndexWithoutTemplateTest() throws IOException, InterruptedException {
+        runTest("spanToNegativeIndexWithoutTemplateTest");
     }
 
     @Test

src/test/java/com/itextpdf/html2pdf/css/grid/GridTemplateColumnTest.java

@@ -141,6 +141,11 @@ public void templateColumnBasicTest2() throws IOException, InterruptedException
         runTest("template-cols-without-other-props-2");
     }
 
+    @Test
+    public void templateColumnWithFlexAndGapsTest() throws IOException, InterruptedException {
+        runTest("template-cols-with-flex-and-gaps");
+    }
+
     private void runTest(String testName) throws IOException, InterruptedException {
         convertToPdfAndCompare(testName,
                 SOURCE_FOLDER, DESTINATION_FOLDER, false,

src/test/java/com/itextpdf/html2pdf/css/grid/GridTemplateNestedTest.java

@@ -24,13 +24,9 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
-import com.itextpdf.io.logs.IoLogMessageConstant;
-import com.itextpdf.test.annotations.LogMessage;
-import com.itextpdf.test.annotations.LogMessages;
 
 import java.io.IOException;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
@@ -57,7 +53,6 @@ public void templateNestedAreasWithBorderTest() throws IOException, InterruptedE
         runTest("grid-nested-areas-with-border");
     }
 
-    @Disabled("DEVSIX-8423")
     @Test
     public void templateNestedArticlesTest() throws IOException, InterruptedException {
         runTest("grid-nested-articles");
@@ -88,7 +83,6 @@ public void templateNestedMixedContentTest() throws IOException, InterruptedExce
         runTest("grid-nested-mixed-content");
     }
 
-    @Disabled("DEVSIX-8423")
     @Test
     public void templateNestedParagraphsTest() throws IOException, InterruptedException {
         runTest("grid-nested-paragraphs");
@@ -114,28 +108,21 @@ public void templateNestedTableMixedContentTest() throws IOException, Interrupte
         runTest("grid-nested-table-with-mixed-content");
     }
 
-    @Disabled("DEVSIX-8423")
     @Test
     public void templateNested2LevelsWithAreasTest() throws IOException, InterruptedException {
         runTest("grid-nested-2-levels-areas");
     }
 
-    @Disabled("DEVSIX-8423")
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.CLIP_ELEMENT, count = 4)
-    })
     @Test
     public void templateNested3LevelsFormsTest() throws IOException, InterruptedException {
         runTest("grid-nested-3-forms");
     }
 
-    @Disabled("DEVSIX-8423")
     @Test
     public void templateNested3LevelsTest() throws IOException, InterruptedException {
         runTest("grid-nested-3-levels");
     }
 
-    @Disabled("DEVSIX-8423")
     @Test
     public void templateNested3LevelsMultipleTest() throws IOException, InterruptedException {
         runTest("grid-nested-3-levels-multiple");

src/test/java/com/itextpdf/html2pdf/css/grid/GridTemplatesTest.java

@@ -136,6 +136,11 @@ public void basicColumnRowStartEndTest() throws IOException, InterruptedExceptio
         runTest("basicColumnRowStartEndTest");
     }
 
+    @Test
+    public void basicColumnRowStartEnd1Test() throws IOException, InterruptedException {
+        runTest("basicColumnRowStartEnd1Test");
+    }
+
     @Test
     public void basicColumnRowStartEnd2Test() throws IOException, InterruptedException {
         runTest("basicColumnRowStartEnd2Test");

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/GridPaintPositionedChildren001Test.java

@@ -23,9 +23,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css.w3c.css_grid.abspos;
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("DEVSIX-8423")
 public class GridPaintPositionedChildren001Test extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/PositionedGridItems025Test.java

@@ -26,9 +26,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("DEVSIX-8423")
 @LogMessages(messages = {
         @LogMessage(messageTemplate = IoLogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, count = 2)
 })

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/PositionedGridItemsNegativeIndices001Test.java

@@ -23,9 +23,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css.w3c.css_grid.abspos;
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("DEVSIX-8423")
 public class PositionedGridItemsNegativeIndices001Test extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/grid_definition/GridAutoRepeatMaxSize002Test.java

@@ -26,9 +26,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("DEVSIX-8423")
 @LogMessages(messages = {
         @LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 3)})
 public class GridAutoRepeatMaxSize002Test extends W3CCssTest {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/grid_definition/GridAutoRepeatMinMaxSize001Test.java

@@ -26,9 +26,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("DEVSIX-8423")
 @LogMessages(messages = {
         @LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 3)})
 public class GridAutoRepeatMinMaxSize001Test extends W3CCssTest {