Fix/240410 (#162)

* pref: unused variable warning

* fix: teleport hydrate error

* style: leptosfmt
This commit is contained in:
luoxiaozero 2024-04-10 22:45:01 +08:00 committed by GitHub
parent 1af5b2573a
commit b87e2e8979
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 25 additions and 19 deletions

View file

@ -113,8 +113,8 @@ pub fn Drawer(
> >
<div <div
class=class_list![ class=class_list![
"thaw-drawer", move || format!("thaw-drawer--placement-{}", placement "thaw-drawer", move || format!("thaw-drawer--placement-{}",
.get()), class.map(| c | move || c.get()) placement.get()), class.map(| c | move || c.get())
] ]
style=move || display.get() style=move || display.get()

View file

@ -58,6 +58,7 @@ pub fn Layout(
) )
}) })
> >
{children()} {children()}
</Scrollbar> </Scrollbar>
</div> </div>

View file

@ -73,7 +73,13 @@ pub fn Modal(
> >
<Scrollbar <Scrollbar
content_style="min-height: 100%; display: flex;" content_style="min-height: 100%; display: flex;"
style=Signal::derive(move || if displayed.get() { String::new() } else { String::from("display: none") }) style=Signal::derive(move || {
if displayed.get() {
String::new()
} else {
String::from("display: none")
}
})
comp_ref=scrollbar_ref comp_ref=scrollbar_ref
> >
<CSSTransition <CSSTransition

View file

@ -291,12 +291,14 @@ pub fn Scrollbar(
class=class_list![ class=class_list![
"thaw-scrollbar__content", content_class.map(| c | move || c.get()) "thaw-scrollbar__content", content_class.map(| c | move || c.get())
] ]
style=move || { style=move || {
format!( format!(
"width: fit-content; {}", "width: fit-content; {}",
content_style.as_ref().map_or(String::new(), |s| s.get()), content_style.as_ref().map_or(String::new(), |s| s.get()),
) )
} }
ref=content_ref ref=content_ref
> >
{children()} {children()}

View file

@ -1,9 +1,8 @@
use leptos::{leptos_dom::helpers::WindowListenerHandle, *}; use leptos::*;
use std::cell::RefCell;
#[cfg(any(feature = "csr", feature = "hydrate"))] #[cfg(any(feature = "csr", feature = "hydrate"))]
thread_local! { thread_local! {
static STACK: RefCell<Vec<uuid::Uuid>> = Default::default(); static STACK: std::cell::RefCell<Vec<uuid::Uuid>> = Default::default();
} }
#[component] #[component]
@ -15,6 +14,7 @@ pub fn FocusTrap(
) -> impl IntoView { ) -> impl IntoView {
#[cfg(any(feature = "csr", feature = "hydrate"))] #[cfg(any(feature = "csr", feature = "hydrate"))]
if disabled == false { if disabled == false {
use leptos::leptos_dom::helpers::WindowListenerHandle;
let esc_handle = StoredValue::new(None::<WindowListenerHandle>); let esc_handle = StoredValue::new(None::<WindowListenerHandle>);
let id = StoredValue::new(uuid::Uuid::new_v4()); let id = StoredValue::new(uuid::Uuid::new_v4());
@ -55,5 +55,12 @@ pub fn FocusTrap(
}); });
} }
#[cfg(not(any(feature = "csr", feature = "hydrate")))]
{
let _ = disabled;
let _ = active;
let _ = on_esc;
}
children() children()
} }

View file

@ -60,17 +60,7 @@ pub fn Teleport(
} else { } else {
let _ = mount; let _ = mount;
let _ = immediate; let _ = immediate;
#[cfg(not(feature = "ssr"))]
{
let _ = element; let _ = element;
let _ = children; let _ = children;
}
#[cfg(feature = "ssr")]
if element.is_none() {
if let Some(children) = children {
// Consumed hydration `id`
let _ = children();
}
}
}} }}
} }