moving widgets from components

Cargo.toml

@@ -17,8 +17,9 @@ panic = "abort"
 rustflags = ["-Z", "threads=8"]
 
 [dependencies]
-iced = { version = "0.12.1", features = ["advanced", "image", "tokio", "lazy"] }
+iced = { version = "0.12.1", features = ["advanced", "image", "tokio", "lazy"]}
 iced_aw = { version = "0.9.3", features = ["tab_bar", "icons"] }
+iced_on_focus_widget = "0.1.0"
 # reqwest = { version = "0.12.5", features = ["blocking"] }
 smol_str = "0.2.2"
 ul-next = { version = "0.2.0", optional = true }

examples/basic_browser.rs

@@ -4,7 +4,7 @@ use iced::{executor, Command, Subscription};
 use iced::{widget::column, Application, Settings, Theme};
 use iced_aw::BOOTSTRAP_FONT_BYTES;
 
-use icy_browser::{browser_view, nav_bar, tab_bar, State, Ultralight};
+use icy_browser::{browser_view, nav_bar, tab_bar, BrowserView, NavBar, State, TabBar, Ultralight};
 
 use std::borrow::Borrow;
 use std::time::Duration;
@@ -18,10 +18,18 @@ fn main() -> Result<(), iced::Error> {
     Browser::run(settings)
 }
 
-struct Browser(State<Ultralight>);
+struct Browser {
+    state: State<Ultralight>,
+    tab_bar: TabBar<Ultralight>,
+    nav_bar: NavBar<Ultralight>,
+    browser_view: BrowserView<Ultralight>,
+}
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone)]
 pub enum Message {
+    TabBar(tab_bar::Message),
+    NavBar(nav_bar::Message),
+    BrowserView(browser_view::Message),
     DoWork,
 }
 
@@ -32,7 +40,20 @@ impl Application for Browser {
     type Theme = Theme;
 
     fn new(_flags: Self::Flags) -> (Self, Command<Message>) {
-        (Self(State::new_ultralight()), Command::none())
+        let state = State::new_ultralight();
+        let tab_bar = tab_bar(state.clone());
+        let nav_bar = nav_bar(state.clone());
+        let browser_view = browser_view(state.clone());
+
+        (
+            Self {
+                state,
+                tab_bar,
+                nav_bar,
+                browser_view,
+            },
+            Command::none(),
+        )
     }
 
     fn title(&self) -> String {
@@ -49,15 +70,24 @@ impl Application for Browser {
 
     fn update(&mut self, message: Self::Message) -> Command<Message> {
         match message {
-            Message::DoWork => self.0.borrow().do_work(),
+            Message::DoWork => self.state.borrow().do_work(),
+            Message::NavBar(nav_bar_message) => match self.nav_bar.update(nav_bar_message) {
+                nav_bar::Action::None => {}
+            },
+            Message::TabBar(tab_bar_message) => match self.tab_bar.update(tab_bar_message) {
+                tab_bar::Action::None => {}
+            },
+            Message::BrowserView(browser_view) => match self.browser_view.update(browser_view) {
+                browser_view::Action::None => {}
+            },
         }
         Command::none()
     }
 
     fn view(&self) -> iced::Element<'_, Self::Message> {
-        let tab_bar = tab_bar(self.0.clone());
-        let nav_bar = nav_bar(self.0.clone());
-        let browser_view = browser_view(self.0.clone());
+        let tab_bar = self.tab_bar.view().map(Message::TabBar);
+        let nav_bar = self.nav_bar.view().map(Message::NavBar);
+        let browser_view = self.browser_view.view().map(Message::BrowserView);
 
         column!(tab_bar, nav_bar, browser_view).into()
     }