macros fix

Scope performance patch

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "osui"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 license = "Apache-2.0"
 description = "A TUI library for advanced uis"
@@ -9,8 +9,7 @@ homepage = "https://osui.netlify.app"
 documentation = "https://osui.netlify.app/docs/"
 
 [features]
-no_rsx = []
+rsx = []
-no_elem = []
 
 [lib]
 name = "osui"
@@ -24,8 +23,10 @@ path = "src/main.rs"
 cc = "1.0"
 
 [dependencies]
+access-cell = "0.1.3"
 crossterm = "0.28.1"
 figlet-rs = "0.1.5"
+osui-macros = { version = "0.1.0", path = "macros" }
 
 [profile.dev]
 opt-level = 1
@@ -43,3 +44,6 @@ overflow-checks = false
 lto = true
 panic = 'abort'
 codegen-units = 1
+
+[workspace]
+members = [".", "macros"]

README.md

@@ -17,21 +17,23 @@
 </p>
 
 <p align="center">
-  <b>OSUI is a customizable terminal user interface (TUI) library written in Rust. It provides a set of components and rsx to build interactive command-line interfaces with ease.</b>
+  <b>OSUI is a customizable terminal user interface (TUI) library written in Rust.</b>
 </p>
 
 ```rust
 use osui::prelude::*;
 
-fn main() -> std::io::Result<()> {
+pub fn main() {
-    let screen = Screen::new();
+    let engine = Console::new();
+    engine.run(App {}).expect("Failed to run engine");
+}
 
+#[component]
+fn App(cx: &Arc<Context>) -> View {
     rsx! {
-        "Hello, World"
+        "Hello World"
     }
-    .draw(&screen);
+    .view(&cx)
-
-    screen.run()
 }
 ```
 

benchmark.csv

@@ -0,0 +1,227 @@
+Iterx72,Nestingx72,Time µs
+14,14,11964
+0,1,1078
+5,8,1818
+10,13,2632
+14,2,3392
+0,9,520
+9,3,2360
+10,5,2551
+10,11,2548
+6,8,1738
+12,12,2922
+0,8,601
+12,4,2919
+0,11,521
+6,4,1942
+11,7,2741
+9,4,2496
+5,9,1764
+13,9,3069
+2,5,1053
+5,11,1790
+14,1,3581
+5,0,962
+0,3,845
+1,3,868
+7,8,2013
+12,3,2987
+9,8,2328
+10,7,2533
+11,1,2766
+7,1,1938
+0,5,687
+6,9,1830
+10,14,2628
+6,12,1786
+4,0,835
+4,14,2464
+10,1,2633
+12,7,2948
+2,9,1066
+4,6,2646
+7,11,1999
+5,13,1748
+13,4,3110
+13,13,3094
+3,5,1166
+11,12,2745
+1,2,814
+9,5,2419
+2,11,1117
+1,13,835
+11,11,2759
+1,12,882
+9,1,2457
+0,6,680
+5,12,1794
+9,11,2326
+10,9,2546
+10,10,2604
+13,2,3250
+13,7,3113
+7,10,1959
+1,14,833
+6,6,1886
+14,7,3339
+6,7,1824
+11,6,2756
+12,6,3007
+14,6,3315
+4,3,11464
+2,14,924
+7,12,1966
+11,14,2817
+9,10,2367
+1,11,827
+8,14,2184
+14,0,643
+11,3,2781
+2,4,1123
+12,8,2950
+13,6,3160
+3,13,1289
+7,7,1989
+3,9,1142
+3,6,1168
+4,8,2788
+14,12,3346
+1,1,805
+5,10,1781
+7,13,1988
+5,5,2015
+0,14,520
+11,8,2890
+3,10,1140
+13,10,3235
+3,14,1185
+8,10,2183
+12,10,2896
+2,8,1072
+9,6,2358
+13,1,3066
+3,8,1133
+11,10,2758
+4,13,2550
+1,0,643
+4,2,5482
+3,7,1155
+1,4,726
+3,3,1192
+4,11,2576
+8,0,619
+9,2,2444
+10,3,2581
+4,5,5400
+5,3,2444
+1,10,804
+10,2,2563
+0,7,592
+0,2,802
+1,5,741
+2,7,984
+10,0,755
+13,14,3112
+5,14,1811
+8,12,2180
+6,11,1723
+4,7,2897
+10,8,2536
+1,7,813
+6,0,699
+8,2,2187
+5,7,1811
+14,8,3304
+2,0,661
+8,13,2185
+1,9,786
+3,0,623
+12,5,3012
+8,1,2203
+8,11,2285
+14,10,3413
+4,10,2613
+11,5,2729
+6,1,2035
+12,1,2891
+5,4,2036
+2,3,1083
+14,3,3312
+3,2,1278
+5,2,2392
+8,7,2151
+5,6,2072
+3,12,1230
+2,10,954
+2,13,932
+13,8,3128
+0,12,521
+11,4,2769
+7,2,1947
+4,1,1802
+8,8,2163
+7,3,1966
+13,3,3207
+1,8,746
+12,9,2955
+10,12,2570
+9,9,2388
+4,12,2566
+7,0,619
+7,9,2004
+13,0,607
+14,9,3355
+3,4,1154
+11,2,2753
+11,13,2739
+6,13,1735
+7,6,1983
+8,3,2166
+7,14,1958
+6,2,2101
+13,5,3221
+8,4,2120
+10,4,2716
+14,5,3264
+14,13,3299
+11,9,2725
+13,11,3132
+1,6,809
+2,2,1155
+4,4,2242
+8,6,2218
+12,0,645
+7,4,1925
+2,6,1054
+9,13,2340
+13,12,3112
+14,4,3334
+3,11,1139
+12,14,3004
+4,9,2649
+0,13,527
+12,11,2976
+0,0,1559
+12,13,2952
+6,10,1749
+14,11,3365
+11,0,647
+2,12,1024
+10,6,2562
+8,5,2227
+9,12,2363
+2,1,1023
+0,10,528
+6,3,2005
+8,9,2195
+7,5,1966
+6,14,1755
+9,0,608
+14,14,3389
+9,7,2391
+0,4,688
+5,1,2574
+9,14,2353
+12,2,2975
+3,1,1276
+6,5,1804

examples/benchmark.rs

@@ -0,0 +1,65 @@
+use osui::prelude::*;
+
+use std::collections::HashMap;
+
+pub fn main() {
+    let engine = Arc::new(Benchmark::new(Console::new()));
+
+    let mut benchmark_result: HashMap<(usize, usize), BenchmarkResult> = HashMap::new();
+
+    for i in 0..15 {
+        for n in 0..15 {
+            let res = {
+                let mut results = Vec::with_capacity(6);
+
+                for _ in 0..6 {
+                    results.push(
+                        engine
+                            .run(App {
+                                n: n * 72,
+                                i: i * 72,
+                            })
+                            .expect("Failed to run engine"),
+                    );
+                }
+
+                results.sort_by_key(|r| r.total_render);
+                results[3].clone()
+            };
+
+            benchmark_result.insert((i, n as usize), res);
+        }
+    }
+
+    let max = benchmark_result
+        .values()
+        .map(|b| b.total_render)
+        .max()
+        .unwrap_or(0);
+
+    println!("Iterx72,Nestingx72,Time µs\n14,14,{}", { max + 500 });
+
+    for ((i, n), bench) in benchmark_result.iter() {
+        println!("{i},{n},{}", bench.total_render);
+    }
+}
+
+#[component]
+fn App(cx: &Arc<Context>, n: usize, i: usize) -> View {
+    let n = n.clone();
+    let i = i.clone();
+
+    if n == 0 {
+        rsx! {
+            "Hello, world!"
+        }
+        .view(&cx)
+    } else {
+        rsx! {
+            for _ in (0..i) {
+                    App { n: n - 1, i: 0 }
+            }
+        }
+        .view(&cx)
+    }
+}

examples/hello_world.rs

@@ -0,0 +1,14 @@
+use osui::prelude::*;
+
+pub fn main() {
+    let engine = Console::new();
+    engine.run(App {}).expect("Failed to run engine");
+}
+
+#[component]
+fn App(cx: &Arc<Context>) -> View {
+    rsx! {
+        "Hello World"
+    }
+    .view(&cx)
+}

examples/simple_benchmark.rs

@@ -0,0 +1,19 @@
+use osui::prelude::*;
+
+pub fn main() {
+    let engine = Benchmark::new(Console::new());
+    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);
+    println!("Tot: {} μs", benchmark_result.total);
+    println!("Tot Render: {} μs", benchmark_result.total_render);
+}
+
+#[component]
+fn App(cx: &Arc<Context>) -> View {
+    rsx! {
+        "Hello, world!"
+    }
+    .view(&cx)
+}

examples/simple_example.rs

@@ -0,0 +1,23 @@
+use osui::prelude::*;
+
+pub fn main() {
+    let engine = Console::new();
+    engine.run(App {}).expect("Failed to run engine");
+}
+
+#[component]
+fn App(cx: &Arc<Context>) -> View {
+    rsx! {
+        MyComponent { "------ example" }
+    }
+    .view(&cx)
+}
+
+#[component]
+fn MyComponent(cx: &Arc<Context>, children: &Rsx) -> View {
+    rsx! {
+        @{children}
+        "Simple"
+    }
+    .view(&cx)
+}

macros/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "osui-macros"
+version = "0.1.0"
+edition = "2024"
+license = "Apache-2.0"
+description = "Macros for osui-rs"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = { version = "2", features = ["full"] }
+quote = "1"
+proc-macro2 = "1"

macros/src/emit.rs

