refactor: clipper ui (#2330)

2023-05-10 20:32:43 +05:30
parent cd4455e893
commit 1b0e2af2fe
4 changed files with 184 additions and 167 deletions
--- a/packages/web/src/javascripts/Hooks/useListKeyboardNavigation.ts
+++ b/packages/web/src/javascripts/Hooks/useListKeyboardNavigation.ts
@@ -96,16 +96,16 @@ export const useListKeyboardNavigation = (

    const selectedItemIndex = Array.from(items).findIndex((item) => item.dataset.selected)
    let indexToFocus = selectedItemIndex > -1 ? selectedItemIndex : initialFocus
-    indexToFocus = getNextFocusableIndex(indexToFocus, items)
+    indexToFocus = getNextFocusableIndex(indexToFocus - 1, items)

-    setTimeout(() => {
-      focusItemWithIndex(indexToFocus, items)
-    }, FIRST_ITEM_FOCUS_TIMEOUT)
+    focusItemWithIndex(indexToFocus, items)
  }, [container, focusItemWithIndex, getNextFocusableIndex, initialFocus])

  useEffect(() => {
    if (shouldAutoFocus) {
-      setInitialFocus()
+      setTimeout(() => {
+        setInitialFocus()
+      }, FIRST_ITEM_FOCUS_TIMEOUT)
    }
  }, [setInitialFocus, shouldAutoFocus])