Skip to content

Commit 485ff91

Browse files
committed
$'syncing commit from monorepo. PR: 92, Title: FIO-8727: fix-panel-component-not-showing-label-in-data-grid'
1 parent 847bed6 commit 485ff91

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/templates/bootstrap3/panel/form.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="panel panel-{{ctx.component.theme}}">
2-
{% if (!ctx.component.hideLabel || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
2+
{% if (!ctx.label.hidden || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
33
<div class="panel-heading"
44
{% if (ctx.component.collapsible) { %}
55
tabindex="0"
@@ -13,7 +13,7 @@
1313
{% if (ctx.component.collapsible) { %}
1414
<i class="formio-collapse-icon {{ctx.iconClass(ctx.collapsed ? 'plus' : 'minus')}} text-muted" data-title="Collapse Panel"></i>
1515
{% } %}
16-
{% if (!ctx.component.hideLabel || ctx.builder) { %}
16+
{% if (!ctx.label.hidden || ctx.builder) { %}
1717
{{ctx.t(ctx.component.title, { _userInput: true })}}
1818
{% } %}
1919
{% if (ctx.component.tooltip) { %}

src/templates/bootstrap4/day/form.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="row" role="group"
2-
{% if (ctx.component.hideLabel) { %}
2+
{% if (ctx.label.hidden) { %}
33
aria-label="{{ctx.component.label}}"
44
{% } else { %}
55
aria-labelledby="l-{{ctx.instance.id}}-{{ctx.component.key}}"

src/templates/bootstrap4/panel/form.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="mb-2 card border">
2-
{% if (!ctx.component.hideLabel || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
2+
{% if (!ctx.label.hidden || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
33
<div class="card-header {{ctx.transform('class', 'bg-' + ctx.component.theme)}}"
44
{% if (ctx.component.collapsible) { %}
55
tabindex="0"
@@ -13,7 +13,7 @@
1313
{% if (ctx.component.collapsible) { %}
1414
<i class="formio-collapse-icon {{ctx.iconClass(ctx.collapsed ? 'plus-square-o' : 'minus-square-o')}} text-muted" data-title="Collapse Panel"></i>
1515
{% } %}
16-
{% if (!ctx.component.hideLabel || ctx.builder) { %}
16+
{% if (!ctx.label.hidden || ctx.builder) { %}
1717
{{ctx.t(ctx.component.title, { _userInput: true })}}
1818
{% } %}
1919
{% if (ctx.component.tooltip) { %}

src/templates/bootstrap5/day/form.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="row" role="group"
2-
{% if (ctx.component.hideLabel) { %}
2+
{% if (ctx.label.hidden) { %}
33
aria-label="{{ctx.component.label}}"
44
{% } else { %}
55
aria-labelledby="l-{{ctx.instance.id}}-{{ctx.component.key}}"

src/templates/bootstrap5/panel/form.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="mb-2 card border">
2-
{% if (!ctx.component.hideLabel || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
2+
{% if (!ctx.label.hidden || ctx.builder || ctx.component.collapsible || ctx.component.tooltip) { %}
33
<div class="card-header {{ctx.transform('class', 'bg-' + ctx.component.theme)}}"
44
{% if (ctx.component.collapsible) { %}
55
tabindex="0"
@@ -13,7 +13,7 @@
1313
{% if (ctx.component.collapsible) { %}
1414
<i class="formio-collapse-icon {{ctx.iconClass(ctx.collapsed ? 'plus-square-o' : 'minus-square-o')}} text-muted" data-title="Collapse Panel"></i>
1515
{% } %}
16-
{% if (!ctx.component.hideLabel || ctx.builder) { %}
16+
{% if (!ctx.label.hidden || ctx.builder) { %}
1717
{{ctx.t(ctx.component.title, { _userInput: true })}}
1818
{% } %}
1919
{% if (ctx.component.tooltip) { %}

0 commit comments

Comments
 (0)