Remove radiobox.hpp

CMakeLists.txt

@@ -78,7 +78,6 @@ add_library(component STATIC
   include/ftxui/component/component_base.hpp
   include/ftxui/component/event.hpp
   include/ftxui/component/mouse.hpp
-  include/ftxui/component/radiobox.hpp
   include/ftxui/component/receiver.hpp
   include/ftxui/component/screen_interactive.hpp
   include/ftxui/component/toggle.hpp

include/ftxui/component/component_options.hpp

@@ -58,6 +58,8 @@ struct RadioboxOption {
 
   /// Called when the selected entry changes.
   std::function<void()> on_change = []() {};
+
+  Ref<int> focused_entry = 0;
 };
 
 /// @brief Option for the Toggle component.

include/ftxui/component/radiobox.hpp

@@ -1,52 +0,0 @@
-#ifndef FTXUI_COMPONENT_RADIOBOX_HPP
-#define FTXUI_COMPONENT_RADIOBOX_HPP
-
-#include <functional>  // for function
-#include <string>      // for wstring, allocator
-#include <vector>      // for vector
-
-#include "ftxui/component/component.hpp"       // for Component
-#include "ftxui/component/component_base.hpp"  // for ComponentBase
-#include "ftxui/dom/elements.hpp"  // for Element, Decorator, inverted, nothing
-#include "ftxui/screen/box.hpp"    // for Box
-
-namespace ftxui {
-struct Event;
-
-/// @brief A list of selectable element. One and only one can be selected at
-/// the same time.
-/// @ingroup component
-class RadioboxBase : public ComponentBase {
- public:
-  // Access this interface from a Component
-  static RadioboxBase* From(Component component);
-
-  // Constructor.
-  RadioboxBase(const std::vector<std::wstring>* entries,
-               int* selected,
-               Ref<RadioboxOption> option = {});
-  ~RadioboxBase() override = default;
-
-  int focused = 0;
-
-  // Component implementation.
-  Element Render() override;
-  bool OnEvent(Event) override;
-
- private:
-  const std::vector<std::wstring>* const entries_;
-  int* const selected_;
-
-  bool OnMouseEvent(Event event);
-  int cursor_position = 0;
-  std::vector<Box> boxes_;
-  Ref<RadioboxOption> option_;
-};
-
-}  // namespace ftxui
-
-#endif /* end of include guard: FTXUI_COMPONENT_RADIOBOX_HPP */
-
-// Copyright 2020 Arthur Sonzogni. All rights reserved.
-// Use of this source code is governed by the MIT license that can be found in
-// the LICENSE file.

src/ftxui/component/radiobox.cpp

@@ -5,13 +5,127 @@
 #include <utility>     // for move
 
 #include "ftxui/component/captured_mouse.hpp"  // for CapturedMouse
+#include "ftxui/component/component.hpp"       // for Component
 #include "ftxui/component/event.hpp"  // for Event, Event::ArrowDown, Event::ArrowUp, Event::Return, Event::Tab, Event::TabReverse
 #include "ftxui/component/mouse.hpp"  // for Mouse, Mouse::Left, Mouse::Pressed
-#include "ftxui/component/radiobox.hpp"
 #include "ftxui/component/screen_interactive.hpp"  // for Component
 
 namespace ftxui {
 
+namespace {
+/// @brief A list of selectable element. One and only one can be selected at
+/// the same time.
+/// @ingroup component
+class RadioboxBase : public ComponentBase {
+ public:
+  RadioboxBase(const std::vector<std::wstring>* entries,
+               int* selected,
+               Ref<RadioboxOption> option)
+      : entries_(entries), selected_(selected), option_(std::move(option)) {
+#if defined(FTXUI_MICROSOFT_TERMINAL_FALLBACK)
+    // Microsoft terminal do not use fonts able to render properly the default
+    // radiobox glyph.
+    if (option_->checked == L"◉ ")
+      option_->checked = L"(*)";
+    if (option_->unchecked == L"○ ")
+      option_->unchecked = L"( )";
+#endif
+  }
+  ~RadioboxBase() override = default;
+
+ private:
+
+  Element Render() override {
+    std::vector<Element> elements;
+    bool is_focused = Focused();
+    boxes_.resize(entries_->size());
+    for (size_t i = 0; i < entries_->size(); ++i) {
+      auto style = (focused_entry() == int(i) && is_focused)
+                       ? option_->style_focused
+                       : option_->style_unfocused;
+      auto focus_management = (focused_entry() != int(i)) ? nothing
+                              : is_focused                ? focus
+                                                          : select;
+
+      const std::wstring& symbol = *selected_ == int(i)
+                                       ? option_->style_checked
+                                       : option_->style_unchecked;
+      elements.push_back(hbox(text(symbol), text(entries_->at(i)) | style) |
+                         focus_management | reflect(boxes_[i]));
+    }
+    return vbox(std::move(elements));
+  }
+
+  bool OnEvent(Event event) override {
+    if (!CaptureMouse(event))
+      return false;
+    if (event.is_mouse())
+      return OnMouseEvent(event);
+
+    if (!Focused())
+      return false;
+
+    int new_focused = focused_entry();
+    if (event == Event::ArrowUp || event == Event::Character('k'))
+      new_focused--;
+    if (event == Event::ArrowDown || event == Event::Character('j'))
+      new_focused++;
+    if (event == Event::Tab && entries_->size())
+      new_focused = (new_focused + 1) % entries_->size();
+    if (event == Event::TabReverse && entries_->size())
+      new_focused = (new_focused + entries_->size() - 1) % entries_->size();
+
+    new_focused = std::max(0, std::min(int(entries_->size()) - 1, new_focused));
+
+    if (focused_entry() != new_focused) {
+      focused_entry() = new_focused;
+      return true;
+    }
+
+    if (event == Event::Character(' ') || event == Event::Return) {
+      *selected_ = focused_entry();
+      option_->on_change();
+    }
+
+    return false;
+  }
+
+  bool OnMouseEvent(Event event) {
+    if (!CaptureMouse(event))
+      return false;
+    for (int i = 0; i < int(boxes_.size()); ++i) {
+      if (!boxes_[i].Contain(event.mouse().x, event.mouse().y))
+        continue;
+
+      focused_entry() = i;
+      TakeFocus();
+
+      if (event.mouse().button == Mouse::Left &&
+          event.mouse().motion == Mouse::Pressed) {
+        cursor_position = i;
+        TakeFocus();
+        if (*selected_ != i) {
+          *selected_ = i;
+          option_->on_change();
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+
+  int& focused_entry() { return option_->focused_entry(); }
+
+  const std::vector<std::wstring>* const entries_;
+  int* const selected_;
+
+  int cursor_position = 0;
+  std::vector<Box> boxes_;
+  Ref<RadioboxOption> option_;
+};
+
+}  // namespace
+
 /// @brief A list of element, where only one can be selected.
 /// @param entries The list of entries in the list.
 /// @param selected The index of the currently selected element.
@@ -45,103 +159,6 @@ Component Radiobox(const std::vector<std::wstring>* entries,
   return Make<RadioboxBase>(entries, selected, std::move(option));
 }
 
-// static
-RadioboxBase* RadioboxBase::From(Component component) {
-  return static_cast<RadioboxBase*>(component.get());
-}
-
-RadioboxBase::RadioboxBase(const std::vector<std::wstring>* entries,
-                           int* selected,
-                           Ref<RadioboxOption> option)
-    : entries_(entries), selected_(selected), option_(std::move(option)) {
-#if defined(FTXUI_MICROSOFT_TERMINAL_FALLBACK)
-  // Microsoft terminal do not use fonts able to render properly the default
-  // radiobox glyph.
-  if (option_->checked == L"◉ ")
-    option_->checked = L"(*)";
-  if (option_->unchecked == L"○ ")
-    option_->unchecked = L"( )";
-#endif
-}
-
-Element RadioboxBase::Render() {
-  std::vector<Element> elements;
-  bool is_focused = Focused();
-  boxes_.resize(entries_->size());
-  for (size_t i = 0; i < entries_->size(); ++i) {
-    auto style = (focused == int(i) && is_focused) ? option_->style_focused
-                                                   : option_->style_unfocused;
-    auto focus_management = (focused != int(i)) ? nothing
-                            : is_focused        ? focus
-                                                : select;
-
-    const std::wstring& symbol = *selected_ == int(i)
-                                     ? option_->style_checked
-                                     : option_->style_unchecked;
-    elements.push_back(hbox(text(symbol), text(entries_->at(i)) | style) |
-                       focus_management | reflect(boxes_[i]));
-  }
-  return vbox(std::move(elements));
-}
-
-bool RadioboxBase::OnEvent(Event event) {
-  if (!CaptureMouse(event))
-    return false;
-  if (event.is_mouse())
-    return OnMouseEvent(event);
-
-  if (!Focused())
-    return false;
-
-  int new_focused = focused;
-  if (event == Event::ArrowUp || event == Event::Character('k'))
-    new_focused--;
-  if (event == Event::ArrowDown || event == Event::Character('j'))
-    new_focused++;
-  if (event == Event::Tab && entries_->size())
-    new_focused = (new_focused + 1) % entries_->size();
-  if (event == Event::TabReverse && entries_->size())
-    new_focused = (new_focused + entries_->size() - 1) % entries_->size();
-
-  new_focused = std::max(0, std::min(int(entries_->size()) - 1, new_focused));
-
-  if (focused != new_focused) {
-    focused = new_focused;
-    return true;
-  }
-
-  if (event == Event::Character(' ') || event == Event::Return) {
-    *selected_ = focused;
-    option_->on_change();
-  }
-
-  return false;
-}
-
-bool RadioboxBase::OnMouseEvent(Event event) {
-  if (!CaptureMouse(event))
-    return false;
-  for (int i = 0; i < int(boxes_.size()); ++i) {
-    if (!boxes_[i].Contain(event.mouse().x, event.mouse().y))
-      continue;
-
-    focused = i;
-    TakeFocus();
-
-    if (event.mouse().button == Mouse::Left &&
-        event.mouse().motion == Mouse::Pressed) {
-      cursor_position = i;
-      TakeFocus();
-      if (*selected_ != i) {
-        *selected_ = i;
-        option_->on_change();
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
 }  // namespace ftxui
 
 // Copyright 2020 Arthur Sonzogni. All rights reserved.

src/ftxui/component/radiobox_test.cpp

@@ -2,9 +2,9 @@
 #include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiResolver, TestFactoryImpl
 #include <memory>                   // for __shared_ptr_access, shared_ptr
 
+#include "ftxui/component/component.hpp"
 #include "ftxui/component/event.hpp"  // for Event, Event::Return, Event::ArrowDown, Event::ArrowUp, Event::Tab, Event::TabReverse
 #include "ftxui/component/mouse.hpp"  // for ftxui
-#include "ftxui/component/radiobox.hpp"
 #include "gtest/gtest_pred_impl.h"    // for EXPECT_EQ, Test, TEST
 
 using namespace ftxui;