Merge pull request #7576 from divyanshiGupta/ODC-5281

Bug 1908715: Add fix to loop back to last quick-search list item on pressing arrow up key when on top
openshift · Dec 17, 2020 · 56d306f · 56d306f
2 parents 45e7535 + be4de40
commit 56d306f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/frontend/packages/topology/src/components/quick-search/QuickSearchList.scss b/frontend/packages/topology/src/components/quick-search/QuickSearchList.scss
@@ -30,7 +30,7 @@
       var(--pf-c-data-list__item--sm--BorderBottomColor) !important;
   }
   &__all-items-link {
-    padding: var(--pf-global--spacer--xs) 0px;
+    padding: var(--pf-global--spacer--sm) 0px;
     text-align: center;
     font-size: var(--pf-global--FontSize--md);
   }

diff --git a/frontend/packages/topology/src/components/quick-search/QuickSearchModalBody.tsx b/frontend/packages/topology/src/components/quick-search/QuickSearchModalBody.tsx
@@ -82,7 +82,8 @@ const QuickSearchModalBody: React.FC<QuickSearchModalBodyProps> = ({
   }, [selectedItem, namespace, searchTerm]);
 
   const selectPrevious = React.useCallback(() => {
-    const index = getIndexOfSelectedItem();
+    let index = getIndexOfSelectedItem();
+    if (index === 0) index = listCatalogItems?.length;
     setSelectedItemId(listCatalogItems?.[index - 1]?.uid);
     setSelectedItem(listCatalogItems?.[index - 1]);
   }, [listCatalogItems, getIndexOfSelectedItem]);
@@ -101,10 +102,12 @@ const QuickSearchModalBody: React.FC<QuickSearchModalBodyProps> = ({
           break;
         }
         case 'ArrowUp': {
+          e.preventDefault();
           selectPrevious();
           break;
         }
         case 'ArrowDown': {
+          e.preventDefault();
           selectNext();
           break;
         }