From b45ef950a1b210e4283e735060c9e741348126b2 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Fri, 1 Aug 2025 19:47:41 -0500 Subject: [PATCH] changed % state dependency to be after the components --- src/macros.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/macros.rs b/src/macros.rs index 0bc9ed9..a3e2d20 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -153,7 +153,7 @@ macro_rules! rsx_inner { $crate::rsx_inner! { $r, $($rest)* }; }; - ($r:expr, $(%$dep:ident)* $(@$comp:expr;)* $s:literal $($rest:tt)*) => { + ($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())); @@ -161,7 +161,7 @@ macro_rules! rsx_inner { }; // static - ($r:expr, $(%$dep:ident)* $(@$comp:expr;)* static $name:path { $($inner:tt)* } ($($e:expr),*) $($rest:tt)*) => { + ($r:expr, $(@$comp:expr;)* static $name:path { $($inner:tt)* } ($($e:expr),*) $($rest:tt)*) => { let w = $crate::widget::StaticWidget::new(Box::new(<$name>::new($($e),*))); $(w.component($comp);)* $r.create_element_static(w, $crate::frontend::Rsx(Vec::new())); @@ -176,14 +176,14 @@ macro_rules! rsx_inner { $crate::rsx_inner! { $r, $($rest)* }; }; - ($r:expr, $(%$dep:ident)* $(@$comp:expr;)* $name:path { $($inner:tt)* } ($($e:expr),*) $($rest:tt)*) => { + ($r:expr, $(@$comp:expr;)* $(%$dep:ident)* $name:path { $($inner:tt)* } ($($e:expr),*) $($rest:tt)*) => { $r.create_element({ $(let $dep = $dep.clone();)* move || { $crate::widget::WidgetLoad::new(<$name>::new($($e),*)) $(.component($comp))* } }, vec![$(Box::new($dep.clone())),*], $crate::rsx!{ $($inner)* }); $crate::rsx_inner! { $r, $($rest)* }; }; - ($r:expr, $(%$dep:ident)* $(@$comp:expr;)* $name:path { $($inner:tt)* } $($rest:tt)*) => { + ($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)* });