From 22959ea1cf888b6b8a5e1b26280b7c68b7fb0955 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 24 Sep 2026 13:56:40 +0100
Subject: [PATCH] [light] Use register_apply_condition for light.is_on and
 light.is_off (#19556)

---
 esphome/components/light/automation.h  | 17 --------------
 esphome/components/light/automation.py | 31 +++++++++-----------------
 esphome/components/light/types.py      |  2 --
 tests/components/light/common.yaml     | 11 +++++++++
 4 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/esphome/components/light/automation.h b/esphome/components/light/automation.h
index 5ce5f1ee60..2e963479f7 100644
--- a/esphome/components/light/automation.h
+++ b/esphome/components/light/automation.h
@@ -117,23 +117,6 @@ template<bool Forward, typename... Ts> class LightEffectCycleAction final : publ
   bool include_none_{false};
 };
 
-template<typename... Ts> class LightIsOnCondition final : public Condition<Ts...> {
- public:
-  explicit LightIsOnCondition(LightState *state) : state_(state) {}
-  bool check(const Ts &...x) override { return this->state_->current_values.is_on(); }
-
- protected:
-  LightState *state_;
-};
-template<typename... Ts> class LightIsOffCondition final : public Condition<Ts...> {
- public:
-  explicit LightIsOffCondition(LightState *state) : state_(state) {}
-  bool check(const Ts &...x) override { return !this->state_->current_values.is_on(); }
-
- protected:
-  LightState *state_;
-};
-
 class LightTurnOnTrigger final : public Trigger<>, public LightRemoteValuesListener {
  public:
   explicit LightTurnOnTrigger(LightState *a_light) : light_(a_light) {
diff --git a/esphome/components/light/automation.py b/esphome/components/light/automation.py
index d84df33a23..5ae2660774 100644
--- a/esphome/components/light/automation.py
+++ b/esphome/components/light/automation.py
@@ -38,8 +38,6 @@ from .types import (
     ColorMode,
     DimRelativeAction,
     LightEffectCycleAction,
-    LightIsOffCondition,
-    LightIsOnCondition,
     LightState,
     ToggleAction,
 )
@@ -381,24 +379,15 @@ async def light_addressable_set_to_code(config, action_id, template_arg, args):
     return var
 
 
-@automation.register_condition(
-    "light.is_on",
-    LightIsOnCondition,
-    automation.maybe_simple_id(
-        {
-            cv.Required(CONF_ID): cv.use_id(LightState),
-        }
-    ),
+LIGHT_CONDITION_SCHEMA = automation.maybe_simple_id(
+    {
+        cv.Required(CONF_ID): cv.use_id(LightState),
+    }
 )
-@automation.register_condition(
-    "light.is_off",
-    LightIsOffCondition,
-    automation.maybe_simple_id(
-        {
-            cv.Required(CONF_ID): cv.use_id(LightState),
-        }
-    ),
+
+automation.register_apply_condition(
+    "light.is_on", LIGHT_CONDITION_SCHEMA, "current_values.is_on()"
+)
+automation.register_apply_condition(
+    "light.is_off", LIGHT_CONDITION_SCHEMA, "current_values.is_on() == false"
 )
-async def light_is_on_off_to_code(config, condition_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(condition_id, template_arg, paren)
diff --git a/esphome/components/light/types.py b/esphome/components/light/types.py
index 4d2de314f6..ceb974f26d 100644
--- a/esphome/components/light/types.py
+++ b/esphome/components/light/types.py
@@ -44,8 +44,6 @@ ToggleAction = light_ns.class_("ToggleAction", automation.Action)
 LightEffectCycleAction = light_ns.class_("LightEffectCycleAction", automation.Action)
 DimRelativeAction = light_ns.class_("DimRelativeAction", automation.Action)
 AddressableSet = light_ns.class_("AddressableSet", automation.Action)
-LightIsOnCondition = light_ns.class_("LightIsOnCondition", automation.Condition)
-LightIsOffCondition = light_ns.class_("LightIsOffCondition", automation.Condition)
 
 # Triggers
 LightTurnOnTrigger = light_ns.class_(
diff --git a/tests/components/light/common.yaml b/tests/components/light/common.yaml
index 5ba245e7c3..5dc7091e40 100644
--- a/tests/components/light/common.yaml
+++ b/tests/components/light/common.yaml
@@ -68,6 +68,17 @@ esphome:
 
       - light.toggle: test_binary_light
       - light.turn_off: test_rgb_light
+      - if:
+          condition:
+            light.is_on: test_binary_light
+          then:
+            - logger.log: binary light is on
+      - if:
+          condition:
+            light.is_off:
+              id: test_rgb_light
+          then:
+            - logger.log: rgb light is off
       - light.turn_on:
           id: test_rgb_light
           brightness: 100%