From b39b665072a2d36914e741b2c11620323924be89 Mon Sep 17 00:00:00 2001
From: alpadev <2838324+alpadev@users.noreply.github.com>
Date: Sat, 22 May 2021 09:58:52 +0200
Subject: Automatically select an item in the dropdown when using arrow keys
 (#34052)

---
 js/src/util/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/src/util')

diff --git a/js/src/util/index.js b/js/src/util/index.js
index 77bdc072f..4d077b21f 100644
--- a/js/src/util/index.js
+++ b/js/src/util/index.js
@@ -264,9 +264,9 @@ const execute = callback => {
 const getNextActiveElement = (list, activeElement, shouldGetNext, isCycleAllowed) => {
   let index = list.indexOf(activeElement)
 
-  // if the element does not exist in the list initialize it as the first element
+  // if the element does not exist in the list return an element depending on the direction and if cycle is allowed
   if (index === -1) {
-    return list[0]
+    return list[!shouldGetNext && isCycleAllowed ? list.length - 1 : 0]
   }
 
   const listLength = list.length
-- 
cgit v1.2.3