You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2024/09/20 12:10:40 UTC

(myfaces-tobago) 01/03: feat: add data attribute support for FacesMessages

This is an automated email from the ASF dual-hosted git repository.

bommel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit 9556397c153f18de653822f75485c32987ff6303
Author: Carsten Dimmek <ca...@ldbv.bayern.de>
AuthorDate: Mon Sep 16 09:20:48 2024 +0200

    feat: add data attribute support for FacesMessages
    
    Added TobagoFacesMessage to support data attributes on FacesMessages
    
    TOBAGO-2355
---
 .../myfaces/tobago/application/TobagoFacesMessage.java | 18 ++++++++++++++++++
 .../internal/renderkit/renderer/MessagesRenderer.java  |  5 +++++
 .../tobago/internal/util/HtmlRendererUtils.java        |  7 ++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/TobagoFacesMessage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/TobagoFacesMessage.java
new file mode 100644
index 0000000000..d48e676127
--- /dev/null
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/TobagoFacesMessage.java
@@ -0,0 +1,18 @@
+package org.apache.myfaces.tobago.application;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TobagoFacesMessage extends LabelValueExpressionFacesMessage {
+
+    private final Map<Object, Object> dataAttributes = new HashMap<>();
+
+    public Map<Object, Object> getDataAttributes() {
+        return dataAttributes;
+    }
+
+    public void setDataAttribute(final Object key, final Object value) {
+        dataAttributes.put(key, value);
+    }
+
+}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
index 8ec1c88f12..0699a7cd25 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
@@ -19,6 +19,7 @@
 
 package org.apache.myfaces.tobago.internal.renderkit.renderer;
 
+import org.apache.myfaces.tobago.application.TobagoFacesMessage;
 import org.apache.myfaces.tobago.internal.component.AbstractUIMessages;
 import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
@@ -96,6 +97,10 @@ public class MessagesRenderer<T extends AbstractUIMessages> extends RendererBase
             BootstrapClass.FADE,
             BootstrapClass.SHOW);
         HtmlRendererUtils.writeDataAttributes(facesContext, writer, component);
+        if (message instanceof TobagoFacesMessage) {
+          final TobagoFacesMessage tobagoFacesMessage = (TobagoFacesMessage) message;
+          HtmlRendererUtils.writeDataAttributes(facesContext, writer, tobagoFacesMessage.getDataAttributes());
+        }
         writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.ALERT.toString(), false);
 
         writer.startElement(HtmlElements.BUTTON);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
index 9ec8a96ac9..caeec2b5e2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
@@ -153,8 +153,13 @@ public final class HtmlRendererUtils {
   public static void writeDataAttributes(
       final FacesContext context, final TobagoResponseWriter writer, final UIComponent component)
       throws IOException {
+    writeDataAttributes(context, writer, ComponentUtils.getDataAttributes(component));
+  }
+
+  public static void writeDataAttributes(
+      final FacesContext context, final TobagoResponseWriter writer, final Map<Object, Object> dataAttributes)
+      throws IOException {
 
-    final Map<Object, Object> dataAttributes = ComponentUtils.getDataAttributes(component);
     if (dataAttributes == null) {
       return;
     }