From e8943975035e93923830820428b06b3677bab8f9 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 9 Oct 2026 15:39:25 -1000
Subject: [PATCH] [datetime] Build on_value with build_callback_automation
 (#20445)

---
 esphome/components/datetime/__init__.py       | 20 +++++++++----------
 esphome/components/datetime/datetime_base.h   | 10 ----------
 .../components/datetime/common-triggers.yaml  | 10 ++++++++++
 .../datetime/test-triggers.esp8266-ard.yaml   |  3 +++
 4 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 tests/components/datetime/common-triggers.yaml
 create mode 100644 tests/components/datetime/test-triggers.esp8266-ard.yaml

diff --git a/esphome/components/datetime/__init__.py b/esphome/components/datetime/__init__.py
index de79c05a9f..20fd258cb0 100644
--- a/esphome/components/datetime/__init__.py
+++ b/esphome/components/datetime/__init__.py
@@ -43,9 +43,6 @@ DateEntity = datetime_ns.class_("DateEntity", DateTimeBase)
 TimeEntity = datetime_ns.class_("TimeEntity", DateTimeBase)
 DateTimeEntity = datetime_ns.class_("DateTimeEntity", DateTimeBase)
 
-DateTimeStateTrigger = datetime_ns.class_(
-    "DateTimeStateTrigger", automation.Trigger.template(cg.ESPTime)
-)
 
 OnTimeTrigger = datetime_ns.class_(
     "OnTimeTrigger", automation.Trigger, cg.Component, cg.Parented.template(TimeEntity)
@@ -75,11 +72,7 @@ def _validate_time_present(config: ConfigType) -> ConfigType:
 _DATETIME_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
     cv.Schema(
         {
-            cv.Optional(CONF_ON_VALUE): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DateTimeStateTrigger),
-                }
-            ),
+            cv.Optional(CONF_ON_VALUE): automation.validate_automation({}),
             cv.Optional(CONF_TIME_ID): cv.use_id(time.RealTimeClock),
         }
     )
@@ -144,9 +137,16 @@ async def setup_datetime_core_(var: MockObj, config: ConfigType) -> None:
         await mqtt.register_mqtt_component(mqtt_, config)
     if web_server_config := config.get(CONF_WEB_SERVER):
         await web_server.add_entity_config(var, web_server_config)
+    # The state callback carries nothing; the automation gets the value as an ESPTime.
     for conf in config.get(CONF_ON_VALUE, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [(cg.ESPTime, "x")], conf)
+        await automation.build_callback_automation(
+            var,
+            "add_on_state_callback",
+            [(cg.ESPTime, "x")],
+            conf,
+            params=[],
+            forward=[automation.parent_ref(var).state_as_esptime()],
+        )
 
     if CONF_TIME_ID in config:
         rtc = await cg.get_variable(config[CONF_TIME_ID])
diff --git a/esphome/components/datetime/datetime_base.h b/esphome/components/datetime/datetime_base.h
index f99debb692..fdbb193006 100644
--- a/esphome/components/datetime/datetime_base.h
+++ b/esphome/components/datetime/datetime_base.h
@@ -31,14 +31,4 @@ class DateTimeBase : public EntityBase {
 #endif
 };
 
-class DateTimeStateTrigger final : public Trigger<ESPTime> {
- public:
-  explicit DateTimeStateTrigger(DateTimeBase *parent) : parent_(parent) {
-    parent->add_on_state_callback([this]() { this->trigger(this->parent_->state_as_esptime()); });
-  }
-
- protected:
-  DateTimeBase *parent_;
-};
-
 }  // namespace esphome::datetime
diff --git a/tests/components/datetime/common-triggers.yaml b/tests/components/datetime/common-triggers.yaml
new file mode 100644
index 0000000000..e93e8b2b51
--- /dev/null
+++ b/tests/components/datetime/common-triggers.yaml
@@ -0,0 +1,10 @@
+datetime:
+  - platform: template
+    name: Datetime Trigger Test
+    id: datetime_trigger_test
+    type: datetime
+    optimistic: true
+    on_value:
+      - logger.log:
+          format: "New value %04d-%02d-%02d"
+          args: [x.year, x.month, x.day_of_month]
diff --git a/tests/components/datetime/test-triggers.esp8266-ard.yaml b/tests/components/datetime/test-triggers.esp8266-ard.yaml
new file mode 100644
index 0000000000..3829bedb1a
--- /dev/null
+++ b/tests/components/datetime/test-triggers.esp8266-ard.yaml
@@ -0,0 +1,3 @@
+packages:
+  datetime: !include common.yaml
+  triggers: !include common-triggers.yaml