From 0927bd63fae51752d2f693e9d7d92ae2f0fc9552 Mon Sep 17 00:00:00 2001
From: daria <95225431+dariiing@users.noreply.github.com>
Date: Mon, 30 Mar 2026 15:49:29 +0300
Subject: [PATCH] add aria-labelledby for required questions

---
 www/form/inner.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 18e42b046..6184f8772 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4085,7 +4085,7 @@ define([
                     });
                     requiredContent.push(infoIcon);
                 }
-                requiredTag = h('span.cp-form-required-tag', requiredContent);
+                requiredTag = h('span.cp-form-required-tag', { 'id': 'cp-required-' + (n-1) }, requiredContent);
             }
 
             var dragHandle;
@@ -4427,11 +4427,16 @@ define([
 
             var editableCls = editable ? ".editable" : "";
             var draggable = APP.drag ? '' : '.nodrag';
-            elements.push(h('fieldset.cp-form-block'+editableCls+draggable, {
+            var ariaLabelledby = 'cp-question-' + (n-1);
+            if (requiredTag) {
+                ariaLabelledby += ' cp-required-' + (n-1);
+            }
+            var attributes = {
                 'data-id':uid,
                 'data-type':type,
-                'aria-labelledby': 'cp-question-' + (n-1)
-            }, [
+                'aria-labelledby': ariaLabelledby
+            };
+            elements.push(h('fieldset.cp-form-block'+editableCls+draggable, attributes, [
                 h('header', [
                     APP.isEditor ? dragHandle : undefined,
                     shiftButtons,