Add {Const,}StringRef to simplify components.

examples/component/button.cpp

@@ -1,20 +1,21 @@
-#include <string>  // for operator+, to_wstring, allocator, wstring
+#include <memory>  // for __shared_ptr_access, shared_ptr
+#include <string>  // for operator+, to_wstring
 
-#include "ftxui/component/component.hpp"           // for Button, Make
-#include "ftxui/component/container.hpp"           // for Container
+#include "ftxui/component/captured_mouse.hpp"  // for ftxui
+#include "ftxui/component/component.hpp"  // for Button, Horizontal, Renderer
+#include "ftxui/component/component_base.hpp"      // for ComponentBase
 #include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
+#include "ftxui/dom/elements.hpp"  // for separator, Element, gauge, text, operator|, vbox, border
 
 using namespace ftxui;
 
 int main(int argc, const char* argv[]) {
   int value = 50;
-  std::wstring label_dec = L"decrease";
-  std::wstring label_inc = L"increase";
 
   // The tree of components. This defines how to navigate using the keyboard.
   auto buttons = Container::Horizontal({
-      Button(&label_dec, [&] { value--; }),
-      Button(&label_inc, [&] { value++; }),
+      Button("Decrease", [&] { value--; }),
+      Button("Increase", [&] { value++; }),
   });
 
   // Modify the way to render them on screen:

examples/component/checkbox.cpp

@@ -1,24 +1,19 @@
 #include "ftxui/component/checkbox.hpp"
-#include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"       // for Checkbox, Make
-#include "ftxui/component/container.hpp"       // for Container
-#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive, Component
+#include "ftxui/component/captured_mouse.hpp"      // for ftxui
+#include "ftxui/component/component.hpp"           // for Checkbox, Vertical
+#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
 
 using namespace ftxui;
 
 int main(int argc, const char* argv[]) {
-  std::wstring build_examples_label = L"Build examples";
-  std::wstring build_tests_label = L"Build tests";
-  std::wstring use_webassembly_label = L"Use WebAssembly";
-
   bool build_examples_state = false;
   bool build_tests_state = false;
   bool use_webassembly_state = true;
 
   auto component = Container::Vertical({
-      Checkbox(&build_examples_label, &build_examples_state),
-      Checkbox(&build_tests_label, &build_tests_state),
-      Checkbox(&use_webassembly_label, &use_webassembly_state),
+      Checkbox("Build examples", &build_examples_state),
+      Checkbox("Build tests", &build_tests_state),
+      Checkbox("Use WebAssembly", &use_webassembly_state),
   });
 
   auto screen = ScreenInteractive::TerminalOutput();

examples/component/checkbox_in_frame.cpp

@@ -1,18 +1,17 @@
-#include <memory>  // for unique_ptr, make_unique, __shared_ptr_access
-#include <string>  // for operator+, wstring
+#include <memory>  // for __shared_ptr_access, allocator_traits<>::value_type, shared_ptr
+#include <string>  // for operator+
 #include <vector>  // for vector
 
-#include "ftxui/component/component.hpp"       // for Checkbox, Make
-#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, operator|, size, vbox, border, frame, Elements, HEIGHT, LESS_THAN
+#include "ftxui/component/captured_mouse.hpp"  // for ftxui
+#include "ftxui/component/component.hpp"  // for Checkbox, Renderer, Vertical
+#include "ftxui/component/component_base.hpp"      // for ComponentBase
+#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
+#include "ftxui/dom/elements.hpp"  // for Element, operator|, size, border, frame, HEIGHT, LESS_THAN
 #include "ftxui/screen/string.hpp"  // for to_wstring
 
 using namespace ftxui;
 
 struct CheckboxState {
-  std::wstring label;
   bool checked;
 };
 
@@ -20,10 +19,9 @@ int main(int argc, const char* argv[]) {
   int size = 30;
   std::vector<CheckboxState> states(size);
   auto container = Container::Vertical({});
-  for(int i = 0; i<size; ++i) {
+  for (int i = 0; i < size; ++i) {
     states[i].checked = false;
-    states[i].label = L"Checkbox " + to_wstring(i);
-    container->Add(Checkbox(&states[i].label, &states[i].checked));
+    container->Add(Checkbox(L"Checkbox" + to_wstring(i), &states[i].checked));
   }
 
   auto component = Renderer(container, [&] {

examples/component/gallery.cpp

@@ -1,14 +1,13 @@
 #include <functional>  // for function
-#include <memory>      // for allocator, __shared_ptr_access
+#include <memory>      // for shared_ptr, allocator, __shared_ptr_access
 #include <string>      // for wstring, basic_string
 #include <vector>      // for vector
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"  // for Slider, Checkbox, Button, Input, Make, Menu, Radiobox, Toggle
+#include "ftxui/component/component.hpp"  // for Slider, Checkbox, Vertical, Renderer, Button, Input, Menu, Radiobox, 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 separator, operator|, Element, size, xflex, text, WIDTH, hbox, vbox, EQUAL, LESS_THAN, border, GREATER_THAN
+#include "ftxui/dom/elements.hpp"  // for separator, Element, operator|, size, xflex, text, WIDTH, hbox, vbox, EQUAL, border, GREATER_THAN
 
 using namespace ftxui;
 
@@ -27,7 +26,8 @@ Component Wrap(std::wstring name, Component component) {
 int main(int argc, const char* argv[]) {
   auto screen = ScreenInteractive::FitComponent();
 
-  // -- Menu ----------------------------------------------------------------------
+  // -- Menu
+  // ----------------------------------------------------------------------
   const std::vector<std::wstring> menu_entries = {
       L"Menu 1",
       L"Menu 2",
@@ -48,14 +48,12 @@ int main(int argc, const char* argv[]) {
   toggle = Wrap(L"Toggle", toggle);
 
   // -- Checkbox ---------------------------------------------------------------
-  std::wstring checkbox_1_label = L"checkbox1";
-  std::wstring checkbox_2_label = L"checkbox2";
   bool checkbox_1_selected = false;
   bool checkbox_2_selected = false;
 
   auto checkboxes = Container::Vertical({
-      Checkbox(&checkbox_1_label, &checkbox_1_selected),
-      Checkbox(&checkbox_2_label, &checkbox_2_selected),
+      Checkbox("checkbox1", &checkbox_1_selected),
+      Checkbox("checkbox2", &checkbox_2_selected),
   });
   checkboxes = Wrap(L"Checkbox", checkboxes);
 
@@ -72,8 +70,7 @@ int main(int argc, const char* argv[]) {
 
   // -- Input ------------------------------------------------------------------
   std::wstring input_label;
-  std::wstring input_placeholder = L"input";
-  auto input = Input(&input_label, &input_placeholder);
+  auto input = Input(&input_label, L"placeholder");
   input = Wrap(L"Input", input);
 
   // -- Button -----------------------------------------------------------------

examples/component/homescreen.cpp

@@ -2,20 +2,19 @@
 #include <chrono>      // for operator""s, chrono_literals
 #include <cmath>       // for sin
 #include <functional>  // for ref, reference_wrapper, function
-#include <memory>      // for make_shared, __shared_ptr_access
-#include <string>  // for allocator, wstring, basic_string, operator+, to_wstring
-#include <thread>   // for sleep_for, thread
-#include <utility>  // for move
-#include <vector>   // for vector
+#include <memory>      // for allocator, shared_ptr, __shared_ptr_access
+#include <string>      // for wstring, basic_string, operator+, to_wstring
+#include <thread>      // for sleep_for, thread
+#include <utility>     // for move
+#include <vector>      // for vector
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"  // for Checkbox, Input, Menu, Radiobox, Toggle
+#include "ftxui/component/component.hpp"  // for Checkbox, Renderer, Horizontal, Vertical, Input, Menu, Radiobox, Tab, Toggle
 #include "ftxui/component/component_base.hpp"  // for ComponentBase
-#include "ftxui/component/container.hpp"       // for Container
 #include "ftxui/component/event.hpp"           // for Event, Event::Custom
 #include "ftxui/component/input.hpp"           // for InputBase
 #include "ftxui/component/screen_interactive.hpp"  // for Component, ScreenInteractive
-#include "ftxui/dom/elements.hpp"  // for text, operator|, color, bgcolor, Element, filler, size, vbox, flex, hbox, graph, separator, EQUAL, WIDTH, hcenter, bold, border, window, Elements, HEIGHT, hflow, flex_grow, frame, gauge, LESS_THAN, spinner, dim, GREATER_THAN
+#include "ftxui/dom/elements.hpp"  // for text, operator|, color, bgcolor, Element, filler, size, vbox, flex, hbox, graph, separator, EQUAL, WIDTH, hcenter, bold, border, window, HEIGHT, Elements, hflow, flex_grow, frame, gauge, LESS_THAN, spinner, dim, GREATER_THAN
 #include "ftxui/screen/color.hpp"  // for Color, Color::BlueLight, Color::RedLight, Color::Black, Color::Blue, Color::Cyan, Color::CyanLight, Color::GrayDark, Color::GrayLight, Color::Green, Color::GreenLight, Color::Magenta, Color::MagentaLight, Color::Red, Color::White, Color::Yellow, Color::YellowLight, Color::Default
 
 using namespace ftxui;
@@ -157,17 +156,15 @@ int main(int argc, const char* argv[]) {
       false,
       false,
   };
-  std::wstring input_add_content = L"";
-  std::wstring input_add_placeholder = L"input_files";
-  Component input_add = Input(&input_add_content, &input_add_placeholder);
+  std::wstring input_add_content;
+  Component input_add = Input(&input_add_content, "input files");
 
   std::vector<std::wstring> input_entries;
   int input_selected = 0;
   Component input = Menu(&input_entries, &input_selected);
 
   std::wstring executable_content_ = L"";
-  std::wstring executable_placeholder_ = L"executable";
-  Component executable_ = Input(&executable_content_, &executable_placeholder_);
+  Component executable_ = Input(&executable_content_, "executable");
 
   Component flags = Container::Vertical({
       Checkbox(&options_label[0], &options_state[0]),

examples/component/input.cpp

@@ -1,23 +1,20 @@
 #include <memory>  // for allocator, __shared_ptr_access
-#include <string>  // for operator+, wstring, char_traits
+#include <string>  // for operator+, char_traits, wstring
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"       // for Input, Make
+#include "ftxui/component/component.hpp"       // for Input, Renderer, Vertical
 #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 text, hbox, separator, border, vbox, Element
+#include "ftxui/dom/elements.hpp"  // for text, hbox, Element, separator, operator|, vbox, border
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
 
   std::wstring first_name_;
   std::wstring last_name_;
-  std::wstring first_name_placeholder_ = L"first_name";
-  std::wstring last_name_placeholder_ = L"last_name";
 
-  Component input_first_name_ = Input(&first_name_, &first_name_placeholder_);
-  Component input_last_name_ = Input(&last_name_, &last_name_placeholder_);
+  Component input_first_name_ = Input(&first_name_, "first name");
+  Component input_last_name_ = Input(&last_name_, "last name");
 
   auto component = Container::Vertical({
       input_first_name_,

examples/component/menu2.cpp

@@ -1,12 +1,11 @@
 #include <functional>  // for function
-#include <memory>      // for __shared_ptr_access, shared_ptr
-#include <string>  // for wstring, allocator, operator+, to_string, basic_string
-#include <vector>  // for vector
+#include <memory>      // for allocator, __shared_ptr_access
+#include <string>      // for wstring, operator+, to_string, basic_string
+#include <vector>      // for vector
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"       // for Menu, Make
+#include "ftxui/component/component.hpp"       // for Menu, Horizontal, Renderer
 #include "ftxui/component/component_base.hpp"  // for ComponentBase
-#include "ftxui/component/container.hpp"       // for Container
 #include "ftxui/component/menu.hpp"            // for MenuBase
 #include "ftxui/component/screen_interactive.hpp"  // for Component, ScreenInteractive
 #include "ftxui/dom/elements.hpp"  // for text, separator, bold, hcenter, vbox, hbox, gauge, Element, operator|, border

examples/component/menu_style.cpp

@@ -1,15 +1,14 @@
 #include <functional>        // for function
 #include <initializer_list>  // for initializer_list
-#include <memory>            // for __shared_ptr_access
-#include <string>            // for wstring, allocator, basic_string
+#include <memory>            // for __shared_ptr_access, shared_ptr, allocator
+#include <string>            // for wstring, basic_string
 #include <vector>            // for vector
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"       // for Menu, Make
+#include "ftxui/component/component.hpp"       // for Menu, Horizontal, Renderer
 #include "ftxui/component/component_base.hpp"  // for ComponentBase
-#include "ftxui/component/container.hpp"       // for Container
 #include "ftxui/component/menu.hpp"            // for MenuBase
-#include "ftxui/component/screen_interactive.hpp"  // for Component, ScreenInteractive
+#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive, Component
 #include "ftxui/dom/elements.hpp"  // for operator|, Element, separator, bgcolor, color, flex, Decorator, bold, hbox, border, dim
 #include "ftxui/screen/color.hpp"  // for Color, Color::Blue, Color::BlueLight, Color::Red, Color::Yellow
 

examples/component/modal_dialog.cpp

@@ -1,13 +1,11 @@
-#include <functional>  // for function
-#include <memory>  // for allocator, __shared_ptr_access, shared_ptr, make_shared
+#include <memory>  // for allocator, __shared_ptr_access, shared_ptr
 #include <string>  // for wstring, operator+, basic_string, char_traits
 #include <vector>  // for vector
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"       // for Button, Make
-#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/component/component.hpp"  // for Button, Renderer, Horizontal, Tab
+#include "ftxui/component/component_base.hpp"      // for ComponentBase
+#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
 #include "ftxui/dom/elements.hpp"  // for Element, operator|, filler, text, hbox, separator, center, vbox, bold, border, clear_under, dbox, size, GREATER_THAN, HEIGHT
 
 int main(int argc, const char* argv[]) {
@@ -21,10 +19,8 @@ int main(int argc, const char* argv[]) {
   std::wstring rating = L"3/5 stars";
 
   // At depth=0, two buttons. One for rating FTXUI and one for quitting.
-  std::wstring label_rate_ftxui = L"Rate FTXUI";
-  std::wstring label_quit = L"Quit";
-  auto button_rate_ftxui = Button(&label_rate_ftxui, [&] { depth = 1; });
-  auto button_quit = Button(&label_quit, screen.ExitLoopClosure());
+  auto button_rate_ftxui = Button("Rate FTXUI", [&] { depth = 1; });
+  auto button_quit = Button("Quit", screen.ExitLoopClosure());
 
   auto depth_0_container = Container::Horizontal({
       button_rate_ftxui,

examples/component/radiobox_in_frame.cpp

@@ -1,8 +1,9 @@
+#include <memory>  // for __shared_ptr_access, shared_ptr
 #include <string>  // for wstring, operator+
 #include <vector>  // for vector
 
 #include "ftxui/component/captured_mouse.hpp"      // for ftxui
-#include "ftxui/component/component.hpp"           // for Make, Radiobox
+#include "ftxui/component/component.hpp"           // for Radiobox, Renderer
 #include "ftxui/component/component_base.hpp"      // for ComponentBase
 #include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
 #include "ftxui/dom/elements.hpp"  // for Element, operator|, size, border, frame, HEIGHT, LESS_THAN

examples/component/slider.cpp

@@ -1,5 +1,3 @@
-#include <memory>  // for allocator
-
 #include "ftxui/component/captured_mouse.hpp"      // for ftxui
 #include "ftxui/component/component.hpp"           // for Slider
 #include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive

examples/component/slider_rgb.cpp

@@ -1,14 +1,11 @@
-#include <functional>  // for function
-#include <memory>      // for allocator, __shared_ptr_access
-#include <string>      // for operator+, to_wstring, char_traits
+#include <memory>  // for allocator, __shared_ptr_access, shared_ptr
+#include <string>  // for operator+, to_wstring, char_traits
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"       // for Slider, Make
+#include "ftxui/component/component.hpp"       // for Slider, Renderer, Vertical
 #include "ftxui/component/component_base.hpp"  // for ComponentBase
-#include "ftxui/component/container.hpp"       // for Container
-#include "ftxui/component/event.hpp"  // for Event, Event::Escape, Event::Return
-#include "ftxui/component/screen_interactive.hpp"  // for Component, ScreenInteractive
-#include "ftxui/dom/elements.hpp"  // for separator, operator|, Element, size, text, vbox, xflex, bgcolor, hbox, GREATER_THAN, WIDTH, border, HEIGHT, LESS_THAN
+#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
+#include "ftxui/dom/elements.hpp"  // for separator, Element, operator|, size, text, vbox, xflex, bgcolor, hbox, GREATER_THAN, WIDTH, border, HEIGHT, LESS_THAN
 #include "ftxui/screen/color.hpp"  // for Color
 
 using namespace ftxui;

examples/component/tab_horizontal.cpp

@@ -1,12 +1,11 @@
-#include <memory>  // for __shared_ptr_access
-#include <string>  // for wstring, allocator, basic_string
+#include <memory>  // for allocator, __shared_ptr_access, shared_ptr
+#include <string>  // for wstring, basic_string
 #include <vector>  // for vector
 
 #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/component/component.hpp"  // for Radiobox, Renderer, Tab, Toggle, Vertical
+#include "ftxui/component/component_base.hpp"      // for ComponentBase
+#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
 #include "ftxui/dom/elements.hpp"  // for Element, separator, operator|, vbox, border
 
 using namespace ftxui;

examples/component/tab_vertical.cpp

@@ -1,13 +1,12 @@
-#include <memory>  // for __shared_ptr_access
-#include <string>  // for wstring, allocator, basic_string
+#include <memory>  // for allocator, __shared_ptr_access, shared_ptr
+#include <string>  // for wstring, basic_string
 #include <vector>  // for vector
 
 #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
+#include "ftxui/component/component.hpp"  // for Radiobox, Horizontal, Menu, Renderer, Tab
+#include "ftxui/component/component_base.hpp"      // for ComponentBase
+#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
+#include "ftxui/dom/elements.hpp"  // for Element, separator, hbox, operator|, border
 
 using namespace ftxui;
 

examples/component/toggle.cpp

@@ -1,13 +1,10 @@
-#include <functional>  // for function
-#include <memory>      // for allocator, __shared_ptr_access
-#include <string>      // for wstring, basic_string
-#include <vector>      // for vector
+#include <memory>  // for allocator, __shared_ptr_access
+#include <string>  // for wstring, basic_string
+#include <vector>  // for vector
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"       // for Toggle, Make
+#include "ftxui/component/component.hpp"       // for Toggle, Renderer, Vertical
 #include "ftxui/component/component_base.hpp"  // for ComponentBase
-#include "ftxui/component/container.hpp"       // for Container
-#include "ftxui/component/event.hpp"           // for Event, Event::Return
 #include "ftxui/component/screen_interactive.hpp"  // for Component, ScreenInteractive
 #include "ftxui/dom/elements.hpp"  // for text, hbox, vbox, Element