Move linkAnnotation outside Table-tag in tag hierarchy, add test

DEVSIX-1229

Author: LodrKumquat

layout/src/main/java/com/itextpdf/layout/renderer/TableRenderer.java

@@ -890,6 +890,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
      */
     @Override
     public void draw(DrawContext drawContext) {
+        applyDestinationsAndAnnotation(drawContext);
         PdfDocument document = drawContext.getDocument();
         boolean isTagged = drawContext.isTaggingEnabled() && getModelElement() instanceof IAccessibleElement;
         boolean ignoreTag = false;
@@ -914,16 +915,47 @@ public void draw(DrawContext drawContext) {
                 applyGeneratedAccessibleAttributes(tagPointer, layoutAttributes);
             }
 
-            super.draw(drawContext);
+            boolean relativePosition = isRelativePosition();
+            if (relativePosition) {
+                applyRelativePositioningTranslation(false);
+            }
+
+            beginElementOpacityApplying(drawContext);
+            drawBackground(drawContext);
+            drawBorder(drawContext);
+            drawChildren(drawContext);
+            drawPositionedChildren(drawContext);
+            endElementOpacityApplying(drawContext);
+
+            if (relativePosition) {
+                applyRelativePositioningTranslation(true);
+            }
 
             tagPointer.moveToParent();
 
             boolean toRemoveConnectionsWithTag = isLastRendererForModelElement && ((Table) getModelElement()).isComplete();
             if (toRemoveConnectionsWithTag) {
                 tagPointer.removeElementConnectionToTag(accessibleElement);
             }
+            flushed = true;
         } else {
-            super.draw(drawContext);
+            boolean relativePosition = isRelativePosition();
+            if (relativePosition) {
+                applyRelativePositioningTranslation(false);
+            }
+
+            beginElementOpacityApplying(drawContext);
+            drawBackground(drawContext);
+            drawBorder(drawContext);
+            drawChildren(drawContext);
+            drawPositionedChildren(drawContext);
+            endElementOpacityApplying(drawContext);
+
+            if (relativePosition) {
+                applyRelativePositioningTranslation(true);
+            }
+
+            flushed = true;
         }
     }
 

layout/src/test/java/com/itextpdf/layout/AutoTaggingTest.java

@@ -52,6 +52,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.kernel.font.PdfFontFactory;
 import com.itextpdf.kernel.geom.PageSize;
+import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.CompressionConstants;
 import com.itextpdf.kernel.pdf.PdfArray;
 import com.itextpdf.kernel.pdf.PdfDictionary;
@@ -60,6 +61,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.pdf.WriterProperties;
 import com.itextpdf.kernel.pdf.action.PdfAction;
+import com.itextpdf.kernel.pdf.annot.PdfLinkAnnotation;
 import com.itextpdf.kernel.pdf.canvas.draw.SolidLine;
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.layout.border.SolidBorder;
@@ -69,12 +71,14 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.property.TextAlignment;
 import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.layout.property.VerticalAlignment;
+import com.itextpdf.layout.property.Property;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.IntegrationTest;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.xml.sax.SAXException;
@@ -401,6 +405,26 @@ public void tableTest07() throws IOException, InterruptedException, ParserConfig
         compareResult("tableTest07.pdf", "cmp_tableTest07.pdf");
     }
 
+    @Ignore
+    @Test
+    public void linkInsideTable() throws IOException, InterruptedException, ParserConfigurationException, SAXException {
+        PdfDocument pdf = new PdfDocument(new PdfWriter(destinationFolder + "linkInsideTable.pdf"));
+        pdf.setTagged();
+        Document doc = new Document(pdf);
+
+        Table table = new Table(new float[] {1,2,3}).setFixedLayout().setWidth(400);
+
+        table.addCell("1x");
+        table.addCell("2x");
+        table.addCell("3x");
+        table.setProperty(Property.LINK_ANNOTATION, new PdfLinkAnnotation(new Rectangle(0, 0)).setAction(PdfAction.createURI("http://itextpdf.com/")));
+        doc.add(table);
+
+        doc.close();
+        compareResult("linkInsideTable.pdf", "cmp_linkInsideTable.pdf");
+    }
+
+
     @Test
     public void tableTest08() throws IOException, InterruptedException, ParserConfigurationException, SAXException {
         PdfDocument pdfDocument = new PdfDocument(new PdfWriter(destinationFolder + "tableTest08.pdf"));