From f6a2cf9579b528f899ad3db75b525e1258ac06d3 Mon Sep 17 00:00:00 2001
From: brendanbond <brendanbond@users.noreply.github.com>
Date: Thu, 11 Sep 2025 14:26:00 +0000
Subject: [PATCH] $'syncing commit from monorepo. PR: 397, Title: FIO-10499
 Fixed panel being incorrectly announced in readonly mode'

---
 src/templates/bootstrap4/panel/form.ejs | 6 +++---
 src/templates/bootstrap5/panel/form.ejs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/templates/bootstrap4/panel/form.ejs b/src/templates/bootstrap4/panel/form.ejs
index b41275c19..9140f9251 100644
--- a/src/templates/bootstrap4/panel/form.ejs
+++ b/src/templates/bootstrap4/panel/form.ejs
@@ -1,10 +1,10 @@
 <div class="mb-2 card border">
-  {% if (!ctx.component.hideLabel || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
+  {% if (!ctx.label.hidden || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
   <div class="card-header {{ctx.transform('class', 'bg-' + ctx.component.theme)}}"
     {% if (ctx.component.collapsible) { %}
     tabindex="0"
     {% } %}
-    role="button"
+    role="{{ctx.readOnly ? 'presentation' : 'button'}}"
     aria-expanded="{{ctx.component.collapsible ? !ctx.collapsed : true}}"
     aria-controls="{{ctx.instance.id}}-{{ctx.component.key}}"
     ref="header"
@@ -13,7 +13,7 @@
       {% if (ctx.component.collapsible) { %}
         <i class="formio-collapse-icon {{ctx.iconClass(ctx.collapsed ? 'plus-square-o' : 'minus-square-o')}} text-muted" data-title="Collapse Panel"></i>
       {% } %}
-      {% if (!ctx.component.hideLabel || ctx.builder) { %}
+      {% if (!ctx.label.hidden || ctx.builder) { %}
       {{ctx.t(ctx.component.title, { _userInput: true })}}
       {% } %}
       {% if (ctx.component.tooltip) { %}
diff --git a/src/templates/bootstrap5/panel/form.ejs b/src/templates/bootstrap5/panel/form.ejs
index b41275c19..9140f9251 100644
--- a/src/templates/bootstrap5/panel/form.ejs
+++ b/src/templates/bootstrap5/panel/form.ejs
@@ -1,10 +1,10 @@
 <div class="mb-2 card border">
-  {% if (!ctx.component.hideLabel || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
+  {% if (!ctx.label.hidden || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
   <div class="card-header {{ctx.transform('class', 'bg-' + ctx.component.theme)}}"
     {% if (ctx.component.collapsible) { %}
     tabindex="0"
     {% } %}
-    role="button"
+    role="{{ctx.readOnly ? 'presentation' : 'button'}}"
     aria-expanded="{{ctx.component.collapsible ? !ctx.collapsed : true}}"
     aria-controls="{{ctx.instance.id}}-{{ctx.component.key}}"
     ref="header"
@@ -13,7 +13,7 @@
       {% if (ctx.component.collapsible) { %}
         <i class="formio-collapse-icon {{ctx.iconClass(ctx.collapsed ? 'plus-square-o' : 'minus-square-o')}} text-muted" data-title="Collapse Panel"></i>
       {% } %}
-      {% if (!ctx.component.hideLabel || ctx.builder) { %}
+      {% if (!ctx.label.hidden || ctx.builder) { %}
       {{ctx.t(ctx.component.title, { _userInput: true })}}
       {% } %}
       {% if (ctx.component.tooltip) { %}