@@ -0,0 +1,183 @@
+//! # RSX Emission
+//!
+//! Converts parsed RSX AST into Rust code that constructs RSX objects.
+
+use crate::parse::*;
+use proc_macro2::TokenStream;
+use quote::quote;
+
+/// Emits code for the root RSX
+pub fn emit_rsx(root: RsxRoot) -> TokenStream {
+    emit_rsx_vec(&root.nodes)
+}
+
+/// Emits code for a vector of RSX nodes
+pub fn emit_rsx_vec(nodes: &Vec<RsxNode>) -> TokenStream {
+    let nodes = nodes.iter().map(emit_node_scope);
+
+    quote! {{
+        let mut r = osui::frontend::Rsx::new();
+        #(#nodes)*
+        r
+    }}
+}
+
+/// Emits variable bindings for dependencies
+fn emit_deps(deps: &[Dep]) -> TokenStream {
+    deps.iter()
+        .map(|d| {
+            let ident = &d.ident;
+            if let Some(pat) = &d.pat {
+                quote!( let #pat = #ident.clone(); )
+            } else {
+                quote!( let #ident = #ident.clone(); )
+            }
+        })
+        .collect()
+}
+
+/// Emits a Vec of dependencies as HookDependency trait objects
+fn emit_deps_vec(deps: &[Dep]) -> TokenStream {
+    let deps = deps.iter().map(|d| {
+        let ident = &d.ident;
+
+        quote! {
+            std::sync::Arc::new(#ident) as std::sync::Arc<dyn HookDependency>
+        }
+    });
+
+    quote! {
+        vec![ #(#deps),* ]
+    }
+}
+
+/// Emits code for a single node within a scope
+fn emit_node_scope(node: &RsxNode) -> TokenStream {
+    match node {
+        RsxNode::Text(_) => {
+            let emit = emit_node(node);
+            quote! {
+                r.static_scope(move |scope| {#emit});
+            }
+        }
+
+        RsxNode::Component { .. } => {
+            let emit = emit_node(node);
+            quote! {
+                r.static_scope(move |scope| {#emit});
+            }
+        }
+
+        RsxNode::Mount(m) => quote! {
+            #m.mount();
+        },
+
+        RsxNode::If {
+            deps,
+            cond,
+            children,
+        } => {
+            let deps_emit = emit_deps(deps);
+            let deps_vec_emit = emit_deps_vec(deps);
+            let kids = children.iter().map(emit_node);
+
+            quote! {
+                {
+                    #deps_emit
+                    r.dynamic_scope(move |scope| {
+                        if #cond {
+                            if scope.children.lock().unwrap().is_empty() {
+                                #(#kids)*
+                            }
+                        } else {
+                            scope.children.lock().unwrap().clear();
+                        }
+                    }, #deps_vec_emit);
+                }
+            }
+        }
+
+        RsxNode::For {
+            deps,
+            pat,
+            expr,
+            children,
+        } => {
+            let deps_emit = emit_deps(deps);
+            let deps_vec_emit = emit_deps_vec(deps);
+            let kids = children.iter().map(emit_node);
+
+            quote! {
+                {
+                    #deps_emit
+                    #[allow(unused_parens)]
+                    r.dynamic_scope(move |scope| {
+                        scope.children.lock().unwrap().clear();
+                        for #pat in #expr {
+                            #(#kids)*
+                        }
+                    }, #deps_vec_emit);
+                }
+            }
+        }
+
+        RsxNode::Expr(expr) => quote! {
+            r.child(#expr);
+        },
+    }
+}
+
+fn emit_node(node: &RsxNode) -> TokenStream {
+    match node {
+        RsxNode::Text(text) => quote! {
+            scope.view(Arc::new(move |ctx| {
+                ctx.draw_text(Point { x: 0, y: 0 }, &format!(#text))
+            }));
+        },
+
+        RsxNode::Component {
+            path,
+            props,
+            children,
+        } => {
+            let prop_inits = props.iter().map(|p| {
+                let name = &p.name;
+                let value = &p.value;
+                quote! { #name: #value }
+            });
+
+            let emit_children = emit_rsx_vec(children);
+
+            let component_expr = if children.len() > 0 {
+                quote! {
+                    #path {
+                        #(#prop_inits,)*
+                        children: #emit_children
+                    }
+                }
+            } else {
+                quote! {
+                    #path {
+                        #(#prop_inits,)*
+                    }
+                }
+            };
+
+            quote! {
+                scope.child(#component_expr, None);
+            }
+        }
+
+        RsxNode::Mount(m) => quote! {
+            #m.mount();
+        },
+
+        RsxNode::If { .. } => panic!("Invalid if statement"),
+
+        RsxNode::For { .. } => panic!("Invalid for loop"),
+
+        RsxNode::Expr(expr) => quote! {
+            r.child(#expr);
+        },
+    }
+}

macros/src/lib.rs

@@ -0,0 +1,149 @@
+//! # OSUI Macros
+//!
+//! Procedural macros for OSUI that provide ergonomic syntax for defining components.
+//!
+//! ## Features
+//!
+//! - `#[component]` - Transforms a function into a reusable component with props
+//! - `rsx!` - Creates RSX (React-like Syntax) for component hierarchies
+
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{FnArg, ItemFn, Pat, ReturnType, Type, parse_macro_input};
+
+mod emit;
+mod parse;
+
+/// RSX (React-like Syntax) macro for building component hierarchies
+///
+/// # Example
+///
+/// ```rust,ignore
+/// rsx! {
+///     Component {
+///         prop: value,
+///     }
+/// }
+/// ```
+#[proc_macro]
+pub fn rsx(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as parse::RsxRoot);
+    emit::emit_rsx(ast).into()
+}
+
+/// Component attribute macro for defining reusable components
+///
+/// Transforms a function into a component with automatic prop handling.
+/// The first parameter must be `cx: &Arc<Context>`.
+/// Remaining parameters become component props.
+///
+/// # Example
+///
+/// ```rust,ignore
+/// #[component]
+/// pub fn Counter(cx: &Arc<Context>, initial: &i32) -> View {
+///     let count = use_state(*initial);
+///     
+///     Arc::new(move |ctx| {
+///         ctx.draw_text(Point { x: 0, y: 0 }, &format!("Count: {}", count.get_dl()));
+///     })
+/// }
+/// ```
+#[proc_macro_attribute]
+pub fn component(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(item as ItemFn);
+
+    let name = &input.sig.ident;
+    let vis = &input.vis;
+    let body = &input.block;
+
+    let return_ty = match &input.sig.output {
+        ReturnType::Type(_, ty) => ty,
+        _ => {
+            return syn::Error::new_spanned(&input.sig, "component must return View")
+                .to_compile_error()
+                .into();
+        }
+    };
+
+    let mut inputs = input.sig.inputs.iter();
+
+    // ---- First param must be cx ----
+    let cx = match inputs.next() {
+        Some(FnArg::Typed(pat)) => pat,
+        _ => {
+            return syn::Error::new_spanned(&input.sig, "first argument must be cx: &Arc<Context>")
+                .to_compile_error()
+                .into();
+        }
+    };
+
+    let cx_ident = match &*cx.pat {
+        Pat::Ident(id) => &id.ident,
+        _ => unreachable!(),
+    };
+
+    let cx_ty = &cx.ty;
+
+    // ---- Remaining params are props ----
+    let mut struct_fields = Vec::new();
+    let mut render_params = Vec::new();
+    let mut call_args = Vec::new();
+
+    for arg in inputs {
+        let FnArg::Typed(pat) = arg else { continue };
+
+        let ident = match &*pat.pat {
+            Pat::Ident(id) => &id.ident,
+            _ => {
+                return syn::Error::new_spanned(pat, "unsupported prop pattern")
+                    .to_compile_error()
+                    .into();
+            }
+        };
+
+        // Strip leading &
+        let owned_ty = match &*pat.ty {
+            Type::Reference(r) => &r.elem,
+            ty => ty,
+        };
+
+        struct_fields.push(quote! {
+            pub #ident: #owned_ty
+        });
+
+        render_params.push(quote! {
+            #ident: &#owned_ty
+        });
+
+        call_args.push(quote! {
+            &self.#ident
+        });
+    }
+
+    let expanded = quote! {
+        #vis struct #name {
+            #(#struct_fields,)*
+        }
+
+        impl #name {
+            pub fn component(
+                #cx_ident: #cx_ty,
+                #(#render_params,)*
+            ) -> #return_ty {
+                #body
+            }
+        }
+
+        impl ComponentImpl for #name {
+            fn call(&self, cx: &std::sync::Arc<Context>) -> #return_ty {
+                Self::component(
+                    cx,
+                    #(#call_args,)*
+                )
+            }
+        }
+    };
+
+    expanded.into()
+}

macros/src/parse.rs

@@ -0,0 +1,241 @@
+//! # RSX Parser
+//!
+//! Parses RSX syntax into an AST that can be emitted as Rust code.
+
+use syn::braced;
+use syn::parse::discouraged::Speculative;
+use syn::{
+    Expr, Ident, LitStr, Pat, Path, Result, Token,
+    parse::{Parse, ParseStream},
+    token::Brace,
+};
+
+/// Root of an RSX expression
+pub struct RsxRoot {
+    /// Top-level nodes in the RSX
+    pub nodes: Vec<RsxNode>,
+}
+
+impl Parse for RsxRoot {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let mut nodes = Vec::new();
+        while !input.is_empty() {
+            nodes.push(input.parse()?);
+        }
+        Ok(Self { nodes })
+    }
+}
+
+/// A single component prop: `name: value`
+pub struct RsxProp {
+    /// Property name
+    pub name: Ident,
+    /// Property value expression
+    pub value: Expr,
+}
+
+/// AST node representing different RSX constructs
+pub enum RsxNode {
+    /// String literal: `"text"`
+    Text(LitStr),
+    /// Expression node: `{expr}`
+    Expr(Expr),
+    /// Component instantiation: `Component { prop: value, ... }`
+    Component {
+        /// Component path (e.g., `my_module::MyComponent`)
+        path: Path,
+        /// Component properties
+        props: Vec<RsxProp>,
+        /// Child nodes
+        children: Vec<RsxNode>,
+    },
+    /// Mount lifecycle: `@mount`
+    Mount(Ident),
+    /// Conditional rendering: `@if condition { ... }`
+    If {
+        /// Dependencies to track for reactivity
+        deps: Vec<Dep>,
+        /// Condition expression
+        cond: Expr,
+        /// Child nodes to render if true
+        children: Vec<RsxNode>,
+    },
+    /// Loop rendering: `@for pattern in expr { ... }`
+    For {
+        /// Dependencies to track for reactivity
+        deps: Vec<Dep>,
+        /// Loop pattern (e.g., `(key, value)`)
+        pat: Pat,
+        /// Iterable expression
+        expr: Expr,
+        /// Child nodes to render for each iteration
+        children: Vec<RsxNode>,
+    },
+}
+
+pub struct Dep {
+    pub ident: Ident,
+    pub pat: Option<Pat>,
+}
+
+fn parse_deps(input: ParseStream) -> Result<Vec<Dep>> {
+    let mut deps = Vec::new();
+
+    if input.peek(Token![%]) {
+        input.parse::<Token![%]>()?;
+        loop {
+            let ident: Ident = input.parse()?;
+            let pat = if input.peek(Token![as]) {
+                input.parse::<Token![as]>()?;
+                // Patterns in syn 2.0 are parsed via `Pat::parse_multi`
+                // instead of implementing the `Parse` trait directly.
+                Some(Pat::parse_multi(input)?)
+            } else {
+                None
+            };
+
+            deps.push(Dep { ident, pat });
+
+            if !input.peek(Token![,]) {
+                break;
+            }
+            input.parse::<Token![,]>()?;
+        }
+    }
+
+    Ok(deps)
+}
+
+impl Parse for RsxNode {
+    fn parse(input: ParseStream) -> Result<Self> {
+        // @{ $expr }
+        if input.peek(Token![@]) {
+            input.parse::<Token![@]>()?;
+
+            let content;
+            braced!(content in input);
+
+            let expr: Expr = content.parse()?;
+            return Ok(RsxNode::Expr(expr));
+        }
+
+        // !$ident
+        if input.peek(Token![!]) {
+            input.parse::<Token![!]>()?;
+            let mount: Ident = input.parse()?;
+            return Ok(RsxNode::Mount(mount));
+        }
+
+        let deps = parse_deps(input)?;
+
+        // %$dep if $expr { $rsx }
+        if input.peek(Token![if]) {
+            input.parse::<Token![if]>()?;
+            let cond: Expr = input.parse()?;
+            let content;
+            braced!(content in input);
+            let children = parse_children(&content)?;
+            return Ok(RsxNode::If {
+                deps,
+                cond,
+                children,
+            });
+        }
+
+        // %$dep for $pat in $expr { $rsx }
+        if input.peek(Token![for]) {
+            input.parse::<Token![for]>()?;
+            let pat: Pat = Pat::parse_multi(input)?;
+            input.parse::<Token![in]>()?;
+            let expr: Expr = input.parse()?;
+            let content;
+            braced!(content in input);
+            let children = parse_children(&content)?;
+            return Ok(RsxNode::For {
+                deps,
+                pat,
+                expr,
+                children,
+            });
+        }
+
+        // "%$dep for $pat in $expr { $rsx }"
+        if input.peek(LitStr) {
+            return Ok(RsxNode::Text(input.parse()?));
+        }
+
+        parse_component_invocation(input)
+    }
+}
+
+/// Parses Path or Path { ... } into RsxNode::Component.
+fn parse_component_invocation(input: ParseStream) -> Result<RsxNode> {
+    let path: Path = input.parse()?;
+
+    if !input.peek(Brace) {
+        return Ok(RsxNode::Component {
+            path,
+            props: Vec::new(),
+            children: Vec::new(),
+        });
+    }
+
+    let content;
+    braced!(content in input);
+
+    let (props, children) = parse_props_and_children(&content)?;
+
+    Ok(RsxNode::Component {
+        path,
+        props,
+        children,
+    })
+}
+
+fn parse_props_and_children(input: ParseStream) -> Result<(Vec<RsxProp>, Vec<RsxNode>)> {
+    Ok((parse_props(input)?, RsxRoot::parse(input)?.nodes))
+}
+
+fn parse_props(input: ParseStream) -> Result<Vec<RsxProp>> {
+    let mut props = Vec::new();
+
+    while !input.is_empty() {
+        let fork = input.fork();
+
+        let path: Path = match fork.parse() {
+            Ok(p) => p,
+            Err(_) => break,
+        };
+
+        if fork.peek(Token![:]) {
+            let name = path
+                .get_ident()
+                .cloned()
+                .ok_or_else(|| fork.error("prop name must be a single identifier"))?;
+
+            fork.parse::<Token![:]>()?;
+            let value: Expr = fork.parse()?;
+
+            input.advance_to(&fork);
+
+            props.push(RsxProp { name, value });
+
+            if input.peek(Token![,]) {
+                input.parse::<Token![,]>()?;
+            }
+        } else {
+            // ❌ do not commit → nothing consumed
+            break;
+        }
+    }
+
+    Ok(props)
+}
+
+fn parse_children(input: ParseStream) -> Result<Vec<RsxNode>> {
+    let mut nodes = Vec::new();
+    while !input.is_empty() {
+        nodes.push(input.parse()?);
+    }
+    Ok(nodes)
+}

src/component/context.rs

@@ -0,0 +1,249 @@
+//! # Context Module
+//!
+//! Provides the Context type which is central to component state management.
+//! Context holds component state, manages event handlers, and coordinates
+//! rendering and updates across the component tree.
+
+use std::{
+    any::{Any, TypeId},
+    collections::HashMap,
+    sync::{Arc, Mutex},
+};
+
+use access_cell::AccessCell;
+
+use crate::{
+    component::EventHandler,
+    engine::{Command, CommandExecutor},
+    render::DrawContext,
+    state::{use_effect, HookDependency},
+    View,
+};
+
+use super::{scope::Scope, Component, ComponentImpl};
+
+/// Context represents the runtime state and behavior of a component
+/// 
+/// Each component instance has a Context that holds:
+/// - The component implementation
+/// - The current view (render result)
+/// - Event handlers for responding to events
+/// - Child scopes for managing child components
+pub struct Context {
+    /// The component implementation
+    component: AccessCell<Component>,
+    /// The current rendered view
+    view: AccessCell<View>,
+    /// Event handlers grouped by event type
+    event_handlers: AccessCell<HashMap<TypeId, Vec<EventHandler>>>,
+    /// Child scopes (component hierarchies)
+    pub(crate) scopes: Mutex<Vec<Arc<Scope>>>,
+    /// Command executor for this context's command handling
+    executor: Arc<dyn CommandExecutor>,
+}
+
+impl Context {
+    /// Creates a new context for the given component
+    pub fn new<F: ComponentImpl + 'static>(
+        component: F,
+        executor: Arc<dyn CommandExecutor>,
+    ) -> Arc<Self> {
+        Arc::new(Self {
+            component: AccessCell::new(Arc::new(component)),
+            view: AccessCell::new(Arc::new(|_| {})),
+            event_handlers: AccessCell::new(HashMap::new()),
+            scopes: Mutex::new(Vec::new()),
+            executor,
+        })
+    }
+
+    /// Refreshes the component by re-rendering it
+    /// 
+    /// Clears event handlers and calls the component to produce a new view.
+    pub fn refresh(self: &Arc<Self>) {
+        self.event_handlers
+            .access(|event_handlers| event_handlers.clear());
+        self.component.access({
+            let s = self.clone();
+            move |component| {
+                let component = component.clone();
+                s.view.access({
+                    let s = s.clone();
+                    move |view| *view = component.call(&s)
+                })
+            }
+        });
+    }
+
+    /// Synchronously refreshes the component
+    /// 
+    /// Blocks until the component has finished rendering.
+    pub fn refresh_sync(self: &Arc<Self>) {
+        let (tx, rx) = std::sync::mpsc::channel::<()>();
+
+        self.event_handlers
+            .access(|event_handlers| event_handlers.clear());
+
+        self.component.access({
+            let s = self.clone();
+            move |component| {
+                let component = component.clone();
+
+                s.view.access({
+                    let s = s.clone();
+                    let tx = tx.clone();
+                    move |view| {
+                        *view = component.call(&s);
+                        let _ = tx.send(()); // signal completion
+                    }
+                });
+            }
+        });
+
+        // BLOCK until view closure finishes
+        let _ = rx.recv();
+    }
+
+    /// Gets the current view
+    pub fn get_view(self: &Arc<Self>) -> View {
+        self.view.access_ref().clone()
+    }
+
+    /// Registers an event handler for events of type T
+    /// 
+    /// When an event of type T is emitted, the handler is called with
+    /// the context and a reference to the event.
+    pub fn on_event<T: Any + 'static, F: Fn(&Arc<Self>, &T) + Send + Sync + 'static>(
+        self: &Arc<Self>,
+        handler: F,
+    ) {
+        let new_handler: EventHandler =
+            Arc::new(Mutex::new(move |ctx: &Arc<Context>, event: &dyn Any| {
+                if let Some(e) = event.downcast_ref::<T>() {
+                    (handler)(ctx, e);
+                }
+            }));
+        self.event_handlers.access(|event_handlers| {
+            event_handlers
+                .entry(TypeId::of::<T>())
+                .or_insert_with(Vec::new)
+                .push(new_handler);
+        });
+    }
+
+    /// Emits an event to this component and all descendants
+    /// 
+    /// Calls all registered handlers for this event type,
+    /// then propagates the event to child components.
+    pub fn emit_event<E: Send + Sync + Any + 'static>(self: &Arc<Self>, event: E) {
+        let event = Arc::new(event);
+        let handlers_to_call: Vec<EventHandler> = {
+            let guard = self.event_handlers.access_ref();
+            guard.get(&TypeId::of::<E>()).cloned().unwrap_or_default()
+        };
+        for h in &handlers_to_call {
+            (h.lock().unwrap())(self, event.as_ref());
+        }
+
+        for scope in self.scopes.lock().unwrap().iter() {
+            for (child, _) in scope.children.lock().unwrap().iter() {
+                child.emit_event(event.clone());
+            }
+        }
+    }
+
+    /// Emits an event to this component in a spawned thread
+    /// 
+    /// Similar to emit_event but handlers are called in spawned threads
+    /// for concurrent execution.
+    pub fn emit_event_threaded<E: Any + Send + Sync + Clone + 'static>(
+        self: &Arc<Self>,
+        event: &E,
+    ) {
+        let handlers_to_call: Vec<EventHandler> = {
+            let guard = self.event_handlers.access_ref();
+            guard.get(&TypeId::of::<E>()).cloned().unwrap_or_default()
+        };
+        for h in handlers_to_call {
+            let event = event.clone();
+            let s = self.clone();
+            std::thread::spawn(move || {
+                (h.lock().unwrap())(&s, &event);
+            });
+        }
+
+        for scope in self.scopes.lock().unwrap().iter() {
+            for (child, _) in scope.children.lock().unwrap().iter() {
+                child.emit_event_threaded(event);
+            }
+        }
+    }
+
+    /// Creates a new child scope
+    pub fn scope(self: &Arc<Self>) -> Arc<Scope> {
+        let scope = Scope::new(self.executor.clone());
+        self.scopes.lock().unwrap().push(scope.clone());
+
+        scope
+    }
+
+    /// Creates a dynamic child scope that re-renders when dependencies change
+    pub fn dyn_scope<F: Fn(&Arc<Scope>) + Send + Sync + 'static>(
+        self: &Arc<Self>,
+        drawer: F,
+        dependencies: &[&dyn HookDependency],
+    ) -> Arc<Scope> {
+        let scope = Scope::new(self.executor.clone());
+        self.scopes.lock().unwrap().push(scope.clone());
+
+        drawer(&scope);
+
+        use_effect(
+            {
+                let scope = scope.clone();
+                move || {
+                    drawer(&scope);
+                }
+            },
+            dependencies,
+        );
+
+        scope
+    }
+
+    /// Adds a pre-constructed scope as a child
+    pub fn add_scope(self: &Arc<Self>, scope: Arc<Scope>) {
+        self.scopes.lock().unwrap().push(scope);
+    }
+
+    /// Renders all child components to the draw context
+    pub fn draw_children(self: &Arc<Self>, ctx: &mut DrawContext) {
+        for scope in self.scopes.lock().unwrap().iter() {
+            for (child, view_wrapper) in scope.children.lock().unwrap().iter() {
+                let view = child.get_view();
+
+                if let Some(view_wrapper) = view_wrapper {
+                    view_wrapper(ctx, view)
+                } else {
+                    ctx.draw_view(ctx.area.clone(), view);
+                }
+            }
+        }
+    }
+
+    /// Gets the command executor for this context
+    pub fn get_executor(self: &Arc<Self>) -> Arc<dyn CommandExecutor> {
+        self.executor.clone()
+    }
+
+    /// Executes a command
+    pub fn execute<T: Command + 'static>(self: &Arc<Self>, command: T) -> crate::Result<()> {
+        self.executor
+            .execute_command(&(Arc::new(command) as Arc<dyn Command>))
+    }
+
+    /// Stops the application
+    pub fn stop(self: &Arc<Self>) -> crate::Result<()> {
+        self.execute(crate::engine::commands::Stop)
+    }
+}

src/component/mod.rs

@@ -0,0 +1,44 @@
+//! # Component Module
+//!
+//! Provides the component system that forms the foundation of OSUI.
+//! Components are reusable units of UI that can manage their own state
+//! and respond to events.
+
+pub mod context;
+pub mod scope;
+
+use std::{
+    any::Any,
+    sync::{Arc, Mutex},
+};
+
+use crate::View;
+
+use context::Context;
+
+/// A Component is an implementor of the ComponentImpl trait, wrapped in Arc
+pub type Component = Arc<dyn ComponentImpl>;
+
+/// An event handler function stored in a mutex for thread-safe mutation
+pub type EventHandler = Arc<Mutex<dyn FnMut(&Arc<Context>, &dyn Any) + Send + Sync>>;
+
+/// Trait implemented by components to render themselves
+pub trait ComponentImpl: Send + Sync {
+    /// Renders the component within the given context, returning a View
+    fn call(&self, cx: &Arc<Context>) -> View;
+}
+
+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/component/scope.rs

@@ -0,0 +1,56 @@
+//! # Scope Module
+//!
+//! Provides the Scope type for managing component hierarchies.
+//! Scopes group child components and manage their lifecycle.
+
+use std::sync::{Arc, Mutex};
+
+use crate::{engine::CommandExecutor, View, ViewWrapper};
+
+use super::{context::Context, ComponentImpl};
+
+/// A scope groups child components and manages their rendering
+/// 
+/// Scopes form the hierarchical structure of a component tree.
+/// Each scope contains references to its child components and their
+/// optional view wrappers (for layout/styling).
+pub struct Scope {
+    /// Child components with optional view wrappers
+    pub children: Mutex<Vec<(Arc<Context>, Option<ViewWrapper>)>>,
+    /// Command executor for this scope's children
+    executor: Arc<dyn CommandExecutor>,
+}
+
+impl Scope {
+    /// Creates a new scope with the given command executor
+    pub fn new(executor: Arc<dyn CommandExecutor>) -> Arc<Self> {
+        Arc::new(Self {
+            children: Mutex::new(Vec::new()),
+            executor,
+        })
+    }
+
+    /// Adds a child component to this scope
+    /// 
+    /// The view_wrapper is optional and can be used for layout or styling.
+    pub fn child<F: ComponentImpl + 'static>(
+        self: &Arc<Self>,
+        child: F,
+        view_wrapper: Option<ViewWrapper>,
+    ) {
+        let ctx = Context::new(child, self.executor.clone());
+
+        ctx.refresh();
+
+        self.children.lock().unwrap().push((ctx, view_wrapper));
+    }
+
+    /// Adds a view directly to this scope
+    pub fn view(self: &Arc<Self>, view: View) {
+        let ctx = Context::new(view, self.executor.clone());
+
+        ctx.refresh();
+
+        self.children.lock().unwrap().push((ctx, None));
+    }
+}

