Thaw/v0.5

.github/workflows/ci.yml

@@ -27,6 +27,7 @@ jobs:
                   toolchain: stable
                   target: wasm32-unknown-unknown
                   override: true
+            - uses: Swatinem/rust-cache@v2
             - name: Install Trunk
               uses: jetli/[email protected]
               with:
@@ -47,6 +48,7 @@ jobs:
                   toolchain: nightly
                   target: wasm32-unknown-unknown
                   override: true
+            - uses: Swatinem/rust-cache@v2
             - name: Install Trunk
               uses: jetli/[email protected]
               with:
@@ -67,14 +69,11 @@ jobs:
                   toolchain: stable
                   target: wasm32-unknown-unknown
                   override: true
-            - name: Install Trunk
-              uses: jetli/[email protected]
-              with:
-                  version: "latest"
+            - uses: Swatinem/rust-cache@v2
             - name: Install Cargo BInstall
               uses: cargo-bins/cargo-binstall@main
             - name: Install Cargo Leptos
-              run: cargo binstall cargo-leptos -y
+              run: cargo binstall cargo-leptos --locked --no-confirm
             - name: Build
               run: |
                   cd ./examples/ssr_axum
@@ -91,14 +90,11 @@ jobs:
                   toolchain: nightly
                   target: wasm32-unknown-unknown
                   override: true
-            - name: Install Trunk
-              uses: jetli/[email protected]
-              with:
-                  version: "latest"
+            - uses: Swatinem/rust-cache@v2
             - name: Install Cargo BInstall
               uses: cargo-bins/cargo-binstall@main
             - name: Install Cargo Leptos
-              run: cargo binstall cargo-leptos -y
+              run: cargo binstall cargo-leptos --locked --no-confirm
             - name: Build
               run: |
                   cd ./examples/ssr_axum
@@ -116,6 +112,7 @@ jobs:
                   toolchain: stable
                   target: wasm32-unknown-unknown
                   override: true
+            - uses: Swatinem/rust-cache@v2
             - name: cargo test
               run: |
                   cd thaw_utils

.github/workflows/demo.yml

@@ -31,6 +31,7 @@ jobs:
                   toolchain: stable
                   target: wasm32-unknown-unknown
                   override: true
+            - uses: Swatinem/rust-cache@v2
             - name: Install Trunk
               uses: jetli/[email protected]
               with:

CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.5.0-alpha](https://github.com/thaw-ui/thaw/compare/v0.4.5...v0.5.0-alpha) (2025-03-30)
+
+### Features
+
+* Adds `Tree` component, closes [#392](https://github.com/thaw-ui/thaw/pull/392).
+* `Menu` is changed to a generic component, closes [#390](https://github.com/thaw-ui/thaw/pull/390).
+
+### Breaking Changes
+
+* Update leptos to v0.8.0-beta.
+* Theme is changed to use getset.
+* RatingColor adds Marigold prop.
+* InputType adds Number prop.
+* The icon prop of `Icon` is changed to icondata_core::Icon type.
+* The value prop of `MenuItem` is changed to generic type.
+
 ## [0.4.5](https://github.com/thaw-ui/thaw/compare/v0.4.4...v0.4.5) (2025-03-30)
 
 ### Features
@@ -69,4 +85,4 @@
 
 ### 0.1.0-beta2 - 0.4.0-rc (2023-11-14 - 2024-12-09)
 
-See [0.1 - 0.4 changelog](./changelog/CHANGELOG-0.1-0.4.md)
+See [0.1 - 0.4 changelog](./changelogs/CHANGELOG-0.1-0.4.md)

Cargo.toml

@@ -14,12 +14,16 @@ exclude = ["examples"]
 rust-version = "1.79"
 
 [workspace.dependencies]
-thaw = { version = "0.4.5", path = "./thaw" }
-thaw_components = { version = "0.3.1", path = "./thaw_components" }
+thaw = { version = "0.5.0-alpha", path = "./thaw" }
+thaw_components = { version = "0.4.0-alpha", path = "./thaw_components" }
 thaw_macro = { version = "0.1.0", path = "./thaw_macro" }
-thaw_utils = { version = "0.1.1", path = "./thaw_utils" }
+thaw_utils = { version = "0.2.0-alpha", path = "./thaw_utils" }
 
-leptos = { version = "0.7.7" }
-leptos_meta = { version = "0.7.7" }
-leptos_router = { version = "0.7.7" }
-reactive_stores = { version = "0.1.7" }
+# leptos
+leptos = { version = "0.8.0-beta" }
+leptos_meta = { version = "0.8.0-beta" }
+leptos_router = { version = "0.8.0-beta" }
+reactive_stores = { version = "0.2.0-beta" }
+
+# web
+wasm-bindgen = { version = "0.2.100" }

demo/Cargo.toml

@@ -26,7 +26,7 @@ uuid = { version = "1.10.0", features = ["v4", "js"] }
 console_error_panic_hook = "0.1.7"
 console_log = "1"
 log = "0.4"
-js-sys = "0.3.70"
+js-sys = "0.3.74"
 gloo-net = { version = "0.6.0" }
 
 [features]

demo/index.html

@@ -10,6 +10,7 @@
             href="/favicon.ico"
             type="image/x-icon"
         />
+        <meta name="thaw-ui-style"/>
         <link data-trunk rel="copy-file" href="./src/assets/svg/grid_dot.svg" />
         <link data-trunk rel="copy-file" href="./src/assets/favicon.ico" />
         <link

demo/src/app.rs

@@ -58,6 +58,7 @@ fn TheRouter() -> impl IntoView {
                     <Route path=path!("/server-sider-rendering") view=ServerSiderRenderingMdPage />
                     <Route path=path!("/development/components") view=DevelopmentComponentsMdPage />
                     <Route path=path!("/customize-theme") view=CustomizeThemeMdPage />
+                    <Route path=path!("/style-element-position") view=StyleElementPositionMdPage />
                     <Route path=path!("/FAQs") view=FAQsMdPage />
                 </ParentRoute>
                 <ParentRoute path=path!("/components") view=ComponentsPage>
@@ -120,6 +121,7 @@ fn TheRouter() -> impl IntoView {
                     <Route path=path!("/time-picker") view=TimePickerMdPage />
                     <Route path=path!("/toast") view=ToastMdPage />
                     <Route path=path!("/tooltip") view=TooltipMdPage />
+                    <Route path=path!("/tree") view=TreeMdPage />
                     <Route path=path!("/upload") view=UploadMdPage />
                 </ParentRoute>
             </Routes>

demo/src/components/demo.rs

@@ -20,7 +20,7 @@ pub fn Demo(
     let css_vars = Memo::new(move |_| {
         let mut css_vars = String::new();
         theme.with(|theme| {
-            if theme.color.color_scheme == "dark" {
+            if theme.color.color_scheme() == "dark" {
                 css_vars.push_str("--demo-border-color: #383f52;");
                 css_vars.push_str("--demo-background-color: #242832;");
             } else {
@@ -32,7 +32,12 @@ pub fn Demo(
     });
 
     let code_class = Memo::new(move |_| {
-        theme.with(|theme| format!("demo-demo__code color-scheme--{}", theme.color.color_scheme))
+        theme.with(|theme| {
+            format!(
+                "demo-demo__code color-scheme--{}",
+                theme.color.color_scheme()
+            )
+        })
     });
     let is_show_code = RwSignal::new(children.is_none());
 

demo/src/components/site_header.rs

@@ -5,6 +5,14 @@ use leptos_router::hooks::use_navigate;
 // use leptos_use::{storage::use_local_storage, utils::FromToStringCodec};
 use thaw::*;
 
+#[derive(Clone)]
+enum HeaderAction {
+    ChangeTheme,
+    Github,
+    Discord,
+    Navigate(&'static str),
+}
+
 #[component]
 pub fn SiteHeader() -> impl IntoView {
     let navigate = use_navigate();
@@ -172,19 +180,18 @@ pub fn SiteHeader() -> impl IntoView {
                 </AutoComplete>
                 <Menu
                     position=MenuPosition::BottomEnd
-                    on_select=move |value: String| match value.as_str() {
-                        "Dark" => change_theme(MouseEvent::new("click").unwrap()),
-                        "Light" => change_theme(MouseEvent::new("click").unwrap()),
-                        "github" => {
+                    on_select=move |value: HeaderAction| match value {
+                        HeaderAction::ChangeTheme => change_theme(MouseEvent::new("click").unwrap()),
+                        HeaderAction::Github => {
                             _ = window().open_with_url("http://github.com/thaw-ui/thaw");
                         }
-                        "discord" => {
+                        HeaderAction::Discord => {
                             _ = window()
                                 .open_with_url(
                                     "https://discord.gg/VwtS7b8c",
                                 );
                         }
-                        _ => navigate_signal.get()(&value, Default::default()),
+                        HeaderAction::Navigate(value) => navigate_signal.get()(&value, Default::default()),
                     }
                 >
                     <MenuTrigger slot>
@@ -195,11 +202,11 @@ pub fn SiteHeader() -> impl IntoView {
                             attr:style="font-size: 22px; padding: 0px 6px;"
                         />
                     </MenuTrigger>
-                    <MenuItem value=theme_name>{theme_name}</MenuItem>
-                    <MenuItem icon=icondata::AiGithubOutlined value="github">
+                    <MenuItem value=HeaderAction::ChangeTheme>{theme_name}</MenuItem>
+                    <MenuItem value=HeaderAction::Github icon=icondata::AiGithubOutlined>
                         "Github"
                     </MenuItem>
-                    <MenuItem icon=icondata::BiDiscordAlt value="discord">
+                    <MenuItem  value=HeaderAction::Discord icon=icondata::BiDiscordAlt>
                         "Discord"
                     </MenuItem>
                     {
@@ -216,7 +223,7 @@ pub fn SiteHeader() -> impl IntoView {
                                         .into_iter()
                                         .map(|item| {
                                             let NavItemOption { label, value, .. } = item;
-                                            view! { <MenuItem value=value>{label}</MenuItem> }
+                                            view! { <MenuItem value=HeaderAction::Navigate(value)>{label}</MenuItem> }
                                         })
                                         .collect_view()}
                                 }

demo/src/pages/components.rs

@@ -155,6 +155,11 @@ pub(crate) fn gen_nav_data() -> Vec<NavGroupOption> {
                     value: "/guide/customize-theme",
                     label: "Customize Theme",
                 },
+                NavItemOption {
+                    group: Some("Theme"),
+                    value: "/guide/style-element-position",
+                    label: "Style Element Position",
+                },
                 NavItemOption {
                     group: None,
                     value: "/guide/FAQs",
@@ -469,6 +474,11 @@ pub(crate) fn gen_nav_data() -> Vec<NavGroupOption> {
                     value: "/components/tooltip",
                     label: "Tooltip",
                 },
+                NavItemOption {
+                    group: None,
+                    value: "/components/tree",
+                    label: "Tree",
+                },
                 NavItemOption {
                     group: None,
                     value: "/components/upload",

demo_markdown/Cargo.toml

@@ -14,4 +14,7 @@ quote = "1.0.36"
 comrak = "0.26.0"
 proc-macro2 = "1.0.86"
 syn = "2.0.74"
-syntect = "5.2.0"
+syntect = "5.2.0"
+
+# fix: https://github.com/jhpratt/deranged/issues/17
+deranged = "=0.4.0"

demo_markdown/docs/_guide/server_sider_rendering.md

@@ -32,6 +32,15 @@ For [start-actix](https://github.com/leptos-rs/start-actix), it is in the [src/m
 
 ## Features
 
+<MessageBar layout=MessageBarLayout::Multiline intent=MessageBarIntent::Warning>
+    <MessageBarBody>
+      <h3 style="margin: 0">"Prerequisite"</h3>
+      <p>
+        "The following configuration is only suitable for enabling one of SSR and Hydrate at the same time. If you want to enable both SSR and Hydrate, please refer to the configuration of cargo-leptos section below."
+      </p>
+    </MessageBarBody>
+</MessageBar>
+
 To enable the ssr mode, the following configurations are required:
 
 ```toml

demo_markdown/docs/_guide/theme/customize_theme.md

@@ -4,9 +4,9 @@
 let theme = RwSignal::new(Theme::light());
 let on_customize_theme = move |_| {
     theme.update(|theme| {
-        theme.color.color_brand_background = "#f5222d".to_string();
-        theme.color.color_brand_background_hover = "#ff4d4f".to_string();
-        theme.color.color_brand_background_pressed = "#cf1322".to_string();
+        theme.color.set_color_brand_background("#f5222d".to_string());
+        theme.color.set_color_brand_background_hover("#ff4d4f".to_string());
+        theme.color.set_color_brand_background_pressed("#cf1322".to_string());
     });
 };
 

demo_markdown/docs/_guide/theme/style_element_position.md

@@ -0,0 +1,14 @@
+# Style Element Position
+
+Sometimes you want to control where the style element should be inserted.
+
+You can create a <meta name="thaw-ui-style" /> element inside head element, then thaw-ui's style will be inserted right before it.
+
+```html
+<head>
+  <xxx />
+  <!-- thaw-ui's style will be inserted here -->
+  <meta name="thaw-ui-style" />
+  <xxx />
+</head>
+```

demo_markdown/src/lib.rs

@@ -24,6 +24,7 @@ pub fn include_md(_token_stream: proc_macro::TokenStream) -> proc_macro::TokenSt
         "InstallationMdPage" => "../docs/_guide/installation.md",
         "ServerSiderRenderingMdPage" => "../docs/_guide/server_sider_rendering.md",
         "CustomizeThemeMdPage" => "../docs/_guide/theme/customize_theme.md",
+        "StyleElementPositionMdPage" => "../docs/_guide/theme/style_element_position.md",
         "FAQsMdPage" => "../docs/_guide/FAQs.md",
         "AccordionMdPage" => "../../thaw/src/accordion/docs/mod.md",
         "AnchorMdPage" => "../../thaw/src/anchor/docs/mod.md",
@@ -84,6 +85,7 @@ pub fn include_md(_token_stream: proc_macro::TokenStream) -> proc_macro::TokenSt
         "TimePickerMdPage" => "../../thaw/src/time_picker/docs/mod.md",
         "ToastMdPage" => "../../thaw/src/toast/docs/mod.md",
         "TooltipMdPage" => "../../thaw/src/tooltip/docs/mod.md",
+        "TreeMdPage" => "../../thaw/src/tree/docs/mod.md",
         "UploadMdPage" => "../../thaw/src/upload/docs/mod.md"
     };
 

examples/island/Cargo.toml

@@ -16,7 +16,7 @@ leptos_router = { version = "0.7.7" }
 tokio = { version = "1", features = ["rt-multi-thread"], optional = true }
 tower = { version = "0.4", optional = true }
 tower-http = { version = "0.5", features = ["fs"], optional = true }
-wasm-bindgen = "0.2.95"
+wasm-bindgen = "0.2.100"
 thiserror = "1"
 tracing = { version = "0.1", optional = true }
 http = "1"

examples/ssr_axum/Cargo.toml

@@ -7,21 +7,27 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-axum = { version = "0.7.5", optional = true }
-console_error_panic_hook = "0.1"
-leptos = { version = "0.7.7" }
-leptos_axum = { version = "0.7.7", optional = true }
-leptos_meta = { version = "0.7.7" }
-leptos_router = { version = "0.7.7" }
-tokio = { version = "1", features = ["rt-multi-thread"], optional = true }
+http = "1"
 tower = { version = "0.5.0", optional = true }
 tower-http = { version = "0.5", features = ["fs"], optional = true }
-wasm-bindgen = "0.2.95"
+axum = { version = "0.8.1", optional = true }
+
+tokio = { version = "1", features = ["rt-multi-thread"], optional = true }
+
+console_log = "1"
+console_error_panic_hook = "0.1"
+
+leptos = { version = "0.8.0-beta" }
+leptos_axum = { version = "0.8.0-beta", optional = true }
+leptos_meta = { version = "0.8.0-beta" }
+leptos_router = { version = "0.8.0-beta" }
+
+wasm-bindgen = "0.2.100"
+
 thiserror = "1"
 tracing = { version = "0.1", optional = true }
-http = "1"
-console_log = "1"
 log = "0.4"
+
 demo = { path = "../../demo", default-features = false }
 thaw = { path = "../../thaw" }