From 7336c1280f6aac20889d196e5cef718abe74f046 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 22 Sep 2022 15:19:59 +0200
Subject: [PATCH] Fix select issues (#13839)

---
 src/components/ha-selector/ha-selector-select.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts
index d051b5f125..c454d339cd 100644
--- a/src/components/ha-selector/ha-selector-select.ts
+++ b/src/components/ha-selector/ha-selector-select.ts
@@ -41,7 +41,7 @@ export class HaSelectSelector extends LitElement {
     );
 
     if (!this.selector.select.custom_value && this._mode === "list") {
-      if (!this.selector.select.multiple || this.required) {
+      if (!this.selector.select.multiple) {
         return html`
           <div>
             ${this.label}
@@ -64,7 +64,8 @@ export class HaSelectSelector extends LitElement {
 
       return html`
         <div>
-          ${this.label}${options.map(
+          ${this.label}
+          ${options.map(
             (item: SelectOption) => html`
               <ha-formfield .label=${item.label}>
                 <ha-checkbox
@@ -114,7 +115,7 @@ export class HaSelectSelector extends LitElement {
           .required=${this.required && !value.length}
           .value=${this._filter}
           .items=${options.filter(
-            (item) => !item.disabled && !this.value?.includes(item.value)
+            (option) => !option.disabled && !value?.includes(option.value)
           )}
           @filter-changed=${this._filterChanged}
           @value-changed=${this._comboBoxValueChanged}
@@ -290,6 +291,9 @@ export class HaSelectSelector extends LitElement {
     ha-formfield {
       display: block;
     }
+    mwc-list-item[disabled] {
+      --mdc-theme-text-primary-on-background: var(--disabled-text-color);
+    }
   `;
 }