working Rsx

examples/hello_world.rs

@@ -40,61 +40,55 @@ fn app(cx: &Arc<Context>) -> View {
         }
     });
 
-    {
+    // {
-        let scope = cx.scope();
+    //     cx.dyn_scope(
+    //         {
+    //             let count = count.clone();
+    //             move |scope| {
+    //                 if *count.get() != 0 {
+    //                     if scope.children.lock().unwrap().len() == 0 {
+    //                         scope.child(
+    //                             my_component,
+    //                             Some(Arc::new(|ctx, view| {
+    //                                 let area = ctx.allocate(5, 2, 0, 0);
+    //                                 ctx.draw_view(area, view)
+    //                             })),
+    //                         );
+    //                     }
+    //                 } else {
+    //                     scope.children.lock().unwrap().clear();
+    //                 }
+    //             }
+    //         },
+    //         &[&count],
+    //     );
+    // }
 
-        scope.child(
+    // {
-            my_component,
+    //     cx.dyn_scope(
-            Some(Arc::new(|ctx, view| {
+    //         {
-                let area = ctx.allocate(5, 0, 0, 0);
+    //             let count = count.clone();
-                ctx.draw_view(area, view)
+    //             move |scope| {
-            })),
+    //                 scope.children.lock().unwrap().clear();
-        );
+
+    //                 for i in 0..count.get_dl() {
+    //                     scope.view(Arc::new(move |ctx| {
+    //                         ctx.draw_text(Point { x: 0, y: i }, &format!("{i}"));
+    //                     }));
+    //                 }
+    //             }
+    //         },
+    //         &[&count],
+    //     );
+    // }
+
+    rsx! {
+        my_component (ctx, view) {
+            let area = ctx.allocate(0, 0, 10, 10);
+            ctx.draw_view(area, view);
+        }
     }
-
+    .view(cx.clone())
-    {
-        cx.dyn_scope(
-            {
-                let count = count.clone();
-                move |scope| {
-                    if *count.get() != 0 {
-                        if scope.children.lock().unwrap().len() == 0 {
-                            scope.child(
-                                my_component,
-                                Some(Arc::new(|ctx, view| {
-                                    let area = ctx.allocate(5, 2, 0, 0);
-                                    ctx.draw_view(area, view)
-                                })),
-                            );
-                        }
-                    } else {
-                        scope.children.lock().unwrap().clear();
-                    }
-                }
-            },
-            &[&count],
-        );
-    }
-
-    {
-        cx.dyn_scope(
-            {
-                let count = count.clone();
-                move |scope| {
-                    scope.children.lock().unwrap().clear();
-
-                    for i in 0..count.get_dl() {
-                        scope.view(Arc::new(move |ctx| {
-                            ctx.draw_text(Point { x: 0, y: i }, &format!("{i}"));
-                        }));
-                    }
-                }
-            },
-            &[&count],
-        );
-    }
-
-    rsx! {}.view(cx.clone())
 }
 
 fn my_component(cx: &Arc<Context>) -> View {
@@ -112,7 +106,8 @@ fn my_component(cx: &Arc<Context>) -> View {
         }
     });
 
-    Arc::new(move |ctx| {
+    rsx! {
-        ctx.draw_text(Point { x: 0, y: 0 }, &format!("Count: {count}"));
+        "Count: {count}"
-    })
+    }
+    .view(cx.clone())
 }

src/component.rs

@@ -179,6 +179,12 @@ impl Context {
 }
 
 impl Scope {
+    pub fn new() -> Arc<Self> {
+        Arc::new(Self {
+            children: Mutex::new(Vec::new()),
+        })
+    }
+
     pub fn child<F: Fn(&Arc<Context>) -> View + Send + Sync + 'static>(
         self: &Arc<Self>,
         child: F,

src/macros.rs

@@ -3,9 +3,42 @@ macro_rules! rsx {
     () => {
         $crate::frontend::Rsx::new()
     };
+
+    ($($rsx:tt)+) => {{
+        let mut r = $crate::frontend::Rsx::new();
+        $crate::rsx_scope!(r, $($rsx)+);
+        r
+    }};
 }
 
 #[macro_export]
 macro_rules! rsx_scope {
-    () => {};
+    ($rsx:expr, $text:literal $($rest:tt)*) => {
+        let scope = $crate::component::Scope::new();
+
+        scope.view(Arc::new(move |ctx| ctx.draw_text(Point { x: 0, y: 0 }, &format!($text))));
+
+        $rsx.static_scope(scope);
+        $crate::rsx_scope!($rsx, $($rest)*);
+    };
+
+    ($rsx:expr, $component:ident ($ctx:ident, $view:ident) $body:block $($rest:tt)*) => {
+        let scope = $crate::component::Scope::new();
+
+        scope.child($component, Some(Arc::new(|$ctx, $view| $body)));
+
+        $rsx.static_scope(scope);
+        $crate::rsx_scope!($rsx, $($rest)*);
+    };
+
+    ($rsx:expr, $component:ident $($rest:tt)*) => {
+        let scope = $crate::component::Scope::new();
+
+        scope.child($component, None);
+
+        $rsx.static_scope(scope);
+        $crate::rsx_scope!($rsx, $($rest)*);
+    };
+
+    ($rsx:expr,) => {};
 }