Refactor

Author: bendera

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

@@ -20,8 +20,8 @@ import {
 import {VscElement} from '../VscElement.js';
 import {chevronDownIcon} from './template-elements.js';
 
-const VISIBLE_OPTS = 10;
-const OPT_HEIGHT = 22;
+export const VISIBLE_OPTS = 10;
+export const OPT_HEIGHT = 22;
 
 /**
  * @cssprop --dropdown-z-index - workaround for dropdown z-index issues
@@ -232,7 +232,7 @@ export class VscodeSelectBase extends VscElement {
   private _isBeingFiltered = false;
 
   @state()
-  private _optionListScrollPos = 0;
+  protected _optionListScrollPos = 0;
 
   /** @internal */
   protected _multiple = false;
@@ -308,28 +308,12 @@ export class VscodeSelectBase extends VscElement {
       this._value = values[0];
       this._values = values;
     }
-
-    if (!this._multiple && !this.combobox && selectedIndexes.length === 0) {
-      this._selectedIndex = this._options.length > 0 ? 0 : -1;
-    }
   }
 
   protected _toggleDropdown(visible: boolean) {
     this.open = visible;
     this.ariaExpanded = String(visible);
 
-    if (visible && !this._multiple) {
-      this._activeIndex = this._selectedIndex;
-    }
-
-    if (visible && !this._multiple && !this.combobox) {
-      this._activeIndex = this._selectedIndex;
-
-      if (this._activeIndex > VISIBLE_OPTS - 1) {
-        this._optionListScrollPos = Math.floor(this._activeIndex * OPT_HEIGHT);
-      }
-    }
-
     if (visible) {
       window.addEventListener('click', this._onClickOutside);
     } else {
@@ -505,7 +489,7 @@ export class VscodeSelectBase extends VscElement {
     }
   }
 
-  private _scrollActiveElementToTop() {
+  protected _scrollActiveElementToTop() {
     this._optionListScrollPos = Math.floor(this._activeIndex * OPT_HEIGHT);
   }
 

src/vscode-single-select/vscode-single-select.ts

@@ -2,7 +2,11 @@ import {html, LitElement, TemplateResult} from 'lit';
 import {property, query} from 'lit/decorators.js';
 import {customElement} from '../includes/VscElement.js';
 import {chevronDownIcon} from '../includes/vscode-select/template-elements.js';
-import {VscodeSelectBase} from '../includes/vscode-select/vscode-select-base.js';
+import {
+  OPT_HEIGHT,
+  VISIBLE_OPTS,
+  VscodeSelectBase,
+} from '../includes/vscode-select/vscode-select-base.js';
 import styles from './vscode-single-select.styles.js';
 import {AssociatedFormControl} from '../includes/AssociatedFormControl.js';
 import {
@@ -250,6 +254,30 @@ export class VscodeSingleSelect
     super._dispatchChangeEvent();
   }
 
+  protected override _setStateFromSlottedElements(): void {
+    super._setStateFromSlottedElements();
+
+    if (!this.combobox && this._selectedIndexes.length === 0) {
+      this._selectedIndex = this._options.length > 0 ? 0 : -1;
+    }
+  }
+
+  protected override _toggleDropdown(visible: boolean): void {
+    super._toggleDropdown(visible);
+
+    if (visible) {
+      this._activeIndex = this._selectedIndex;
+    }
+
+    if (visible && !this.combobox) {
+      this._activeIndex = this._selectedIndex;
+
+      if (this._activeIndex > VISIBLE_OPTS - 1) {
+        this._optionListScrollPos = Math.floor(this._activeIndex * OPT_HEIGHT);
+      }
+    }
+  }
+
   protected override _onSlotChange(): void {
     super._onSlotChange();