From 750fb346bf6336dd95ce8a0983b8162f21290485 Mon Sep 17 00:00:00 2001 From: Carsten Dimmek Date: Thu, 21 Nov 2024 14:22:05 +0100 Subject: [PATCH 1/2] feat: Added after facet to tc:column issue: TOBAGO-2369 --- .../tobago/internal/renderkit/renderer/SheetRenderer.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java index 60c92e603a..2a6d4421ed 100644 --- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java +++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java @@ -963,6 +963,13 @@ private void encodeHeaderRows( insideEnd(facesContext, Facets.bar); } + final UIComponent after = ComponentUtils.getFacet(column, Facets.after); + if (after != null) { + insideBegin(facesContext, Facets.after); + after.encodeAll(facesContext); + insideEnd(facesContext, Facets.after); + } + writer.endElement(HtmlElements.SPAN); if (!autoLayout) { if (column.isResizable()) { From b5650a26c48a1fb9169f56cea781999c3b8b9726 Mon Sep 17 00:00:00 2001 From: Carsten Dimmek Date: Thu, 21 Nov 2024 17:32:10 +0100 Subject: [PATCH 2/2] feat: Added after facet to tc:column issue: TOBAGO-2369 --- .../tobago/internal/renderkit/renderer/SheetRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java index 2a6d4421ed..c5b4966a95 100644 --- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java +++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java @@ -962,7 +962,8 @@ private void encodeHeaderRows( bar.encodeAll(facesContext); insideEnd(facesContext, Facets.bar); } - + writer.endElement(HtmlElements.SPAN); + final UIComponent after = ComponentUtils.getFacet(column, Facets.after); if (after != null) { insideBegin(facesContext, Facets.after); @@ -970,7 +971,6 @@ private void encodeHeaderRows( insideEnd(facesContext, Facets.after); } - writer.endElement(HtmlElements.SPAN); if (!autoLayout) { if (column.isResizable()) { encodeResizing(writer, sheet, j - offset + cell.getColumnSpan() - 1);