From fa4bc28d3e442363e016136d070d66760ec2c92e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 11 Oct 2026 15:54:44 -1000
Subject: [PATCH] [text] Build the on_value trigger with
 build_callback_automation (#19613)

---
 esphome/components/text/__init__.py             | 17 ++++-------------
 esphome/components/text/automation.h            | 16 ----------------
 tests/components/text/common-triggers.yaml      | 11 +++++++++++
 .../text/test-triggers.esp8266-ard.yaml         |  3 +++
 4 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 esphome/components/text/automation.h
 create mode 100644 tests/components/text/common-triggers.yaml
 create mode 100644 tests/components/text/test-triggers.esp8266-ard.yaml

diff --git a/esphome/components/text/__init__.py b/esphome/components/text/__init__.py
index fbbc09bd2d..243185b674 100644
--- a/esphome/components/text/__init__.py
+++ b/esphome/components/text/__init__.py
@@ -9,7 +9,6 @@ from esphome.const import (
     CONF_MODE,
     CONF_MQTT_ID,
     CONF_ON_VALUE,
-    CONF_TRIGGER_ID,
     CONF_VALUE,
     CONF_WEB_SERVER,
 )
@@ -30,11 +29,6 @@ text_ns = cg.esphome_ns.namespace("text")
 Text = text_ns.class_("Text", cg.EntityBase)
 TextPtr = Text.operator("ptr")
 
-# Triggers
-TextStateTrigger = text_ns.class_(
-    "TextStateTrigger", automation.Trigger.template(cg.std_string)
-)
-
 # Conditions
 TextMode = text_ns.enum("TextMode")
 
@@ -50,11 +44,7 @@ _TEXT_SCHEMA = (
         {
             cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTTextComponent),
             cv.GenerateID(): cv.declare_id(Text),
-            cv.Optional(CONF_ON_VALUE): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TextStateTrigger),
-                }
-            ),
+            cv.Optional(CONF_ON_VALUE): automation.validate_automation(),
             cv.Required(CONF_MODE): cv.enum(TEXT_MODES, upper=True),
         }
     )
@@ -104,8 +94,9 @@ async def setup_text_core_(
     cg.add(var.traits.set_mode(config[CONF_MODE]))
 
     for conf in config.get(CONF_ON_VALUE, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
+        await automation.build_callback_automation(
+            var, "add_on_state_callback", [(cg.std_string, "x")], conf
+        )
 
     if (mqtt_id := config.get(CONF_MQTT_ID)) is not None:
         mqtt_ = cg.new_Pvariable(mqtt_id, var)
diff --git a/esphome/components/text/automation.h b/esphome/components/text/automation.h
deleted file mode 100644
index bd6fb3cd23..0000000000
--- a/esphome/components/text/automation.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-#include "text.h"
-
-namespace esphome::text {
-
-class TextStateTrigger final : public Trigger<std::string> {
- public:
-  explicit TextStateTrigger(Text *parent) {
-    parent->add_on_state_callback([this](const std::string &value) { this->trigger(value); });
-  }
-};
-
-}  // namespace esphome::text
diff --git a/tests/components/text/common-triggers.yaml b/tests/components/text/common-triggers.yaml
new file mode 100644
index 0000000000..585cb30c2d
--- /dev/null
+++ b/tests/components/text/common-triggers.yaml
@@ -0,0 +1,11 @@
+# on_value with the new text as trigger argument.
+text:
+  - platform: template
+    name: Text Triggers
+    id: text_triggers
+    optimistic: true
+    mode: text
+    on_value:
+      - logger.log:
+          format: "Text is %s"
+          args: ["x.c_str()"]
diff --git a/tests/components/text/test-triggers.esp8266-ard.yaml b/tests/components/text/test-triggers.esp8266-ard.yaml
new file mode 100644
index 0000000000..aecb27e602
--- /dev/null
+++ b/tests/components/text/test-triggers.esp8266-ard.yaml
@@ -0,0 +1,3 @@
+packages:
+  text: !include common.yaml
+  triggers: !include common-triggers.yaml