chore: Simplify how the default theme is provided (#287)

marc2332 · Aug 22, 2023 · 3f5e96d · 3f5e96d
1 parent e0e0d6b
commit 3f5e96d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/components/src/theme.rs b/components/src/theme.rs
@@ -1,5 +1,5 @@
 use dioxus::prelude::*;
-use freya_hooks::{use_init_default_theme, use_init_theme, Theme};
+use freya_hooks::{use_init_theme, Theme};
 
 /// [`ThemeProvider`] component properties.
 #[derive(Props)]
@@ -18,11 +18,7 @@ pub struct ThemeProviderProps<'a> {
 ///
 #[allow(non_snake_case)]
 pub fn ThemeProvider<'a>(cx: Scope<'a, ThemeProviderProps<'a>>) -> Element<'a> {
-    if let Some(theme) = cx.props.theme.as_ref() {
-        use_init_theme(cx, theme.clone());
-    } else {
-        use_init_default_theme(cx);
-    }
+    use_init_theme(cx, cx.props.theme.clone().unwrap_or_default());
 
     render!(&cx.props.children)
 }
diff --git a/hooks/src/use_theme.rs b/hooks/src/use_theme.rs
@@ -7,9 +7,8 @@ pub fn use_init_theme(cx: &ScopeState, theme: Theme) {
 }
 
 /// Provide the default [`Theme`].
-pub fn use_init_default_theme(cx: &ScopeState) -> Theme {
-    use_shared_state_provider(cx, || LIGHT_THEME);
-    LIGHT_THEME
+pub fn use_init_default_theme(cx: &ScopeState) {
+    use_shared_state_provider(cx, Theme::default);
 }
 
 /// Subscribe to [`Theme`] changes.
@@ -23,7 +22,7 @@ pub fn use_theme(cx: &ScopeState) -> &UseSharedState<Theme> {
 pub fn use_get_theme(cx: &ScopeState) -> Theme {
     use_shared_state::<Theme>(cx)
         .map(|v| v.read().clone())
-        .unwrap_or(LIGHT_THEME)
+        .unwrap_or_default()
 }
 
 /// Theming properties for DropdownItem components.
@@ -133,6 +132,12 @@ pub struct Theme {
     pub loader: LoaderTheme,
 }
 
+impl Default for Theme {
+    fn default() -> Self {
+        LIGHT_THEME
+    }
+}
+
 /// `Light` theme
 pub const LIGHT_THEME: Theme = Theme {
     name: "light",