Fix highlighting active option when dropdown open

Author: bendera

src/includes/vscode-select/OptionListController.ts

@@ -331,14 +331,18 @@ export class OptionListController implements ReactiveController {
   }
 
   activateDefault() {
-    if (this._multiSelect && this._selectedIndexes.size > 0) {
-      const indexes = this._selectedIndexes.values();
-      const first = indexes.next();
-      this._activeIndex = first.value ? first.value : 0;
-    }
-
-    if (!this._multiSelect && this._selectedIndex > -1) {
-      this._activeIndex = this._selectedIndex;
+    if (this._multiSelect) {
+      if (this._selectedIndexes.size > 0) {
+        const indexes = this._selectedIndexes.values();
+        const first = indexes.next();
+        this._activeIndex = first.value ? first.value : 0;
+      }
+    } else {
+      if (this._selectedIndex > -1) {
+        this._activeIndex = this._selectedIndex;
+      } else {
+        this._activeIndex = 0;
+      }
     }
 
     this._host.requestUpdate();

src/includes/vscode-select/vscode-select-base.ts

@@ -207,17 +207,7 @@ export class VscodeSelectBase extends VscElement {
     if (changedProperties.has('open')) {
       if (this.open) {
         this._opts.activateDefault();
-
-        if (!this._multiple && !this.combobox) {
-          const activeOption = this._opts.getActiveOption();
-          const filteredActiveIndex = activeOption?.relativeIndex ?? -1;
-
-          if (filteredActiveIndex > VISIBLE_OPTS - 1) {
-            this._optionListScrollPos = Math.floor(
-              filteredActiveIndex * OPT_HEIGHT
-            );
-          }
-        }
+        this._scrollActiveElementToTop();
 
         window.addEventListener('click', this._onClickOutside);
       } else {