Merge pull request #411 from CirclesUBI/fix/search-fix

Fix/search fix
CirclesUBI · Aug 23, 2023 · fe0eb56 · fe0eb56
2 parents af0f185 + 1e0afe3
commit fe0eb56
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/shell/package.json b/shell/package.json
@@ -95,7 +95,7 @@
     "qr-scanner": "^1.4.2",
     "quill": "^1.3.7",
     "react-image-file-resizer": "^0.4.8",
-    "simplebar": "^5.3.9",
+    "simplebar": "^6.2.5",
     "string-replace-loader": "^3.1.0",
     "style-loader": "^3.3.1",
     "svelte-easy-crop": "^1.0.7",
@@ -118,4 +118,4 @@
   "browserslist": [
     "defaults"
   ]
-}
+}
diff --git a/shell/src/shared/molecules/Select/List.svelte b/shell/src/shared/molecules/Select/List.svelte
@@ -174,15 +174,17 @@ function handleKeyDown(e) {
 }
 
 function scrollToActiveItem(className) {
-  if (isVirtualList || !container) return;
+  let input = document.getElementById("dropdownSelectInput");
+  input.scrollIntoView();
+  // if (isVirtualList || !container) return;
 
-  let offsetBounding;
-  const focusedElemBounding = container.querySelector(`.listItem .${className}`);
-  if (focusedElemBounding) {
-    offsetBounding = container.getBoundingClientRect().bottom - focusedElemBounding.getBoundingClientRect().bottom;
-  }
+  // let offsetBounding;
+  // const focusedElemBounding = container.querySelector(`.listItem .${className}`);
+  // if (focusedElemBounding) {
+  //   offsetBounding = container.getBoundingClientRect().bottom - focusedElemBounding.getBoundingClientRect().bottom;
+  // }
 
-  container.scrollTop -= offsetBounding;
+  // container.scrollTop -= offsetBounding;
 }
 
 function isItemActive(item, selectedValue, optionIdentifier) {
@@ -218,7 +220,7 @@ function isItemHover(hoverItemIndex, item, itemIndex, items) {
 {/if}
 
 {#if !isVirtualList}
-  <div data-simplebar class="listContainer">
+  <div class="listContainer">
     {#if items}
       {#each items as item, i}
         {#if item.isGroupHeader && !item.isSelectable}

diff --git a/shell/src/shared/molecules/Select/Select.svelte b/shell/src/shared/molecules/Select/Select.svelte
@@ -554,7 +554,7 @@ function handleWindowClick(event) {
 function handleClick() {
   if (isDisabled) return;
   isFocused = true;
-  // listOpen = !listOpen;
+  listOpen = !listOpen;
 }
 
 export function handleClear() {
@@ -726,6 +726,7 @@ onDestroy(() => {
       class:h-12="{staticList !== true}">
       <div class="flex-grow">
         <input
+          id="dropdownSelectInput"
           type="text"
           on:blur
           name="searchTerm"