[myfaces-tobago] branch tobago-5.x updated: feat: markup 'number' for tc:in

[hn...@apache.org]

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

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


The following commit(s) were added to refs/heads/tobago-5.x by this push:
     new c490a27  feat: markup 'number' for tc:in
c490a27 is described below

commit c490a279c7b15b6b838dadb0209b9fa5fbd012b6
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Feb 22 11:31:13 2022 +0100

    feat: markup 'number' for tc:in
    
    Markup 'number' should be available for tc:in.
    
    Issue: TOBAGO-2098
---
 .../tobago/internal/renderkit/renderer/InRenderer.java     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
index ec5c27c..40fbf0b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
@@ -21,6 +21,7 @@ package org.apache.myfaces.tobago.internal.renderkit.renderer;
 
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.context.Markup;
 import org.apache.myfaces.tobago.internal.component.AbstractUIButton;
 import org.apache.myfaces.tobago.internal.component.AbstractUIIn;
 import org.apache.myfaces.tobago.internal.component.AbstractUIOut;
@@ -30,6 +31,7 @@ import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
 import org.apache.myfaces.tobago.internal.util.RenderUtils;
 import org.apache.myfaces.tobago.internal.util.StringUtils;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
+import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
@@ -74,7 +76,7 @@ public class InRenderer<T extends AbstractUIIn> extends MessageLayoutRendererBas
 
   @Override
   protected void encodeBeginField(final FacesContext facesContext, final T component)
-      throws IOException {
+    throws IOException {
     final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, component);
     final String currentValue = getCurrentValue(facesContext, component);
     final boolean password = component.isPassword();
@@ -86,6 +88,7 @@ public class InRenderer<T extends AbstractUIIn> extends MessageLayoutRendererBas
     final String fieldId = component.getFieldId(facesContext);
     final boolean readonly = component.isReadonly();
     final boolean disabled = component.isDisabled();
+    final Markup markup = component.getMarkup();
     final boolean required = ComponentUtils.getBooleanAttribute(component, Attributes.required);
 
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
@@ -144,9 +147,10 @@ public class InRenderer<T extends AbstractUIIn> extends MessageLayoutRendererBas
     }
 
     writer.writeClassAttribute(
-        BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)),
-        BootstrapClass.FORM_CONTROL,
-        component.getCustomClass());
+      markup != null && markup.contains(Markup.NUMBER) ? TobagoClass.NUMBER : null,
+      BootstrapClass.borderColor(ComponentUtils.getMaximumSeverity(component)),
+      BootstrapClass.FORM_CONTROL,
+      component.getCustomClass());
 
     writer.writeAttribute(HtmlAttributes.REQUIRED, required);
     renderFocus(clientId, component.isFocus(), component.isError(), facesContext, writer);
@@ -163,7 +167,7 @@ public class InRenderer<T extends AbstractUIIn> extends MessageLayoutRendererBas
   }
 
   private void encodeGroupAddon(final FacesContext facesContext, final TobagoResponseWriter writer,
-      final UIComponent addon, final boolean isAfterFacet) throws IOException {
+    final UIComponent addon, final boolean isAfterFacet) throws IOException {
     if (addon != null) {
       for (final UIComponent child : RenderUtils.getFacetChildren(addon)) {
         insideBegin(facesContext, isAfterFacet ? Facets.after : Facets.before);