osui-rs/osui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

changed % state dependency to be after the components

Browse Source
This commit is contained in:
selimaj-dev
2025-08-01 19:47:41 -05:00
parent 063c90d986
commit b45ef950a1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/macros.rs
+4 -4
View File
@@ -153,7 +153,7 @@ macro_rules! rsx_inner {
$crate::rsx_inner! { $r, $($rest)* }; $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 || { $r.create_element({ $(let $dep = $dep.clone();)* move || {
$crate::widget::WidgetLoad::new(format!($s)) $(.component($comp))* $crate::widget::WidgetLoad::new(format!($s)) $(.component($comp))*
} }, vec![$(Box::new($dep.clone())),*], $crate::frontend::Rsx(Vec::new())); } }, vec![$(Box::new($dep.clone())),*], $crate::frontend::Rsx(Vec::new()));
@@ -161,7 +161,7 @@ macro_rules! rsx_inner {
}; };
// static // 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),*))); let w = $crate::widget::StaticWidget::new(Box::new(<$name>::new($($e),*)));
$(w.component($comp);)* $(w.component($comp);)*
$r.create_element_static(w, $crate::frontend::Rsx(Vec::new())); $r.create_element_static(w, $crate::frontend::Rsx(Vec::new()));
@@ -176,14 +176,14 @@ macro_rules! rsx_inner {
$crate::rsx_inner! { $r, $($rest)* }; $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 || { $r.create_element({ $(let $dep = $dep.clone();)* move || {
$crate::widget::WidgetLoad::new(<$name>::new($($e),*)) $(.component($comp))* $crate::widget::WidgetLoad::new(<$name>::new($($e),*)) $(.component($comp))*
} }, vec![$(Box::new($dep.clone())),*], $crate::rsx!{ $($inner)* }); } }, vec![$(Box::new($dep.clone())),*], $crate::rsx!{ $($inner)* });
$crate::rsx_inner! { $r, $($rest)* }; $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 || { $r.create_element({ $(let $dep = $dep.clone();)* move || {
$crate::widget::WidgetLoad::new(<$name>::new()) $(.component($comp))* $crate::widget::WidgetLoad::new(<$name>::new()) $(.component($comp))*
} }, vec![$(Box::new($dep.clone())),*], $crate::rsx!{ $($inner)* }); } }, vec![$(Box::new($dep.clone())),*], $crate::rsx!{ $($inner)* });