Component params

examples/benchmark.rs

@@ -17,14 +17,7 @@ pub fn main() {
 
             let handle = thread::spawn(move || {
                 let res = engine
-                    .run(move |cx| {
+                    .run(BenchmarkApp(items))
-                        rsx! {
-                            for _ in (0..items) {
-                                "Hello, world!"
-                            }
-                        }
-                        .view(cx.clone())
-                    })
                     .expect("Failed to run engine");
 
                 tx.send((items, res)).expect("Failed to send result");
@@ -46,5 +39,18 @@ pub fn main() {
     for (items, bench) in results {
         println!("Results for {items} items:\n{bench}");
     }
+}
 
+struct BenchmarkApp(pub usize);
+
+impl ComponentImpl for BenchmarkApp {
+    fn call(&self, cx: &Arc<Context>) -> View {
+        let items = self.0.clone();
+        rsx! {
+            for _ in (0..items) {
+                "Hello, world!"
+            }
+        }
+        .view(cx.clone())
+    }
 }

examples/hello_world.rs

@@ -4,12 +4,16 @@ use osui::prelude::*;
 
 pub fn main() {
     let engine = Console::new();
-    engine.run(app).expect("Failed to run engine");
+    engine.run(App).expect("Failed to run engine");
 }
 
-fn app(cx: &Arc<Context>) -> View {
+struct App;
-    rsx! {
+
-        "Hello, world!"
+impl ComponentImpl for App {
+    fn call(&self, cx: &Arc<Context>) -> View {
+        rsx! {
+            "Hello, world!"
+        }
+        .view(cx.clone())
     }
-    .view(cx.clone())
 }

examples/simple_benchmark.rs

@@ -4,7 +4,7 @@ use osui::prelude::*;
 
 pub fn main() {
     let engine = Benchmark::new(Console::new());
-    let benchmark_result = engine.run(app).expect("Failed to run engine");
+    let benchmark_result = engine.run(App).expect("Failed to run engine");
     println!("Avg: {} μs", benchmark_result.average);
     println!("Min: {} μs", benchmark_result.min);
     println!("Max: {} μs", benchmark_result.max);
@@ -12,9 +12,13 @@ pub fn main() {
     println!("Tot Render: {} μs", benchmark_result.total_render);
 }
 
-fn app(cx: &Arc<Context>) -> View {
+struct App;
-    rsx! {
+
-        "Hello, world!"
+impl ComponentImpl for App {
+    fn call(&self, cx: &Arc<Context>) -> View {
+        rsx! {
+            "Hello, world!"
+        }
+        .view(cx.clone())
     }
-    .view(cx.clone())
 }

src/component.rs

@@ -11,9 +11,13 @@ use crate::{
     View, ViewWrapper,
 };
 
-pub type Component = Arc<dyn Fn(&Arc<Context>) -> View + Send + Sync>;
+pub type Component = Arc<dyn ComponentImpl>;
 pub type EventHandler = Arc<Mutex<dyn FnMut(&Arc<Context>, &dyn Any) + Send + Sync>>;
 
+pub trait ComponentImpl: Send + Sync {
+    fn call(&self, cx: &Arc<Context>) -> View;
+}
+
 pub struct Scope {
     pub children: Mutex<Vec<(Arc<Context>, Option<ViewWrapper>)>>,
     executor: Arc<dyn CommandExecutor>,
@@ -28,7 +32,7 @@ pub struct Context {
 }
 
 impl Context {
-    pub fn new<F: Fn(&Arc<Self>) -> View + Send + Sync + 'static>(
+    pub fn new<F: ComponentImpl + 'static>(
         component: F,
         executor: Arc<dyn CommandExecutor>,
     ) -> Arc<Self> {
@@ -48,7 +52,7 @@ impl Context {
             move || {
                 s.event_handlers.lock().unwrap().clear();
                 let c = s.component.lock().unwrap().clone();
-                *s.view.lock().unwrap() = (c)(&s);
+                *s.view.lock().unwrap() = c.call(&s);
             }
         });
     }
@@ -62,7 +66,7 @@ impl Context {
             move || {
                 s.event_handlers.lock().unwrap().clear();
                 let c = s.component.lock().unwrap().clone();
-                *s.view.lock().unwrap() = (c)(&s);
+                *s.view.lock().unwrap() = c.call(&s);
                 *done.lock().unwrap() = true;
             }
         });
@@ -194,7 +198,7 @@ impl Scope {
         })
     }
 
-    pub fn child<F: Fn(&Arc<Context>) -> View + Send + Sync + 'static>(
+    pub fn child<F: ComponentImpl + 'static>(
         self: &Arc<Self>,
         child: F,
         view_wrapper: Option<ViewWrapper>,
@@ -207,10 +211,25 @@ impl Scope {
     }
 
     pub fn view(self: &Arc<Self>, view: View) {
-        let ctx = Context::new(move |_| view.clone(), self.executor.clone());
+        let ctx = Context::new(view, self.executor.clone());
 
         ctx.refresh();
 
         self.children.lock().unwrap().push((ctx, None));
     }
 }
+
+impl ComponentImpl for View {
+    fn call(&self, _: &Arc<Context>) -> View {
+        self.clone()
+    }
+}
+
+impl<F> ComponentImpl for F
+where
+    F: Fn(&Arc<Context>) -> View + Send + Sync,
+{
+    fn call(&self, ctx: &Arc<Context>) -> View {
+        self(ctx)
+    }
+}

src/engine/benchmark.rs

@@ -2,7 +2,11 @@ use std::{io::stdout, sync::Arc, time::Instant};
 
 use crossterm::{cursor::MoveTo, execute, terminal::Clear};
 
-use crate::{prelude::Context, render::Area, DrawContext, View};
+use crate::{
+    prelude::{ComponentImpl, Context},
+    render::Area,
+    DrawContext, View,
+};
 
 use super::Engine;
 
@@ -24,10 +28,7 @@ impl<T: Engine> Benchmark<T> {
 }
 
 impl<T: Engine> Engine<BenchmarkResult> for Benchmark<T> {
-    fn run<F: Fn(&Arc<Context>) -> View + Send + Sync + 'static>(
+    fn run<F: ComponentImpl + 'static>(&self, component: F) -> crate::Result<BenchmarkResult> {
-        &self,
-        component: F,
-    ) -> crate::Result<BenchmarkResult> {
         let mut times: Vec<u128> = Vec::new();
         let cx = self.init(component);
 
@@ -59,10 +60,7 @@ impl<T: Engine> Engine<BenchmarkResult> for Benchmark<T> {
         })
     }
 
-    fn init<F: Fn(&Arc<Context>) -> View + Send + Sync + 'static>(
+    fn init<F: ComponentImpl + 'static>(&self, component: F) -> Arc<Context> {
-        &self,
-        component: F,
-    ) -> Arc<Context> {
         self.0.init(component)
     }
 

src/engine/console.rs

@@ -7,7 +7,7 @@ use crossterm::{cursor::MoveTo, execute, terminal::Clear};
 
 use crate::{
     engine::{commands, CommandExecutor},
-    prelude::Context,
+    prelude::{ComponentImpl, Context},
     render::Area,
     DrawContext, View,
 };
@@ -79,10 +79,7 @@ impl Engine for Console {
         ));
     }
 