src/demos/mod.rs

@@ -1,62 +0,0 @@
-use std::sync::Arc;
-
-use osui::prelude::*;
-
-pub fn app(screen: Arc<Screen>) -> Rsx {
-    let count = use_state(0);
-
-    std::thread::spawn({
-        let count = count.clone();
-        move || loop {
-            **count.get() += 1;
-            std::thread::sleep(std::time::Duration::from_secs(1));
-        }
-    });
-
-    rsx! {
-        @Handler::new({
-            let screen = screen.clone();
-            move |_, e: &crossterm::event::Event| {
-                if let crossterm::event::Event::Key(crossterm::event::KeyEvent { code, .. }) = e {
-                    if *code == crossterm::event::KeyCode::Char('q') {
-                        screen.close();
-                    }
-                }
-            }});
-        Paginator {
-            FlexRow {
-                Heading, smooth: false, { "OSUI" }
-                "Welcome to the OSUI demo!"
-                "Press tab to switch to the next page or shift+tab to the previous page"
-            }
-
-            FlexCol, gap: 3, {
-                @Transform::new().padding(2, 2);
-                @Style { foreground: None, background: Background::RoundedOutline(0x00ff00) };
-                Div {
-                    "This is text inside a div"
-                }
-
-                @Transform::new().padding(2, 2);
-                @Style { foreground: None, background: Background::Outline(0x00ff00) };
-                Div {
-                    "This is text inside a div with square outlines"
-                }
-
-                // TODO: div with width full
-            }
-
-            FlexCol, gap: 2, {
-                @transform!{ y: Center };
-                static Div { // static only affects the element, not children
-                    %count
-                    "This will increment every second: {count}"
-                }
-
-                @Transform::new().padding(1, 1).dimensions(40, 1);
-                @Style { foreground: Some(0xffffff), background: Background::RoundedOutline(0xff0000) };
-                Input { }
-            }
-        }
-    }
-}

src/elements/div.rs

@@ -1,75 +0,0 @@
-use std::sync::Arc;
-
-use crate::{
-    widget::{Element, Widget},
-    NoRender, NoRenderRoot,
-};
-
-pub struct Div {
-    children: Vec<Arc<Widget>>,
-    size: (u16, u16),
-}
-
-impl Div {
-    pub fn new() -> Self {
-        Div {
-            children: Vec::new(),
-            size: (0, 0),
-        }
-    }
-}
-
-impl Element for Div {
-    fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        let (width, height) = scope.get_size_or(self.size.0, self.size.1);
-        scope.use_area(width, height);
-    }
-
-    fn after_render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        let mut transform = scope.get_transform().clone();
-        let (w, h) = scope.get_parent_size();
-        scope.set_parent_size(transform.width, transform.height);
-
-        for elem in &self.children {
-            if elem.get::<NoRender>().is_some() {
-                continue;
-            }
-
-            scope.clear();
-
-            if let Some(style) = elem.get() {
-                scope.set_style(style);
-            }
-            if let Some(t) = elem.get() {
-                scope.set_transform(&t);
-            }
-            elem.get_elem().render(scope);
-            if let Some(t) = elem.get() {
-                scope.set_transform(&t);
-            }
-            let t = scope.get_transform_mut();
-            transform.width = transform.width.max(t.x + t.width + (t.px * 2));
-            transform.height = transform.height.max(t.y + t.height + (t.py * 2));
-            t.x += transform.x + transform.px;
-            t.y += transform.y + transform.py;
-
-            scope.draw();
-            elem.get_elem().after_render(scope);
-        }
-        scope.set_parent_size(w, h);
-        self.size = (transform.width, transform.height);
-    }
-
-    fn draw_child(&mut self, element: &Arc<Widget>) {
-        self.children.push(element.clone());
-        element.inject(|w| w.component(NoRenderRoot));
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}

src/elements/flex.rs

@@ -1,158 +0,0 @@
-use std::sync::Arc;
-
-use crate::{
-    widget::{Element, Widget},
-    NoRender, NoRenderRoot,
-};
-
-pub struct FlexRow {
-    pub gap: u16,
-    children: Vec<Arc<Widget>>,
-    size: (u16, u16),
-}
-
-pub struct FlexCol {
-    pub gap: u16,
-    children: Vec<Arc<Widget>>,
-    size: (u16, u16),
-}
-
-impl FlexRow {
-    pub fn new() -> Self {
-        Self {
-            children: Vec::new(),
-            size: (0, 0),
-            gap: 0,
-        }
-    }
-}
-
-impl FlexCol {
-    pub fn new() -> Self {
-        Self {
-            children: Vec::new(),
-            size: (0, 0),
-            gap: 0,
-        }
-    }
-}
-
-impl Element for FlexRow {
-    fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        let (width, height) = scope.get_size_or(self.size.0, self.size.1);
-        scope.use_area(width, height);
-    }
-
-    fn after_render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        let mut transform = scope.get_transform().clone();
-        let (w, h) = scope.get_parent_size();
-        scope.set_parent_size(transform.width, transform.height);
-
-        let mut v = 0;
-
-        for elem in &self.children {
-            if elem.get::<NoRender>().is_some() {
-                continue;
-            }
-
-            scope.clear();
-            if let Some(style) = elem.get() {
-                scope.set_style(style);
-            }
-            if let Some(t) = elem.get() {
-                scope.set_transform(&t);
-            }
-            elem.get_elem().render(scope);
-            if let Some(t) = elem.get() {
-                scope.set_transform(&t);
-            }
-            let t = scope.get_transform_mut();
-            transform.width = transform.width.max(t.width);
-            transform.height = transform.height.max(v + t.height);
-            t.x += transform.x;
-            t.y += transform.y + v;
-            v += t.height + self.gap + (t.py * 2);
-            t.px += transform.px;
-            t.py += transform.py;
-
-            scope.draw();
-
-            elem.get_elem().after_render(scope);
-        }
-        scope.set_parent_size(w, h);
-        self.size = (transform.width, transform.height);
-    }
-
-    fn draw_child(&mut self, element: &Arc<Widget>) {
-        self.children.push(element.clone());
-        element.inject(|w| w.component(NoRenderRoot));
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}
-
-impl Element for FlexCol {
-    fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        let (width, height) = scope.get_size_or(self.size.0, self.size.1);
-        scope.use_area(width, height);
-    }
-
-    fn after_render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        let mut transform = scope.get_transform().clone();
-        let (w, h) = scope.get_parent_size();
-        scope.set_parent_size(transform.width, transform.height);
-
-        let mut v = 0;
-
-        for elem in &self.children {
-            if elem.get::<NoRender>().is_some() {
-                continue;
-            }
-
-            scope.clear();
-            if let Some(style) = elem.get() {
-                scope.set_style(style);
-            }
-            if let Some(t) = elem.get() {
-                scope.set_transform(&t);
-            }
-            elem.get_elem().render(scope);
-            if let Some(t) = elem.get() {
-                scope.set_transform(&t);
-            }
-            let t = scope.get_transform_mut();
-            transform.width = transform.width.max(v + t.width + (t.px * 2));
-            transform.height = transform.height.max(t.height + (t.py * 2));
-            t.x += transform.x + v;
-            t.y += transform.y;
-            v += t.width + self.gap + (t.px * 2);
-            t.px += transform.px;
-            t.py += transform.py;
-
-            scope.draw();
-
-            elem.get_elem().after_render(scope);
-        }
-        scope.set_parent_size(w, h);
-        self.size = (transform.width, transform.height);
-    }
-
-    fn draw_child(&mut self, element: &Arc<Widget>) {
-        self.children.push(element.clone());
-        element.inject(|w| w.component(NoRenderRoot));
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}

src/elements/heading.rs

@@ -1,63 +0,0 @@
-use std::sync::Arc;
-
-use figlet_rs::FIGfont;
-
-use crate::{
-    widget::{Element, Widget},
-    NoRender, NoRenderRoot,
-};
-
-pub struct Heading {
-    pub font: FIGfont,
-    pub smooth: bool,
-    children: Vec<Arc<Widget>>,
-}
-
-impl Heading {
-    pub fn new() -> Heading {
-        Heading {
-            font: FIGfont::standard().unwrap(),
-            smooth: false,
-            children: Vec::new(),
-        }
-    }
-}
-
-impl Element for Heading {
-    fn render(&mut self, scope: &mut crate::prelude::RenderScope) {
-        let mut s = String::new();
-        for element in &self.children {
-            if element.get::<NoRender>().is_some() {
-                continue;
-            }
-
-            if let Some(e) = element.get_elem().as_any().downcast_ref::<String>() {
-                s += e;
-            }
-        }
-        if let Some(t) = self.font.convert(&s) {
-            scope.draw_text(
-                0,
-                0,
-                &if self.smooth {
-                    format!("{t}").replace("-", "─").replace("|", "│")
-                } else {
-                    format!("{t}")
-                },
-            );
-        }
-    }
-
-    fn draw_child(&mut self, element: &Arc<Widget>) {
-        element.inject(|w| w.component(NoRenderRoot));
-        self.children.push(element.clone());
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}

src/elements/input.rs

@@ -1,80 +0,0 @@
-use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
-
-use crate::{
-    state::{use_state, State},
-    widget::Element,
-};
-
-pub struct Input {
-    pub state: State<String>,
-    cursor: usize,
-}
-
-impl Element for Input {
-    fn render(&mut self, scope: &mut crate::prelude::RenderScope) {
-        let s = self.state.get();
-        scope.draw_text(0, 0, &s);
-        if let Some(c) = s.chars().nth(self.cursor) {
-            scope.draw_text_inverted(self.cursor as u16, 0, &c.to_string());
-        } else {
-            scope.draw_text_inverted(s.len() as u16, 0, " ");
-        }
-    }
-
-    fn event(&mut self, event: &dyn crate::prelude::Event) {
-        if let Some(crossterm::event::Event::Key(KeyEvent {
-            code, modifiers, ..
-        })) = event.get()
-        {
-            if !modifiers.is_empty() && !modifiers.contains(KeyModifiers::SHIFT) {
-                return;
-            }
-
-            match code {
-                KeyCode::Char(c) => {
-                    self.state.get().insert(self.cursor, *c);
-                    self.cursor += 1;
-                }
-                KeyCode::Backspace => {
-                    if self.cursor > 0 {
-                        self.state.get().remove(self.cursor - 1);
-                        self.cursor -= 1;
-                    }
-                }
-                KeyCode::Delete => {
-                    if self.cursor > 0 && self.state.get().len() > self.cursor {
-                        self.state.get().remove(self.cursor);
-                    }
-                }
-                KeyCode::Left => {
-                    if self.cursor > 0 {
-                        self.cursor -= 1;
-                    }
-                }
-                KeyCode::Right => {
-                    if self.cursor < self.state.get().len() {
-                        self.cursor += 1;
-                    }
-                }
-                _ => {}
-            }
-        }
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}
-
-impl Input {
-    pub fn new() -> Self {
-        Self {
-            state: use_state(String::new()),
-            cursor: 0,
-        }
-    }
-}

src/elements/mod.rs

@@ -1,41 +0,0 @@
-pub mod div;
-pub mod flex;
-pub mod heading;
-pub mod input;
-pub mod paginator;
-
-pub use div::*;
-pub use flex::*;
-pub use heading::*;
-pub use input::*;
-pub use paginator::*;
-
-use crate::Element;
-
-impl Element for String {
-    fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        scope.draw_text(0, 0, self);
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}
-
-impl Element for (String, u32) {
-    fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        scope.draw_text_colored(0, 0, &self.0, self.1);
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}

src/elements/paginator.rs

@@ -1,102 +0,0 @@
-use std::sync::Arc;
-
-use crossterm::event::{KeyCode, KeyEvent};
-
-use crate::{
-    widget::{Element, Widget},
-    NoRender, NoRenderRoot,
-};
-
-pub struct Paginator {
-    children: Vec<Arc<Widget>>,
-    size: (u16, u16),
-    index: usize,
-}
-
-impl Paginator {
-    pub fn new() -> Self {
-        Self {
-            children: Vec::new(),
-            size: (0, 0),
-            index: 0,
-        }
-    }
-}
-
-impl Element for Paginator {
-    fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        let (width, height) = scope.get_size_or(self.size.0, self.size.1);
-        scope.use_area(width, height);
-    }
-
-    fn after_render(&mut self, scope: &mut crate::render_scope::RenderScope) {
-        if let Some(elem) = self.children.get(self.index) {
-            if elem.get::<NoRender>().is_some() {
-                return;
-            }
-
-            let mut transform = scope.get_transform().clone();
-            let (w, h) = scope.get_parent_size();
-            scope.set_parent_size(transform.width, transform.height);
-            scope.clear();
-
-            if let Some(style) = elem.get() {
-                scope.set_style(style);
-            }
-            if let Some(t) = elem.get() {
-                scope.set_transform(&t);
-            }
-            elem.get_elem().render(scope);
-            if let Some(t) = elem.get() {
-                scope.set_transform(&t);
-            }
-            let t = scope.get_transform_mut();
-            transform.width = transform.width.max(t.x + t.width + (t.px * 2));
-            transform.height = transform.height.max(t.y + t.height + (t.py * 2));
-            t.x += transform.x + transform.px;
-            t.y += transform.y + transform.py;
-
-            scope.draw();
-            elem.get_elem().after_render(scope);
-
-            scope.set_parent_size(w, h);
-            self.size = (transform.width, transform.height);
-        }
-    }
-
-    fn event(&mut self, event: &dyn crate::prelude::Event) {
-        if let Some(crossterm::event::Event::Key(KeyEvent { code, .. })) = event.get() {
-            let cl = self.children.len();
-            match code {
-                KeyCode::Tab => {
-                    if self.index + 1 < cl {
-                        self.index += 1;
-                    } else {
-                        self.index = 0;
-                    }
-                }
-                KeyCode::BackTab => {
-                    if self.index > 0 {
-                        self.index -= 1;
-                    } else if cl > 0 {
-                        self.index = cl - 1;
-                    }
-                }
-                _ => {}
-            }
-        }
-    }
-
-    fn draw_child(&mut self, element: &Arc<Widget>) {
-        self.children.push(element.clone());
-        element.inject(|w| w.component(NoRenderRoot));
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}

src/engine/benchmark.rs

@@ -0,0 +1,110 @@
+//! # Benchmark Module
+//!
+//! Provides performance benchmarking capabilities for rendering engines.
+
+use std::{io::stdout, sync::Arc, time::Instant};
+
+use crossterm::{cursor::MoveTo, execute, terminal::Clear};
+
+use crate::component::{context::Context, ComponentImpl};
+use crate::{render::Area, DrawContext, View};
+
+use super::Engine;
+
+/// Results of a benchmark run
+#[derive(Debug, Clone)]
+pub struct BenchmarkResult {
+    /// Average render time in microseconds
+    pub average: u128,
+    /// Minimum render time in microseconds
+    pub min: u128,
+    /// Maximum render time in microseconds
+    pub max: u128,
+    /// Total time spent rendering in microseconds
+    pub total_render: u128,
+    /// Total benchmark time including setup in microseconds
+    pub total: u128,
+}
+
+/// Wraps an engine to benchmark its rendering performance
+pub struct Benchmark<T: Engine>(T);
+
+impl<T: Engine> Benchmark<T> {
+    /// Creates a new benchmark wrapper around the given engine
+    pub fn new(engine: T) -> Self {
+        Self(engine)
+    }
+}
+
+impl<T: Engine> Engine<BenchmarkResult> for Benchmark<T> {
+    fn run<F: ComponentImpl + 'static>(&self, component: F) -> crate::Result<BenchmarkResult> {
+        let mut times: Vec<u128> = Vec::new();
+        let cx = self.init(component);
+
+        let start = Instant::now();
+
+        // Run 40 render cycles and measure each
+        for _ in 0..40 {
+            let start = Instant::now();
+            self.render(&cx);
+            let end = Instant::now();
+            times.push(end.duration_since(start).as_micros());
+        }
+
+        let end = Instant::now();
+
+        execute!(stdout(), Clear(crossterm::terminal::ClearType::Purge)).unwrap();
+        execute!(stdout(), Clear(crossterm::terminal::ClearType::All)).unwrap();
+        execute!(stdout(), MoveTo(0, 0)).unwrap();
+
+        Ok(BenchmarkResult {
+            min: *times.iter().min().unwrap_or(&0),
+            max: *times.iter().max().unwrap_or(&0),
+            total: end.duration_since(start).as_micros(),
+            total_render: times.iter().sum::<u128>(),
+            average: if times.len() > 0 {
+                times.iter().sum::<u128>() / (times.len() as u128)
+            } else {
+                0
+            },
+        })
+    }
+
+    fn init<F: ComponentImpl + 'static>(&self, component: F) -> Arc<Context> {
+        self.0.init(component)
+    }
+
+    fn draw_context(&self, ctx: &DrawContext) {
+        self.0.draw_context(ctx)
+    }
+
+    fn render(&self, cx: &Arc<Context>) {
+        self.0.render(cx)
+    }
+
+    fn render_view(&self, area: &Area, view: &View) -> DrawContext {
+        self.0.render_view(area, view)
+    }
+
+    fn render_delay(&self) {
+        self.0.render_delay();
+    }
+
+    fn executor(&self) -> Arc<dyn super::CommandExecutor> {
+        self.0.executor()
+    }
+}
+
+impl std::fmt::Display for BenchmarkResult {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "- Average: {} µs\n\
+             - Min: {} µs\n\
+             - Max: {} µs\n\
+             - Total Render: {} µs\n\
+             - Total: {} µs",
+            self.average, self.min, self.max, self.total_render, self.total
+        )
+    }
+}

