Default input tags with invalid types.

DEVSIX-2753

Author: ars18wrw

src/main/java/com/itextpdf/html2pdf/LogMessageConstant.java

@@ -72,6 +72,8 @@ public final class LogMessageConstant {
     /** The Constant INPUT_SUPPORTS_ONLY_POINT_WIDTH. */
     @Deprecated
     public static final String INPUT_SUPPORTS_ONLY_POINT_WIDTH = "Input field supports only point width";
+    /** The Constant INPUT_TYPE_IS_INVALID. */
+    public static final String INPUT_TYPE_IS_INVALID = "Input type {0} is invalid. The default text type will be used instead.";
     /** The Constant INPUT_TYPE_IS_NOT_SUPPORTED. */
     public static final String INPUT_TYPE_IS_NOT_SUPPORTED = "Input type {0} is not supported";
     /** The Constant INVALID_CSS_PROPERTY_DECLARATION. */

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/InputTagWorker.java

@@ -84,6 +84,13 @@ public class InputTagWorker implements ITagWorker, IDisplayAware {
      */
     public InputTagWorker(IElementNode element, ProcessorContext context) {
         String inputType = element.getAttribute(AttributeConstants.TYPE);
+        if (!AttributeConstants.INPUT_TYPE_VALUES.contains(inputType)) {
+            if (null != inputType && 0 != inputType.length()) {
+                Logger logger = LoggerFactory.getLogger(InputTagWorker.class);
+                logger.warn(MessageFormatUtil.format(LogMessageConstant.INPUT_TYPE_IS_INVALID, inputType));
+            }
+            inputType = AttributeConstants.TEXT;
+        }
         String value = element.getAttribute(AttributeConstants.VALUE);
         String name = context.getFormFieldNameResolver().resolveFormName(element.getAttribute(AttributeConstants.NAME));
         // Default input type is text

src/main/java/com/itextpdf/html2pdf/html/AttributeConstants.java

@@ -44,6 +44,11 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.styledxmlparser.CommonAttributeConstants;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Class that bundles a series of attribute constants.
  */
@@ -218,15 +223,33 @@ private AttributeConstants() {
     /** The Constant CHECKED. */
     public static final String CHECKED = "checked";
 
+    /** The Constant DATE. */
+    public static final String DATE = "date";
+
+    /** The Constant DATETIME. */
+    public static final String DATETIME = "datetime";
+
+    /** The Constant DATETIME_LOCAL. */
+    public static final String DATETIME_LOCAL = "datetime_local";
+
     /** The Constant EMAIL. */
     public static final String EMAIL = "email";
 
+    /** The Constant FILE. */
+    public static final String FILE = "file";
+
+    /** The Constant HIDDEN. */
+    public static final String HIDDEN = "hidden";
+
     /** The Constant I. */
     public static final String I = "I";
 
     /** The Constant i. */
     public static final String i = "i";
 
+    /** The Constant IMAGE. */
+    public static final String IMAGE = "image";
+
     /** The Constant LEFT. */
     public static final String LEFT = "left";
 
@@ -236,31 +259,61 @@ private AttributeConstants() {
     /** The Constant MIDDLE. */
     public static final String MIDDLE = "middle";
 
+    /** The Constant MONTH. */
+    public static final String MONTH = "month";
+
     /** The Constant PASSWORD. */
     public static final String PASSWORD = "password";
 
+    /** The Constant PLACEHOLDER. */
+    public static final String PLACEHOLDER = "placeholder";
+
     /** The Constant RADIO. */
     public static final String RADIO = "radio";
 
+    /** The Constant RANGE. */
+    public static final String RANGE = "range";
+
+    /** The Constant RESET. */
+    public static final String RESET = "reset";
+
     /** The Constant RIGHT. */
     public static final String RIGHT = "right";
 
     /** The Constant RTL. */
     public static final String RTL = "rtl";
 
+    /** The Constant SEARCH. */
+    public static final String SEARCH = "search";
+
+    /**The Constant START*/
+    public static final String START = "start";
+
     /** The Constant SUBMIT. */
     public static final String SUBMIT = "submit";
 
+    /** The Constant TEL. */
+    public static final String TEL = "tel";
+
     /** The Constant TEXT. */
     public static final String TEXT = "text";
 
+    /** The Constant TIME. */
+    public static final String TIME = "time";
+
     /** The Constant TOP. */
     public static final String TOP = "top";
 
-    /**The Constant start*/
-    public static final String START = "start";
+    /**The Constant URL*/
+    public static final String URL = "url";
 
-    public static final String PLACEHOLDER = "placeholder";
+    /**The Constant WEEK*/
+    public static final String WEEK = "week";
+
+    /** The Constant INPUT_TYPE_VALUES. */
+    public static final Set<String> INPUT_TYPE_VALUES = Collections.unmodifiableSet(new HashSet<>(
+            Arrays.asList(new String[] {BUTTON, CHECKBOX, COLOR, DATE, DATETIME, DATETIME_LOCAL, EMAIL, FILE, HIDDEN,
+                    IMAGE, MONTH, NUMBER, PASSWORD, RADIO, RANGE, RESET, SEARCH, SUBMIT, TEL, TEXT, TIME, URL, WEEK})));
 
     // iText custom attributes
     public static final class ObjectTypes{

src/test/java/com/itextpdf/html2pdf/element/InputTest.java

@@ -175,6 +175,12 @@ public void buttonWithDisplayBlockTest() throws IOException, InterruptedExceptio
         runTest("buttonWithDisplayBlock");
     }
 
+    @Test
+    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.INPUT_TYPE_IS_INVALID))
+    public void inputDefaultTest01() throws IOException, InterruptedException {
+        runTest("inputDefaultTest01");
+    }
+
     @Test
     public void placeholderTest01() throws IOException, InterruptedException {
         runTest("placeholderTest01");

src/test/resources/com/itextpdf/html2pdf/element/InputTest/cmp_inputDefaultTest01.pdf

@@ -0,0 +1,2 @@
+The chechbox type is set incorrectly. Thus the default type (text) should be used.
+<input type=\"checkbox\" id=\"check\" unchecked disabled>