4 files changed, 55 insertions, 2 deletions
diff --git a/src/theme_builder/components/conditions/ClickStateConditionEditor.cpp b/src/theme_builder/components/conditions/ClickStateConditionEditor.cpp
index a9170cc5..80d221bd 100644
--- a/src/theme_builder/components/conditions/ClickStateConditionEditor.cpp
+++ b/src/theme_builder/components/conditions/ClickStateConditionEditor.cpp
@@ -61,7 +61,8 @@ ClickStateConditionEditor::GetValue() const {
 }
 
 void ClickStateConditionEditor::SetValue(
-    ClonablePtr<ui::style::ClickStateCondition> value, bool trigger_change) {
+    const ClonablePtr<ui::style::ClickStateCondition>& value,
+    bool trigger_change) {
   click_state_select_.SetSelectedIndex(
       ConvertClickStateToIndex(value->GetClickState()), trigger_change);
 }
diff --git a/src/theme_builder/components/conditions/ClickStateConditionEditor.h b/src/theme_builder/components/conditions/ClickStateConditionEditor.h
index f172f029..4e18c423 100644
--- a/src/theme_builder/components/conditions/ClickStateConditionEditor.h
+++ b/src/theme_builder/components/conditions/ClickStateConditionEditor.h
@@ -13,7 +13,7 @@ class ClickStateConditionEditor : public ConditionEditor {
 
  public:
   ClonablePtr<ui::style::ClickStateCondition> GetValue() const;
-  void SetValue(ClonablePtr<ui::style::ClickStateCondition> value,
+  void SetValue(const ClonablePtr<ui::style::ClickStateCondition>& value,
                 bool trigger_change = true);
 
   ClonablePtr<ui::style::Condition> GetCondition() override {
diff --git a/src/theme_builder/components/conditions/FocusConditionEditor.cpp b/src/theme_builder/components/conditions/FocusConditionEditor.cpp
new file mode 100644
index 00000000..d5d864e1
--- /dev/null
+++ b/src/theme_builder/components/conditions/FocusConditionEditor.cpp
@@ -0,0 +1,23 @@
+#include "FocusConditionEditor.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/style/Condition.h"
+
+namespace cru::theme_builder::components::conditions {
+FocusConditionEditor::FocusConditionEditor() {
+  GetContainer()->AddChild(focus_check_box_.GetRootControl());
+
+  focus_check_box_.ChangeEvent()->AddSpyOnlyHandler(
+      [this] { change_event_.Raise(nullptr); });
+}
+
+FocusConditionEditor::~FocusConditionEditor() {}
+
+ClonablePtr<ui::style::FocusCondition> FocusConditionEditor::GetValue() const {
+  return ui::style::FocusCondition::Create(focus_check_box_.GetValue());
+}
+
+void FocusConditionEditor::SetValue(
+    const ClonablePtr<ui::style::FocusCondition> &value, bool trigger_change) {
+  focus_check_box_.SetValue(value->IsHasFocus(), trigger_change);
+}
+}  // namespace cru::theme_builder::components::conditions
diff --git a/src/theme_builder/components/conditions/FocusConditionEditor.h b/src/theme_builder/components/conditions/FocusConditionEditor.h
new file mode 100644
index 00000000..ab5d40c6
--- /dev/null
+++ b/src/theme_builder/components/conditions/FocusConditionEditor.h
@@ -0,0 +1,29 @@
+#pragma once
+#include "../properties/CheckBoxPropertyEditor.h"
+#include "ConditionEditor.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/style/Condition.h"
+
+namespace cru::theme_builder::components::conditions {
+class FocusConditionEditor : public ConditionEditor {
+ public:
+  FocusConditionEditor();
+  ~FocusConditionEditor() override;
+
+ public:
+  ClonablePtr<ui::style::FocusCondition> GetValue() const;
+  void SetValue(const ClonablePtr<ui::style::FocusCondition>& value,
+                bool trigger_change = true);
+
+  ClonablePtr<ui::style::Condition> GetCondition() override {
+    return GetValue();
+  }
+
+  IEvent<std::nullptr_t>* ChangeEvent() { return &change_event_; }
+
+ private:
+  properties::CheckBoxPropertyEditor focus_check_box_;
+
+  Event<std::nullptr_t> change_event_;
+};
+}  // namespace cru::theme_builder::components::conditions