From e18bbff2165f451225e1fda7f647a6e22f5488e6 Mon Sep 17 00:00:00 2001 From: luoxiaozero <48741584+luoxiaozero@users.noreply.github.com> Date: Sun, 29 Sep 2024 14:09:30 +0800 Subject: [PATCH] feat: update leptos to v0.7.0-beta7 (#272) --- Cargo.toml | 6 +++--- demo/src/pages/components.rs | 4 ++-- examples/island/Cargo.toml | 8 ++++---- examples/ssr_axum/Cargo.toml | 8 ++++---- examples/ssr_axum/public/favicon.ico | Bin 23462 -> 5673 bytes examples/ssr_axum/public/logo.svg | 13 ++++++------- thaw/src/calendar/mod.rs | 6 +++--- thaw/src/loading_bar/mod.rs | 4 +--- thaw/src/toast/toaster.rs | 4 +++- thaw_utils/src/class_list.rs | 23 ++++++++++------------- 10 files changed, 36 insertions(+), 40 deletions(-) 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 100548a1e909d48f0c2a178b01cd2760b5c98732..81f1f1599dbb82e797143adfd2b85e91096ffd6f 100644 GIT binary patch literal 5673 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 JD)lhY{{w*igB<_> literal 23462 zcmeI4TZ|Po7{@C_F;VdH;G^s9!558}7@u@sR7j8*jRuj#Yrq$bny6=wXm;^IH! zr_+8NAx^`;#ft_0UL^XK3vq!E;&SYW60c)tJhxw$3UTR`YEL4j=#N}2I%HkkA-hB! z`vCUOv44wwKlVe|W#h;4L$FMzU!gu4>*!Vxt;mc z#5&}&R6Zfjs$7W*1%S^S`INXBx@^LJv@{zx+at(-5c^G(TcKJ}vz9Bx>A2tbqTIVH z=3}$VA0c-o%Mn$vh?ymJR2L7SoO`E;QI=gz{Dk`cfMjz$jW+qTxC(rRrv;Ga{c9m$s7^I4uFAgV8wAc0PJMgK6UA!^doT7mKfn18B!? zZ3i##xgYz9sGP`Z$D0#)G6BZNsfX!&*k-J(k{9x?VITJ@`1n9GKeNl7@x+5!2p{&S>`I$D#_hrR;f_`BP zUTDW}gWRw_!5_O!8mKrMuMk!)PLx9V{;ZhxMA`P9&sXFV{=D1uo}CqcG4b+cmB)$s z@7fZ|O2Q@%$Y;dGMeHkiuPfSr>bp|P6MwVR_N|qd4=W!|l-qYjI4fm`+l%y9VNWjy z+HtmgZ{3p5Yx_F1Uvt!Td9283_*FZ5{xbHDl!HsMYjuaEy8 zGqbYA>(p$Yn7>asLegM7$7NfM_IxzDT$a(NK5G4ak1^UOJHLId@j@_q(8;N{L&`5V ztNsh0%c0L3AN%sT5SuQ z-gdJ356&JhwHc3^;;rN8D4ygFSG%L=pAwB1f?AP^o+B8t{Rp^nHSVjIEpXk5Q zuCwBC6!q|I%?pf{IXP*DpY^3nKRH~5K9o{bz8ufdy19>-u~!??zvXpJ(tmz!GNW`% z?DjrZJDx5h!`s(4->=-9$g@AiYOfb7=IQ(X8rna!_S?~)&)21y#^<@w`re+O|Mz6Y zafqO@XkNpS?Q3M9_0Fqv#^>vz(wO=Mt+|HTQ&TqQt?J@V@3N%J9J@Z2WmP37rT6XN zw7L+h*!ES1RrQ=WR?`Je^kZq-T4*?yeHCTZ4o-^6063MOJC4Dt2&?vSqAk&1?mMep zao(KszT4iA@{4}=&N0q^jm=jI5%p_>(6hqY4sW7P3f5r^K)%156fk`J{?E> zsHfW>U=KL`Ze&Hji&p;vSGi`xZ`9ZBZ?Yep%bpM- zmopo#pg)tD6*--!$ThJ6?Uruu?Z;$1A+kN? z*+cB{d)=2x`!nU~j`d^{th&Tr9H^G&eo5evZTn3EUh(bE3D zt<0*@N6V=qf9jL(Po9|{Oxmovc*n`=i^|tlV-OMJ|E8YhL{I?IEQsQKfkcgyt&OU z)E2L6W|8Nk4=;~(C-h?jt8LMEd5r_W55wxuun~U9k^KSkS$X*(vtEMJwb;$$@cD9@ zw&u%;>j7M2GBM^K{mbp`->%y*u<9#iTOpjNhl>?|Zx=7D-_{I#kBxQTI}7omzc1Sn z*VgLSlgCQ);&rZ#aw*^6j+$xfVh8p1Wt2`=e4W=8mp0X}^ZNSTrvARnxX!CfT$0v5 zG>q%%OB2?1vHxP*TJ1^e;$v4jZQi&L$`UajLqq3fNoj=Lxm*LBd7 z>*($Jrhnsm7T-(hKc4Rw9d1`?SZ z3b*UKA6&nU_3l;jY0W$Nj$F)lA?x>Kob%>k_o*h>U%aeUmv)>d{Z-Y!{|{vdE4L{< z+qj`#De2Ed|1bC0QiweEd0sBs&y2|u<+vJqdA|q~zp`<(rMkF2roLtKO2#MDc+SsJ zY^*G!F0l`cRZZ8ng$leGP0>}p5}?uJm=5X_@Y+ouwy>^5!B gX**Y$D*Km10$ZbAFe6=Gc(JZW>H3A5(WrO-1Fx - + + + 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)