Merge pull request #306 from volosied/MYFACES-4450-40

4.0.x: MYFACES-4450: render tabindex for outputLabel; update test
apache · Sep 6, 2022 · 4ab0941 · 4ab0941
2 parents fddd85d + 4385a67
commit 4ab0941
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonHtmlAttributesUtil.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonHtmlAttributesUtil.java
@@ -671,11 +671,7 @@ public static void renderLabelPassthroughPropertiesWithoutEvents(ResponseWriter
             return;
         }
 
-        if ((commonPropertiesMarked & CommonHtmlAttributes.ACCESSKEY) != 0)
-        {
-            HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
-                    HTML.ACCESSKEY_ATTR, HTML.ACCESSKEY_ATTR);
-        }
+        renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component);
         renderCommonPassthroughPropertiesWithoutEvents(writer, commonPropertiesMarked, component);
     }
 

diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
@@ -93,6 +93,7 @@ public void testHtmlPropertyPassTru() throws Exception
         HtmlRenderedAttr[] attrs = {
             //_AccesskeyProperty
             new HtmlRenderedAttr("accesskey"),
+            new HtmlRenderedAttr("tabindex"),
             //_UniversalProperties
             new HtmlRenderedAttr("dir"), 
             new HtmlRenderedAttr("lang"),