From 91c504061b90ca64c21d42ce26f833a7ec12d9b5 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 17 Dec 2025 15:19:26 -0700
Subject: [PATCH] [select] Eliminate string allocation in state callbacks
 (#12505)

Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
---
 esphome/components/copy/select/copy_select.cpp | 2 +-
 esphome/components/mqtt/mqtt_select.cpp        | 3 +--
 esphome/components/select/automation.h         | 8 ++++++--
 esphome/components/select/select.cpp           | 5 ++---
 esphome/components/select/select.h             | 4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/esphome/components/copy/select/copy_select.cpp b/esphome/components/copy/select/copy_select.cpp
index e45338e78..e85e08e35 100644
--- a/esphome/components/copy/select/copy_select.cpp
+++ b/esphome/components/copy/select/copy_select.cpp
@@ -7,7 +7,7 @@ namespace copy {
 static const char *const TAG = "copy.select";
 
 void CopySelect::setup() {
-  source_->add_on_state_callback([this](const std::string &value, size_t index) { this->publish_state(index); });
+  source_->add_on_state_callback([this](size_t index) { this->publish_state(index); });
 
   traits.set_options(source_->traits.get_options());
 
diff --git a/esphome/components/mqtt/mqtt_select.cpp b/esphome/components/mqtt/mqtt_select.cpp
index e1660b07e..e48af980c 100644
--- a/esphome/components/mqtt/mqtt_select.cpp
+++ b/esphome/components/mqtt/mqtt_select.cpp
@@ -21,8 +21,7 @@ void MQTTSelectComponent::setup() {
     call.set_option(state);
     call.perform();
   });
-  this->select_->add_on_state_callback(
-      [this](const std::string &state, size_t index) { this->publish_state(this->select_->option_at(index)); });
+  this->select_->add_on_state_callback([this](size_t index) { this->publish_state(this->select_->option_at(index)); });
 }
 
 void MQTTSelectComponent::dump_config() {
diff --git a/esphome/components/select/automation.h b/esphome/components/select/automation.h
index 768f2621f..dda540355 100644
--- a/esphome/components/select/automation.h
+++ b/esphome/components/select/automation.h
@@ -8,9 +8,13 @@ namespace esphome::select {
 
 class SelectStateTrigger : public Trigger<std::string, size_t> {
  public:
-  explicit SelectStateTrigger(Select *parent) {
-    parent->add_on_state_callback([this](const std::string &value, size_t index) { this->trigger(value, index); });
+  explicit SelectStateTrigger(Select *parent) : parent_(parent) {
+    parent->add_on_state_callback(
+        [this](size_t index) { this->trigger(std::string(this->parent_->option_at(index)), index); });
   }
+
+ protected:
+  Select *parent_;
 };
 
 template<typename... Ts> class SelectSetAction : public Action<Ts...> {
diff --git a/esphome/components/select/select.cpp b/esphome/components/select/select.cpp
index 4fc4d79b0..28d7eb07d 100644
--- a/esphome/components/select/select.cpp
+++ b/esphome/components/select/select.cpp
@@ -32,8 +32,7 @@ void Select::publish_state(size_t index) {
   this->state = option;  // Update deprecated member for backward compatibility
 #pragma GCC diagnostic pop
   ESP_LOGD(TAG, "'%s': Sending state %s (index %zu)", this->get_name().c_str(), option, index);
-  // Callback signature requires std::string, create temporary for compatibility
-  this->state_callback_.call(std::string(option), index);
+  this->state_callback_.call(index);
 #if defined(USE_SELECT) && defined(USE_CONTROLLER_REGISTRY)
   ControllerRegistry::notify_select_update(this);
 #endif
@@ -41,7 +40,7 @@ void Select::publish_state(size_t index) {
 
 const char *Select::current_option() const { return this->has_state() ? this->option_at(this->active_index_) : ""; }
 
-void Select::add_on_state_callback(std::function<void(std::string, size_t)> &&callback) {
+void Select::add_on_state_callback(std::function<void(size_t)> &&callback) {
   this->state_callback_.add(std::move(callback));
 }
 
diff --git a/esphome/components/select/select.h b/esphome/components/select/select.h
index 63707f6bd..854fdcf25 100644
--- a/esphome/components/select/select.h
+++ b/esphome/components/select/select.h
@@ -75,7 +75,7 @@ class Select : public EntityBase {
   /// Return the option value at the provided index offset (as const char* from flash).
   const char *option_at(size_t index) const;
 
-  void add_on_state_callback(std::function<void(std::string, size_t)> &&callback);
+  void add_on_state_callback(std::function<void(size_t)> &&callback);
 
  protected:
   friend class SelectCall;
@@ -111,7 +111,7 @@ class Select : public EntityBase {
     }
   }
 
-  CallbackManager<void(std::string, size_t)> state_callback_;
+  CallbackManager<void(size_t)> state_callback_;
 };
 
 }  // namespace esphome::select