fix: search (ctrl + K) and keyboard arrow issue (RocketChat#29538)

Co-authored-by: Hugo Costa <[email protected]>
sampaiodiego · Jun 14, 2023 · 9b89995 · 9b89995
1 parent 27a2f98
commit 9b89995
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.changeset/search-shortcut.md b/.changeset/search-shortcut.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed Search Shortcut (ctrl + K) and keyboard navigation and selection
diff --git a/apps/meteor/client/sidebar/search/SearchList.tsx b/apps/meteor/client/sidebar/search/SearchList.tsx
@@ -235,9 +235,15 @@ const SearchList = forwardRef(function SearchList({ onClose }: SearchListProps,
 		let nextSelectedElement = null;
 
 		if (dir === 'up') {
-			nextSelectedElement = (selectedElement.current?.parentElement?.previousSibling as HTMLElement).querySelector('a');
+			const potentialElement = selectedElement.current?.parentElement?.previousSibling as HTMLElement;
+			if (potentialElement) {
+				nextSelectedElement = potentialElement.querySelector('a');
+			}
 		} else {
-			nextSelectedElement = (selectedElement.current?.parentElement?.nextSibling as HTMLElement).querySelector('a');
+			const potentialElement = selectedElement.current?.parentElement?.nextSibling as HTMLElement;
+			if (potentialElement) {
+				nextSelectedElement = potentialElement.querySelector('a');
+			}
 		}
 
 		if (nextSelectedElement) {