Always draw single line text in single line text form fields

DEVSIX-3012

Author: vitali-pr

forms/src/main/java/com/itextpdf/forms/fields/PdfFormAnnotation.java

@@ -116,12 +116,14 @@ public class PdfFormAnnotation extends AbstractPdfFormField {
      */
     static final float X_OFFSET = 2;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PdfFormAnnotation.class);
-
     protected float borderWidth = 1;
     protected Color backgroundColor;
     protected Color borderColor;
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(PdfFormAnnotation.class);
+
+    private static final String LINE_ENDINGS_REGEXP = "\\r\\n|\\r|\\n";
+
     private Button formFieldElement;
 
     /**
@@ -910,15 +912,17 @@ protected void drawTextFormFieldAndSaveAppearance() {
         }
 
         IFormField textFormField;
+        String value = parent.getDisplayValue();
         if (parent.isMultiline()) {
             textFormField = new TextArea("");
             textFormField.setProperty(Property.FONT_SIZE, UnitValue.createPointValue(getFontSize()));
         } else {
             textFormField = new InputField("");
             textFormField.setProperty(Property.FONT_SIZE,
                     UnitValue.createPointValue(getFontSize(new PdfArray(rectangle), parent.getValueAsString())));
+            value = value.replaceAll(LINE_ENDINGS_REGEXP, " ");
         }
-        textFormField.setProperty(FormProperty.FORM_FIELD_VALUE, parent.getDisplayValue());
+        textFormField.setProperty(FormProperty.FORM_FIELD_VALUE, value);
         textFormField.setProperty(Property.FONT, getFont());
         textFormField.setProperty(Property.TEXT_ALIGNMENT, parent.getJustification());
         textFormField.setProperty(FormProperty.FORM_FIELD_PASSWORD_FLAG, getParentField().isPassword());

forms/src/test/java/com/itextpdf/forms/PdfFormFieldTextTest.java

@@ -23,9 +23,12 @@ This file is part of the iText (R) project.
 package com.itextpdf.forms;
 
 import com.itextpdf.forms.fields.PdfFormField;
+import com.itextpdf.forms.fields.PdfTextFormField;
+import com.itextpdf.forms.fields.TextFormFieldBuilder;
 import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.kernel.font.PdfFontFactory;
+import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDictionary;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfName;
@@ -162,4 +165,26 @@ public void fontsResourcesHelvCourierNotoFontTest() throws IOException {
 
         ExtendedITextTest.printOutputPdfNameAndDir(destinationFolder + filename);
     }
+
+    @Test
+    public void lineEndingsTest() throws IOException, InterruptedException {
+        String destFilename = destinationFolder + "lineEndingsTest.pdf";
+        String cmpFilename = sourceFolder + "cmp_lineEndingsTest.pdf";
+
+        try (PdfDocument pdfDoc = new PdfDocument(new PdfWriter(destFilename))) {
+            PdfAcroForm form = PdfAcroForm.getAcroForm(pdfDoc, true);
+
+            PdfTextFormField field = new TextFormFieldBuilder(pdfDoc, "single")
+                    .setWidgetRectangle(new Rectangle(50, 700, 500, 120)).createText();
+            field.setValue("Line 1\nLine 2\rLine 3\r\nLine 4");
+            form.addField(field);
+
+            PdfTextFormField field2 = new TextFormFieldBuilder(pdfDoc, "multi")
+                    .setWidgetRectangle(new Rectangle(50, 500, 500, 120)).createMultilineText();
+            field2.setValue("Line 1\nLine 2\rLine 3\r\nLine 4");
+            form.addField(field2);
+        }
+
+        Assert.assertNull(new CompareTool().compareByContent(destFilename, cmpFilename, destinationFolder, "diff_"));
+    }
 }