apache · henningn · Mar 5, 2026 · Mar 4, 2026
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
@@ -135,6 +135,7 @@ public enum Attributes {
   iconSize,
   id,
   immediate,
+  icon,
   image,
   inline,
   itemDescription,

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBadge.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBadge.java
@@ -25,6 +25,8 @@
 
 public abstract class AbstractUIBadge extends UIOutput implements Visual {
 
+  public abstract String getIcon();
+
   public abstract String getImage();
 
   public abstract String getTip();

diff --git a/...go-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java b/...go-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
@@ -19,12 +19,6 @@
 
 package org.apache.myfaces.tobago.internal.component;
 
-import org.apache.myfaces.tobago.component.SupportFieldId;
-import org.apache.myfaces.tobago.component.SupportsAccessKey;
-import org.apache.myfaces.tobago.component.SupportsAutoSpacing;
-import org.apache.myfaces.tobago.component.Visual;
-import org.apache.myfaces.tobago.util.ComponentUtils;
-
 import jakarta.faces.component.UICommand;
 import jakarta.faces.component.UIComponent;
 import jakarta.faces.component.UIInput;
@@ -33,6 +27,11 @@
 import jakarta.faces.component.visit.VisitContext;
 import jakarta.faces.component.visit.VisitResult;
 import jakarta.faces.context.FacesContext;
+import org.apache.myfaces.tobago.component.SupportFieldId;
+import org.apache.myfaces.tobago.component.SupportsAccessKey;
+import org.apache.myfaces.tobago.component.SupportsAutoSpacing;
+import org.apache.myfaces.tobago.component.Visual;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 /**
  * Base class for commands.
@@ -57,7 +56,9 @@ public boolean isParentOfCommands() {
     return parentOfCommands;
   }
 
-  public abstract java.lang.String getImage();
+  public abstract String getIcon();
+
+  public abstract String getImage();
 
   @Override
   public abstract String getLabel();
@@ -70,6 +71,7 @@ public String getFieldId(final FacesContext facesContext) {
       return getClientId(facesContext);
     }
   }
+
   private static class ParentOfCommandVisitor implements VisitCallback {
     private boolean parentOfCommands = false;
     private final FacesContext facesContext;
@@ -85,17 +87,18 @@ public VisitResult visit(VisitContext context, UIComponent target) {
       if (!target.getClientId(facesContext).equals(clientId)
           && (target instanceof Visual && !((Visual) target).isPlain()
           || ComponentUtils.isStandardHtmlRendererType(target))) {
-         if (!(target instanceof AbstractUIEvent)
-             && (target instanceof UICommand || target instanceof UIInput)) {
-           parentOfCommands = true;
-           return VisitResult.COMPLETE;
-         } else {
-           return VisitResult.ACCEPT;
-         }
+        if (!(target instanceof AbstractUIEvent)
+            && (target instanceof UICommand || target instanceof UIInput)) {
+          parentOfCommands = true;
+          return VisitResult.COMPLETE;
+        } else {
+          return VisitResult.ACCEPT;
+        }
       } else {
         return VisitResult.ACCEPT;
       }
     }
+
     public boolean isParentOfCommands() {
       return parentOfCommands;
     }

diff --git a/...go-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java b/...go-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
@@ -19,11 +19,10 @@
 
 package org.apache.myfaces.tobago.internal.component;
 
+import jakarta.faces.context.FacesContext;
 import org.apache.myfaces.tobago.component.SupportsAutoSpacing;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 
-import jakarta.faces.context.FacesContext;
-
 import java.io.IOException;
 
 /**
@@ -37,6 +36,8 @@ public abstract class AbstractUISection extends AbstractUICollapsiblePanel imple
 
   public abstract void setLevel(Integer level);
 
+  public abstract String getIcon();
+
   public abstract String getImage();
 
   @Override

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITab.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITab.java
@@ -19,10 +19,9 @@
 
 package org.apache.myfaces.tobago.internal.component;
 
-import org.apache.myfaces.tobago.component.SupportsAccessKey;
-
 import jakarta.faces.component.NamingContainer;
 import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import org.apache.myfaces.tobago.component.SupportsAccessKey;
 
 /**
  * {@link org.apache.myfaces.tobago.internal.taglib.component.TabTagDeclaration}
@@ -32,6 +31,8 @@ public abstract class AbstractUITab
 
   public abstract String getLabel();
 
+  public abstract String getIcon();
+
   public abstract String getImage();
 
   public abstract boolean isDisabled();

diff --git a/...re/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java b/...re/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
@@ -38,6 +38,7 @@ public class BadgeRenderer<T extends AbstractUIBadge> extends RendererBase<T> {
   public void encodeBeginInternal(final FacesContext facesContext, final T component) throws IOException {
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
     final Markup markup = component.getMarkup() != null ? component.getMarkup() : Markup.NULL;
+    final String icon = component.getIcon();
     final String image = component.getImage();
     final String tip = component.getTip();
     final String value = getCurrentValue(facesContext, component);
@@ -54,7 +55,11 @@ public void encodeBeginInternal(final FacesContext facesContext, final T compone
     if (tip != null) {
       writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
     }
-    HtmlRendererUtils.encodeIconOrImage(writer, image);
+    if (icon != null) {
+      HtmlRendererUtils.encodeIcon(writer, icon);
+    } else {
+      HtmlRendererUtils.encodeIconOrImage(writer, image);
+    }
     if (value != null) {
       writer.startElement(HtmlElements.SPAN);
       writer.writeText(value);

diff --git a/.../main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java b/.../main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
@@ -72,6 +72,7 @@ public void encodeBeginInternal(final FacesContext facesContext, final T compone
     final String clientId = component.getClientId(facesContext);
     final boolean disabled = component.isDisabled();
     final LabelWithAccessKey label = new LabelWithAccessKey(component);
+    final String icon = component.getIcon();
     final String image = component.getImage();
     final UIComponent labelFacet = ComponentUtils.getFacet(component, Facets.label);
     final UIComponent popoverFacet = ComponentUtils.getFacet(component, Facets.popover);
@@ -157,7 +158,11 @@ public void encodeBeginInternal(final FacesContext facesContext, final T compone
       insideEnd(facesContext, Facets.popover);
     }
 
-    HtmlRendererUtils.encodeIconOrImage(writer, image);
+    if (icon != null) {
+      HtmlRendererUtils.encodeIcon(writer, icon);
+    } else {
+      HtmlRendererUtils.encodeIconOrImage(writer, image);
+    }
 
     if (labelFacet != null) {
       insideBegin(facesContext, Facets.label);

diff --git a/.../src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java b/.../src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
@@ -85,8 +85,13 @@ public void encodeBeginInternal(final FacesContext facesContext, final T compone
     writer.writeClassAttribute(TobagoClass.HEADER);
     writer.startElement(tag);
 
+    final String icon = component.getIcon();
     final String image = component.getImage();
-    HtmlRendererUtils.encodeIconOrImage(writer, image);
+    if (icon != null) {
+      HtmlRendererUtils.encodeIcon(writer, icon);
+    } else {
+      HtmlRendererUtils.encodeIconOrImage(writer, image);
+    }
 
     final UIComponent labelFacet = ComponentUtils.getFacet(component, Facets.label);
     final String labelString = component.getLabel();

diff --git a/...src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java b/...src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
@@ -284,9 +284,14 @@ private void encodeHeader(
           }
 
           boolean labelEmpty = true;
+          final String icon = tab.getIcon();
           final String image = tab.getImage();
-          if (image != null) {
-            HtmlRendererUtils.encodeIconOrImage(writer, image);
+          if (icon != null || image != null) {
+            if (icon != null) {
+              HtmlRendererUtils.encodeIcon(writer, icon);
+            } else {
+              HtmlRendererUtils.encodeIconOrImage(writer, image);
+            }
             labelEmpty = false;
           }
           if (label.getLabel() != null) {

diff --git a/...rc/main/java/org/apache/myfaces/tobago/internal/taglib/component/BadgeTagDeclaration.java b/...rc/main/java/org/apache/myfaces/tobago/internal/taglib/component/BadgeTagDeclaration.java
@@ -25,6 +25,7 @@
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
 import org.apache.myfaces.tobago.component.RendererTypes;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasConverter;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasIcon;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasImage;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
@@ -88,5 +89,5 @@
         )
     })
 public interface BadgeTagDeclaration
-    extends HasIdBindingAndRendered, HasTip, IsVisual, HasConverter, HasValue, HasImage {
+    extends HasIdBindingAndRendered, HasTip, IsVisual, HasConverter, HasValue, HasIcon, HasImage {
 }
diff --git a/...c/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java b/...c/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
@@ -34,6 +34,7 @@
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasAutoSpacing;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasConfirmation;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasFragment;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasIcon;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasImage;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
@@ -176,6 +177,6 @@
 public interface ButtonTagDeclaration
     extends HasIdBindingAndRendered, HasAction, HasActionListener, IsImmediateCommand, HasConfirmation,
     HasLink, HasOutcome, HasFragment, IsTransition, HasTarget, IsDisabledBySecurity,
-    IsOmit, IsVisual, HasLabel, HasAccessKey, HasTip, HasImage,
+    IsOmit, IsVisual, HasLabel, HasAccessKey, HasTip, HasIcon, HasImage,
     IsDefaultCommand, HasTabIndex, HasAutoSpacing {
 }
diff --git a/...src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java b/...src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
@@ -34,6 +34,7 @@
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasAutoSpacing;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasConfirmation;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasFragment;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasIcon;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasImage;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
@@ -133,5 +134,5 @@
 public interface LinkTagDeclaration
     extends HasIdBindingAndRendered, HasAction, HasActionListener, IsImmediateCommand, HasConfirmation,
     HasLink, HasOutcome, HasFragment, IsTransition, HasTarget, IsDisabledBySecurity,
-    IsOmit, HasImage, HasTabIndex, IsVisual, HasLabel, HasAccessKey, HasTip, HasAutoSpacing {
+    IsOmit, HasIcon, HasImage, HasTabIndex, IsVisual, HasLabel, HasAccessKey, HasTip, HasAutoSpacing {
 }
diff --git a/.../main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java b/.../main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java
@@ -28,6 +28,7 @@
 import org.apache.myfaces.tobago.component.RendererTypes;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasAutoSpacing;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasCollapsedMode;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasIcon;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasImage;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
@@ -56,7 +57,7 @@
     })
 
 public interface SectionTagDeclaration
-    extends HasIdBindingAndRendered, HasLabel, IsVisual, HasImage, IsCollapsed, HasCollapsedMode, HasTip,
+    extends HasIdBindingAndRendered, HasLabel, IsVisual, HasIcon, HasImage, IsCollapsed, HasCollapsedMode, HasTip,
     HasAutoSpacing {
 
   /**

diff --git a/.../src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java b/.../src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java
@@ -19,6 +19,7 @@
 
 package org.apache.myfaces.tobago.internal.taglib.component;
 
+import jakarta.faces.component.UIPanel;
 import org.apache.myfaces.tobago.apt.annotation.Behavior;
 import org.apache.myfaces.tobago.apt.annotation.Facet;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
@@ -27,15 +28,14 @@
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.RendererTypes;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasAccessKey;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasIcon;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasImage;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
 
-import jakarta.faces.component.UIPanel;
-
 /**
  * Renders a tab within a tab group.
  */
@@ -56,5 +56,5 @@
             isDefault = true)
     })
 public interface TabTagDeclaration
