1 files changed, 26 insertions, 9 deletions

diff --git a/cli/component.cpp b/cli/component.cpp
index 4def946..e588959 100644
--- a/cli/component.cpp
+++ b/cli/component.cpp
@@ -1,41 +1,58 @@
 #include "component.hpp"
 
+#include <algorithm>
+
 namespace katja
 {
-    PageContainer::PageContainer(std::vector<std::pair<std::string, Page>> pages)
+    ScreenContainer::ScreenContainer(std::vector<std::pair<std::string, Page>> pages, std::function<void()> on_enter)
+        : on_enter(on_enter)
     {
         ftxui::Components menu_pages;
 
         std::transform(std::cbegin(pages), std::cend(pages), std::back_inserter(menu_entries),
                 [](const std::pair<std::string, Page>& pair) { return pair.first; });
-        std::transform(std::cbegin(pages), std::cend(pages), std::back_inserter(menu_pages),
+        std::transform(std::cbegin(pages), std::cend(pages), std::back_inserter(this->menu_pages),
                 [](const std::pair<std::string, Page>& pair) { return pair.second; });
+        std::copy(std::cbegin(this->menu_pages), std::cend(this->menu_pages), std::back_inserter(menu_pages));
 
         ftxui::MenuOption menu_option = ftxui::MenuOption::Horizontal();
-        this->menu = ftxui::Menu(&this->menu_entries, &this->menu_selected, menu_option);
+        this->menu = ftxui::Toggle(&this->menu_entries, &this->menu_selected);
 
-        this->content = ftxui::Container::Tab(menu_pages, &this->menu_selected);
+        this->content = ftxui::Container::Tab(std::move(menu_pages), &this->menu_selected);
     }
 
-    ftxui::Element PageContainer::Render()
+    ftxui::Element ScreenContainer::OnRender()
     {
         return ftxui::vbox({
             this->menu->Render(),
+            ftxui::separator(),
             this->content->Render()
         });
     }
 
-    bool PageContainer::OnEvent(ftxui::Event event)
+    bool ScreenContainer::OnEvent(ftxui::Event event)
     {
         if (event.character() == "q" && this->on_enter)
         {
             on_enter();
             return true;
         }
-        return menu->OnEvent(event);
+        int previously = this->menu_selected;
+        bool result = menu->OnEvent(event);
+
+        if (previously != this->menu_selected)
+        {
+            this->menu_pages.at(this->menu_selected)->Load();
+        }
+        return result;
+    }
+
+    ftxui::Component Screen(std::vector<std::pair<std::string, Page>> pages, std::function<void()> on_enter)
+    {
+        return std::make_shared<ScreenContainer>(std::move(pages), on_enter);
     }
 
-    ftxui::Element WelcomePage::Render()
+    ftxui::Element WelcomePage::OnRender()
     {
         return ftxui::text("Select an action in the menu.");
     }
@@ -53,7 +70,7 @@ namespace katja
     {
     }
 
-    ftxui::Element UpdatesPage::Render()
+    ftxui::Element UpdatesPage::OnRender()
     {
         std::vector<std::shared_ptr<ftxui::Node>> lines;