-    fn init<F: Fn(&Arc<Context>) -> View + Send + Sync + 'static>(
+    fn init<C: ComponentImpl + 'static>(&self, component: C) -> Arc<Context> {
-        &self,
-        component: F,
-    ) -> Arc<Context> {
         let cx = Context::new(component, self.executor.clone());
         cx.refresh();
 
@@ -102,10 +99,7 @@ impl Engine for Console {
         self.executor.clone()
     }
 
-    fn run<F: Fn(&Arc<Context>) -> View + Send + Sync + 'static>(
+    fn run<F: ComponentImpl + 'static>(&self, component: F) -> crate::Result<()> {
-        &self,
-        component: F,
-    ) -> crate::Result<()> {
         let cx = self.init(component);
 
         while self.executor.is_running() {

src/engine/mod.rs

@@ -7,18 +7,15 @@ pub use console::*;
 
 use std::{any::Any, sync::Arc};
 
-use crate::{prelude::Context, render::Area, DrawContext, View};
+use crate::{
+    prelude::{ComponentImpl, Context},
+    render::Area,
+    DrawContext, View,
+};
 
 pub trait Engine<Output = ()> {
-    fn run<F: Fn(&Arc<Context>) -> View + Send + Sync + 'static>(
+    fn run<C: ComponentImpl + 'static>(&self, component: C) -> crate::Result<Output>;
-        &self,
+    fn init<C: ComponentImpl + 'static>(&self, component: C) -> Arc<Context>;
-        component: F,
-    ) -> crate::Result<Output>;
-
-    fn init<F: Fn(&Arc<Context>) -> View + Send + Sync + 'static>(
-        &self,
-        component: F,
-    ) -> Arc<Context>;
     fn render(&self, cx: &Arc<Context>);
     fn render_delay(&self) {
         std::thread::sleep(std::time::Duration::from_millis(16))