test: adjusted focus keyboard handling check

SAP · May 28, 2024 · 87026c7 · 87026c7
1 parent 6ff682d
commit 87026c7
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/packages/fiori/src/NotificationListGroupItem.ts b/packages/fiori/src/NotificationListGroupItem.ts
@@ -189,11 +189,6 @@ class NotificationListGroupItem extends NotificationListItemBase {
 	}
 
 	async _onkeydown(e: KeyboardEvent) {
-		const isFocused = document.activeElement === this;
-		if (!isFocused) {
-			return;
-		}
-
 		await super._onkeydown(e);
 
 		const space = isSpace(e);

diff --git a/packages/fiori/src/NotificationListItem.ts b/packages/fiori/src/NotificationListItem.ts
@@ -497,8 +497,7 @@ class NotificationListItem extends NotificationListItemBase {
 			return;
 		}
 
-		const isFocused = document.activeElement === this;
-		if (isFocused || (!isUp(e) && !isDown(e))) {
+		if (!isUp(e) && !isDown(e)) {
 			return;
 		}
 

diff --git a/packages/main/src/CustomListItem.ts b/packages/main/src/CustomListItem.ts
@@ -54,9 +54,8 @@ class CustomListItem extends ListItem {
 
 	async _onkeydown(e: KeyboardEvent) {
 		const isTab = isTabNext(e) || isTabPrevious(e);
-		const isFocused = document.activeElement === this;
 
-		if (!isTab && !isFocused && !isF2(e)) {
+		if (!isTab && !isF2(e)) {
 			return;
 		}
 
@@ -65,9 +64,8 @@ class CustomListItem extends ListItem {
 
 	_onkeyup(e: KeyboardEvent) {
 		const isTab = isTabNext(e) || isTabPrevious(e);
-		const isFocused = document.activeElement === this;
 
-		if (!isTab && !isFocused && !isF2(e)) {
+		if (!isTab && !isF2(e)) {
 			return;
 		}
 

diff --git a/packages/main/src/TreeItemCustom.ts b/packages/main/src/TreeItemCustom.ts
@@ -52,9 +52,8 @@ class TreeItemCustom extends TreeItemBase {
 
 	async _onkeydown(e: KeyboardEvent) {
 		const isTab = isTabNext(e) || isTabPrevious(e);
-		const isFocused = document.activeElement === this;
 
-		if (!isTab && !isFocused && !isF2(e)) {
+		if (!isTab && !isF2(e)) {
 			return;
 		}
 
@@ -63,9 +62,8 @@ class TreeItemCustom extends TreeItemBase {
 
 	_onkeyup(e: KeyboardEvent) {
 		const isTab = isTabNext(e) || isTabPrevious(e);
-		const isFocused = document.activeElement === this;
 
-		if (!isTab && !isFocused && !isF2(e)) {
+		if (!isTab && !isF2(e)) {
 			return;
 		}
 

diff --git a/packages/main/test/pages/List.html b/packages/main/test/pages/List.html
@@ -14,6 +14,32 @@
 </head>
 
 <body class="list1auto">
+	<div id="host">
+		<template shadowrootmode="open">
+		   <span>I'm in the shadow DOM</span>
+		   <ui5-list header-text="API: CustomListItem" selection-mode="SingleEnd">
+			  <ui5-li-custom>
+				 <div class="list5auto">
+					<ui5-button>Press me</ui5-button>
+					<ui5-link>Go to SAP</ui5-link>
+				 </div>
+			  </ui5-li-custom>
+			  <ui5-li-custom>
+				 <div class="list5auto">
+					<ui5-button>Press me</ui5-button>
+					<ui5-link>Go to SAP</ui5-link>
+				 </div>
+			  </ui5-li-custom>
+			  <ui5-li-custom>
+				 <div class="list5auto">
+					<ui5-button>Press me</ui5-button>
+					<ui5-link>Go to SAP</ui5-link>
+				 </div>
+			  </ui5-li-custom>
+		   </ui5-list>
+		</template>
+	</div>
+
 	<ui5-title>List growing="Scroll"</ui5-title>
 	<label class="list2auto">new items loaded:</label>
 	<label id="result" class="list2auto"> 0 times: 0</label>