Assign Form role to widget annotation only if it's not a part of Form role struct element already

It allows to create widget annotations with labels.

DEVSIX-7965

Author: vitali-pr

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

@@ -101,7 +101,9 @@ public static void addWidgetAnnotationToPage(PdfPage page, PdfAnnotation annotat
         if (tagged) {
             tagPointer = document.getTagStructureContext().getAutoTaggingPointer();
             //TODO DEVSIX-4117 PrintField attributes
-            tagPointer.addTag(StandardRoles.FORM);
+            if (!StandardRoles.FORM.equals(tagPointer.getRole())) {
+                tagPointer.addTag(StandardRoles.FORM);
+            }
         }
 
         page.addAnnotation(index, annotation, true);

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

@@ -274,6 +274,37 @@ public void formFieldTaggingTest10() throws IOException, InterruptedException, P
         compareOutput(outFileName, cmpFileName);
     }
 
+    @Test
+    public void formFieldTaggingTest11() throws IOException, InterruptedException, ParserConfigurationException, SAXException {
+        String outFileName = destinationFolder + "taggedPdfWithForms11.pdf";
+        String cmpFileName = sourceFolder + "cmp_taggedPdfWithForms11.pdf";
+
+        PdfWriter writer = new PdfWriter(outFileName);
+        PdfReader reader = new PdfReader(sourceFolder + "taggedDocWithFields.pdf");
+        PdfDocument pdfDoc = new PdfDocument(reader, writer);
+        pdfDoc.setTagged();
+
+        PdfAcroForm acroForm = PdfFormCreator.getAcroForm(pdfDoc, true);
+
+        PdfButtonFormField pushButton = new PushButtonFormFieldBuilder(pdfDoc, "push")
+                .setWidgetRectangle(new Rectangle(36, 650, 40, 20)).setCaption("Button 1").createPushButton();
+        pushButton.setFontSize(12f);
+
+        PdfButtonFormField pushButton2 = new PushButtonFormFieldBuilder(pdfDoc, "push 2")
+                .setWidgetRectangle(new Rectangle(36, 600, 40, 20)).setCaption("Button 2").createPushButton();
+        pushButton.setFontSize(12f);
+
+        TagTreePointer tagPointer = pdfDoc.getTagStructureContext().getAutoTaggingPointer();
+        tagPointer.moveToKid(StandardRoles.DIV);
+        acroForm.addField(pushButton);
+        tagPointer.moveToKid(StandardRoles.FORM);
+        acroForm.addField(pushButton2);
+
+        pdfDoc.close();
+
+        compareOutput(outFileName, cmpFileName);
+    }
+
     private void addFormFieldsToDocument(PdfDocument pdfDoc, PdfAcroForm acroForm) {
         Rectangle rect = new Rectangle(36, 700, 20, 20);
         Rectangle rect1 = new Rectangle(36, 680, 20, 20);

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

@@ -50,6 +50,8 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.xmp.XMPMetaFactory;
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.borders.SolidBorder;
+import com.itextpdf.layout.element.Div;
+import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.type.IntegrationTest;
 import com.itextpdf.test.pdfa.VeraPdfValidator; // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
@@ -100,7 +102,7 @@ public void checkFormFieldTest() throws IOException, XMPException, InterruptedEx
     }
 
     @Test
-    public void checkTextAreaTest() throws IOException, XMPException, InterruptedException {
+    public void checkTextAreaWithLabelTest() throws IOException, XMPException, InterruptedException {
         String outFile = DESTINATION_FOLDER + "textAreaTest.pdf";
         String cmpFile = SOURCE_FOLDER + "cmp_textAreaTest.pdf";
 
@@ -112,13 +114,19 @@ public void checkTextAreaTest() throws IOException, XMPException, InterruptedExc
             document.setFont(font);
             createSimplePdfUA2Document(pdfDocument);
 
-            TextArea formTextArea = new TextArea("form text area");
+            Paragraph paragraph = new Paragraph("Widget label").setFont(font);
+            paragraph.getAccessibilityProperties().setRole(StandardRoles.LBL);
+
+            TextArea formTextArea = new TextArea("form text1");
             formTextArea.setProperty(FormProperty.FORM_FIELD_FLATTEN, false);
             formTextArea.setProperty(FormProperty.FORM_FIELD_VALUE, "form\ntext\narea");
 
-            document.add(formTextArea);
-            PdfAcroForm form = PdfFormCreator.getAcroForm(pdfDocument, true);
-            form.getField("form text area").getPdfObject().put(PdfName.Contents, new PdfString("Description"));
+            Div div = new Div();
+            div.getAccessibilityProperties().setRole(StandardRoles.FORM);
+            div.add(paragraph);
+            div.add(formTextArea);
+
+            document.add(div);
         }
         compareAndValidate(outFile, cmpFile);
     }