-    extends HasIdBindingAndRendered, IsVisual, HasLabel, HasAccessKey, HasTip, IsDisabled, HasImage {
+    extends HasIdBindingAndRendered, IsVisual, HasLabel, HasAccessKey, HasTip, IsDisabled, HasIcon, HasImage {
 }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasIcon.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasIcon.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.internal.taglib.declaration;
+
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+
+public interface HasIcon {
+  /**
+   * CSS class to render an icon.
+   */
+  @TagAttribute
+  @UIComponentTagAttribute()
+  void setIcon(String icon);
+}
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
@@ -19,9 +19,16 @@
 
 package org.apache.myfaces.tobago.internal.util;
 
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
+import org.apache.myfaces.tobago.renderkit.css.CssItem;
 import org.apache.myfaces.tobago.renderkit.css.Icons;
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
@@ -32,13 +39,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.el.ELContext;
-import jakarta.el.ValueExpression;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UIInput;
-import jakarta.faces.context.FacesContext;
-import jakarta.faces.model.SelectItem;
-
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.Locale;
@@ -74,6 +74,19 @@ public static void writeLabelWithAccessKey(final TobagoResponseWriter writer, fi
     }
   }
 
+  public static void encodeIcon(final TobagoResponseWriter writer, final String icon) throws IOException {
+    if (icon != null && !icon.isEmpty()) {
+      writer.startElement(HtmlElements.I);
+      writer.writeClassAttribute(new CssItem() {
+        @Override
+        public String getName() {
+          return icon;
+        }
+      });
+      writer.endElement(HtmlElements.I);
+    }
+  }
+
   public static void encodeIconOrImage(final TobagoResponseWriter writer, final String image) throws IOException {
     if (image != null && !image.isEmpty()) {
       if (Icons.matches(image)) {
@@ -179,7 +192,7 @@ public static void writeDataAttributes(
       final String value;
       if (mapValue instanceof ValueExpression) {
         Object expressionValue = ((ValueExpression) mapValue).getValue(elContext);
-        value = expressionValue !=null ? expressionValue.toString() : null;
+        value = expressionValue != null ? expressionValue.toString() : null;
       } else {
         value = mapValue.toString();
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,6 +135,7 @@ public enum Attributes { @@
       iconSize,
       id,
       immediate,
+      icon,
       image,
       inline,
       itemDescription,
@@ Expand Down @@