From e2aa6e03c6d80f18f9ecf962ddd7faec8286b393 Mon Sep 17 00:00:00 2001
From: yusufwib01 <yusuf.wibisono@moodle.com>
Date: Tue, 20 May 2025 16:32:44 +0700
Subject: [PATCH] MDL-85467 core: Replace orphaned label with span for
 accessibility

This commit replaces orphaned labels with spans for improved
accessibility. It also updates the XPATH partial named selector
for select_menu fields to target span elements.
---
 group/templates/comboboxsearch/group_selector.mustache | 4 ++--
 lib/behat/classes/partial_named_selector.php           | 2 +-
 lib/templates/select_menu.mustache                     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/group/templates/comboboxsearch/group_selector.mustache b/group/templates/comboboxsearch/group_selector.mustache
index 13b07f59da5..0fc8844ce60 100644
--- a/group/templates/comboboxsearch/group_selector.mustache
+++ b/group/templates/comboboxsearch/group_selector.mustache
@@ -34,9 +34,9 @@
 <span class="d-none" data-region="groupid" data-groupid="{{group}}"></span>
 <div class="align-items-center d-flex">
     <div class="d-block pe-3 text-truncate">
-        <label class="d-block m-0 small" aria-hidden="true">
+        <span class="d-block m-0 small" aria-hidden="true">
             {{label}}
-        </label>
+        </span>
         <span class="p-0 font-weight-bold" data-selected-option>
             {{selectedgroup}}
         </span>
diff --git a/lib/behat/classes/partial_named_selector.php b/lib/behat/classes/partial_named_selector.php
index a73150c8074..60529a30abb 100644
--- a/lib/behat/classes/partial_named_selector.php
+++ b/lib/behat/classes/partial_named_selector.php
@@ -338,7 +338,7 @@ XPATH
 XPATH
         ,
             'select_menu' => <<<XPATH
-//*[@role='combobox'][@aria-labelledby = //label[contains(normalize-space(string(.)), %locator%)]/@id]
+//*[@role='combobox'][@aria-labelledby = //span[contains(normalize-space(string(.)), %locator%)]/@id]
 XPATH
         ,
         ],
diff --git a/lib/templates/select_menu.mustache b/lib/templates/select_menu.mustache
index 6834bdb2ef6..3b027998751 100644
--- a/lib/templates/select_menu.mustache
+++ b/lib/templates/select_menu.mustache
@@ -86,7 +86,7 @@
 }}
 <div class="dropdown select-menu" id="{{baseid}}">
     {{#label}}{{^inlinelabel}}
-        <label id="{{baseid}}-label"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}>{{label}}</label>
+        <span id="{{baseid}}-label"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}>{{label}}</span>
     {{/inlinelabel}}{{/label}}
     <div
         class="btn dropdown-toggle{{#inlinelabel}} d-flex text-left align-items-center p-0{{/inlinelabel}}"
@@ -102,7 +102,7 @@
         {{#inlinelabel}}
             <div class="pr-3 text-truncate">
                 {{#label}}
-                    <label class="d-block m-0 small" id="{{baseid}}-label"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}>{{label}}</label>
+                    <span class="d-block m-0 small" id="{{baseid}}-label"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}>{{label}}</span>
                 {{/label}}
                 <span class="font-weight-bold" data-selected-option>
                     {{selectedoption}}