fix: simplify styling in scroll_view composable and update http example

actuate-rs · Dec 9, 2024 · f90e4c4 · f90e4c4
1 parent 5dad9a3
commit f90e4c4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git a/examples/http.rs b/examples/http.rs
@@ -54,8 +54,10 @@ impl Compose for BreedList {
                 name: breed.0.clone(),
                 families: breed.1.clone(),
             }))
+            .max_width(Val::Px(400.))
             .flex_gap(Val::Px(30.)),
         )
+        .align_items(AlignItems::Center)
     }
 }
 

diff --git a/src/ui/material/button.rs b/src/ui/material/button.rs
@@ -53,9 +53,7 @@ impl<'a, C> Button<'a, C> {
 
 impl<C: Compose> Compose for Button<'_, C> {
     fn compose(cx: Scope<Self>) -> impl Compose {
-        let theme = use_context::<Theme>(&cx)
-            .cloned()
-            .unwrap_or_default();
+        let theme = use_context::<Theme>(&cx).cloned().unwrap_or_default();
 
         container(unsafe { Signal::map_unchecked(cx.me(), |me| &me.content) })
             .background_color(cx.me().background_color.unwrap_or(theme.colors.primary))

diff --git a/src/ui/material/container.rs b/src/ui/material/container.rs
@@ -67,9 +67,7 @@ impl<'a, C> Container<'a, C> {
 
 impl<C: Compose> Compose for Container<'_, C> {
     fn compose(cx: Scope<Self>) -> impl Compose {
-        let theme = use_context::<Theme>(&cx)
-            .cloned()
-            .unwrap_or_default();
+        let theme = use_context::<Theme>(&cx).cloned().unwrap_or_default();
 
         cx.me()
             .modifier

diff --git a/src/ui/material/radio.rs b/src/ui/material/radio.rs
@@ -66,9 +66,7 @@ impl RadioButton<'_> {
 
 impl Compose for RadioButton<'_> {
     fn compose(cx: Scope<Self>) -> impl Compose {
-        let theme = use_context::<Theme>(&cx)
-            .cloned()
-            .unwrap_or_default();
+        let theme = use_context::<Theme>(&cx).cloned().unwrap_or_default();
 
         let size = Val::Px(cx.me().outer_radius * 2.);
         let inner_size = Val::Px(cx.me().inner_radius * 2.);

diff --git a/src/ui/material/text.rs b/src/ui/material/text.rs
@@ -64,9 +64,7 @@ impl Text<'_> {
 
 impl Compose for Text<'_> {
     fn compose(cx: crate::Scope<Self>) -> impl Compose {
-        let theme = use_context::<Theme>(&cx)
-            .cloned()
-            .unwrap_or_default();
+        let theme = use_context::<Theme>(&cx).cloned().unwrap_or_default();
 
         let style = &theme.typography[cx.me().typography][cx.me().typography_style];
 

diff --git a/src/ui/mod.rs b/src/ui/mod.rs
@@ -111,7 +111,6 @@ impl<C: Compose> Compose for ScrollView<'_, C> {
         modifier
             .apply(
                 spawn(Node {
-                    height: Val::Percent(100.),
                     flex_direction: FlexDirection::Column,
                     overflow: Overflow::scroll_y(),
                     ..Default::default()