Add grid shorthands

DEVSIX-8358

Author: Dmitry Radchuk

src/main/java/com/itextpdf/html2pdf/css/CssConstants.java

@@ -147,32 +147,8 @@ public class CssConstants extends CommonCssConstants {
     /** The Constant FIRST_EXCEPT. */
     public static final String FIRST_EXCEPT = "first-except";
 
-    /** The Constant GRID. */
-    public static final String GRID = "grid";
-    /** The Constant GRID_COLUMN_END. */
-    public static final String GRID_COLUMN_END = "grid-column-end";
-    /** The Constant GRID_COLUMN_START. */
-    public static final String GRID_COLUMN_START = "grid-column-start";
-    /** The Constant GRID_ROW_END. */
-    public static final String GRID_ROW_END = "grid-row-end";
-    /** The Constant GRID_ROW_START. */
-    public static final String GRID_ROW_START = "grid-row-start";
-    /** The Constant GRID_TEMPLATE_AREAS. */
-    public static final String GRID_TEMPLATE_AREAS = "grid-template-areas";
-    /** The Constant GRID_TEMPLATE_COLUMNS. */
-    public static final String GRID_TEMPLATE_COLUMNS = "grid-template-columns";
-    /** The Constant GRID_TEMPLATE_ROWS. */
-    public static final String GRID_TEMPLATE_ROWS = "grid-template-rows";
-    /** The Constant GRID_AUTO_ROWS. */
-    public static final String GRID_AUTO_ROWS = "grid-auto-rows";
-    /** The Constant GRID_AUTO_COLUMNS. */
-    public static final String GRID_AUTO_COLUMNS = "grid-auto-columns";
-    /** The Constant GRID_AUTO_FLOW. */
-    public static final String GRID_AUTO_FLOW = "grid-auto-flow";
     /** The Constant GRID_AREA. */
     public static final String GRID_AREA = "grid-area";
-    /** The Constant DENSE. */
-    public static final String DENSE = "dense";
 
     /** The Constant INLINE. */
     public static final String INLINE = "inline";

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

@@ -255,9 +255,9 @@ private static void applyTemplate(String templateStr, IPropertyContainer contain
         List<IElement> children = ((IAbstractElement) container).getChildren();
         for (IElement child : children) {
             substituteLinename(lineNumbersPerName, startProperty, child,
-                    Math.max(namedAreaLength + 1, currentLine));
+                    Math.max(namedAreaLength + 1, currentLine), "-start");
             substituteLinename(lineNumbersPerName, endProperty, child,
-                    Math.max(namedAreaLength + 1, currentLine));
+                    Math.max(namedAreaLength + 1, currentLine), "-end");
             substituteLinenameInSpan(lineNumbersPerName, startProperty, endProperty, spanProperty, child,
                     Math.max(namedAreaLength + 1, currentLine));
         }
