Skip to content

Commit 5f8e0e2

Browse files
authored
fix(ui5-list): remove focus trap for empty list (#2411)
1 parent 37ee83f commit 5f8e0e2

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

packages/main/src/List.hbs

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
</header>
1515
{{/if}}
1616

17-
<div id="{{_id}}-before" tabindex="0" class="ui5-list-focusarea"></div>
17+
{{#if hasData}}
18+
<div id="{{_id}}-before" tabindex="0" class="ui5-list-focusarea"></div>
19+
{{/if}}
1820

1921
<ul id="{{_id}}-listUl"
2022
class="ui5-list-ul"
@@ -46,5 +48,7 @@
4648
</div>
4749
{{/if}}
4850

49-
<div id="{{_id}}-after" tabindex="0" class="ui5-list-focusarea"></div>
51+
{{#if hasData}}
52+
<div id="{{_id}}-after" tabindex="0" class="ui5-list-focusarea"></div>
53+
{{/if}}
5054
</div>

packages/main/src/List.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,12 @@ class List extends UI5Element {
381381
return `${this._id}-header`;
382382
}
383383

384+
get hasData() {
385+
return this.items.length !== 0;
386+
}
387+
384388
get showNoDataText() {
385-
return this.items.length === 0 && this.noDataText;
389+
return !this.hasData && this.noDataText;
386390
}
387391

388392
get showBusy() {

0 commit comments

Comments
 (0)