From 380c7379018ebdcd25a8240cc5b588d00bf3f55e Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Fri, 18 Jul 2025 20:41:59 +0200
Subject: [PATCH] Add reorder option to entity selector (#149002)

---
 homeassistant/helpers/selector.py                       | 2 ++
 tests/components/blueprint/snapshots/test_importer.ambr | 2 ++
 tests/helpers/test_selector.py                          | 5 +++++
 tests/helpers/test_service.py                           | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/homeassistant/helpers/selector.py b/homeassistant/helpers/selector.py
index 7bd1ee9ddf3..9eaedc6f5ef 100644
--- a/homeassistant/helpers/selector.py
+++ b/homeassistant/helpers/selector.py
@@ -813,6 +813,7 @@ class EntitySelectorConfig(BaseSelectorConfig, EntityFilterSelectorConfig, total
     exclude_entities: list[str]
     include_entities: list[str]
     multiple: bool
+    reorder: bool
     filter: EntityFilterSelectorConfig | list[EntityFilterSelectorConfig]
 
 
@@ -829,6 +830,7 @@ class EntitySelector(Selector[EntitySelectorConfig]):
             vol.Optional("exclude_entities"): [str],
             vol.Optional("include_entities"): [str],
             vol.Optional("multiple", default=False): cv.boolean,
+            vol.Optional("reorder", default=False): cv.boolean,
             vol.Optional("filter"): vol.All(
                 cv.ensure_list,
                 [ENTITY_FILTER_SELECTOR_CONFIG_SCHEMA],
diff --git a/tests/components/blueprint/snapshots/test_importer.ambr b/tests/components/blueprint/snapshots/test_importer.ambr
index 38cb3b485d4..fdfd3f6b285 100644
--- a/tests/components/blueprint/snapshots/test_importer.ambr
+++ b/tests/components/blueprint/snapshots/test_importer.ambr
@@ -203,6 +203,7 @@
             'light',
           ]),
           'multiple': False,
+          'reorder': False,
         }),
       }),
     }),
@@ -217,6 +218,7 @@
             'binary_sensor',
           ]),
           'multiple': False,
+          'reorder': False,
         }),
       }),
     }),
diff --git a/tests/helpers/test_selector.py b/tests/helpers/test_selector.py
index dc25206177b..9e8f1b15311 100644
--- a/tests/helpers/test_selector.py
+++ b/tests/helpers/test_selector.py
@@ -231,6 +231,11 @@ def test_device_selector_schema_error(schema) -> None:
                 ["sensor.abc123", "sensor.ghi789"],
             ),
         ),
+        (
+            {"multiple": True, "reorder": True},
+            ((["sensor.abc123", "sensor.def456"],)),
+            (None, "abc123", ["sensor.abc123", None]),
+        ),
         (
             {"filter": {"domain": "light"}},
             ("light.abc123", FAKE_UUID),
diff --git a/tests/helpers/test_service.py b/tests/helpers/test_service.py
index f4d0846c262..8f094536988 100644
--- a/tests/helpers/test_service.py
+++ b/tests/helpers/test_service.py
@@ -1091,6 +1091,7 @@ async def test_async_get_all_descriptions_filter(hass: HomeAssistant) -> None:
                                     }
                                 ],
                                 "multiple": False,
+                                "reorder": False,
                             },
                         },
                     },
@@ -1113,6 +1114,7 @@ async def test_async_get_all_descriptions_filter(hass: HomeAssistant) -> None:
                             }
                         ],
                         "multiple": False,
+                        "reorder": False,
                     },
                 },
             },