@@ -329,7 +329,7 @@ private static void substituteLinenameInSpan(Map<String, List<Integer>> lineNumb
     }
 
     private static void substituteLinename(Map<String, List<Integer>> lineNumbersPerName, int property,
-                                           IElement child, int lastLineNumber) {
+                                           IElement child, int lastLineNumber, String alternateLineNameSuffix) {
         Object propValue = child.<Object>getProperty(property);
         if (!(propValue instanceof String)) {
             // It means it's null or we processed it earlier
@@ -340,9 +340,15 @@ private static void substituteLinename(Map<String, List<Integer>> lineNumbersPer
         Tuple2<Integer, String> parsedValue = parseStringValue((String) propValue);
         int idx = parsedValue.getFirst();
         String strValue = parsedValue.getSecond();
+        if (idx == 0 || strValue == null) {
+            return;
+        }
 
         List<Integer> lineNumbers = lineNumbersPerName.get(strValue);
-        if (lineNumbers == null || idx == 0 || strValue == null) {
+        if (lineNumbers == null) {
+            lineNumbers = lineNumbersPerName.get(strValue + alternateLineNameSuffix);
+        }
+        if (lineNumbers == null) {
             return;
         }
 

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

@@ -59,6 +59,26 @@ public void templateAreasBasicTest() throws IOException, InterruptedException {
         runTest("templateAreasBasic");
     }
 
+    @Test
+    public void templateAreasShorthandBasicTest() throws IOException, InterruptedException {
+        runTest("templateAreasShorthandBasic");
+    }
+
+    @Test
+    public void templateAreasShorthandAdvancedTest() throws IOException, InterruptedException {
+        runTest("templateAreasShorthandAdvanced");
+    }
+
+    @Test
+    public void gridShorthandAdvancedTest() throws IOException, InterruptedException {
+        runTest("gridShorthandAdvanced");
+    }
+
+    @Test
+    public void templateShorthandWithoutLineNamesTest() throws IOException, InterruptedException {
+        runTest("templateShorthandWithoutLineNames");
+    }
+
     @Test
     public void templateAreasInvalidNameTest() throws IOException, InterruptedException {
         runTest("templateAreasInvalidName");

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

@@ -30,6 +30,7 @@ This file is part of the iText (R) project.
 
 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;
 
@@ -56,6 +57,7 @@ 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");
@@ -86,6 +88,7 @@ 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");
@@ -101,8 +104,6 @@ public void templateNestedTableTest() throws IOException, InterruptedException {
         runTest("grid-nested-table");
     }
 
-    @LogMessages(messages = @LogMessage(
-            messageTemplate = IoLogMessageConstant.TABLE_WIDTH_IS_MORE_THAN_EXPECTED_DUE_TO_MIN_WIDTH, count = 4))
     @Test
     public void templateNestedTableNestedGridTest() throws IOException, InterruptedException {
         runTest("grid-nested-table-nested-grid");
@@ -113,11 +114,13 @@ 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)
     })
@@ -126,11 +129,13 @@ public void templateNested3LevelsFormsTest() throws IOException, InterruptedExce
         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

@@ -583,6 +583,26 @@ public void autoFitWithGapsTest() throws IOException, InterruptedException {
         runTest("autoFitWithGapsTest");
     }
 
+    @Test
+    public void rowColumnShorthandSimpleTest() throws IOException, InterruptedException {
+        runTest("rowColumnShorthandSimpleTest");
+    }
+
+    @Test
+    public void gridShorthandColumnAutoFlowTest() throws IOException, InterruptedException {
+        runTest("gridShorthandColumnAutoFlowTest");
+    }
+
+    @Test
+    public void gridShorthandRowAutoFlowTest() throws IOException, InterruptedException {
+        runTest("gridShorthandRowAutoFlowTest");
+    }
+
+    @Test
+    public void shrankTemplateAfterAutoFitTest() throws IOException, InterruptedException {
+        runTest("shrankTemplateAfterAutoFitTest");
+    }
+
     @Test
     public void gridLayoutDisablingTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("basicColumnFewDivsTest",

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

@@ -27,7 +27,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
-//TODO DEVSIX-8358: Support shorthands
 @LogMessages(messages = {
         @LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 4)})
 public class AbsolutePositioningDefiniteSizes001Test extends W3CCssGridTest {

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

@@ -27,7 +27,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
-//TODO DEVSIX-8358: Support shorthands
 public class AbsolutePositioningGridContainerParent001Test extends W3CCssGridTest {
     @Override
     protected String getHtmlFileName() {

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

@@ -24,7 +24,6 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.html2pdf.css.w3c.css_grid.W3CCssGridTest;
 
-//TODO DEVSIX-8358: Support shorthands
 public class DescendantStaticPosition001Test extends W3CCssGridTest {
     @Override
     protected String getHtmlFileName() {

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

@@ -27,7 +27,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
-//TODO DEVSIX-8358: Support shorthands
 @LogMessages(messages = {
         @LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE, count = 6)
 })

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

@@ -27,7 +27,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
-//TODO DEVSIX-8358: Support shorthands
 //TODO DEVSIX-5166 change after align-self is supported is supported
 @LogMessages(messages = {
         @LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE, count = 11)