src/engine/commands.rs

@@ -0,0 +1,14 @@
+//! # Commands Module
+//!
+//! Defines built-in commands for controlling the engine.
+
+use crate::engine::Command;
+
+/// Command to stop the engine and terminate the application
+pub struct Stop;
+
+impl Command for Stop {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}

src/engine/console.rs

@@ -0,0 +1,153 @@
+//! # Console Engine Implementation
+//!
+//! Provides a Console implementation of the Engine trait for rendering
+//! to the terminal using crossterm.
+
+use std::{
+    io::{stdout, Write},
+    sync::{Arc, Mutex},
+};
+
+use crossterm::{cursor::MoveTo, execute, terminal::Clear};
+
+use crate::component::{context::Context, ComponentImpl};
+use crate::{
+    engine::{commands, CommandExecutor},
+    render::Area,
+    DrawContext, View,
+};
+
+use super::Engine;
+
+/// Executes commands for the console engine
+pub struct ConsoleExecutor {
+    /// Flag indicating whether the application is running
+    running: Mutex<bool>,
+}
+
+/// Console-based rendering engine
+/// 
+/// Renders components to the terminal using crossterm for cross-platform support.
+pub struct Console {
+    /// Thread functions to execute
+    threads: Mutex<Vec<Arc<dyn Fn(Arc<Context>) + Send + Sync>>>,
+    /// The executor for this console
+    executor: Arc<ConsoleExecutor>,
+}
+
+impl Console {
+    /// Creates a new console engine
+    pub fn new() -> Self {
+        Self {
+            threads: Mutex::new(Vec::new()),
+            executor: Arc::new(ConsoleExecutor {
+                running: Mutex::new(true),
+            }),
+        }
+    }
+
+    /// Registers a thread function to run alongside the engine
+    pub fn thread<F: Fn(Arc<Context>) + Send + Sync + 'static>(&self, run: F) {
+        self.threads.lock().unwrap().push(Arc::new(run));
+    }
+}
+
+impl Engine for Console {
+    fn render_view(&self, area: &Area, view: &View) -> DrawContext {
+        let mut context = DrawContext::new(area.clone());
+        view(&mut context);
+        context
+    }
+
+    fn draw_context(&self, ctx: &DrawContext) {
+        for inst in &ctx.drawing {
+            match inst {
+                crate::render::DrawInstruction::Text(point, text) => {
+                    let (x, y) = (ctx.area.x + point.x, ctx.area.y + point.y);
+                    execute!(stdout(), MoveTo(x, y),).unwrap();
+                    print!("{text}");
+                    stdout().flush().unwrap();
+                }
+                crate::render::DrawInstruction::Child(_point, child) => self.draw_context(child),
+                crate::render::DrawInstruction::View(area, view) => {
+                    self.draw_context(&self.render_view(area, view))
+                }
+            }
+        }
+    }
+
+    fn render(&self, cx: &Arc<Context>) {
+        let (width, height) = crossterm::terminal::size().unwrap();
+
+        execute!(stdout(), Clear(crossterm::terminal::ClearType::Purge)).unwrap();
+        execute!(stdout(), Clear(crossterm::terminal::ClearType::All)).unwrap();
+
+        self.draw_context(&self.render_view(
+            &Area {
+                x: 0,
+                y: 0,
+                width,
+                height,
+            },
+            &cx.get_view(),
+        ));
+    }
+
+    fn init<C: ComponentImpl + 'static>(&self, component: C) -> Arc<Context> {
+        crossterm::execute!(std::io::stdout(), crossterm::cursor::Hide).unwrap();
+
+        let cx = Context::new(component, self.executor.clone());
+        cx.refresh();
+
+        for thread in self.threads.lock().unwrap().iter() {
+            let thread = thread.clone();
+
+            std::thread::spawn({
+                let cx = cx.clone();
+                move || thread(cx)
+            });
+        }
+
+        cx
+    }
+
+    fn executor(&self) -> Arc<dyn super::CommandExecutor> {
+        self.executor.clone()
+    }
+
+    fn run<F: ComponentImpl + 'static>(&self, component: F) -> crate::Result<()> {
+        let cx = self.init(component);
+
+        while self.executor.is_running() {
+            self.render(&cx);
+            self.render_delay();
+        }
+
+        Ok(())
+    }
+}
+
+impl ConsoleExecutor {
+    /// Checks if the engine is still running
+    pub fn is_running(self: &Arc<ConsoleExecutor>) -> bool {
+        *self.running.lock().unwrap()
+    }
+
+    /// Stops the engine
+    pub fn stop(&self) -> crate::Result<()> {
+        *self.running.lock()? = false;
+        Ok(())
+    }
+}
+
+impl CommandExecutor for ConsoleExecutor {
+    fn execute_command(&self, command: &Arc<dyn super::Command>) -> crate::Result<()> {
+        let command = command.as_any();
+
+        if let Some(commands::Stop) = command.downcast_ref() {
+            self.stop()?;
+        }
+
+        Ok(())
+    }
+}

src/engine/mod.rs

@@ -0,0 +1,55 @@
+//! # Engine Module
+//!
+//! Provides the rendering engine and command execution system.
+//! The engine is responsible for initializing components, rendering frames,
+//! and handling user commands.
+
+pub mod benchmark;
+pub mod commands;
+pub mod console;
+
+pub use benchmark::*;
+pub use console::*;
+
+use std::{any::Any, sync::Arc};
+
+use crate::component::{context::Context, ComponentImpl};
+use crate::{render::Area, DrawContext, View};
+
+/// Main engine trait for rendering and running components
+pub trait Engine<Output = ()> {
+    /// Runs a component to completion
+    fn run<C: ComponentImpl + 'static>(&self, component: C) -> crate::Result<Output>;
+    
+    /// Initializes a component and returns its context
+    fn init<C: ComponentImpl + 'static>(&self, component: C) -> Arc<Context>;
+    
+    /// Renders the current state of a component
+    fn render(&self, cx: &Arc<Context>);
+    
+    /// Sleeps between render frames (default 16ms for ~60fps)
+    fn render_delay(&self) {
+        crate::sleep(16);
+    }
+
+    /// Renders a view within an area and returns the draw context
+    fn render_view(&self, area: &Area, view: &View) -> DrawContext;
+    
+    /// Executes the drawing instructions in a draw context
+    fn draw_context(&self, ctx: &DrawContext);
+    
+    /// Returns the command executor for this engine
+    fn executor(&self) -> Arc<dyn CommandExecutor>;
+}
+
+/// Trait for commands that can be executed by the engine
+pub trait Command {
+    /// Returns the command as Any for downcasting
+    fn as_any(&self) -> &dyn Any;
+}
+
+/// Executes commands during the application lifecycle
+pub trait CommandExecutor: Send + Sync {
+    /// Executes the given command
+    fn execute_command(&self, command: &Arc<dyn Command>) -> crate::Result<()>;
+}

src/extensions/id.rs

@@ -1,27 +0,0 @@
-use std::sync::Arc;
-
-use crate::{component, extensions::Extension, widget::Widget, Screen};
-
-pub struct IdExtension(pub Arc<Screen>);
-
-component!(Id(pub usize));
-
-impl Extension for Arc<IdExtension> {}
-
-impl IdExtension {
-    pub fn new(screen: Arc<Screen>) -> Arc<Self> {
-        Arc::new(IdExtension(screen))
-    }
-
-    pub fn get_element(self: &Arc<IdExtension>, id: usize) -> Option<Arc<Widget>> {
-        for elem in self.0.widgets.lock().unwrap().iter() {
-            if let Some(current_id) = elem.get::<Id>() {
-                if current_id.0 == id {
-                    return Some(elem.clone());
-                }
-            }
-        }
-
-        None
-    }
-}

src/extensions/input_handling.rs

@@ -1,26 +0,0 @@
-use crate::extensions::Extension;
-
-pub struct InputExtension;
-
-impl Extension for InputExtension {
-    fn init(&mut self, screen: std::sync::Arc<crate::Screen>) {
-        crossterm::terminal::enable_raw_mode().unwrap();
-        std::thread::spawn(move || loop {
-            if let Ok(e) = crossterm::event::read() {
-                for widget in screen.widgets.lock().unwrap().iter() {
-                    widget.event(&e);
-                }
-            }
-        });
-    }
-
-    fn on_close(&mut self, _screen: std::sync::Arc<crate::Screen>) {
-        crossterm::terminal::disable_raw_mode().unwrap();
-    }
-}
-
-impl crate::extensions::Event for crossterm::event::Event {
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-}

src/extensions/mod.rs

@@ -1,66 +0,0 @@
-pub mod id;
-pub mod input_handling;
-pub mod tick;
-pub mod velocity;
-
-pub use id::*;
-pub use input_handling::*;
-pub use tick::*;
-pub use velocity::*;
-
-use std::{
-    any::{type_name, Any},
-    fmt::Debug,
-    sync::{Arc, Mutex},
-};
-
-use crate::{
-    render_scope::RenderScope,
-    widget::{Component, Widget},
-    Screen,
-};
-
-pub trait Extension {
-    fn init(&mut self, _screen: Arc<Screen>) {}
-    fn on_close(&mut self, _screen: Arc<Screen>) {}
-    fn render_widget(&mut self, _scope: &mut RenderScope, _widget: &Arc<Widget>) {}
-}
-
-pub trait Event: Send + Sync {
-    fn as_any(&self) -> &dyn Any;
-}
-
-#[derive(Clone)]
-pub struct Handler<E: Event>(Arc<Mutex<dyn FnMut(&Arc<Widget>, &E) + Send + Sync>>);
-
-impl<E: Event + 'static> Component for Handler<E> {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
-impl<E: Event + 'static> Handler<E> {
-    pub fn new<F: FnMut(&Arc<Widget>, &E) + Send + Sync + 'static>(f: F) -> Handler<E> {
-        Handler(Arc::new(Mutex::new(f)))
-    }
-
-    pub fn call(&self, w: &Arc<Widget>, e: &E) {
-        (self.0.lock().unwrap())(w, e)
-    }
-}
-
-impl<E: Event> Debug for Handler<E> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Handler({})", type_name::<E>())
-    }
-}
-
-impl<'a> dyn Event + 'a {
-    pub fn get<T: Event + 'static>(&self) -> Option<&T> {
-        self.as_any().downcast_ref()
-    }
-}

src/extensions/tick.rs

@@ -1,26 +0,0 @@
-use std::{fmt::Debug, sync::Arc};
-
-use crate::extensions::Extension;
-use crate::{event, Screen};
-
-pub struct TickExtension(pub u16);
-
-event!(TickEvent(pub u32));
-
-impl Extension for TickExtension {
-    fn init(&mut self, screen: Arc<Screen>) {
-        let rate_dur = 1000 / self.0 as u64;
-        std::thread::spawn({
-            move || {
-                let mut tick = 0;
-                loop {
-                    for w in screen.widgets.lock().unwrap().iter() {
-                        w.event(&TickEvent(tick));
-                    }
-                    tick += 1;
-                    std::thread::sleep(std::time::Duration::from_millis(rate_dur));
-                }
-            }
-        });
-    }
-}

src/extensions/velocity.rs

@@ -1,64 +0,0 @@
-use std::sync::Arc;
-
-use crate::{
-    component,
-    extensions::Extension,
-    style::{Position, Transform},
-    widget::Widget,
-    Screen,
-};
-
-pub struct VelocityExtension;
-
-component!(Velocity(pub i32, pub i32));
-
-impl VelocityExtension {
-    fn apply_velocity(ticks: u16, velocity: i32, x: &mut u16) {
-        if velocity.abs() != 0 && ticks as i32 % (1000 / velocity.abs()) == 0 {
-            if velocity > 0 {
-                *x += 1;
-            } else if velocity < 0 {
-                *x -= 1;
-            }
-        }
-    }
-
-    fn apply_velocity_xy(ticks: u16, widget: &Arc<Widget>) {
-        if let Some(velocity) = widget.get::<Velocity>() {
-            if let Some(mut t) = widget.get::<Transform>() {
-                match &mut t.x {
-                    Position::Const(x) => Self::apply_velocity(ticks, velocity.0, x),
-                    _ => {}
-                }
-
-                match &mut t.y {
-                    Position::Const(y) => Self::apply_velocity(ticks, velocity.1, y),
-                    _ => {}
-                }
-
-                widget.set_component(t);
-            }
-        }
-    }
-}
-
-impl Extension for VelocityExtension {
-    fn init(&mut self, screen: Arc<Screen>) {
-        std::thread::spawn({
-            move || {
-                let mut tick = 0;
-                loop {
-                    for widget in screen.widgets.lock().unwrap().iter() {
-                        Self::apply_velocity_xy(tick, widget);
-                    }
-                    if tick > 1000 {
-                        tick = 0;
-                    } else {
-                        tick += 1;
-                    }
-                    std::thread::sleep(std::time::Duration::from_millis(1));
-                }
-            }
-        });
-    }
-}

src/frontend.rs

@@ -1,103 +1,122 @@
-//! The frontend binder for OSUI.
+//! # Frontend Module
 //!
-//! This module defines the internal representation of RSX elements — the tree-like structure used
+//! Provides the RSX (React-like Syntax) system for composing components.
-//! by the `rsx!` macro in OSUI to declaratively build terminal user interfaces.
+//! This module defines the structure for building component hierarchies
-//!
+//! with static and dynamic scopes, similar to React's JSX.
-//! RSX elements can be either static widgets or dynamically loaded ones with dependencies.
-//! This structure enables recursive rendering, parent-child composition, and runtime dependency handling.
 
 use std::sync::Arc;
 
-use crate::{
+use crate::component::{context::Context, scope::Scope};
-    state::DependencyHandler,
+use crate::{render::Point, state::HookDependency, View};
-    widget::{StaticWidget, Widget, WidgetLoad},
-    Screen,
-};
 
