Restructure the render functions

Author: bendera

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

@@ -246,7 +246,7 @@ export class VscodeSelectBase extends VscElement {
   protected _isPlaceholderOptionActive = false;
 
   @state()
-  private _isBeingFiltered = false;
+  protected _isBeingFiltered = false;
 
   @state()
   protected _optionListScrollPos = 0;
@@ -722,69 +722,8 @@ export class VscodeSelectBase extends VscElement {
     return html`${nothing}`;
   }
 
-  private _renderMultiSelectLabel() {
-    switch (this._opts.selectedIndexes.length) {
-      case 0:
-        return html`<span class="select-face-badge no-item"
-          >No items selected</span
-        >`;
-      case 1:
-        return html`<span class="select-face-badge">1 item selected</span>`;
-      default:
-        return html`<span class="select-face-badge"
-          >${this._opts.selectedIndexes.length} items selected</span
-        >`;
-    }
-  }
-
   protected _renderComboboxFace(): TemplateResult {
-    let inputVal = '';
-
-    if (this._isBeingFiltered) {
-      inputVal = this._opts.filterPattern;
-    } else {
-      const op = this._opts.getSelectedOption();
-      inputVal = op?.label ?? '';
-    }
-
-    const activeDescendant =
-      this._opts.activeIndex > -1 ? `op-${this._opts.activeIndex}` : '';
-    const expanded = this.open ? 'true' : 'false';
-
-    return html`
-      <div class="combobox-face face">
-        ${this._multiple ? this._renderMultiSelectLabel() : nothing}
-        <input
-          aria-activedescendant=${activeDescendant}
-          aria-autocomplete="list"
-          aria-controls="select-listbox"
-          aria-expanded=${expanded}
-          aria-haspopup="listbox"
-          aria-label=${ifDefined(this.label)}
-          class="combobox-input"
-          role="combobox"
-          spellcheck="false"
-          type="text"
-          autocomplete="off"
-          .value=${inputVal}
-          @focus=${this._onComboboxInputFocus}
-          @blur=${this._onComboboxInputBlur}
-          @input=${this._onComboboxInputInput}
-          @click=${this._onComboboxInputClick}
-          @keydown=${this._onComboboxInputSpaceKeyDown}
-        >
-        <button
-          aria-label="Open the list of options"
-          class="combobox-button"
-          type="button"
-          @click=${this._onComboboxButtonClick}
-          @keydown=${this._onComboboxButtonKeyDown}
-          tabindex="-1"
-        >
-          ${chevronDownIcon}
-        </button>
-      </div>
-    `;
+    return html`${nothing}`;
   }
 
   protected _renderDropdownControls(): TemplateResult {

src/vscode-multi-select/vscode-multi-select.ts

@@ -346,6 +346,56 @@ export class VscodeMultiSelect
     }
   }
 
+  protected override _renderComboboxFace(): TemplateResult {
+    let inputVal = '';
+
+    if (this._isBeingFiltered) {
+      inputVal = this._opts.filterPattern;
+    } else {
+      const op = this._opts.getSelectedOption();
+      inputVal = op?.label ?? '';
+    }
+
+    const activeDescendant =
+      this._opts.activeIndex > -1 ? `op-${this._opts.activeIndex}` : '';
+    const expanded = this.open ? 'true' : 'false';
+
+    return html`
+      <div class="combobox-face face">
+        ${this._multiple ? this._renderLabel() : nothing}
+        <input
+          aria-activedescendant=${activeDescendant}
+          aria-autocomplete="list"
+          aria-controls="select-listbox"
+          aria-expanded=${expanded}
+          aria-haspopup="listbox"
+          aria-label=${ifDefined(this.label)}
+          class="combobox-input"
+          role="combobox"
+          spellcheck="false"
+          type="text"
+          autocomplete="off"
+          .value=${inputVal}
+          @focus=${this._onComboboxInputFocus}
+          @blur=${this._onComboboxInputBlur}
+          @input=${this._onComboboxInputInput}
+          @click=${this._onComboboxInputClick}
+          @keydown=${this._onComboboxInputSpaceKeyDown}
+        >
+        <button
+          aria-label="Open the list of options"
+          class="combobox-button"
+          type="button"
+          @click=${this._onComboboxButtonClick}
+          @keydown=${this._onComboboxButtonKeyDown}
+          tabindex="-1"
+        >
+          ${chevronDownIcon}
+        </button>
+      </div>
+    `;
+  }
+
   protected override _renderSelectFace(): TemplateResult {
     const activeDescendant =
       this._opts.activeIndex > -1 ? `op-${this._opts.activeIndex}` : '';
@@ -405,10 +455,7 @@ export class VscodeMultiSelect
 
   override render(): TemplateResult {
     return html`
-      <div
-        class="multi-select"
-        aria-label=${ifDefined(this.label ?? undefined)}
-      >
+      <div class="multi-select">
         <slot class="main-slot" @slotchange=${this._onSlotChange}></slot>
         ${this.combobox ? this._renderComboboxFace() : this._renderSelectFace()}
         ${this._renderDropdown()}

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

@@ -374,6 +374,55 @@ export class VscodeSingleSelect
     `;
   }
 
+  protected override _renderComboboxFace(): TemplateResult {
+    let inputVal = '';
+
+    if (this._isBeingFiltered) {
+      inputVal = this._opts.filterPattern;
+    } else {
+      const op = this._opts.getSelectedOption();
+      inputVal = op?.label ?? '';
+    }
+
+    const activeDescendant =
+      this._opts.activeIndex > -1 ? `op-${this._opts.activeIndex}` : '';
+    const expanded = this.open ? 'true' : 'false';
+
+    return html`
+      <div class="combobox-face face">
+        <input
+          aria-activedescendant=${activeDescendant}
+          aria-autocomplete="list"
+          aria-controls="select-listbox"
+          aria-expanded=${expanded}
+          aria-haspopup="listbox"
+          aria-label=${ifDefined(this.label)}
+          class="combobox-input"
+          role="combobox"
+          spellcheck="false"
+          type="text"
+          autocomplete="off"
+          .value=${inputVal}
+          @focus=${this._onComboboxInputFocus}
+          @blur=${this._onComboboxInputBlur}
+          @input=${this._onComboboxInputInput}
+          @click=${this._onComboboxInputClick}
+          @keydown=${this._onComboboxInputSpaceKeyDown}
+        >
+        <button
+          aria-label="Open the list of options"
+          class="combobox-button"
+          type="button"
+          @click=${this._onComboboxButtonClick}
+          @keydown=${this._onComboboxButtonKeyDown}
+          tabindex="-1"
+        >
+          ${chevronDownIcon}
+        </button>
+      </div>
+    `;
+  }
+
   override render(): TemplateResult {
     return html`
       <div class="single-select">