feat: remove mount_style

demo/Cargo.toml

@@ -8,14 +8,15 @@ edition = "2021"
 
 [dependencies]
 leptos = { version = "0.5.2", features = ["csr"] }
+leptos_meta = { version = "0.5.2", features = ["csr"] }
+leptos_router = { version = "0.5.2", features = ["csr"] }
+leptos_devtools = "0.0.1"
 thaw = { path = "../" }
 icondata = { version = "0.1.0", features = [
     "AiCloseOutlined",
     "AiCheckOutlined",
     "AiGithubOutlined",
 ] }
-leptos_router = { version = "0.5.2", features = ["csr"] }
-leptos_devtools = "0.0.1"
 prisms = { git = "https://github.com/luoxiaozero/prisms", rev = "16d4d34b93fc20578ebf03137d54ecc7eafa4d4b" }
 
 [features]

demo/src/app.rs

@@ -1,5 +1,6 @@
 use crate::pages::*;
 use leptos::*;
+use leptos_meta::provide_meta_context;
 use leptos_router::*;
 use thaw::*;
 
@@ -22,6 +23,7 @@ pub fn App() -> impl IntoView {
     let theme = create_rw_signal(theme);
 
     provide_context(theme);
+    provide_meta_context();
     view! {
         <Provider theme>
             <TheRouter />

demo/src/components/demo.rs

@@ -1,4 +1,5 @@
 use leptos::*;
+use leptos_meta::Style;
 use thaw::*;
 
 #[slot]
@@ -10,7 +11,6 @@ pub struct DemoCode {
 
 #[component]
 pub fn Demo(demo_code: DemoCode, children: Children) -> impl IntoView {
-    mount_style("demo", prisms::prism_css!());
     let theme = use_theme(Theme::light);
     let style = create_memo(move |_| {
         let mut style = String::from("background-image: url(/thaw/grid_dot.svg); background-repeat: repeat; background-size: 1.5rem; margin-top: 1rem; padding: 1rem; border-top-left-radius: 0.5rem; border-top-right-radius: 0.5rem;");
@@ -40,6 +40,9 @@ pub fn Demo(demo_code: DemoCode, children: Children) -> impl IntoView {
         style
     });
     view! {
+        <Style>
+            {prisms::prism_css!()}
+        </Style>
         <div style=move || style.get()>
             {children()}
         </div>

demo/src/pages/grid/mod.rs

@@ -1,25 +1,25 @@
 use crate::components::{Demo, DemoCode};
 use leptos::*;
+use leptos_meta::Style;
 use prisms::highlight_str;
 use thaw::*;
 
 #[component]
 pub fn GridPage() -> impl IntoView {
-    mount_style(
-        "grid-demo",
-        r#".thaw-grid-item {
-        height: 60px;
-        text-align: center;
-        line-height: 60px;
-      }
-      .thaw-grid-item:nth-child(odd) {
-        background-color: #0078ff88;
-      }
-      .thaw-grid-item:nth-child(even) {
-        background-color: #0078ffaa;
-      }"#,
-    );
     view! {
+        <Style>
+            r#".thaw-grid-item {
+                height: 60px;
+                text-align: center;
+                line-height: 60px;
+            }
+            .thaw-grid-item:nth-child(odd) {
+                background-color: #0078ff88;
+            }
+            .thaw-grid-item:nth-child(even) {
+                background-color: #0078ffaa;
+            }"#
+        </Style>
         <div style="width: 896px; margin: 0 auto;">
             <h1>"Grid"</h1>
             <Demo>

src/alert/mod.rs

@@ -1,6 +1,6 @@
 mod theme;
 
-use crate::{theme::use_theme, utils::mount_style::mount_style, Icon, Theme};
+use crate::{theme::use_theme, utils::mount_style, Icon, Theme};
 use icondata::AiIcon;
 use leptos::*;
 pub use theme::AlertTheme;

src/auto_complete/mod.rs

@@ -2,8 +2,8 @@ mod theme;
 
 use crate::{
     components::{Binder, Follower, FollowerPlacement, FollowerWidth},
-    mount_style, use_theme,
+    use_theme,
-    utils::StoredMaybeSignal,
+    utils::{mount_style, StoredMaybeSignal},
     Input, Theme,
 };
 use leptos::*;

src/avatar/mod.rs

@@ -1,6 +1,6 @@
 mod theme;
 
-use crate::{mount_style, use_theme, Theme};
+use crate::{use_theme, utils::mount_style, Theme};
 use leptos::*;
 pub use theme::AvatarTheme;
 

src/badge/mod.rs

@@ -1,4 +1,4 @@
-use crate::{mount_style, theme::use_theme, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 
 #[derive(Default, Clone)]

src/breadcrumb/mod.rs

@@ -1,7 +1,7 @@
 mod breadcrumb_item;
 mod theme;
 
-use crate::{mount_style, use_theme, Theme};
+use crate::{use_theme, utils::mount_style, Theme};
 pub use breadcrumb_item::BreadcrumbItem;
 use leptos::*;
 pub use theme::BreadcrumbTheme;

src/button/mod.rs

@@ -4,7 +4,7 @@ use crate::{
     components::{OptionComp, Wave, WaveRef},
     icon::*,
     theme::*,
-    utils::{mount_style::mount_style, ComponentRef},
+    utils::{mount_style, ComponentRef},
 };
 use leptos::*;
 pub use theme::ButtonTheme;

src/card/mod.rs

@@ -1,4 +1,4 @@
-use crate::{components::*, use_theme, utils::mount_style::mount_style, Theme};
+use crate::{components::*, use_theme, utils::mount_style, Theme};
 use leptos::*;
 
 #[derive(Clone)]

src/checkbox/mod.rs

@@ -1,7 +1,7 @@
 mod checkbox_group;
 mod checkbox_item;
 
-use crate::{components::*, icon::*, theme::use_theme, utils::mount_style::mount_style, Theme};
+use crate::{components::*, icon::*, theme::use_theme, utils::mount_style, Theme};
 pub use checkbox_group::CheckboxGroup;
 pub use checkbox_item::CheckboxItem;
 use icondata::AiIcon;

src/code/mod.rs

@@ -1,4 +1,4 @@
-use crate::utils::mount_style::mount_style;
+use crate::utils::mount_style;
 use leptos::*;
 
 #[component]

src/color_picker/mod.rs

@@ -2,7 +2,7 @@ mod color;
 mod theme;
 
 use crate::components::{Binder, Follower, FollowerPlacement};
-use crate::{mount_style, use_theme, Theme};
+use crate::{use_theme, utils::mount_style, Theme};
 pub use color::*;
 use leptos::*;
 use leptos::{leptos_dom::helpers::WindowListenerHandle, wasm_bindgen::__rt::IntoJsResult};

src/components/binder/mod.rs

@@ -2,7 +2,7 @@ mod get_placement_style;
 
 use crate::{
     components::Teleport,
-    mount_style,
+    utils::mount_style,
     utils::{add_event_listener, EventListenerHandle},
 };
 use get_placement_style::get_follower_placement_style;

src/components/wave/mod.rs

@@ -1,4 +1,4 @@
-use crate::utils::{mount_style::mount_style, ComponentRef};
+use crate::utils::{mount_style, ComponentRef};
 use leptos::{leptos_dom::helpers::TimeoutHandle, *};
 use std::time::Duration;
 

src/divider/mod.rs

@@ -1,6 +1,6 @@
 use leptos::*;
 
-use crate::mount_style;
+use crate::utils::mount_style;
 
 #[component]
 pub fn Divider() -> impl IntoView {

src/input/mod.rs

@@ -2,7 +2,7 @@ mod theme;
 
 use crate::{
     theme::{use_theme, Theme},
-    utils::mount_style::mount_style,
+    utils::mount_style,
 };
 use leptos::*;
 pub use theme::InputTheme;

src/layout/layout_sider.rs

@@ -1,4 +1,4 @@
-use crate::utils::mount_style::mount_style;
+use crate::utils::mount_style;
 use leptos::*;
 
 #[component]

src/layout/mod.rs

@@ -1,7 +1,7 @@
 mod layout_header;
 mod layout_sider;
 
-use crate::utils::mount_style::mount_style;
+use crate::utils::mount_style;
 pub use layout_header::*;
 pub use layout_sider::*;
 use leptos::*;

src/lib.rs

@@ -70,4 +70,4 @@ pub use tabs::*;
 pub use tag::*;
 pub use theme::*;
 pub use upload::*;
-pub use utils::{mount_style::mount_style, signal::SignalWatch};
+pub use utils::SignalWatch;

src/loading_bar/mod.rs

@@ -1,6 +1,6 @@
 mod loading_bar_provider;
 
-use crate::{mount_style, use_theme, utils::ComponentRef, Theme};
+use crate::{use_theme, utils::mount_style, utils::ComponentRef, Theme};
 use leptos::*;
 pub use loading_bar_provider::{use_loading_bar, LoadingBarProvider};
 

src/menu/menu_group.rs

@@ -1,4 +1,4 @@
-use crate::{theme::use_theme, utils::mount_style::mount_style, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 
 #[component]

src/menu/menu_item.rs

@@ -1,5 +1,5 @@
 use super::use_menu;
-use crate::{theme::use_theme, utils::mount_style::mount_style, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 
 #[component]

src/message/message_provider.rs

@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use super::{message_environment::MessageEnvironment, MessageVariant};
-use crate::{components::Teleport, mount_style};
+use crate::{components::Teleport, utils::mount_style};
 use leptos::*;
 use uuid::Uuid;
 

src/mobile/nav_bar/mod.rs

@@ -4,7 +4,7 @@ use crate::{
     components::*,
     icon::*,
     use_theme,
-    utils::{mount_style::mount_style, StoredMaybeSignal},
+    utils::{mount_style, StoredMaybeSignal},
     Theme,
 };
 use leptos::*;

src/mobile/tabbar/mod.rs

@@ -1,7 +1,7 @@
 mod tabbar_item;
 mod theme;
 
-use crate::{use_theme, utils::mount_style::mount_style, Theme};
+use crate::{use_theme, utils::mount_style, Theme};
 use leptos::*;
 pub use tabbar_item::*;
 pub use theme::TabbarTheme;

src/mobile/tabbar/tabbar_item.rs

@@ -1,7 +1,7 @@
 use super::use_tabbar;
 use crate::components::*;
 use crate::utils::StoredMaybeSignal;
-use crate::{icon::*, theme::use_theme, utils::mount_style::mount_style, Theme};
+use crate::{icon::*, theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 
 #[component]

src/mobile/toast/mod.rs

@@ -1,4 +1,4 @@
-use crate::utils::mount_style::mount_style;
+use crate::utils::mount_style;
 use cfg_if::cfg_if;
 use std::time::Duration;
 

src/modal/mod.rs

@@ -1,7 +1,7 @@
 use crate::icon::*;
 use crate::{
     components::{OptionComp, Teleport},
-    utils::{mount_style::mount_style, StoredMaybeSignal},
+    utils::{mount_style, StoredMaybeSignal},
     Card, CardFooter, CardHeader, CardHeaderExtra,
 };
 use leptos::*;

src/progress/mod.rs

@@ -1,4 +1,4 @@
-use crate::utils::{mount_style::mount_style, StoredMaybeSignal};
+use crate::utils::{mount_style, StoredMaybeSignal};
 use leptos::*;
 
 #[component]

src/radio/mod.rs

@@ -1,4 +1,4 @@
-use crate::{theme::use_theme, utils::mount_style::mount_style, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 
 #[component]

src/select/mod.rs

@@ -3,7 +3,7 @@ mod theme;
 use crate::{
     components::{Binder, Follower, FollowerPlacement, FollowerWidth},
     theme::use_theme,
-    utils::mount_style::mount_style,
+    utils::mount_style,
     Theme,
 };
 use leptos::wasm_bindgen::__rt::IntoJsResult;

src/skeleton/mod.rs

@@ -1,6 +1,6 @@
 mod theme;
 
-use crate::{mount_style, theme::use_theme, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 pub use theme::SkeletionTheme;
 

src/slider/mod.rs

@@ -1,6 +1,6 @@
 mod theme;
 
-use crate::{theme::use_theme, utils::mount_style::mount_style, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 pub use theme::SliderTheme;
 

src/space/mod.rs

@@ -1,4 +1,4 @@
-use crate::utils::mount_style::mount_style;
+use crate::utils::mount_style;
 use leptos::*;
 
 #[derive(Default)]

src/switch/mod.rs

@@ -1,6 +1,6 @@
 mod theme;
 
-use crate::{mount_style, theme::use_theme, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 pub use theme::SwitchTheme;
 

src/table/mod.rs

@@ -1,6 +1,6 @@
 mod theme;
 
-use crate::{theme::use_theme, utils::mount_style::mount_style, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 pub use theme::TableTheme;
 

src/tabs/mod.rs

@@ -1,6 +1,6 @@
 mod tab;
 
-use crate::{theme::use_theme, utils::mount_style::mount_style, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 
 pub use tab::*;

src/tabs/tab.rs

@@ -1,5 +1,5 @@
 use super::use_tabs;
-use crate::utils::mount_style::mount_style;
+use crate::utils::mount_style;
 use leptos::*;
 
 #[derive(Clone)]

src/tag/mod.rs

@@ -1,6 +1,6 @@
 mod theme;
 
-use crate::{mount_style, theme::use_theme, Theme};
+use crate::{theme::use_theme, utils::mount_style, Theme};
 use leptos::*;
 pub use theme::TagTheme;
 

src/upload/mod.rs

@@ -1,7 +1,7 @@
 mod theme;
 mod upload_dragger;
 
-use crate::{mount_style, utils::add_event_listener};
+use crate::{utils::add_event_listener, utils::mount_style};
 use leptos::*;
 pub use theme::UploadTheme;
 pub use upload_dragger::UploadDragger;

src/upload/upload_dragger.rs

@@ -1,4 +1,4 @@
-use crate::{use_theme, utils::mount_style::mount_style, Theme};
+use crate::{use_theme, utils::mount_style, Theme};
 use leptos::*;
 
 #[component]

src/utils/mod.rs

@@ -1,11 +1,13 @@
 // mod callback;
 mod component_ref;
 mod event_listener;
-pub mod mount_style;
+mod mount_style;
-pub mod signal;
+mod signal;
 mod stored_maybe_signal;
 
 // pub use callback::AsyncCallback;
-pub use component_ref::ComponentRef;
+pub(crate) use component_ref::ComponentRef;
-pub use event_listener::*;
+pub(crate) use event_listener::*;
-pub use stored_maybe_signal::*;
+pub(crate) use mount_style::mount_style;
+pub use signal::SignalWatch;
+pub(crate) use stored_maybe_signal::*;