diff --git a/Cargo.toml b/Cargo.toml index 7b54b16..e801789 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,6 @@ thaw_components = { version = "0.2.0-beta3", path = "./thaw_components" } thaw_macro = { version = "0.1.0-beta3", path = "./thaw_macro" } thaw_utils = { version = "0.1.0-beta3", path = "./thaw_utils" } -leptos = { version = "0.7.0-beta5" } -leptos_meta = { version = "0.7.0-beta5" } -leptos_router = { version = "0.7.0-beta5" } +leptos = { version = "0.7.0-beta7" } +leptos_meta = { version = "0.7.0-beta7" } +leptos_router = { version = "0.7.0-beta7" } diff --git a/demo/src/pages/components.rs b/demo/src/pages/components.rs index afacbff..5ad5ae7 100644 --- a/demo/src/pages/components.rs +++ b/demo/src/pages/components.rs @@ -95,11 +95,11 @@ pub(crate) struct NavItemOption { } trait VecIntoView { - fn into_view(self) -> Vec>; + fn into_view(self) -> Vec; } impl VecIntoView for Vec { - fn into_view(self) -> Vec> { + fn into_view(self) -> Vec { let mut iter = self.into_iter().peekable(); let mut views = vec![]; while let Some(item) = iter.next() { diff --git a/examples/island/Cargo.toml b/examples/island/Cargo.toml index 6f1ad09..5e8efbf 100644 --- a/examples/island/Cargo.toml +++ b/examples/island/Cargo.toml @@ -9,10 +9,10 @@ crate-type = ["cdylib", "rlib"] [dependencies] axum = { version = "0.7", optional = true } console_error_panic_hook = "0.1" -leptos = { version = "0.7.0-beta5", features = ["experimental-islands"] } -leptos_axum = { version = "0.7.0-beta5", optional = true } -leptos_meta = { version = "0.7.0-beta5" } -leptos_router = { version = "0.7.0-beta5" } +leptos = { version = "0.7.0-beta7", features = ["experimental-islands"] } +leptos_axum = { version = "0.7.0-beta7", optional = true } +leptos_meta = { version = "0.7.0-beta7" } +leptos_router = { version = "0.7.0-beta7" } tokio = { version = "1", features = ["rt-multi-thread"], optional = true } tower = { version = "0.4", optional = true } tower-http = { version = "0.5", features = ["fs"], optional = true } diff --git a/examples/ssr_axum/Cargo.toml b/examples/ssr_axum/Cargo.toml index 527210d..e00b939 100644 --- a/examples/ssr_axum/Cargo.toml +++ b/examples/ssr_axum/Cargo.toml @@ -9,10 +9,10 @@ crate-type = ["cdylib", "rlib"] [dependencies] axum = { version = "0.7.5", optional = true } console_error_panic_hook = "0.1" -leptos = { version = "0.7.0-beta5" } -leptos_axum = { version = "0.7.0-beta5", optional = true } -leptos_meta = { version = "0.7.0-beta5" } -leptos_router = { version = "0.7.0-beta5" } +leptos = { version = "0.7.0-beta7" } +leptos_axum = { version = "0.7.0-beta7", optional = true } +leptos_meta = { version = "0.7.0-beta7" } +leptos_router = { version = "0.7.0-beta7" } tokio = { version = "1", features = ["rt-multi-thread"], optional = true } tower = { version = "0.5.0", optional = true } tower-http = { version = "0.5", features = ["fs"], optional = true } diff --git a/examples/ssr_axum/public/favicon.ico b/examples/ssr_axum/public/favicon.ico index 100548a..81f1f15 100644 Binary files a/examples/ssr_axum/public/favicon.ico and b/examples/ssr_axum/public/favicon.ico differ diff --git a/examples/ssr_axum/public/logo.svg b/examples/ssr_axum/public/logo.svg index 2f77189..ad941a9 100644 --- a/examples/ssr_axum/public/logo.svg +++ b/examples/ssr_axum/public/logo.svg @@ -1,11 +1,10 @@ - - + + + fill="#fff" transform="translate(8 8) scale(13)"> \ No newline at end of file diff --git a/thaw/src/calendar/mod.rs b/thaw/src/calendar/mod.rs index fa6b494..5a54382 100644 --- a/thaw/src/calendar/mod.rs +++ b/thaw/src/calendar/mod.rs @@ -226,10 +226,10 @@ pub(crate) fn now_date() -> NaiveDate { } #[derive(Clone)] -pub struct CalendarChildrenFn(Arc AnyView + Send + Sync>); +pub struct CalendarChildrenFn(Arc AnyView + Send + Sync>); impl Deref for CalendarChildrenFn { - type Target = Arc AnyView + Send + Sync>; + type Target = Arc AnyView + Send + Sync>; fn deref(&self) -> &Self::Target { &self.0 @@ -239,7 +239,7 @@ impl Deref for CalendarChildrenFn { impl From for CalendarChildrenFn where F: Fn(&NaiveDate) -> C + Send + Sync + 'static, - C: RenderHtml + Send + 'static, + C: RenderHtml + Send + 'static, { fn from(f: F) -> Self { Self(Arc::new(move |date| f(date).into_any())) diff --git a/thaw/src/loading_bar/mod.rs b/thaw/src/loading_bar/mod.rs index 6fa3aa9..092b9c7 100644 --- a/thaw/src/loading_bar/mod.rs +++ b/thaw/src/loading_bar/mod.rs @@ -1,12 +1,10 @@ mod loading_bar_provider; -use std::sync::Arc; - pub use loading_bar_provider::*; -use tachys::renderer::DomRenderer; use crate::ConfigInjection; use leptos::{html, prelude::*}; +use std::sync::Arc; use thaw_utils::{mount_style, ComponentRef}; #[derive(Clone)] diff --git a/thaw/src/toast/toaster.rs b/thaw/src/toast/toaster.rs index 048d2af..2522674 100644 --- a/thaw/src/toast/toaster.rs +++ b/thaw/src/toast/toaster.rs @@ -80,7 +80,9 @@ pub fn Toaster( }; list.remove(index); }); - let is_show = toast_show_list.try_update_value(|map| { map.remove(&id) } ).flatten(); + let is_show = toast_show_list + .try_update_value(|map| map.remove(&id)) + .flatten(); if let Some(is_show) = is_show { is_show.dispose(); } diff --git a/thaw_utils/src/class_list.rs b/thaw_utils/src/class_list.rs index e511a23..346412a 100644 --- a/thaw_utils/src/class_list.rs +++ b/thaw_utils/src/class_list.rs @@ -6,7 +6,7 @@ use leptos::{ use leptos::{ prelude::{Oco, RenderEffect, RwSignal}, reactive_graph::traits::{Update, With, WithUntracked}, - tachys::renderer::DomRenderer, + tachys::renderer::{types, Rndr}, }; use std::collections::HashSet; #[cfg(not(feature = "ssr"))] @@ -163,12 +163,9 @@ impl ClassList { } } -impl leptos::tachys::html::class::IntoClass for ClassList -where - R: DomRenderer, -{ +impl leptos::tachys::html::class::IntoClass for ClassList { type AsyncOutput = Self; - type State = RenderEffect<(R::Element, String)>; + type State = RenderEffect<(types::Element, String)>; type Cloneable = Self; type CloneableOwned = Self; @@ -193,7 +190,7 @@ where self.write_class_string(class); } - fn hydrate(self, el: &R::Element) -> Self::State { + fn hydrate(self, el: &types::Element) -> Self::State { let el = el.to_owned(); RenderEffect::new(move |prev| { let mut class = String::new(); @@ -202,7 +199,7 @@ where if let Some(state) = prev { let (el, prev_class) = state; if class != prev_class { - R::set_attribute(&el, "class", &class); + Rndr::set_attribute(&el, "class", &class); (el, class) } else { (el, prev_class) @@ -210,7 +207,7 @@ where } else { if !class.is_empty() { if !FROM_SERVER { - R::set_attribute(&el, "class", &class); + Rndr::set_attribute(&el, "class", &class); } } (el.clone(), class) @@ -218,7 +215,7 @@ where }) } - fn build(self, el: &R::Element) -> Self::State { + fn build(self, el: &types::Element) -> Self::State { let el = el.to_owned(); RenderEffect::new(move |prev| { let mut class = String::new(); @@ -226,14 +223,14 @@ where if let Some(state) = prev { let (el, prev_class) = state; if class != prev_class { - R::set_attribute(&el, "class", &class); + Rndr::set_attribute(&el, "class", &class); (el, class) } else { (el, prev_class) } } else { if !class.is_empty() { - R::set_attribute(&el, "class", &class); + Rndr::set_attribute(&el, "class", &class); } (el.clone(), class) } @@ -249,7 +246,7 @@ where self.write_class_string(&mut class); let (el, prev_class) = state; if class != *prev_class { - R::set_attribute(&el, "class", &class); + Rndr::set_attribute(&el, "class", &class); (el, class) } else { (el, prev_class)