-/// Represents a single element in the RSX tree.
+/// Trait for converting values to RSX
-pub enum RsxElement {
+pub trait ToRsx {
-    /// A static widget with children.
+    /// Convert to RSX representation
-    Element(StaticWidget, Rsx),
+    fn to_rsx(&self) -> Rsx;
-
-    /// A dynamically generated widget (e.g., with state) with associated dependencies and children.
-    DynElement(
-        Box<dyn FnMut() -> WidgetLoad + Send + Sync>,
-        Vec<Box<dyn DependencyHandler>>,
-        Rsx,
-    ),
 }
 
-/// A container representing a group of RSX elements.
+/// Scope types for RSX components
-/// This is typically created via the `rsx!` macro and rendered using a `Screen`.
+#[derive(Clone)]
-pub struct Rsx(pub Vec<RsxElement>);
+pub enum RsxScope {
+    /// Static scope - executed once and never updated
+    Static(Arc<dyn Fn(&Arc<Scope>) + Send + Sync>),
+    /// Dynamic scope - re-executed when dependencies change
+    Dynamic(
+        Arc<dyn Fn(&Arc<Scope>) + Send + Sync>,
+        Vec<Arc<dyn HookDependency>>,
+    ),
+    /// Child RSX scope for composition
+    Child(Rsx),
+}
+
+/// RSX (React-like Syntax) builder for component hierarchies
+/// 
+/// Represents a collection of scopes that define component structure.
+/// Scopes can be static (execute once) or dynamic (reactive to changes).
+#[derive(Clone)]
+pub struct Rsx(Vec<RsxScope>);
 
 impl Rsx {
-    /// Draws the RSX tree onto the given screen without a parent widget.
+    /// Creates a new empty RSX
-    ///
+    pub fn new() -> Self {
-    /// This is the entry point for rendering the UI.
+        Self(Vec::new())
-    pub fn draw(self, screen: &Arc<Screen>) {
-        self.draw_parent(screen, None);
     }
 
-    /// Recursively draws the RSX tree with an optional parent widget.
+    /// Adds a static scope to this RSX
     /// 
-    /// Used internally to establish parent-child widget relationships.
+    /// The provided function is executed once during rendering
-    pub fn draw_parent(self, screen: &Arc<Screen>, parent: Option<Arc<Widget>>) {
+    /// and will not be re-executed on dependency changes.
-        for rsx_elem in self.0 {
+    pub fn static_scope<F: Fn(&Arc<Scope>) + Send + Sync + 'static>(&mut self, scope: F) {
-            match rsx_elem {
+        self.0.push(RsxScope::Static(Arc::new(scope)));
-                RsxElement::DynElement(f, dep, child) => {
+    }
-                    let w = screen.draw_box_dyn(f);
 
-                    if let Some(parent) = &parent {
+    /// Adds a dynamic scope to this RSX
-                        parent.get_elem().draw_child(&w);
+    /// 
-                    }
+    /// The provided function is executed when dependencies change,
+    /// allowing for reactive updates similar to React hooks.
+    pub fn dynamic_scope<F: Fn(&Arc<Scope>) + Send + Sync + 'static>(
+        &mut self,
+        drawer: F,
+        dependencies: Vec<Arc<dyn HookDependency>>,
+    ) {
+        self.0
+            .push(RsxScope::Dynamic(Arc::new(drawer), dependencies));
+    }
 
-                    for d in dep {
+    /// Adds a child RSX
-                        w.dependency_box(d);
+    pub fn child<R: ToRsx>(&mut self, child: R) {
-                    }
+        self.0.push(RsxScope::Child(child.to_rsx()));
+    }
 
-                    child.draw_parent(screen, Some(w.clone()));
+    /// Generates child components within the given context
+    pub fn generate_children(&self, context: &Arc<Context>) {
+        let executor = context.get_executor();
+
+        for scope in &self.0 {
+            match scope {
+                RsxScope::Static(scope_fn) => {
+                    let scope = Scope::new(executor.clone());
+                    (scope_fn)(&scope);
+                    context.add_scope(scope)
                 }
-
+                RsxScope::Dynamic(drawer, dependencies) => {
-                RsxElement::Element(ws, child) => {
+                    let drawer = drawer.clone();
-                    let w = Arc::new(Widget::Static(ws));
+                    context.dyn_scope(
-                    screen.draw_widget(w.clone());
+                        move |c| drawer(c),
-
+                        &dependencies.iter().map(|d| d.as_ref()).collect::<Vec<_>>(),
-                    if let Some(parent) = &parent {
+                    );
-                        parent.get_elem().draw_child(&w);
-                    }
-
-                    child.draw_parent(screen, Some(w.clone()));
                 }
+                RsxScope::Child(child) => child.generate_children(context),
             }
         }
     }
 
-    /// Adds a dynamically constructed element to the RSX tree.
+    /// Converts this RSX to a View
-    ///
+    pub fn view(&self, context: &Arc<Context>) -> View {
-    /// - `load`: A closure returning a `WidgetLoad` used to generate the widget.
+        let context = context.clone();
-    /// - `dependencies`: A list of dependency handlers for state or event updates.
-    /// - `children`: Child RSX elements.
-    pub fn create_element<F: FnMut() -> WidgetLoad + Send + Sync + 'static>(
-        &mut self,
-        load: F,
-        dependencies: Vec<Box<dyn DependencyHandler>>,
-        children: Rsx,
-    ) {
-        self.0.push(RsxElement::DynElement(
-            Box::new(load),
-            dependencies,
-            children,
-        ));
-    }
 
-    /// Adds a statically defined element to the RSX tree with its children.
+        self.generate_children(&context);
-    pub fn create_element_static(&mut self, element: StaticWidget, children: Rsx) {
-        self.0.push(RsxElement::Element(element, children));
-    }
 
-    /// Appends the elements from another `Rsx` tree into this one.
+        Arc::new({
-    pub fn expand(&mut self, other: &mut Rsx) {
+            move |ctx| {
-        self.0.append(&mut other.0);
+                context.draw_children(ctx);
+            }
+        })
+    }
+}
+
+impl ToRsx for &Rsx {
+    fn to_rsx(&self) -> Rsx {
+        Rsx(self.0.clone())
+    }
+}
+
+impl<T: std::fmt::Display> ToRsx for T {
+    fn to_rsx(&self) -> Rsx {
+        let s = self.to_string();
+        Rsx(vec![RsxScope::Static(Arc::new(move |scope| {
+            let s = s.clone();
+            scope.view(Arc::new(move |ctx| ctx.draw_text(Point { x: 0, y: 0 }, &s)))
+        }))])
     }
 }

src/lib.rs

@@ -1,235 +1,90 @@
-//! **OSUI** – A Rust Terminal User Interface Library
+//! # OSUI - A TUI Library for Advanced UIs
 //!
-//! OSUI is a library for building interactive and customizable terminal user interfaces in Rust.
+//! OSUI is a Rust library for building sophisticated Terminal User Interfaces (TUIs).
-//! It provides a component system, real-time keyboard input handling, and a `rsx!` macro
+//! It provides a component-based architecture with state management, event handling,
-//! for defining UI elements in a declarative way, however that is optional.
+//! and rendering capabilities for creating interactive console applications.
 //!
-//! ✅ **Features**
+//! ## Key Features
-//! - 🧱 RSX-like syntax with `rsx!` macro
-//! - 🖥️ Virtual screen abstraction
-//! - 🎹 Keyboard input handling
-//! - 🎯 Component-based design
-//! - ⚡ Real-time rendering
 //!
-//! 🚀 **Quick Example**
+//! - **Component System**: Build UIs using composable components
-//! ```rust
+//! - **State Management**: React-like hooks for managing component state
+//! - **Event Handling**: Type-safe event system with reactive updates
+//! - **RSX Syntax**: Macro-based DSL for defining component hierarchies
+//! - **Console Engine**: Terminal rendering with crossterm support
+//!
+//! ## Architecture
+//!
+//! - [`component`] - Component system and context management
+//! - [`state`] - State management with hooks (useState, useEffect, etc.)
+//! - [`engine`] - Rendering engine and command execution
+//! - [`frontend`] - RSX (React-like Syntax) for component definitions
+//! - [`render`] - Low-level rendering primitives
+//!
+//! ## Example
+//!
+//! ```rust,no_run
 //! use osui::prelude::*;
+//! use std::sync::Arc;
 //!
-//! fn main() -> std::io::Result<()> {
+//! #[component]
-//!     let screen = Screen::new();
+//! pub fn Counter(cx: &Arc<Context>) -> View {
-//!     rsx! {
+//!     let count = use_state(0);
-//!         "👋 Hello, World!"
+//!     
-//!     }.draw(&screen);
+//!     Arc::new(move |ctx| {
-//!     screen.run()
+//!         ctx.draw_text(Point { x: 0, y: 0 }, &format!("Count: {}", count.get_dl()));
+//!     })
 //! }
 //! ```
-//!
-//! ---
-//! 🧰 For full documentation, visit: [osui.netlify.app/docs](https://osui.netlify.app/docs)  
-//!
-//! 🧪 Examples and demos: [github.com/osui-rs/osui/demos](https://github.com/osui-rs/osui/tree/master/src/demos)
 
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 
-use crate::{
+use crate::render::DrawContext;
-    extensions::{Extension, Handler},
-    render_scope::RenderScope,
-    widget::{BoxedElement, DynWidget, Element, StaticWidget, Widget, WidgetLoad},
-};
 
-pub mod elements;
+pub mod component;
-pub mod extensions;
+pub mod engine;
 pub mod frontend;
-pub mod macros;
+pub mod render;
-pub mod render_scope;
 pub mod state;
-pub mod style;
-pub mod utils;
-pub mod widget;
 
 pub mod prelude {
-    pub use crate::{
+    //! Prelude module - Re-exports commonly used items for convenience
-        elements::*, extensions::*, frontend::*, render_scope::*, state::*, style::*, utils::*,
+    pub use crate::component::{context::*, scope::*, *};
-        widget::*, *,
+    pub use crate::engine::*;
-    };
+    pub use crate::frontend::*;
-
+    pub use crate::render::*;
-    pub use crate::style::{
+    pub use crate::state::*;
-        Dimension::{Content, Full},
+    pub use crate::{sleep, Error, Result, View, ViewWrapper};
-        Position::{Center, End},
+    pub use crossterm;
-    };
+    pub use osui_macros::{component, rsx};
+    pub use std::sync::{Arc, Mutex};
 }
 
-/// The main screen abstraction for rendering and managing widgets and extensions.
+/// A View is an async function that renders content to a DrawContext.
-///
+/// It takes a mutable DrawContext and produces drawing instructions.
-/// `Screen` holds the root widget list and registered extensions. It provides methods
+pub type View = Arc<dyn Fn(&mut DrawContext) + Send + Sync>;
-/// for drawing elements, adding extensions, and running the main rendering loop.
+
-///
+/// A ViewWrapper is a higher-order function that wraps views.
-/// # Examples
+/// It can modify or enhance how a view is rendered.
-/// ```rust
+pub type ViewWrapper = Arc<dyn Fn(&mut DrawContext, View) + Send + Sync>;
-/// let screen = Screen::new();
+
-/// rsx! { "Hello" }.draw(&screen);
+/// Result type for OSUI operations
-/// screen.run()?;
+pub type Result<T> = std::result::Result<T, Error>;
-/// ```
+
-pub struct Screen {
+/// Error type for OSUI operations
-    /// The list of widgets currently managed by the screen.
+#[derive(Debug, Clone)]
-    pub widgets: Mutex<Vec<Arc<Widget>>>,
+pub enum Error {
-    /// Registered extensions for the screen.
+    /// Error that occurs when a mutex is poisoned
-    extensions: Mutex<Vec<Arc<Mutex<Box<dyn Extension + Send + Sync>>>>>,
+    PoisonError,
-    /// If it's still running
-    running: Mutex<bool>,
 }
 
-event!(RenderWrapperEvent(*mut RenderScope));
+impl From<std::sync::PoisonError<std::sync::MutexGuard<'_, bool>>> for Error {
-component!(NoRender);
+    fn from(_value: std::sync::PoisonError<std::sync::MutexGuard<'_, bool>>) -> Self {
-component!(NoRenderRoot);
+        Error::PoisonError
-
-impl RenderWrapperEvent {
-    /// Returns a mutable reference to the underlying `RenderScope`.
-    ///
-    /// # Safety
-    /// The caller must ensure the pointer is valid for the lifetime of the event.
-    pub fn get_scope(&self) -> &mut RenderScope {
-        unsafe { &mut *self.0 }
     }
 }
 
-unsafe impl Send for RenderWrapperEvent {}
+/// Sleep for the specified duration in milliseconds.
-unsafe impl Sync for RenderWrapperEvent {}
+/// Useful for controlling render frame rate or delays.
-
+pub fn sleep(delay_ms: u64) {
-impl Screen {
+    std::thread::sleep(std::time::Duration::from_millis(delay_ms));
-    /// Creates a new screen instance wrapped in an `Arc`.
-    pub fn new() -> Arc<Self> {
-        Arc::new(Self {
-            widgets: Mutex::new(Vec::new()),
-            extensions: Mutex::new(Vec::new()),
-            running: Mutex::new(true),
-        })
-    }
-
-    /// Draws a static element and returns its widget handle.
-    pub fn draw<E: Element + 'static + Send + Sync>(self: &Arc<Self>, element: E) -> Arc<Widget> {
-        let w = Arc::new(Widget::Static(StaticWidget::new(Box::new(element))));
-        self.widgets.lock().unwrap().push(w.clone());
-        w
-    }
-
-    /// Draws a boxed element and returns its widget handle.
-    pub fn draw_box(self: &Arc<Self>, element: BoxedElement) -> Arc<Widget> {
-        let w = Arc::new(Widget::Static(StaticWidget::new(element)));
-        self.widgets.lock().unwrap().push(w.clone());
-        w
-    }
-
-    /// Adds an existing widget to the screen.
-    pub fn draw_widget(self: &Arc<Self>, widget: Arc<Widget>) {
-        self.widgets.lock().unwrap().push(widget);
-    }
-
-    /// Draws a dynamic element using a closure and returns its widget handle.
-    pub fn draw_dyn<F: FnMut() -> WidgetLoad + 'static + Send + Sync>(
-        self: &Arc<Self>,
-        element: F,
-    ) -> Arc<Widget> {
-        let w = Arc::new(Widget::Dynamic(DynWidget::new(element)));
-        self.widgets.lock().unwrap().push(w.clone());
-        w
-    }
-
-    /// Draws a dynamic element from a boxed closure and returns its widget handle.
-    pub fn draw_box_dyn(
-        self: &Arc<Self>,
-        element: Box<dyn FnMut() -> WidgetLoad + Send + Sync>,
-    ) -> Arc<Widget> {
-        let w = Arc::new(Widget::Dynamic(DynWidget::new(element)));
-        self.widgets.lock().unwrap().push(w.clone());
-        w
-    }
-
-    /// Registers an extension with the screen.
-    pub fn extension<E: Extension + Send + Sync + 'static>(self: &Arc<Self>, ext: E) {
-        self.extensions
-            .lock()
-            .unwrap()
-            .push(Arc::new(Mutex::new(Box::new(ext))));
-    }
-
-    /// Runs the main rendering loop, calling extensions and rendering widgets.
-    ///
-    /// This method blocks and repeatedly renders the screen at a fixed interval.
-    pub fn run(self: &Arc<Self>) -> std::io::Result<()> {
-        for ext in self.extensions.lock().unwrap().iter() {
-            ext.lock().unwrap().init(self.clone());
-        }
-
-        utils::hide_cursor()?;
-
-        while *self.running.lock().unwrap() {
-            self.render()?;
-            std::thread::sleep(std::time::Duration::from_millis(28));
-        }
-
-        Ok(())
-    }
-
-    /// Renders all widgets and applies extensions.
-    ///
-    /// This method is called internally by `run`.
-    pub fn render(self: &Arc<Self>) -> std::io::Result<()> {
-        let mut scope = RenderScope::new();
-        let (w, h) = crossterm::terminal::size().unwrap();
-        scope.set_parent_size(w, h);
-
-        utils::clear()?;
-        for elem in self.widgets.lock().unwrap().iter() {
-            if elem.get::<NoRender>().is_some() || elem.get::<NoRenderRoot>().is_some() {
-                for ext in self.extensions.lock().unwrap().iter() {
-                    ext.lock().unwrap().render_widget(&mut scope, elem);
-                }
-                elem.auto_refresh();
-                continue;
-            }
-
-            if let Some(wrapper) = elem.get::<Handler<RenderWrapperEvent>>() {
-                wrapper.call(elem, &RenderWrapperEvent(&mut scope));
-            } else {
-                scope.clear();
-
-                if let Some(style) = elem.get() {
-                    scope.set_style(style);
-                }
-                if let Some(t) = elem.get() {
-                    scope.set_transform(&t);
-                }
-
-                for ext in self.extensions.lock().unwrap().iter() {
-                    ext.lock().unwrap().render_widget(&mut scope, elem);
-                }
-
-                elem.get_elem().render(&mut scope);
-
-                if let Some(t) = elem.get() {
-                    scope.set_transform(&t);
-                }
-                scope.draw();
-
-                elem.get_elem().after_render(&mut scope);
-            }
-
-            elem.auto_refresh();
-        }
-        Ok(())
-    }
-
-    /// Closes the loop and calls `on_close` in the extensions
-    pub fn close(self: &Arc<Self>) {
-        *self.running.lock().unwrap() = false;
-
-        utils::show_cursor().unwrap();
-
-        utils::clear().unwrap();
-
-        for ext in self.extensions.lock().unwrap().iter() {
-            ext.lock().unwrap().on_close(self.clone());
-        }
-    }
 }

src/macros.rs

@@ -1,301 +0,0 @@
-/// Declares a struct that implements the `Event` trait.
-///
-/// This macro simplifies the creation of event types used within OSUI's reactive system.
-///
-/// # Variants
-///
-/// - `event!(Name)`
-///   Defines a unit struct named `Name`.
-///
-/// - `event!(Name { ... })`
-///   Defines a named struct with fields.
-///
-/// - `event!(Name (...))`
-///   Defines a tuple struct.
-///
-/// # Examples
-/// ```rust
-/// event!(Clicked);
-/// event!(Resized { width: u32, height: u32 });
-/// event!(Moved(u32, u32));
-/// ```
-#[macro_export]
-macro_rules! event {
-    ($name:ident) => {
-        #[derive(Debug, Clone)]
-        pub struct $name;
-
-        impl $crate::extensions::Event for $name {
-            fn as_any(&self) -> &dyn std::any::Any {
-                self
-            }
-        }
-    };
-
-    ($name:ident {$($inner:tt)*}) => {
-        #[derive(Debug, Clone)]
-        pub struct $name {
-            $($inner)*
-        }
-
-        impl $crate::extensions::Event for $name {
-            fn as_any(&self) -> &dyn std::any::Any {
-                self
-            }
-        }
-    };
-
-    ($name:ident ($($inner:tt)*)) => {
-        #[derive(Debug, Clone)]
-        pub struct $name ($($inner)*);
-
-        impl $crate::extensions::Event for $name {
-            fn as_any(&self) -> &dyn std::any::Any {
-                self
-            }
-        }
-    };
-}
-
-/// Declares a struct that implements the `Component` trait.
-///
-/// Components allow widgets to extend their behavior or contain additional data.
-/// This macro helps avoid boilerplate when defining new components.
-///
-/// # Variants
-///
-/// - `component!(Name)`
-///   Defines a unit struct.
-///
-/// - `component!(Name { ... })`
-///   Defines a named struct with fields.
-///
-/// - `component!(Name (...))`
-///   Defines a tuple struct.
-///
-/// # Examples
-/// ```rust
-/// component!(Focusable);
-/// component!(Tooltip { text: String });
-/// component!(Size(u32, u32));
-/// ```
-#[macro_export]
-macro_rules! component {
-    ($name:ident) => {
-        #[derive(Debug, Clone)]
-        pub struct $name;
-
-        impl $crate::widget::Component for $name {
-            fn as_any(&self) -> &dyn std::any::Any {
-                self
-            }
-
-            fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-                self
-            }
-        }
-    };
-
-    ($name:ident {$($inner:tt)*}) => {
-        #[derive(Debug, Clone)]
-        pub struct $name {
-            $($inner)*
-        }
-
-        impl $crate::widget::Component for $name {
-            fn as_any(&self) -> &dyn std::any::Any {
-                self
-            }
-
-            fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-                self
-            }
-        }
-    };
-
-    ($name:ident ($($inner:tt)*)) => {
-        #[derive(Debug, Clone)]
-        pub struct $name ($($inner)*);
-
-        impl $crate::widget::Component for $name {
-            fn as_any(&self) -> &dyn std::any::Any {
-                self
-            }
-
-            fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-                self
-            }
-        }
-    };
-}
-
-/// Creates an event handler closure that calls a method on `self`.
-///
-/// Useful when you need to register `'static` event handlers that interact with the current instance.
-///
-/// # Arguments
-/// - `$self_ty`: The type of `self`.
-/// - `$self`: The instance variable (usually `self`) being used.
-/// - `$events`: The event source object with an `.on` method.
-/// - `$method`: The method to call when an event is received.
-///
-/// # Example
-/// ```rust
-/// event_handler!(Self, self, events, on_event);
-/// ```
-/// Expands roughly to:
-/// ```rust
-/// let self_ref = self as *mut Self;
-/// events.on(move |es, e| unsafe { (*self_ref).on_event(es, e) });
-/// ```
-///
-/// # Safety
-/// This macro uses `unsafe` code to cast `self` to a raw pointer and dereference it.
-/// Make sure the reference is valid for the closure’s lifetime.
-#[macro_export]
-macro_rules! event_handler {
-    ($self_ty:ty, $self:ident, $events:ident, $method:ident) => {{
-        let self_ref = $self as *mut $self_ty;
-        $events.on(move |es, e| unsafe { (*self_ref).$method(es, e) });
-    }};
-}
-
-/// Creates a `Transform` with property overrides.
-///
-/// Each key-value pair sets a field on a `Transform` struct.
-///
-/// # Example
-/// ```rust
-/// let t = transform!(
-///     x: 10,
-///     y: 20,
-///     scale: 1.5,
-/// );
-/// ```
-///
-/// This expands to:
-/// ```rust
-/// let mut t = Transform::new();
-/// t.x = 10.into();
-/// t.y = 20.into();
-/// t.scale = 1.5.into();
-/// ```
-#[macro_export]
-macro_rules! transform {
-    ($($f:ident: $v:expr),* $(,)?) => {{
-        let mut t = Transform::new();
-        $(t.$f = $v.into();)*
-        t
-    }};
-}
-
-/// Constructs an `Rsx` tree using declarative syntax.
-///
-/// This macro is similar to JSX in UI frameworks, allowing you to nest widgets and assign components or dependencies.
-/// It expands into a tree of `RsxElement` objects.
-///
-/// Internally calls the recursive `rsx_inner!` macro.
-///
-/// # Example
-/// ```rust
-/// rsx! {
-///     "Hello"
-///     static Label { } ("Text")
-///     %state Label { }
-///     @Velocity(20, 0); Transform::new(); "Moving Text"
-/// }
-/// ```
-#[macro_export]
-macro_rules! rsx {
-    ($($inner:tt)*) => {{
-        let mut r = $crate::frontend::Rsx(Vec::new());
-
-        $crate::rsx_inner! { r, $($inner)* };
-
-        r
-    }};
-}
-
-/// Internal macro used by `rsx!` to recursively build `Rsx` trees.
-///
-/// This macro handles various syntactic forms used in the declarative layout system:
-///
-/// - Static text or components
-/// - Dynamic widgets with dependencies (`%dep`)
-/// - Component annotations (`@comp`)
-/// - Argument passing to constructors
-/// - Nesting and expansion from other `Rsx` blocks
-///
-/// **This macro is not intended for direct use**; use `rsx!` instead.
-///
-/// # Example expansion
-/// ```rust
-/// rsx! {
-///     static Label { } ("Title")
-///     %state Label { inner }
-///     "Text"
-/// }
-/// ```
-///
-/// Would produce a nested `Rsx` tree of static and dynamic widgets.
-#[macro_export]
-macro_rules! rsx_inner {
-    // static
-    ($r:expr, $(@$comp:expr;)* static $s:literal $($rest:tt)*) => {
-        let w = $crate::widget::StaticWidget::new(Box::new(format!($s)));
-        $(w.component($comp);)*
-        $r.create_element_static(w, $crate::frontend::Rsx(Vec::new()));
-        $crate::rsx_inner! { $r, $($rest)* };
-    };
-
-    ($r:expr, $(@$comp:expr;)* $(%$dep:ident)* $s:literal $($rest:tt)*) => {
-        $r.create_element({ $(let $dep = $dep.clone();)* move || {
-            $crate::widget::WidgetLoad::new(format!($s)) $(.component($comp))*
-        } }, vec![$(Box::new($dep.clone())),*], $crate::frontend::Rsx(Vec::new()));
-        $crate::rsx_inner! { $r, $($rest)* };
-    };
-
-    // static
-    ($r:expr, $(@$comp:expr;)* static $name:path, $($f:ident $(: $v:expr)?),+, { $($inner:tt)* } $($rest:tt)*) => {
-        let w = $crate::widget::StaticWidget::new(Box::new({
-            let mut elem = <$name>::new();
-            $(elem.$f = $($v)?;)+
-            elem
-        }));
-        $(w.component($comp);)*
-        $r.create_element_static(w, $crate::rsx!{ $($inner)* });
-        $crate::rsx_inner! { $r, $($rest)* };
-    };
-
-    ($r:expr, $(@$comp:expr;)* static $name:path { $($inner:tt)* } $($rest:tt)*) => {
-        let w = $crate::widget::StaticWidget::new(Box::new(<$name>::new()));
-        $(w.component($comp);)*
-        $r.create_element_static(w, $crate::rsx!{ $($inner)* });
-        $crate::rsx_inner! { $r, $($rest)* };
-    };
-
-    ($r:expr, $(@$comp:expr;)* $(%$dep:ident)* $name:path, $($f:ident $(: $v:expr)?),+, { $($inner:tt)* } $($rest:tt)*) => {
-        $r.create_element({ $(let $dep = $dep.clone();)* move || {
-            $crate::widget::WidgetLoad::new({
-                let mut elem = <$name>::new();
-                $(elem.$f = $($v)?;)+
-                elem
-            }) $(.component($comp))*
-        } }, vec![$(Box::new($dep.clone())),*], $crate::rsx!{ $($inner)* });
-        $crate::rsx_inner! { $r, $($rest)* };
-    };
-
-    ($r:expr, $(@$comp:expr;)* $(%$dep:ident)* $name:path { $($inner:tt)* } $($rest:tt)*) => {
-        $r.create_element({ $(let $dep = $dep.clone();)* move || {
-            $crate::widget::WidgetLoad::new(<$name>::new()) $(.component($comp))*
-        } }, vec![$(Box::new($dep.clone())),*], $crate::rsx!{ $($inner)* });
-        $crate::rsx_inner! { $r, $($rest)* };
-    };
-
-    ($r:expr, $expand:ident => ($($inner:tt)*) $($rest:tt)*) => {
-        $r.expand(&mut $expand($($inner)*));
-        $crate::rsx_inner! { $r, $($rest)* };
-    };
-
-    ($r:expr,) => {};
-}

src/main.rs

@@ -1,11 +0,0 @@
-mod demos;
-use osui::prelude::*;
-
-fn main() -> std::io::Result<()> {
-    let screen = Screen::new();
-    screen.extension(InputExtension);
-
-    demos::app(screen.clone()).draw(&screen);
-
-    screen.run()
-}

src/render.rs

@@ -0,0 +1,111 @@
+//! # Rendering Module
+//!
+//! This module provides low-level rendering primitives and data structures
+//! for drawing content to the terminal. It includes geometric primitives
+//! (Point, Area, Size) and drawing instructions.
+
+use crate::View;
+
+/// Represents a drawing instruction that can be executed by the rendering engine
+#[derive(Clone)]
+pub enum DrawInstruction {
+    /// Draw text at a specific point
+    Text(Point, String),
+    /// Render a view within a specified area
+    View(Area, View),
+    /// Render a child drawing context at an offset
+    Child(Point, DrawContext),
+}
+
+/// Represents the dimensions of a drawable area
+#[derive(Clone)]
+pub struct Size {
+    /// Width in terminal columns
+    pub width: u16,
+    /// Height in terminal rows
+    pub height: u16,
+}
+
+/// Represents a position in 2D space
+#[derive(Clone)]
+pub struct Point {
+    /// X coordinate (column)
+    pub x: u16,
+    /// Y coordinate (row)
+    pub y: u16,
+}
+
+/// Represents a rectangular area with position and dimensions
+#[derive(Clone)]
+pub struct Area {
+    /// X coordinate (column) of the top-left corner
+    pub x: u16,
+    /// Y coordinate (row) of the top-left corner
+    pub y: u16,
+    /// Width in terminal columns
+    pub width: u16,
+    /// Height in terminal rows
+    pub height: u16,
+}
+
+/// Context for drawing operations
+///
+/// Accumulates drawing instructions that are executed by the rendering engine.
+/// Tracks allocated space within the drawable area.
+#[derive(Clone)]
+pub struct DrawContext {
+    /// The total area available for drawing
+    pub area: Area,
+    /// The area that has been allocated for drawing (union of all allocations)
+    pub allocated: Area,
+    /// List of drawing instructions to execute
+    pub drawing: Vec<DrawInstruction>,
+}
+
+impl DrawContext {
+    /// Creates a new DrawContext with the specified area
+    pub fn new(area: Area) -> Self {
+        Self {
+            area,
+            allocated: Area {
+                x: u16::MAX,
+                y: u16::MAX,
+                width: 0,
+                height: 0,
+            },
+            drawing: Vec::new(),
+        }
+    }
+
+    /// Allocates space within the drawable area and returns the allocated area
+    /// Updates the allocated bounds to include this allocation
+    pub fn allocate(&mut self, x: u16, y: u16, width: u16, height: u16) -> Area {
+        self.allocated.x = self.allocated.x.min(x);
+        self.allocated.y = self.allocated.y.min(y);
+        self.allocated.width = self.allocated.width.max(width);
+        self.allocated.height = self.allocated.height.max(height);
+
+        Area {
+            x,
+            y,
+            width,
+            height,
+        }
+    }
+
+    /// Adds a drawing instruction to be executed
+    pub fn draw(&mut self, inst: DrawInstruction) {
+        self.drawing.push(inst);
+    }
+
+    /// Draws text at the specified point
+    pub fn draw_text(&mut self, point: Point, text: &str) {
+        self.drawing
+            .push(DrawInstruction::Text(point, text.to_string()));
+    }
+
+    /// Draws a view within the specified area
+    pub fn draw_view(&mut self, area: Area, view: View) {
+        self.drawing.push(DrawInstruction::View(area, view));
+    }
+}

src/render_scope.rs

@@ -1,300 +0,0 @@
-//! Rendering logic and layout scope management for OSUI.
-//!
-//! `RenderScope` is responsible for handling transformations, parent-child dimensions,
-//! stacking draw operations, and rendering styled output to the terminal.
-//!
-//! This module allows widgets to accumulate rendering commands (text, shapes, colors),
-//! and then flush them to the screen with correct styling and positioning.
-//!
-//! Used internally by OSUI's layout and rendering system.
-
-use std::fmt::Debug;
-
-use crate::{
-    style::{RawTransform, Style, Transform},
-    utils::{self, hex_ansi_bg},
-};
-
-/// Represents a single render instruction.
-#[derive(Clone)]
-enum RenderMethod {
-    /// Plain text rendering at current transform.
-    Text(u16, u16, String),
-    /// Plain text rendering at current transform with the bg and fg swapped.
-    TextInverted(u16, u16, String),
-    /// Text rendered with a specific 24-bit color.
-    TextColored(u16, u16, String, u32),
-    /// A filled rectangle of a given size and background color.
-    Rectangle(u16, u16, u16, u16, u32),
-}
-
-/// Stores renderable state and transformation data for a single UI widget.
-///
-/// `RenderScope` tracks dimensions, styles, and draw commands such as text or
-/// background rectangles. It accumulates instructions that are later executed in the `draw` method.
-#[derive(Clone)]
-pub struct RenderScope {
-    transform: RawTransform,
-    render_stack: Vec<RenderMethod>,
-    parent_width: u16,
-    parent_height: u16,
-    style: Style,
-}
-
-impl RenderScope {
-    /// Creates a new, empty `RenderScope`.
-    pub fn new() -> RenderScope {
-        RenderScope {
-            transform: RawTransform::new(),
-            render_stack: Vec::new(),
-            parent_width: 0,
-            parent_height: 0,
-            style: Style::new(),
-        }
-    }
-
-    /// Directly sets the raw transform (position and size) for this scope.
-    pub fn set_transform_raw(&mut self, transform: RawTransform) {
-        self.transform = transform;
-    }
-
-    /// Applies a `Transform` to this scope, factoring in parent dimensions.
-    pub fn set_transform(&mut self, transform: &Transform) {
-        transform.use_dimensions(self.parent_width, self.parent_height, &mut self.transform);
-        transform.use_position(self.parent_width, self.parent_height, &mut self.transform);
-        self.transform.px = transform.px;
-        self.transform.py = transform.py;
-    }
-
-    /// Adds a text draw instruction.
-    pub fn draw_text(&mut self, x: u16, y: u16, text: &str) {
-        self.render_stack
-            .push(RenderMethod::Text(x, y, text.to_string()));
-        let (w, h) = utils::str_size(text);
-        self.transform.width = self.transform.width.max(w);
-        self.transform.height = self.transform.height.max(h);
-    }
-
-    /// Adds a text draw instruction.
-    pub fn draw_text_inverted(&mut self, x: u16, y: u16, text: &str) {
-        self.render_stack
-            .push(RenderMethod::TextInverted(x, y, text.to_string()));
-        let (w, h) = utils::str_size(text);
-        self.transform.width = self.transform.width.max(w);
-        self.transform.height = self.transform.height.max(h);
-    }
-
-    /// Adds a colored text draw instruction.
-    pub fn draw_text_colored(&mut self, x: u16, y: u16, text: &str, color: u32) {
-        self.render_stack
-            .push(RenderMethod::TextColored(x, y, text.to_string(), color));
-        let (w, h) = utils::str_size(text);
-        self.transform.width = self.transform.width.max(w);
-        self.transform.height = self.transform.height.max(h);
-    }
-
-    /// Adds a background rectangle draw instruction.
-    pub fn draw_rect(&mut self, x: u16, y: u16, width: u16, height: u16, color: u32) {
-        self.render_stack
-            .push(RenderMethod::Rectangle(x, y, width, height, color));
-        self.transform.width = self.transform.width.max(width);
-        self.transform.height = self.transform.height.max(height);
-    }
-
-    /// Manually ensures a minimum area is allocated.
-    pub fn use_area(&mut self, width: u16, height: u16) {
-        self.transform.width = self.transform.width.max(width);
-        self.transform.height = self.transform.height.max(height);
-    }
-
-    /// Renders the current stack to the terminal.
-    ///
-    /// This will draw background styles (e.g. solid fill or outline) first,
-    /// followed by each draw instruction in the stack.
-    pub fn draw(&self) {
-        let width = self.transform.width;
-        let height = self.transform.height;
-
-        match self.style.background {
-            crate::style::Background::NoBackground => {}
-            crate::style::Background::Outline(c) => {
-                let width = width + self.transform.px * 2;
-                let height = height + self.transform.py * 2;
-                if width > 1 && height > 1 {
-                    let d = "─".repeat(width as usize - 2);
-                    utils::print_liner(
-                        self.transform.x,
-                        self.transform.y,
-                        &utils::hex_ansi(c),
-                        &format!(
-                            "┌{d}┐{}\n└{d}┘",
-                            format!("\n│{}│", " ".repeat(width as usize - 2))
-                                .repeat(height as usize - 2),
-                        ),
-                    );
-                }
-            }
-            crate::style::Background::RoundedOutline(c) => {
-                let width = width + self.transform.px * 2;
-                let height = height + self.transform.py * 2;
-                if width > 1 && height > 1 {
-                    let d = "─".repeat(width as usize - 2);
-                    utils::print_liner(
-                        self.transform.x,
-                        self.transform.y,
-                        &utils::hex_ansi(c),
-                        &format!(
-                            "╭{d}╮{}\n╰{d}╯",
-                            format!("\n│{}│", " ".repeat(width as usize - 2))
-                                .repeat(height as usize - 2),
-                        ),
-                    );
-                }
-            }
-            crate::style::Background::Solid(c) => utils::print_liner(
-                self.transform.x,
-                self.transform.y,
-                &hex_ansi_bg(c),
-                &std::iter::repeat(" ".repeat(width as usize))
-                    .take(height as usize)
-                    .collect::<Vec<_>>()
-                    .join("\n"),
-            ),
-        }
-
-        for m in &self.render_stack {
-            match m {
-                RenderMethod::Text(x, y, t) => {
-                    if let Some(c) = self.style.foreground {
-                        utils::print_liner(
-                            self.transform.x + self.transform.px + x,
-                            self.transform.y + self.transform.py + y,
-                            &utils::hex_ansi(c),
-                            t,
-                        );
-                    } else {
-                        utils::print(
-                            self.transform.x + self.transform.px,
-                            self.transform.y + self.transform.py,
-                            t,
-                        );
-                    }
-                }
-                RenderMethod::TextInverted(x, y, t) => {
-                    if let Some(c) = self.style.foreground {
-                        utils::print_liner(
-                            self.transform.x + self.transform.px + x,
-                            self.transform.y + self.transform.py + y,
-                            &utils::hex_ansi_bg(c),
-                            t,
-                        );
-                    } else {
-                        utils::print(
-                            self.transform.x + self.transform.px,
-                            self.transform.y + self.transform.py,
-                            t,
-                        );
-                    }
-                }
-                RenderMethod::TextColored(x, y, t, c) => utils::print_liner(
-                    self.transform.x + self.transform.px + x,
-                    self.transform.y + self.transform.py + y,
-                    &utils::hex_ansi(*c),
-                    t,
-                ),
-                RenderMethod::Rectangle(x, y, width, height, color) => {
-                    utils::print_liner(
-                        self.transform.x + self.transform.px + x,
-                        self.transform.y + self.transform.py + y,
-                        &hex_ansi_bg(*color),
-                        &std::iter::repeat(" ".repeat(*width as usize))
-                            .take(*height as usize)
-                            .collect::<Vec<_>>()
-                            .join("\n"),
-                    );
-                }
-            }
-        }
-    }
-
-    /// Clears all render instructions and resets the internal state.
-    pub fn clear(&mut self) {
-        self.render_stack.clear();
-        self.transform = RawTransform::new();
-        self.style = Style::new();
-    }
-
-    /// Gets the currently used width and height.
-    pub fn get_size(&self) -> (u16, u16) {
-        (self.transform.width, self.transform.height)
-    }
-
-    /// Returns current size, or defaults if size is zero.
-    pub fn get_size_or(&self, width: u16, height: u16) -> (u16, u16) {
-        (
-            if self.transform.width == 0 {
-                width
-            } else {
-                self.transform.width
-            },
-            if self.transform.height == 0 {
-                height
-            } else {
-                self.transform.height
-            },
-        )
-    }
-
-    /// Returns size, falling back to parent size if unset.
-    pub fn get_size_or_parent(&self) -> (u16, u16) {
-        (
-            if self.transform.width == 0 {
-                self.parent_width
-            } else {
-                self.transform.width
-            },
-            if self.transform.height == 0 {
-                self.parent_height
-            } else {
-                self.transform.height
-            },
-        )
-    }
-
-    /// Gets the dimensions of the parent container.
-    pub fn get_parent_size(&self) -> (u16, u16) {
-        (self.parent_width, self.parent_height)
-    }
-
-    /// Sets the dimensions of the parent container.
-    pub fn set_parent_size(&mut self, width: u16, height: u16) {
-        self.parent_width = width;
-        self.parent_height = height;
-    }
-
-    /// Returns a mutable reference to the internal raw transform.
-    pub fn get_transform_mut(&mut self) -> &mut RawTransform {
-        &mut self.transform
-    }
-
-    /// Returns a reference to the internal raw transform.
-    pub fn get_transform(&self) -> &RawTransform {
-        &self.transform
-    }
-
-    /// Sets the style for the current render scope.
-    pub fn set_style(&mut self, style: Style) {
-        self.style = style;
-    }
-
-    /// Gets a mutable reference to the style.
-    pub fn get_style(&mut self) -> &mut Style {
-        &mut self.style
-    }
-}
-
-impl Debug for RenderScope {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "RenderScope")
-    }
-}

