From 493d2af7de4ff3526d4d4888badce1350778c23c Mon Sep 17 00:00:00 2001
From: Filip Siderov <filip.siderov@sap.com>
Date: Wed, 28 Oct 2020 11:04:08 +0200
Subject: [PATCH 1/2] fix(ui5-list): remove focus trap for empty list

---
 packages/main/src/List.hbs | 8 ++++++--
 packages/main/src/List.js  | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/main/src/List.hbs b/packages/main/src/List.hbs
index 5eb8461afe3a..880baae916a9 100644
--- a/packages/main/src/List.hbs
+++ b/packages/main/src/List.hbs
@@ -14,7 +14,9 @@
 		</header>
 	{{/if}}
 
-	<div id="{{_id}}-before" tabindex="0" class="ui5-list-focusarea"></div>
+	{{#if noData}}
+		<div id="{{_id}}-before" tabindex="0" class="ui5-list-focusarea"></div>
+	{{/if}}
 
 	<ul id="{{_id}}-listUl"
 		class="ui5-list-ul"
@@ -46,5 +48,7 @@
 		</div>
 	{{/if}}
 
-	<div id="{{_id}}-after" tabindex="0" class="ui5-list-focusarea"></div>
+	{{#if noData}}
+		<div id="{{_id}}-after" tabindex="0" class="ui5-list-focusarea"></div>
+	{{/if}}
 </div>
diff --git a/packages/main/src/List.js b/packages/main/src/List.js
index ce3963f818f5..4c92381d601b 100644
--- a/packages/main/src/List.js
+++ b/packages/main/src/List.js
@@ -381,8 +381,12 @@ class List extends UI5Element {
 		return `${this._id}-header`;
 	}
 
+	get noData() {
+		return this.items.length !== 0;
+	}
+
 	get showNoDataText() {
-		return this.items.length === 0 && this.noDataText;
+		return !this.noData && this.noDataText;
 	}
 
 	get showBusy() {

From dd49bb271e9175c703aaba6ea98ec38b9afb9b1a Mon Sep 17 00:00:00 2001
From: Filip Siderov <filip.siderov@sap.com>
Date: Fri, 30 Oct 2020 11:31:33 +0200
Subject: [PATCH 2/2] fix comment

---
 packages/main/src/List.hbs | 4 ++--
 packages/main/src/List.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/main/src/List.hbs b/packages/main/src/List.hbs
index 880baae916a9..b23d7c5f8893 100644
--- a/packages/main/src/List.hbs
+++ b/packages/main/src/List.hbs
@@ -14,7 +14,7 @@
 		</header>
 	{{/if}}
 
-	{{#if noData}}
+	{{#if hasData}}
 		<div id="{{_id}}-before" tabindex="0" class="ui5-list-focusarea"></div>
 	{{/if}}
 
@@ -48,7 +48,7 @@
 		</div>
 	{{/if}}
 
-	{{#if noData}}
+	{{#if hasData}}
 		<div id="{{_id}}-after" tabindex="0" class="ui5-list-focusarea"></div>
 	{{/if}}
 </div>
diff --git a/packages/main/src/List.js b/packages/main/src/List.js
index 4c92381d601b..cd2cb95b06fa 100644
--- a/packages/main/src/List.js
+++ b/packages/main/src/List.js
@@ -381,12 +381,12 @@ class List extends UI5Element {
 		return `${this._id}-header`;
 	}
 
-	get noData() {
+	get hasData() {
 		return this.items.length !== 0;
 	}
 
 	get showNoDataText() {
-		return !this.noData && this.noDataText;
+		return !this.hasData && this.noDataText;
 	}
 
 	get showBusy() {