From bcce0de29c2d9b46f059aa3a5564aa16f336adbc Mon Sep 17 00:00:00 2001
From: abrahammordev <abrahammordev@gmail.com>
Date: Thu, 6 Aug 2026 12:25:11 +0200
Subject: [PATCH 1/3] fix: Add aria-expanded to file controls

---
 .../Component/Symbol/Glyph/Renderer.php          | 10 ++++++++++
 .../default/Symbol/tpl.glyph.standard.html       |  2 +-
 .../Component/Input/Field/FileInputTest.php      | 16 ++++++++--------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
index 51d1318e4594..1a73300b96d7 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
@@ -66,6 +66,16 @@ public function render(Component\Component $component, RendererInterface $defaul
 
         $tpl = $this->renderLabel($component, $tpl);
 
+        if ($component->getType() === Component\Symbol\Glyph\Glyph::EXPAND
+            || $component->getType() === Component\Symbol\Glyph\Glyph::COLLAPSE) {
+            $tpl->setCurrentBlock("with_aria_expanded");
+            $tpl->setVariable(
+                "ARIA_EXPANDED",
+                $component->getType() === Component\Symbol\Glyph\Glyph::COLLAPSE ? "true" : "false"
+            );
+            $tpl->parseCurrentBlock();
+        }
+
         $id = $this->bindJavaScript($component);
 
         if ($id !== null) {
diff --git a/components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.standard.html b/components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.standard.html
index 7da77fabbc12..15e1c8bc5397 100755
--- a/components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.standard.html
+++ b/components/ILIAS/UI/src/templates/default/Symbol/tpl.glyph.standard.html
@@ -1,3 +1,3 @@
-<a <!-- BEGIN tabbable -->tabindex="0" <!-- END tabbable -->class="glyph<!-- BEGIN highlighted --> highlighted<!-- END highlighted --><!-- BEGIN disabled --> disabled<!-- END disabled -->"<!-- BEGIN with_action --> href="{ACTION}"<!-- END with_action --> aria-label="{LABEL}"<!-- BEGIN with_aria_disabled --> aria-disabled="{ARIA_DISABLED}"<!-- END with_aria_disabled --><!-- BEGIN with_id --> id="{ID}"<!-- END with_id -->>
+<a <!-- BEGIN tabbable -->tabindex="0" <!-- END tabbable -->class="glyph<!-- BEGIN highlighted --> highlighted<!-- END highlighted --><!-- BEGIN disabled --> disabled<!-- END disabled -->"<!-- BEGIN with_action --> href="{ACTION}"<!-- END with_action --> aria-label="{LABEL}"<!-- BEGIN with_aria_disabled --> aria-disabled="{ARIA_DISABLED}"<!-- END with_aria_disabled --><!-- BEGIN with_aria_expanded --> aria-expanded="{ARIA_EXPANDED}"<!-- END with_aria_expanded --><!-- BEGIN with_id --> id="{ID}"<!-- END with_id -->>
 {GLYPH}
 </a>
diff --git a/components/ILIAS/UI/tests/Component/Input/Field/FileInputTest.php b/components/ILIAS/UI/tests/Component/Input/Field/FileInputTest.php
index 2b82067e82c8..067913a5e46f 100755
--- a/components/ILIAS/UI/tests/Component/Input/Field/FileInputTest.php
+++ b/components/ILIAS/UI/tests/Component/Input/Field/FileInputTest.php
@@ -294,12 +294,12 @@ public function testRenderWithMetadata(): void
                     <div class="ui-input-file-input">
                         <div class="ui-input-file-info">
                             <span data-action="expand">
-                                <a tabindex="0" class="glyph" href="#" aria-label="expand_content">
+                                <a tabindex="0" class="glyph" href="#" aria-label="expand_content" aria-expanded="false">
                                     <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
                                 </a>
                             </span>
                             <span data-action="collapse">
-                                <a tabindex="0" class="glyph" href="#" aria-label="collapse_content">
+                                <a tabindex="0" class="glyph" href="#" aria-label="collapse_content" aria-expanded="true">
                                     <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
                                 </a>
                             </span>
@@ -328,10 +328,10 @@ public function testRenderWithMetadata(): void
                     <template>
                         <div class="ui-input-file-input">
                             <div class="ui-input-file-info"><span data-action="expand"><a tabindex="0" class="glyph"
-                                        href="#" aria-label="expand_content"><span
+                                        href="#" aria-label="expand_content" aria-expanded="false"><span
                                             class="glyphicon glyphicon-triangle-right"
                                             aria-hidden="true"></span></a></span><span data-action="collapse"><a
-                                        tabindex="0" class="glyph" href="#" aria-label="collapse_content"><span
+                                         tabindex="0" class="glyph" href="#" aria-label="collapse_content" aria-expanded="true"><span
                                             class="glyphicon glyphicon-triangle-bottom"
                                             aria-hidden="true"></span></a></span><span data-dz-name></span><span
                                     data-dz-size></span><span data-action="remove"><a tabindex="0" class="glyph" href="#"
@@ -401,12 +401,12 @@ public function testRenderWithMetadataValue(): void
                     <div class="ui-input-file-input">
                         <div class="ui-input-file-info">
                             <span data-action="expand">
-                                <a tabindex="0" class="glyph" href="#" aria-label="expand_content">
+                                <a tabindex="0" class="glyph" href="#" aria-label="expand_content" aria-expanded="false">
                                     <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
                                 </a>
                             </span>
                             <span data-action="collapse">
-                                <a tabindex="0" class="glyph" href="#" aria-label="collapse_content">
+                                <a tabindex="0" class="glyph" href="#" aria-label="collapse_content" aria-expanded="true">
                                     <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
                                 </a>
                             </span>
@@ -436,12 +436,12 @@ public function testRenderWithMetadataValue(): void
                         <div class="ui-input-file-input">
                             <div class="ui-input-file-info">
                             <span data-action="expand">
-                                <a tabindex="0" class="glyph" href="#" aria-label="expand_content">
+                                <a tabindex="0" class="glyph" href="#" aria-label="expand_content" aria-expanded="false">
                                     <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
                                 </a>
                             </span>
                             <span data-action="collapse">
-                                <a tabindex="0" class="glyph" href="#" aria-label="collapse_content">
+                                <a tabindex="0" class="glyph" href="#" aria-label="collapse_content" aria-expanded="true">
                                     <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
                                 </a>
                             </span>

From aa9587230e844e7d00d4a9f4d2e78c49acfd5336 Mon Sep 17 00:00:00 2001
From: abrahammordev <abrahammordev@gmail.com>
Date: Thu, 6 Aug 2026 12:36:50 +0200
Subject: [PATCH 2/3] update: Test cases with aria-expanded

---
 .../Component/Symbol/Glyph/GlyphTest.php      | 21 +++++++++++++++----
 .../Component/Table/PresentationTest.php      |  8 +++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/components/ILIAS/UI/tests/Component/Symbol/Glyph/GlyphTest.php b/components/ILIAS/UI/tests/Component/Symbol/Glyph/GlyphTest.php
index 903943bd90dc..71559e1917b5 100755
--- a/components/ILIAS/UI/tests/Component/Symbol/Glyph/GlyphTest.php
+++ b/components/ILIAS/UI/tests/Component/Symbol/Glyph/GlyphTest.php
@@ -385,8 +385,9 @@ public function testRenderSimple(string $type): void
 
         $css_classes = self::$canonical_css_classes[$type];
         $aria_label = self::$aria_labels[$type];
+        $aria_expanded = $this->getAriaExpandedAttribute($type);
 
-        $expected = '<a tabindex="0" class="glyph" href="http://www.ilias.de" aria-label="' . $aria_label . '"><span class="' . $css_classes . '" aria-hidden="true"></span></a>';
+        $expected = '<a tabindex="0" class="glyph" href="http://www.ilias.de" aria-label="' . $aria_label . '"' . $aria_expanded . '><span class="' . $css_classes . '" aria-hidden="true"></span></a>';
         $this->assertEquals($expected, $html);
     }
 
@@ -403,9 +404,10 @@ public function testRenderWithUnavailableAction(string $type): void
 
         $css_classes = self::$canonical_css_classes[$type];
         $aria_label = self::$aria_labels[$type];
+        $aria_expanded = $this->getAriaExpandedAttribute($type);
 
         $expected = '
-        <a class="glyph disabled" aria-label="' . $aria_label . '" aria-disabled="true">
+        <a class="glyph disabled" aria-label="' . $aria_label . '" aria-disabled="true"' . $aria_expanded . '>
             <span class="' . $css_classes . '" aria-hidden="true"></span>
         </a>';
         $this->assertEquals($this->brutallyTrimHTML($expected), $this->brutallyTrimHTML($html));
@@ -495,9 +497,10 @@ public function testRenderWithOnLoadCode(string $type): void
 
         $css_classes = self::$canonical_css_classes[$type];
         $aria_label = self::$aria_labels[$type];
+        $aria_expanded = $this->getAriaExpandedAttribute($type);
 
         $id = $ids[0];
-        $expected = "<a tabindex=\"0\" class=\"glyph\" href=\"http://www.ilias.de\" aria-label=\"$aria_label\" id=\"$id\"><span class=\"$css_classes\" aria-hidden=\"true\"></span></a>";
+        $expected = "<a tabindex=\"0\" class=\"glyph\" href=\"http://www.ilias.de\" aria-label=\"$aria_label\"$aria_expanded id=\"$id\"><span class=\"$css_classes\" aria-hidden=\"true\"></span></a>";
         $this->assertEquals($expected, $html);
     }
 