src/state.rs

@@ -1,100 +1,272 @@
+//! # State Management Module
+//!
+//! Provides React-like hooks for managing component state and side effects.
+//! This module includes useState, useEffect, useMount, and state synchronization hooks.
+
 use std::{
+    any::Any,
     fmt::{Debug, Display, Formatter, Result as FmtResult},
     ops::{Deref, DerefMut},
     sync::{Arc, Mutex, MutexGuard},
 };
 
-/// Trait for tracking dependencies and reactivity.
+use crate::component::context::Context;
-pub trait DependencyHandler: std::fmt::Debug + Send + Sync {
-    /// Called when a dependent is registered.
-    fn add(&self);
-    /// Returns `true` if the state has changed since the last check.
-    fn check(&self) -> bool;
-}
 
-#[derive(Debug, Clone)]
+/// Effect callback that can be triggered by state changes
-pub struct State<T> {
+#[derive(Clone)]
-    inner: Arc<Mutex<Inner<T>>>,
+pub struct HookEffect(Arc<Mutex<dyn FnMut() + Send + Sync>>);
-}
 
+/// State holder for reactive values
+///
+/// Similar to React's useState hook. Holds a value and tracks dependents
+/// that need to be notified when the value changes.
 #[derive(Debug)]
-pub struct Inner<T> {
+pub struct State<T> {
-    value: T,
+    /// The actual state value
-    dependencies: usize,
+    value: Arc<Mutex<T>>,
-    changed: usize,
+    /// Functions to call when state is updated
+    dependents: Arc<Mutex<Vec<HookEffect>>>,
 }
 
+/// Guard for accessing and potentially modifying state
+///
+/// Dereferences to the state value. When dropped after modification,
+/// automatically triggers all dependent effects.
+pub struct Inner<'a, T> {
+    value: MutexGuard<'a, T>,
+    dependents: Arc<Mutex<Vec<HookEffect>>>,
+    updated: bool,
+}
+
+/// Mount lifecycle hook
+///
+/// Tracks whether a component has been mounted and executes
+/// any pending mount effects.
+#[derive(Debug, Clone)]
+pub struct Mount(Arc<Mutex<bool>>, Arc<Mutex<Vec<HookEffect>>>);
+
+/// Creates a new state value
+///
+/// Returns a State that can be read and written from multiple threads.
 pub fn use_state<T>(v: T) -> State<T> {
     State {
-        inner: Arc::new(Mutex::new(Inner {
+        value: Arc::new(Mutex::new(v)),
-            value: v,
+        dependents: Arc::new(Mutex::new(Vec::new())),
-            dependencies: 0,
-            changed: 0,
-        })),
     }
 }
 
 impl<T: Clone> State<T> {
-    /// Gets the cloned value, recommended for preventing deadlocks
+    /// Gets a cloned copy of the state value
+    ///
+    /// Recommended over `get()` to prevent deadlocks when cloning is acceptable.
+    /// "dl" stands for "deadlock-less".
     pub fn get_dl(&self) -> T {
-        self.inner.lock().unwrap().value.clone()
+        self.value.lock().unwrap().clone()
     }
 }
 
 impl<T> State<T> {
-    /// Gets a lock on the state for read/write access.
+    /// Acquires a lock on the state for read/write access
-    pub fn get(&self) -> MutexGuard<'_, Inner<T>> {
+    ///
-        self.inner.lock().unwrap()
+    /// Returns an Inner guard that implements Deref and DerefMut.
-    }
+    /// When dropped after modification, triggers dependent effects.
-
+    pub fn get(&self) -> Inner<'_, T> {
-    /// Sets the value and marks it as changed.
+        Inner {
-    pub fn set(&self, v: T) {
+            value: self.value.lock().unwrap(),
-        let mut inner = self.inner.lock().unwrap();
+            dependents: self.dependents.clone(),
-        inner.value = v;
+            updated: false,
-        inner.changed = inner.dependencies;
-    }
-
-    /// Marks the state as updated.
-    pub fn update(&self) {
-        let mut inner = self.inner.lock().unwrap();
-        inner.changed = inner.dependencies;
-    }
-}
-
-impl<T: Debug + Send + Sync> DependencyHandler for State<T> {
-    fn check(&self) -> bool {
-        let mut inner = self.inner.lock().unwrap();
-        let i = inner.changed > 0;
-        if i {
-            inner.changed -= 1;
         }
-        i
     }
 
-    fn add(&self) {
+    /// Sets the state value and triggers dependents
-        let mut inner = self.inner.lock().unwrap();
+    pub fn set(&self, v: T) {
-        inner.dependencies += 1;
+        *self.value.lock().unwrap() = v;
+        self.update();
+    }
+
+    /// Notifies all dependents of an update
+    pub fn update(&self) {
+        for d in self.dependents.lock().unwrap().iter() {
+            d.call();
+        }
+    }
+
+    /// Clones the State handle (not the value)
+    pub fn clone(&self) -> Self {
+        Self {
+            dependents: self.dependents.clone(),
+            value: self.value.clone(),
+        }
     }
 }
 
 impl<T: Display> Display for State<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-        let inner = self.inner.lock().unwrap();
+        write!(f, "{}", self.value.lock().unwrap())
-        write!(f, "{}", inner.value)
     }
 }
 
