Make component more functionnal

examples/component/tab_horizontal.cpp

@@ -1,71 +1,77 @@
-#include <functional>  // for function
-#include <string>      // for wstring, allocator
-#include <vector>      // for vector
+#include <memory>  // for __shared_ptr_access
+#include <string>  // for wstring, allocator, basic_string
+#include <vector>  // for vector
 
-#include "ftxui/component/component.hpp"           // for Component
-#include "ftxui/component/container.hpp"           // for Container
-#include "ftxui/component/radiobox.hpp"            // for RadioBox
-#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
-#include "ftxui/component/toggle.hpp"              // for Toggle
-#include "ftxui/dom/elements.hpp"                  // for Element, operator|
-#include "ftxui/screen/box.hpp"                    // for ftxui
+#include "ftxui/component/captured_mouse.hpp"  // for ftxui
+#include "ftxui/component/component.hpp"       // for Radiobox, Make, Toggle
+#include "ftxui/component/component_base.hpp"  // for ComponentBase
+#include "ftxui/component/container.hpp"       // for Container
+#include "ftxui/component/screen_interactive.hpp"  // for Component, ScreenInteractive
+#include "ftxui/dom/elements.hpp"  // for Element, separator, operator|, vbox, border
 
 using namespace ftxui;
 
-class MyComponent : public Component {
+class MyComponent : public ComponentBase {
+ private:
+  std::vector<std::wstring> tab_values_ = {
+      L"tab_1",
+      L"tab_2",
+      L"tab_3",
+  };
+  int tab_selected_ = 0;
+  Component tab_toggle_ = Toggle(&tab_values_, &tab_selected_);
+
+  std::vector<std::wstring> tab_1_entries_ = {
+      L"Forest",
+      L"Water",
+      L"I don't know",
+  };
+  int tab_1_selected_ = 0;
+
+  std::vector<std::wstring> tab_2_entries_ = {
+      L"Hello",
+      L"Hi",
+      L"Hay",
+  };
+  int tab_2_selected_ = 0;
+
+  std::vector<std::wstring> tab_3_entries_ = {
+      L"Table",
+      L"Nothing",
+      L"Is",
+      L"Empty",
+  };
+  int tab_3_selected_ = 0;
+
+  Component tab_container_ =
+      Container::Tab(&tab_selected_,
+                     {
+                         Radiobox(&tab_1_entries_, &tab_1_selected_),
+                         Radiobox(&tab_2_entries_, &tab_2_selected_),
+                         Radiobox(&tab_3_entries_, &tab_3_selected_),
+                     });
+
+  Component container_ = Container::Vertical({
+      tab_toggle_,
+      tab_container_,
+  });
+
  public:
-  MyComponent() {
-    Add(&container_);
-    container_.Add(&toggle_);
-
-    toggle_.entries = {
-        L"tab_1",
-        L"tab_2",
-        L"tab_3",
-    };
-
-    container_.Add(&tab_container_);
-
-    radiobox_1_.entries = {L"Forest", L"Water", L"I don't know"};
-    tab_container_.Add(&radiobox_1_);
-
-    radiobox_2_.entries = {
-        L"Hello",
-        L"Hi",
-        L"Hay",
-    };
-    tab_container_.Add(&radiobox_2_);
-
-    radiobox_3_.entries = {
-        L"Table",
-        L"Nothing",
-        L"Is",
-        L"Empty",
-    };
-    tab_container_.Add(&radiobox_3_);
-  }
-
-  std::function<void()> on_enter = []() {};
+  MyComponent() { Add(container_); }
 
   Element Render() {
-    return vbox(toggle_.Render(), separator(), tab_container_.Render()) |
+    return vbox({
+               tab_toggle_->Render(),
+               separator(),
+               tab_container_->Render(),
+           }) |
            border;
   }
-
- private:
-  Toggle toggle_;
-  Container container_ = Container::Vertical();
-  Container tab_container_ = Container::Tab(&(toggle_.selected));
-  RadioBox radiobox_1_;
-  RadioBox radiobox_2_;
-  RadioBox radiobox_3_;
 };
 
 int main(int argc, const char* argv[]) {
   auto screen = ScreenInteractive::TerminalOutput();
-  MyComponent component;
-  component.on_enter = screen.ExitLoopClosure();
-  screen.Loop(&component);
+  screen.Loop(Make<MyComponent>());
 }
 
 // Copyright 2020 Arthur Sonzogni. All rights reserved.