@@ -515,8 +518,9 @@ public function testRenderWithAction(string $type): void
 
         $css_classes = self::$canonical_css_classes[$type];
         $aria_label = self::$aria_labels[$type];
+        $aria_expanded = $this->getAriaExpandedAttribute($type);
 
-        $expected = "<a tabindex=\"0\" class=\"glyph\" href=\"http://www.ilias.de/open-source-lms-ilias/\" aria-label=\"$aria_label\"><span class=\"$css_classes\" aria-hidden=\"true\"></span></a>";
+        $expected = "<a tabindex=\"0\" class=\"glyph\" href=\"http://www.ilias.de/open-source-lms-ilias/\" aria-label=\"$aria_label\"$aria_expanded><span class=\"$css_classes\" aria-hidden=\"true\"></span></a>";
         $this->assertEquals($expected, $html);
     }
 
@@ -546,6 +550,15 @@ public function testIsTabbable(): void
         $this->assertFalse($c->isTabbable());
     }
 
+    private function getAriaExpandedAttribute(string $type): string
+    {
+        return match ($type) {
+            G\Glyph::EXPAND => ' aria-expanded="false"',
+            G\Glyph::COLLAPSE => ' aria-expanded="true"',
+            default => '',
+        };
+    }
+
     public function testTabbableGlyphRender(): void
     {
         $f = $this->getGlyphFactory();
diff --git a/components/ILIAS/UI/tests/Component/Table/PresentationTest.php b/components/ILIAS/UI/tests/Component/Table/PresentationTest.php
index 68be3de89c95..99437f720c8e 100755
--- a/components/ILIAS/UI/tests/Component/Table/PresentationTest.php
+++ b/components/ILIAS/UI/tests/Component/Table/PresentationTest.php
@@ -172,12 +172,12 @@ public function testFullRendering(): void
 
             <div class="il-table-presentation-row-controls col-lg-auto col-sm-12">
                 <div class="il-table-presentation-row-controls-expander inline">
-                    <a tabindex="0" class="glyph" href="#" aria-label="expand_content" id="id_5">
+                    <a tabindex="0" class="glyph" href="#" aria-label="expand_content" aria-expanded="false" id="id_5">
                         <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
                     </a>
                 </div>
                 <div class="il-table-presentation-row-controls-collapser">
-                    <a tabindex="0" class="glyph" href="#" aria-label="collapse_content" id="id_6">
+                    <a tabindex="0" class="glyph" href="#" aria-label="collapse_content" aria-expanded="true" id="id_6">
                         <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
                     </a>
                 </div>
@@ -277,12 +277,12 @@ public function testMinimalRendering(): void
 
             <div class="il-table-presentation-row-controls col-lg-auto col-sm-12">
                 <div class="il-table-presentation-row-controls-expander inline">
-                    <a tabindex="0" class="glyph" href="#" aria-label="expand_content" id="id_5">
+                    <a tabindex="0" class="glyph" href="#" aria-label="expand_content" aria-expanded="false" id="id_5">
                         <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
                     </a>
                 </div>
                 <div class="il-table-presentation-row-controls-collapser">
-                    <a tabindex="0" class="glyph" href="#" aria-label="collapse_content" id="id_6">
+                    <a tabindex="0" class="glyph" href="#" aria-label="collapse_content" aria-expanded="true" id="id_6">
                         <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
                     </a>
                 </div>

From 593c89199223bf364ea07ac58c06bcc467bcf3f6 Mon Sep 17 00:00:00 2001
From: abrahammordev <abrahammordev@gmail.com>
Date: Thu, 6 Aug 2026 12:43:52 +0200
Subject: [PATCH 3/3] update: Strict way to associate expandable button

---
 .../src/Implementation/Component/Symbol/Glyph/Renderer.php   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
index 1a73300b96d7..981bdc4b5393 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/Renderer.php
@@ -66,8 +66,9 @@ public function render(Component\Component $component, RendererInterface $defaul
 
         $tpl = $this->renderLabel($component, $tpl);
 
-        if ($component->getType() === Component\Symbol\Glyph\Glyph::EXPAND
-            || $component->getType() === Component\Symbol\Glyph\Glyph::COLLAPSE) {
+        if (!$this instanceof ButtonContextRenderer
+            && ($component->getType() === Component\Symbol\Glyph\Glyph::EXPAND
+                || $component->getType() === Component\Symbol\Glyph\Glyph::COLLAPSE)) {
             $tpl->setCurrentBlock("with_aria_expanded");
             $tpl->setVariable(
                 "ARIA_EXPANDED",