-impl<T> Deref for Inner<T> {
+impl Debug for HookEffect {
-    type Target = T;
+    fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
+        write!(f, "HookEffect")
+    }
+}
 
+impl HookEffect {
+    /// Creates a new effect from a function
+    pub fn new<F: Fn() + Send + Sync + 'static>(f: F) -> Self {
+        Self(Arc::new(Mutex::new(f)))
+    }
+
+    /// Executes the effect function
+    pub fn call(&self) {
+        (self.0.lock().unwrap())()
+    }
+}
+
+/// Inner implements Deref for read access and DerefMut for write access
+/// On drop after mutation, automatically triggers dependent effects
+impl<T> Drop for Inner<'_, T> {
+    fn drop(&mut self) {
+        if self.updated {
+            for d in self.dependents.lock().unwrap().iter() {
+                d.call();
+            }
+        }
+    }
+}
+
+impl<T> Deref for Inner<'_, T> {
+    type Target = T;
     fn deref(&self) -> &Self::Target {
         &self.value
     }
 }
 
-impl<T> DerefMut for Inner<T> {
+impl<T> DerefMut for Inner<'_, T> {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        self.changed = self.dependencies;
+        self.updated = true;
         &mut self.value
     }
 }
+
+/// Trait for values that can be tracked as dependencies in hooks
+pub trait HookDependency: Send + Sync {
+    /// Register an effect to be triggered on updates
+    fn on_update(&self, hook: HookEffect);
+}
+
+impl<T: Send + Sync> HookDependency for State<T> {
+    fn on_update(&self, hook: HookEffect) {
+        self.dependents.lock().unwrap().push(hook);
+    }
+}
+
+impl HookDependency for Mount {
+    fn on_update(&self, hook: HookEffect) {
+        if *self.0.lock().unwrap() {
+            hook.call();
+        } else {
+            self.1.lock().unwrap().push(hook);
+        }
+    }
+}
+
+impl Mount {
+    /// Mark the component as mounted and execute pending effects
+    pub fn mount(&self) {
+        *self.0.lock().unwrap() = true;
+        for hook_effect in self.1.lock().unwrap().iter() {
+            hook_effect.call();
+        }
+        self.1.lock().unwrap().clear();
+    }
+}
+
+/// Executes a function when dependencies change
+///
+/// Similar to React's useEffect. The provided function is executed
+/// when any of the dependencies change.
+pub fn use_effect<F: FnMut() + Send + Sync + 'static>(f: F, dependencies: &[&dyn HookDependency]) {
+    let f = Arc::new(Mutex::new(f));
+    let hook = HookEffect(Arc::new(Mutex::new({
+        let f = f.clone();
+        move || {
+            let f = f.clone();
+            std::thread::spawn(move || (f.lock().unwrap())());
+        }
+    })));
+
+    for d in dependencies {
+        d.on_update(hook.clone());
+    }
+}
+
+/// Creates a mount lifecycle hook
+///
+/// Returns a Mount that tracks component lifecycle and executes
+/// effects after mounting.
+pub fn use_mount() -> Mount {
+    Mount(Arc::new(Mutex::new(true)), Arc::new(Mutex::new(Vec::new())))
+}
+
+/// Creates a manual mount lifecycle hook
+///
+/// Similar to use_mount but the component starts as unmounted.
+/// Must call .mount() to trigger mounted effects.
+pub fn use_mount_manual() -> Mount {
+    Mount(
+        Arc::new(Mutex::new(false)),
+        Arc::new(Mutex::new(Vec::new())),
+    )
+}
+
+/// Synchronizes state with events from the context
+///
+/// Creates state that is automatically updated when events are emitted
+/// to the context. The decoder function converts events to state values.
+pub fn use_sync_state<
+    T: Send + Sync + 'static,
+    E: Any + 'static,
+    D: Fn(&E) -> T + Send + Sync + 'static,
+>(
+    cx: &Arc<Context>,
+    v: T,
+    decoder: D,
+) -> State<T> {
+    let state = use_state(v);
+
+    cx.on_event({
+        let state = state.clone();
+        move |_, v: &E| state.set(decoder(v))
+    });
+
+    state
+}
+
+/// Synchronizes state changes back to the context as events
+///
+/// Creates an effect that emits an event whenever the state changes.
+/// The encoder function converts state values to events.
+pub fn use_sync_effect<
+    T: Send + Sync + 'static,
+    Ev: Send + Sync + 'static,
+    E: Fn(&State<T>) -> Ev + Send + Sync + 'static,
+>(
+    cx: &Arc<Context>,
+    state: &State<T>,
+    encoder: E,
+    deps: &[&dyn HookDependency],
+) {
+    use_effect(
+        {
+            let state = state.clone();
+            let cx = cx.clone();
+            move || {
+                let ev = encoder(&state);
+                cx.emit_event(ev);
+            }
+        },
+        deps,
+    );
+}

src/style.rs

@@ -1,228 +0,0 @@
-//! Layout and style definitions for OSUI widgets.
-//!
-//! This module defines the structures used to manage rendering geometry (`Transform`, `RawTransform`),
-//! position and size enums (`Position`, `Dimension`), and styling (`Style`, `Background`, etc.).
-//!
-//! These types are used internally by components to calculate layout and control their appearance.
-
-use crate::component;
-
-/// Resolved layout information for a widget after layout calculations.
-///
-/// This struct holds concrete values for position (`x`, `y`), dimensions
-/// (`width`, `height`), and padding (`px`, `py`).
-#[derive(Debug, Clone)]
-pub struct RawTransform {
-    pub x: u16,
-    pub y: u16,
-    pub width: u16,
-    pub height: u16,
-    pub px: u16,
-    pub py: u16,
-}
-
-/// Horizontal or vertical position relative to a parent container.
-#[derive(Debug, Clone)]
-pub enum Position {
-    /// Fixed position in cells from the origin.
-    Const(u16),
-    /// Centered in the parent.
-    Center,
-    /// Aligned to the end (right or bottom) of the parent.
-    End,
-}
-
-/// Sizing rule for width or height.
-#[derive(Debug, Clone)]
-pub enum Dimension {
-    /// Fills the available space from the parent.
-    Full,
-    /// Automatically sized to fit content.
-    Content,
-    /// Fixed size in cells.
-    Const(u16),
-}
-
-/// Background appearance for a widget.
-#[derive(Debug, Clone)]
-pub enum Background {
-    /// Transparent / no background.
-    NoBackground,
-    /// Draws a basic outline using the given color.
-    Outline(u32),
-    /// Draws a rounded outline using the given color.
-    RoundedOutline(u32),
-    /// Fills the background with the specified color.
-    Solid(u32),
-}
-
-component!(Transform {
-    pub x: Position,
-    pub y: Position,
-    pub mx: i32,
-    pub my: i32,
-    pub px: u16,
-    pub py: u16,
-    pub width: Dimension,
-    pub height: Dimension,
-});
-
-component!(Style {
-    pub background: Background,
-    pub foreground: Option<u32>,
-});
-
-impl Style {
-    /// Creates a style with no background or foreground.
-    pub fn new() -> Self {
-        Self {
-            background: Background::NoBackground,
-            foreground: None,
-        }
-    }
-}
-
-impl Transform {
-    /// Creates a default transform with top-left alignment and content sizing.
-    pub fn new() -> Transform {
-        Transform {
-            x: Position::Const(0),
-            y: Position::Const(0),
-            mx: 0,
-            my: 0,
-            px: 0,
-            py: 0,
-            width: Dimension::Content,
-            height: Dimension::Content,
-        }
-    }
-
-    /// Shortcut for centering both horizontally and vertically.
-    pub fn center() -> Transform {
-        Transform {
-            x: Position::Center,
-            y: Position::Center,
-            mx: 0,
-            my: 0,
-            px: 0,
-            py: 0,
-            width: Dimension::Content,
-            height: Dimension::Content,
-        }
-    }
-
-    /// Aligns the widget to the bottom of its parent.
-    pub fn bottom(mut self) -> Self {
-        self.y = Position::End;
-        self
-    }
-
-    /// Aligns the widget to the right of its parent.
-    pub fn right(mut self) -> Self {
-        self.x = Position::End;
-        self
-    }
-
-    /// Adds margin (offset) from parent edge.
-    pub fn margin(mut self, x: i32, y: i32) -> Self {
-        self.mx = x;
-        self.my = y;
-        self
-    }
-
-    /// Adds internal spacing (padding) around content.
-    pub fn padding(mut self, x: u16, y: u16) -> Self {
-        self.px = x;
-        self.py = y;
-        self
-    }
-
-    /// Sets constant dimensions.
-    pub fn dimensions(mut self, width: u16, height: u16) -> Self {
-        self.width = Dimension::Const(width);
-        self.height = Dimension::Const(height);
-        self
-    }
-
-    /// Resolves `Dimension` rules into absolute values for the given parent size.
-    pub fn use_dimensions(&self, parent_width: u16, parent_height: u16, raw: &mut RawTransform) {
-        self.width.use_dimension(parent_width, &mut raw.width);
-        self.height.use_dimension(parent_height, &mut raw.height);
-    }
-
-    /// Resolves `Position` rules into absolute positions for the given parent size.
-    pub fn use_position(&self, parent_width: u16, parent_height: u16, raw: &mut RawTransform) {
-        self.x
-            .use_position(raw.width, parent_width, self.mx, &mut raw.x);
-        self.y
-            .use_position(raw.height, parent_height, self.my, &mut raw.y);
-    }
-}
-
-impl RawTransform {
-    /// Creates a new transform with all fields set to 0.
-    pub fn new() -> RawTransform {
-        RawTransform {
-            x: 0,
-            y: 0,
-            width: 0,
-            height: 0,
-            px: 0,
-            py: 0,
-        }
-    }
-}
-
-impl Dimension {
-    /// Applies a dimension rule to determine a final size.
-    pub fn use_dimension(&self, parent: u16, r: &mut u16) {
-        match self {
-            Self::Full => *r = parent,
-            Self::Content => {}
-            Self::Const(n) => *r = *n,
-        }
-    }
-}
-
-impl Position {
-    /// Applies a position rule to determine a final coordinate, based on size and parent.
-    pub fn use_position(&self, size: u16, parent: u16, m: i32, r: &mut u16) {
-        let base = match self {
-            Self::Center => {
-                if parent < size {
-                    return;
-                }
-                (parent - size) / 2
-            }
-            Self::Const(n) => *n,
-            Self::End => {
-                if parent < size {
-                    return;
-                }
-                parent - size
-            }
-        };
-
-        let adjusted = if m >= 0 {
-            base.checked_add(m as u16)
-        } else {
-            base.checked_sub((-m) as u16)
-        };
-
-        if let Some(val) = adjusted {
-            *r = val;
-        }
-    }
-}
-
-impl From<u16> for Position {
-    fn from(value: u16) -> Self {
-        Self::Const(value)
-    }
-}
-
-impl From<u16> for Dimension {
-    fn from(value: u16) -> Self {
-        Self::Const(value)
-    }
-}

