3 files changed, 32 insertions, 0 deletions
diff --git a/src/theme_builder/components/properties/ColorPropertyEditor.h b/src/theme_builder/components/properties/ColorPropertyEditor.h
index 7c7155ab..3ee0933b 100644
--- a/src/theme_builder/components/properties/ColorPropertyEditor.h
+++ b/src/theme_builder/components/properties/ColorPropertyEditor.h
@@ -13,6 +13,8 @@ class ColorPropertyEditor : public ui::components::Component {
   ~ColorPropertyEditor() override;
 
  public:
+  ui::controls::Control* GetRootControl() override { return &container_; }
+
   String GetLabel() const { return label_.GetText(); }
   void SetLabel(String label) { label_.SetText(std::move(label)); }
 
diff --git a/src/theme_builder/components/properties/CornerRadiusPropertyEditor.h b/src/theme_builder/components/properties/CornerRadiusPropertyEditor.h
index de55cdd4..04de2adf 100644
--- a/src/theme_builder/components/properties/CornerRadiusPropertyEditor.h
+++ b/src/theme_builder/components/properties/CornerRadiusPropertyEditor.h
@@ -9,6 +9,8 @@ class CornerRadiusPropertyEditor : public ui::components::Component {
   CornerRadiusPropertyEditor();
   ~CornerRadiusPropertyEditor() override;
 
+  ui::controls::Control* GetRootControl() override { return &container_; }
+
   ui::CornerRadius GetCornerRadius() const { return corner_radius_; }
   void SetCornerRadius(const ui::CornerRadius& corner_radius);
 
diff --git a/src/theme_builder/components/properties/OptionalPropertyEditor.h b/src/theme_builder/components/properties/OptionalPropertyEditor.h
new file mode 100644
index 00000000..e343727f
--- /dev/null
+++ b/src/theme_builder/components/properties/OptionalPropertyEditor.h
@@ -0,0 +1,28 @@
+#pragma once
+#include "cru/ui/components/Component.h"
+#include "cru/ui/controls/CheckBox.h"
+#include "cru/ui/controls/FlexLayout.h"
+
+namespace cru::theme_builder::components::properties {
+template <typename TEditor>
+class OptionalPropertyEditor : public ui::components::Component {
+ public:
+  OptionalPropertyEditor() {
+    container_.AddChild(&check_box_);
+    container_.AddChild(editor_->GetRootControl());
+  }
+  ~OptionalPropertyEditor() override { container_.RemoveFromParent(); }
+
+  ui::controls::Control* GetRootControl() override { return &container_; }
+
+  bool IsEnabled() const { return check_box_.IsChecked(); }
+  void SetEnabled(bool enabled) { check_box_.SetChecked(enabled); }
+
+  TEditor* GetEditor() { return &editor_; }
+
+ private:
+  ui::controls::FlexLayout container_;
+  ui::controls::CheckBox check_box_;
+  TEditor editor_;
+};
+}  // namespace cru::theme_builder::components::properties