From 00299bc74db4b4a461f2a0faf747a29a6140ebf9 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 9 Nov 2021 16:10:26 +0100
Subject: [PATCH] Fix multi select ha-form (#10585)

---
 src/components/ha-form/ha-form-multi_select.ts | 4 +++-
 src/components/ha-form/types.ts                | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/ha-form/ha-form-multi_select.ts b/src/components/ha-form/ha-form-multi_select.ts
index fa50750373..3023a1a15f 100644
--- a/src/components/ha-form/ha-form-multi_select.ts
+++ b/src/components/ha-form/ha-form-multi_select.ts
@@ -52,7 +52,9 @@ export class HaFormMultiSelect extends LitElement implements HaFormElement {
   }
 
   protected render(): TemplateResult {
-    const options = Object.entries(this.schema.options);
+    const options = Array.isArray(this.schema.options)
+      ? this.schema.options
+      : Object.entries(this.schema.options);
     const data = this.data || [];
 
     const renderedOptions = options.map((item: string | [string, string]) => {
diff --git a/src/components/ha-form/types.ts b/src/components/ha-form/types.ts
index ad740b625f..c52ba0b947 100644
--- a/src/components/ha-form/types.ts
+++ b/src/components/ha-form/types.ts
@@ -38,7 +38,7 @@ export interface HaFormSelectSchema extends HaFormBaseSchema {
 
 export interface HaFormMultiSelectSchema extends HaFormBaseSchema {
   type: "multi_select";
-  options: Record<string, string>;
+  options: Record<string, string> | string[];
 }
 
 export interface HaFormFloatSchema extends HaFormBaseSchema {