src/utils.rs

@@ -1,122 +0,0 @@
-//! The `utils` module provides utility functions for terminal manipulation
-//! and string operations, designed to enhance terminal-based applications.
-
-use std::io::{self, Write};
-
-/// Clears the terminal screen and moves the cursor to the top-left corner.
-///
-/// # Returns
-/// A `io::Result<()>` indicating whether the operation succeeded.
-///
-/// # Example
-/// ```
-/// utils::clear().unwrap();
-/// ```
-pub fn clear() -> io::Result<()> {
-    print!("\x1B[2J\x1B[H");
-    std::io::stdout().flush()
-}
-
-/// Hides the terminal cursor.
-///
-/// # Returns
-/// A `io::Result<()>` indicating whether the operation succeeded.
-///
-/// # Example
-/// ```
-/// utils::hide_cursor().unwrap();
-/// ```
-pub fn hide_cursor() -> io::Result<()> {
-    print!("\x1b[?25l");
-    std::io::stdout().flush()
-}
-
-/// Shows the terminal cursor.
-///
-/// # Returns
-/// A `io::Result<()>` indicating whether the operation succeeded.
-///
-/// # Example
-/// ```
-/// utils::show_cursor().unwrap();
-/// ```
-pub fn show_cursor() -> io::Result<()> {
-    print!("\x1B[?25h");
-    std::io::stdout().flush()
-}
-
-/// Flushes the terminal's stdout buffer.
-///
-/// # Returns
-/// A `io::Result<()>` indicating whether the operation succeeded.
-///
-/// # Example
-/// ```
-/// utils::flush().unwrap();
-/// ```
-pub fn flush() -> io::Result<()> {
-    std::io::stdout().flush()
-}
-
-/// Calculates the width and height of a string when rendered in a terminal.
-///
-/// # Arguments
-/// - `s`: The input string.
-///
-/// # Returns
-/// A tuple `(u16, u16)` where:
-/// - The first value is the maximum width of the string in characters.
-/// - The second value is the height of the string in lines.
-///
-/// # Example
-/// ```
-/// let (width, height) = utils::str_size("Hello\nWorld!");
-/// assert_eq!((5, 2), (width, height));
-/// ```
-pub fn str_size(s: &str) -> (u16, u16) {
-    let mut height = 1;
-    let mut max_width = 0;
-    let mut current_width = 0;
-
-    for b in s.bytes() {
-        if b == b'\n' {
-            height += 1;
-            max_width = max_width.max(current_width);
-            current_width = 0;
-        } else {
-            current_width += 1;
-        }
-    }
-
-    max_width = max_width.max(current_width);
-
-    (max_width, height)
-}
-
-pub fn hex_ansi(hex: u32) -> String {
-    let r = ((hex >> 16) & 0xFF) as u8;
-    let g = ((hex >> 8) & 0xFF) as u8;
-    let b = (hex & 0xFF) as u8;
-    format!("\x1b[38;2;{r};{g};{b}m")
-}
-
-pub fn hex_ansi_bg(hex: u32) -> String {
-    let r = ((hex >> 16) & 0xFF) as u8;
-    let g = ((hex >> 8) & 0xFF) as u8;
-    let b = (hex & 0xFF) as u8;
-    format!("\x1b[48;2;{r};{g};{b}m")
-}
-
-pub(crate) fn print(x: u16, y: u16, text: &str) {
-    for (i, line) in text.lines().enumerate() {
-        print!("\x1b[{};{}H{line}\x1b[0m", y + i as u16 + 1, x + 1);
-        flush().unwrap();
-    }
-}
-
-pub(crate) fn print_liner(x: u16, y: u16, liner: &str, text: &str) {
-    for (i, line) in text.lines().enumerate() {
-        print!("\x1b[{};{}H{liner}{line}\x1b[0m", y + i as u16 + 1, x + 1);
-        flush().unwrap();
-    }
-}

src/widget.rs

@@ -1,362 +0,0 @@
-//! Core widget infrastructure for OSUI.
-//!
-//! This module defines the traits and types that power the widget system, including:
-//! - `Element` and `Component`: building blocks for renderable and state-carrying objects
-//! - `Widget`: container type for wrapping elements and components
-//! - `StaticWidget` and `DynWidget`: concrete widget implementations
-//! - Dependency tracking and reactive updates for dynamic widgets
-
-use std::{
-    any::{Any, TypeId},
-    collections::HashMap,
-    sync::{Arc, Mutex, MutexGuard},
-};
-
-use crate::{
-    prelude::{Event, Handler},
-    render_scope::RenderScope,
-    state::DependencyHandler,
-};
-
-/// A trait object for any renderable UI element.
-pub type BoxedElement = Box<dyn Element + Send + Sync>;
-
-/// A trait object for any component attached to a widget.
-pub type BoxedComponent = Box<dyn Component + Send + Sync>;
-
-/// Core trait for anything that can be rendered in the UI.
-///
-/// Elements are responsible for their own rendering logic and can define hooks
-/// for lifecycle events and child rendering.
-pub trait Element: Send + Sync {
-    /// Called to perform rendering for the element.
-    #[allow(unused)]
-    fn render(&mut self, scope: &mut RenderScope) {}
-
-    /// Called after rendering, for follow-up logic or cleanup.
-    #[allow(unused)]
-    fn after_render(&mut self, scope: &mut RenderScope) {}
-
-    /// Called to draw child widgets, if any.
-    #[allow(unused)]
-    fn draw_child(&mut self, element: &Arc<Widget>) {}
-
-    #[allow(unused)]
-    fn event(&mut self, event: &dyn Event) {}
-
-    /// Returns a type-erased reference to this object.
-    fn as_any(&self) -> &dyn Any;
-
-    /// Returns a mutable type-erased reference to this object.
-    fn as_any_mut(&mut self) -> &mut dyn Any;
-}
-
-/// Optional trait for state or metadata attached to widgets.
-///
-/// Components can be used to store data such as layout style,
-/// animation state, bindings, or other logic.
-pub trait Component: Send + Sync {
-    fn as_any(&self) -> &dyn Any;
-    fn as_any_mut(&mut self) -> &mut dyn Any;
-}
-
-/// Container for a widget during initial construction.
-///
-/// Holds the root element and any associated components.
-pub struct WidgetLoad(BoxedElement, HashMap<TypeId, BoxedComponent>);
-
-/// A widget with fixed content and no dynamic behavior.
-pub struct StaticWidget(Mutex<BoxedElement>, Mutex<HashMap<TypeId, BoxedComponent>>);
-
-/// A widget with dynamic content and dependency tracking.
-///
-/// This widget supports reactive updates and can be rebuilt using
-/// a provided `FnMut()` function when dependencies change.
-pub struct DynWidget(
-    Mutex<BoxedElement>,
-    Mutex<HashMap<TypeId, BoxedComponent>>,
-    Mutex<Box<dyn FnMut() -> WidgetLoad + Send + Sync>>,
-    Mutex<Vec<Box<dyn DependencyHandler>>>,
-    Mutex<Option<Box<dyn FnMut(WidgetLoad) -> WidgetLoad + Send + Sync>>>,
-);
-
-/// A reference-counted wrapper around either a static or dynamic widget.
-///
-/// Use `Arc<Widget>` as the standard way to store and pass around widgets in the UI tree.
-pub enum Widget {
-    Static(StaticWidget),
-    Dynamic(DynWidget),
-}
-
-impl WidgetLoad {
-    /// Creates a new `WidgetLoad` with a given root element.
-    pub fn new<E: Element + 'static>(e: E) -> Self {
-        Self(Box::new(e), HashMap::new())
-    }
-
-    /// Attaches a component if one of its type doesn't already exist.
-    pub fn component<C: Component + 'static>(mut self, c: C) -> Self {
-        self.1.entry(c.type_id()).or_insert_with(|| Box::new(c));
-        self
-    }
-
-    /// Replaces any existing component of the same type.
-    pub fn set_component<C: Component + 'static>(mut self, c: C) -> Self {
-        self.1.insert(c.type_id(), Box::new(c));
-        self
-    }
-
-    /// Attempts to retrieve a component of the given type.
-    pub fn get<C: Component + 'static + Clone>(&self) -> Option<C> {
-        self.1
-            .get(&TypeId::of::<C>())
-            .and_then(|c| c.as_any().downcast_ref::<C>())
-            .map(|c| c.clone())
-    }
-}
-
-impl Widget {
-    pub fn new_static(e: BoxedElement) -> Self {
-        Self::Static(StaticWidget(Mutex::new(e), Mutex::new(HashMap::new())))
-    }
-
-    pub fn new_dyn<F: FnMut() -> WidgetLoad + 'static + Send + Sync>(mut e: F) -> Self {
-        let wl = e();
-        Self::Dynamic(DynWidget(
-            Mutex::new(wl.0),
-            Mutex::new(wl.1),
-            Mutex::new(Box::new(e)),
-            Mutex::new(Vec::new()),
-            Mutex::new(None),
-        ))
-    }
-}
-
-impl Widget {
-    pub fn get_elem(&self) -> MutexGuard<BoxedElement> {
-        match self {
-            Widget::Static(w) => w.get_elem(),
-            Widget::Dynamic(w) => w.get_elem(),
-        }
-    }
-
-    pub fn after_render(&self) {
-        match self {
-            Widget::Static(w) => w.after_render(),
-            Widget::Dynamic(w) => w.after_render(),
-        }
-    }
-
-    pub fn component<C: Component + 'static>(self: &Arc<Self>, c: C) -> &Arc<Self> {
-        match &**self {
-            Widget::Static(w) => {
-                w.component(c);
-            }
-            Widget::Dynamic(w) => {
-                w.component(c);
-            }
-        }
-        self
-    }
-
-    pub fn set_component<C: Component + 'static>(self: &Arc<Self>, c: C) -> &Arc<Self> {
-        match &**self {
-            Widget::Static(w) => {
-                w.set_component(c);
-            }
-            Widget::Dynamic(w) => {
-                w.set_component(c);
-            }
-        }
-        self
-    }
-
-    pub fn get<C: Component + 'static + Clone>(&self) -> Option<C> {
-        match self {
-            Widget::Static(w) => w.get(),
-            Widget::Dynamic(w) => w.get(),
-        }
-    }
-
-    pub fn inject<F: FnMut(WidgetLoad) -> WidgetLoad + 'static + Send + Sync>(
-        self: &Arc<Self>,
-        mut f: F,
-    ) {
-        match &**self {
-            Widget::Dynamic(w) => {
-                w.inject(f);
-            }
-            Widget::Static(w) => {
-                let wl = WidgetLoad::new(String::new());
-                w.1.lock().unwrap().extend(f(wl).1);
-            }
-        }
-    }
-
-    pub fn refresh(self: &Arc<Self>) {
-        match &**self {
-            Widget::Dynamic(w) => {
-                w.refresh();
-            }
-            Widget::Static(_) => {}
-        }
-    }
-
-    pub fn auto_refresh(self: &Arc<Self>) {
-        match &**self {
-            Widget::Dynamic(w) => {
-                w.auto_refresh();
-            }
-            Widget::Static(_) => {}
-        }
-    }
-
-    pub fn dependency<D: DependencyHandler + 'static>(self: &Arc<Self>, d: D) -> &Arc<Self> {
-        match &**self {
-            Widget::Dynamic(w) => {
-                w.dependency(d);
-            }
-            Widget::Static(_) => {}
-        }
-        self
-    }
-
-    pub fn dependency_box(self: &Arc<Self>, d: Box<dyn DependencyHandler>) -> &Arc<Self> {
-        match &**self {
-            Widget::Dynamic(w) => {
-                w.dependency_box(d);
-            }
-            Widget::Static(_) => {}
-        }
-        self
-    }
-
-    pub fn event<E: Event + Clone + 'static>(self: &Arc<Self>, e: &E) {
-        if let Some(wrapper) = self.get::<Handler<E>>() {
-            wrapper.call(self, e);
-        }
-
-        match &**self {
-            Widget::Dynamic(w) => {
-                w.get_elem().event(e);
-            }
-            Widget::Static(w) => {
-                w.get_elem().event(e);
-            }
-        }
-    }
-}
-
-impl StaticWidget {
-    fn after_render(&self) {}
-    fn get_elem(&self) -> MutexGuard<BoxedElement> {
-        self.0.lock().unwrap()
-    }
-}
-
-impl StaticWidget {
-    pub fn new(e: BoxedElement) -> Self {
-        Self(Mutex::new(e), Mutex::new(HashMap::new()))
-    }
-
-    pub fn component<C: Component + 'static>(&self, c: C) {
-        self.1
-            .lock()
-            .unwrap()
-            .entry(c.type_id())
-            .or_insert_with(|| Box::new(c));
-    }
-
-    pub fn set_component<C: Component + 'static>(&self, c: C) {
-        self.1.lock().unwrap().insert(c.type_id(), Box::new(c));
-    }
-
-    pub fn get<C: Component + 'static + Clone>(&self) -> Option<C> {
-        self.1
-            .lock()
-            .unwrap()
-            .get(&TypeId::of::<C>())
-            .and_then(|c| c.as_any().downcast_ref::<C>())
-            .map(Clone::clone)
-    }
-}
-
-impl DynWidget {
-    fn after_render(&self) {}
-    fn get_elem(&self) -> MutexGuard<BoxedElement> {
-        self.0.lock().unwrap()
-    }
-}
-
-impl DynWidget {
-    pub fn new<F: FnMut() -> WidgetLoad + 'static + Send + Sync>(mut e: F) -> Self {
-        let wl = e();
-        Self(
-            Mutex::new(wl.0),
-            Mutex::new(wl.1),
-            Mutex::new(Box::new(e)),
-            Mutex::new(Vec::new()),
-            Mutex::new(None),
-        )
-    }
-
-    /// Replace or modify the widget's structure on reload and init.
-    pub fn inject<F: FnMut(WidgetLoad) -> WidgetLoad + 'static + Send + Sync>(&self, f: F) {
-        *self.4.lock().unwrap() = Some(Box::new(f));
-        self.refresh();
-    }
-
-    /// Rebuild the widget's content by re-evaluating the original function.
-    pub fn refresh(&self) {
-        let mut w = (self.2.lock().unwrap())();
-
-        if let Some(we) = &mut *self.4.lock().unwrap() {
-            w = (we)(w);
-        }
-
-        *self.0.lock().unwrap() = w.0;
-        *self.1.lock().unwrap() = w.1;
-    }
-
-    /// Re-evaluates the widget if any dependency has changed.
-    pub fn auto_refresh(&self) {
-        for d in self.3.lock().unwrap().iter() {
-            if d.check() {
-                self.refresh();
-            }
-        }
-    }
-
-    /// Adds a dependency to this widget.
-    pub fn dependency<D: DependencyHandler + 'static>(&self, d: D) {
-        d.add();
-        self.3.lock().unwrap().push(Box::new(d));
-    }
-
-    /// Adds a boxed dependency.
-    pub fn dependency_box(&self, d: Box<dyn DependencyHandler>) {
-        d.add();
-        self.3.lock().unwrap().push(d);
-    }
-
-    pub fn component<C: Component + 'static>(&self, c: C) {
-        self.1
-            .lock()
-            .unwrap()
-            .entry(c.type_id())
-            .or_insert_with(|| Box::new(c));
-    }
-
-    pub fn set_component<C: Component + 'static>(&self, c: C) {
-        self.1.lock().unwrap().insert(c.type_id(), Box::new(c));
-    }
-
-    pub fn get<C: Component + 'static + Clone>(&self) -> Option<C> {
-        self.1
-            .lock()
-            .unwrap()
-            .get(&TypeId::of::<C>())
-            .and_then(|c| c.as_any().downcast_ref::<C>())
-            .map(Clone::clone)
-    }
-}