adam/leptos-use
1
0
Fork 0
mirror of https://github.com/adoyle0/leptos-use.git synced 2025-01-23 17:09:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reintroduced proper watch

Browse source
This commit is contained in:
CorvusPrudens 2024-07-23 10:50:20 -06:00
parent b4a0efcc06
commit 3433fc6608
5 changed files with 224 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

255
src/core/element_maybe_signal.rs
View file

@ -1,10 +1,11 @@
use crate::{UseDocument, UseWindow}; use crate::{UseDocument, UseWindow};
use cfg_if::cfg_if; use cfg_if::cfg_if;
use leptos::html::HtmlElement; use leptos::html::{CreateElement, ElementType};
use leptos::prelude::wrappers::read::Signal; use leptos::prelude::wrappers::read::Signal;
use leptos::prelude::*; use leptos::prelude::*;
use send_wrapper::SendWrapper;
use std::marker::PhantomData; use std::marker::PhantomData;
use std::ops::Deref; use wasm_bindgen::JsCast;
/// Used as an argument type to make it easily possible to pass either /// Used as an argument type to make it easily possible to pass either
/// * a `web_sys` element that implements `E` (for example `EventTarget`, `Element` or `HtmlElement`), /// * a `web_sys` element that implements `E` (for example `EventTarget`, `Element` or `HtmlElement`),
@ -17,9 +18,9 @@ pub enum ElementMaybeSignal<T, E>
where where
T: Into<E> + Clone + 'static, T: Into<E> + Clone + 'static,
{ {
Static(Option<T>), Static(Option<SendWrapper<T>>),
Dynamic(Signal<Option<T>>), Dynamic(Signal<Option<SendWrapper<T>>>),
_Phantom(PhantomData<E>), _Phantom(PhantomData<fn() -> E>),
} }
impl<T, E> Default for ElementMaybeSignal<T, E> impl<T, E> Default for ElementMaybeSignal<T, E>
@ -61,16 +62,28 @@ where
fn with<O>(&self, f: impl FnOnce(&Option<T>) -> O) -> O { fn with<O>(&self, f: impl FnOnce(&Option<T>) -> O) -> O {
match self { match self {
Self::Static(t) => f(t), Self::Static(t) => {
Self::Dynamic(s) => s.with(f), let value = t.as_ref().map(|t| t.clone().take());
f(&value)
}
Self::Dynamic(s) => s.with(|s| {
let value = s.as_ref().map(|s| s.clone().take());
f(&value)
}),
_ => unreachable!(), _ => unreachable!(),
} }
} }
fn try_with<O>(&self, f: impl FnOnce(&Option<T>) -> O) -> Option<O> { fn try_with<O>(&self, f: impl FnOnce(&Option<T>) -> O) -> Option<O> {
match self { match self {
Self::Static(t) => Some(f(t)), Self::Static(t) => {
Self::Dynamic(s) => s.try_with(f), let value = t.as_ref().map(|t| t.clone().take());
Some(f(&value))
}
Self::Dynamic(s) => s.try_with(|s| {
let value = s.as_ref().map(|s| s.clone().take());
f(&value)
}),
_ => unreachable!(), _ => unreachable!(),
} }
} }
@ -84,16 +97,28 @@ where
fn with_untracked<O>(&self, f: impl FnOnce(&Option<T>) -> O) -> O { fn with_untracked<O>(&self, f: impl FnOnce(&Option<T>) -> O) -> O {
match self { match self {
Self::Static(t) => f(t), Self::Static(t) => {
Self::Dynamic(s) => s.with_untracked(f), let value = t.as_ref().map(|t| t.clone().take());
f(&value)
}
Self::Dynamic(s) => s.with_untracked(|s| {
let value = s.as_ref().map(|s| s.clone().take());
f(&value)
}),
_ => unreachable!(), _ => unreachable!(),
} }
} }
fn try_with_untracked<O>(&self, f: impl FnOnce(&Option<T>) -> O) -> Option<O> { fn try_with_untracked<O>(&self, f: impl FnOnce(&Option<T>) -> O) -> Option<O> {
match self { match self {
Self::Static(t) => Some(f(t)), Self::Static(t) => {
Self::Dynamic(s) => s.try_with_untracked(f), let value = t.as_ref().map(|t| t.clone().take());
Some(f(&value))
}
Self::Dynamic(s) => s.try_with_untracked(|s| {
let value = s.as_ref().map(|s| s.clone().take());
f(&value)
}),
_ => unreachable!(), _ => unreachable!(),
} }
} }
@ -106,7 +131,7 @@ where
T: Into<E> + Clone + 'static, T: Into<E> + Clone + 'static,
{ {
fn from(value: T) -> Self { fn from(value: T) -> Self {
ElementMaybeSignal::Static(Some(value)) ElementMaybeSignal::Static(Some(SendWrapper::new(value)))
} }
} }
@ -115,7 +140,7 @@ where
T: Into<E> + Clone + 'static, T: Into<E> + Clone + 'static,
{ {
fn from(target: Option<T>) -> Self { fn from(target: Option<T>) -> Self {
ElementMaybeSignal::Static(target) ElementMaybeSignal::Static(target.map(SendWrapper::new))
} }
} }
@ -126,7 +151,7 @@ macro_rules! impl_from_deref_option {
E: From<$ty2> + 'static, E: From<$ty2> + 'static,
{ {
fn from(value: $ty) -> Self { fn from(value: $ty) -> Self {
Self::Static((*value).clone()) Self::Static((*value).clone().map(SendWrapper::new))
} }
} }
}; };
@ -205,10 +230,10 @@ macro_rules! impl_from_signal_option {
}; };
} }
impl_from_signal_option!(Signal<Option<T>>); impl_from_signal_option!(Signal<Option<SendWrapper<T>>>);
impl_from_signal_option!(ReadSignal<Option<T>>); impl_from_signal_option!(ReadSignal<Option<SendWrapper<T>>>);
impl_from_signal_option!(RwSignal<Option<T>>); impl_from_signal_option!(RwSignal<Option<SendWrapper<T>>>);
impl_from_signal_option!(Memo<Option<T>>); impl_from_signal_option!(Memo<Option<SendWrapper<T>>>);
macro_rules! impl_from_signal { macro_rules! impl_from_signal {
($ty:ty) => { ($ty:ty) => {
@ -223,10 +248,10 @@ macro_rules! impl_from_signal {
}; };
} }
impl_from_signal!(Signal<T>); impl_from_signal!(Signal<SendWrapper<T>>);
impl_from_signal!(ReadSignal<T>); impl_from_signal!(ReadSignal<SendWrapper<T>>);
impl_from_signal!(RwSignal<T>); impl_from_signal!(RwSignal<SendWrapper<T>>);
impl_from_signal!(Memo<T>); impl_from_signal!(Memo<SendWrapper<T>>);
// From NodeRef ////////////////////////////////////////////////////////////// // From NodeRef //////////////////////////////////////////////////////////////
@ -234,14 +259,14 @@ macro_rules! impl_from_node_ref {
($ty:ty) => { ($ty:ty) => {
impl<R> From<NodeRef<R>> for ElementMaybeSignal<$ty, $ty> impl<R> From<NodeRef<R>> for ElementMaybeSignal<$ty, $ty>
where where
R: ElementDescriptor + Clone + 'static, R: ElementType + CreateElement<Dom> + Clone + Send + Sync + 'static,
R::Output: JsCast + Into<$ty> + Clone + 'static,
{ {
fn from(node_ref: NodeRef<R>) -> Self { fn from(node_ref: NodeRef<R>) -> Self {
Self::Dynamic(Signal::derive(move || { Self::Dynamic(Signal::derive(move || {
node_ref.get().map(move |el| { node_ref.get().map(move |el| {
let el = el.into_any(); let el: $ty = el.clone().into();
let el: $ty = el.deref().clone().into(); SendWrapper::new(el)
el
}) })
})) }))
} }
@ -253,90 +278,90 @@ impl_from_node_ref!(web_sys::EventTarget);
impl_from_node_ref!(web_sys::Element); impl_from_node_ref!(web_sys::Element);
impl_from_node_ref!(web_sys::HtmlElement); impl_from_node_ref!(web_sys::HtmlElement);
// From leptos::html::HTMLElement /////////////////////////////////////////////// // // From leptos::html::HTMLElement ///////////////////////////////////////////////
//
macro_rules! impl_from_html_element { // macro_rules! impl_from_html_element {
($ty:ty) => { // ($ty:ty) => {
impl<HtmlEl> From<HtmlElement<HtmlEl>> for ElementMaybeSignal<$ty, $ty> // impl<HtmlEl> From<HtmlElement<HtmlEl>> for ElementMaybeSignal<$ty, $ty>
where // where
HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty>, // HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty>,
{ // {
fn from(value: HtmlElement<HtmlEl>) -> Self { // fn from(value: HtmlElement<HtmlEl>) -> Self {
let el: &$ty = value.deref(); // let el: &$ty = value.deref();
Self::Static(Some(el.clone())) // Self::Static(Some(el.clone()))
} // }
} // }
}; // };
} // }
//
impl_from_html_element!(web_sys::EventTarget); // impl_from_html_element!(web_sys::EventTarget);
impl_from_html_element!(web_sys::Element); // impl_from_html_element!(web_sys::Element);
impl_from_html_element!(web_sys::HtmlElement); // impl_from_html_element!(web_sys::HtmlElement);
//
// From Signal<leptos::html::HTMLElement> ///////////////////////////////////////// // // From Signal<leptos::html::HTMLElement> /////////////////////////////////////////
//
macro_rules! impl_from_signal_html_element { // macro_rules! impl_from_signal_html_element {
($signal:ty, $ty:ty) => { // ($signal:ty, $ty:ty) => {
impl<HtmlEl> From<$signal> for ElementMaybeSignal<$ty, $ty> // impl<HtmlEl> From<$signal> for ElementMaybeSignal<$ty, $ty>
where // where
HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty> + Clone, // HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty> + Clone,
{ // {
fn from(value: $signal) -> Self { // fn from(value: $signal) -> Self {
Self::Dynamic(Signal::derive(move || { // Self::Dynamic(Signal::derive(move || {
let value = value.get(); // let value = value.get();
let el: &$ty = value.deref(); // let el: &$ty = value.deref();
Some(el.clone()) // Some(el.clone())
})) // }))
} // }
} // }
}; // };
} // }
//
impl_from_signal_html_element!(Signal<HtmlElement<HtmlEl>>, web_sys::EventTarget); // impl_from_signal_html_element!(Signal<HtmlElement<HtmlEl>>, web_sys::EventTarget);
impl_from_signal_html_element!(ReadSignal<HtmlElement<HtmlEl>>, web_sys::EventTarget); // impl_from_signal_html_element!(ReadSignal<HtmlElement<HtmlEl>>, web_sys::EventTarget);
impl_from_signal_html_element!(RwSignal<HtmlElement<HtmlEl>>, web_sys::EventTarget); // impl_from_signal_html_element!(RwSignal<HtmlElement<HtmlEl>>, web_sys::EventTarget);
impl_from_signal_html_element!(Memo<HtmlElement<HtmlEl>>, web_sys::EventTarget); // impl_from_signal_html_element!(Memo<HtmlElement<HtmlEl>>, web_sys::EventTarget);
//
impl_from_signal_html_element!(Signal<HtmlElement<HtmlEl>>, web_sys::Element); // impl_from_signal_html_element!(Signal<HtmlElement<HtmlEl>>, web_sys::Element);
impl_from_signal_html_element!(ReadSignal<HtmlElement<HtmlEl>>, web_sys::Element); // impl_from_signal_html_element!(ReadSignal<HtmlElement<HtmlEl>>, web_sys::Element);
impl_from_signal_html_element!(RwSignal<HtmlElement<HtmlEl>>, web_sys::Element); // impl_from_signal_html_element!(RwSignal<HtmlElement<HtmlEl>>, web_sys::Element);
impl_from_signal_html_element!(Memo<HtmlElement<HtmlEl>>, web_sys::Element); // impl_from_signal_html_element!(Memo<HtmlElement<HtmlEl>>, web_sys::Element);
//
// From Signal<Option<leptos::html::HTMLElement>> ///////////////////////////////////////// // // From Signal<Option<leptos::html::HTMLElement>> /////////////////////////////////////////
//
macro_rules! impl_from_signal_html_element { // macro_rules! impl_from_signal_html_element {
($signal:ty, $ty:ty) => { // ($signal:ty, $ty:ty) => {
impl<HtmlEl> From<$signal> for ElementMaybeSignal<$ty, $ty> // impl<HtmlEl> From<$signal> for ElementMaybeSignal<$ty, $ty>
where // where
HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty> + Clone, // HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty> + Clone,
{ // {
fn from(value: $signal) -> Self { // fn from(value: $signal) -> Self {
Self::Dynamic(Signal::derive(move || { // Self::Dynamic(Signal::derive(move || {
let el: Option<$ty> = value.get().map(|el| el.deref().clone()); // let el: Option<$ty> = value.get().map(|el| el.deref().clone());
el // el
})) // }))
} // }
} // }
}; // };
} // }
//
impl_from_signal_html_element!(Signal<Option<HtmlElement<HtmlEl>>>, web_sys::EventTarget); // impl_from_signal_html_element!(Signal<Option<HtmlElement<HtmlEl>>>, web_sys::EventTarget);
impl_from_signal_html_element!( // impl_from_signal_html_element!(
ReadSignal<Option<HtmlElement<HtmlEl>>>, // ReadSignal<Option<HtmlElement<HtmlEl>>>,
web_sys::EventTarget // web_sys::EventTarget
); // );
impl_from_signal_html_element!(RwSignal<Option<HtmlElement<HtmlEl>>>, web_sys::EventTarget); // impl_from_signal_html_element!(RwSignal<Option<HtmlElement<HtmlEl>>>, web_sys::EventTarget);
impl_from_signal_html_element!(Memo<Option<HtmlElement<HtmlEl>>>, web_sys::EventTarget); // impl_from_signal_html_element!(Memo<Option<HtmlElement<HtmlEl>>>, web_sys::EventTarget);
//
impl_from_signal_html_element!(Signal<Option<HtmlElement<HtmlEl>>>, web_sys::Element); // impl_from_signal_html_element!(Signal<Option<HtmlElement<HtmlEl>>>, web_sys::Element);
impl_from_signal_html_element!(ReadSignal<Option<HtmlElement<HtmlEl>>>, web_sys::Element); // impl_from_signal_html_element!(ReadSignal<Option<HtmlElement<HtmlEl>>>, web_sys::Element);
impl_from_signal_html_element!(RwSignal<Option<HtmlElement<HtmlEl>>>, web_sys::Element); // impl_from_signal_html_element!(RwSignal<Option<HtmlElement<HtmlEl>>>, web_sys::Element);
impl_from_signal_html_element!(Memo<Option<HtmlElement<HtmlEl>>>, web_sys::Element); // impl_from_signal_html_element!(Memo<Option<HtmlElement<HtmlEl>>>, web_sys::Element);
//
impl_from_signal_html_element!(Signal<Option<HtmlElement<HtmlEl>>>, web_sys::HtmlElement); // impl_from_signal_html_element!(Signal<Option<HtmlElement<HtmlEl>>>, web_sys::HtmlElement);
impl_from_signal_html_element!( // impl_from_signal_html_element!(
ReadSignal<Option<HtmlElement<HtmlEl>>>, // ReadSignal<Option<HtmlElement<HtmlEl>>>,
web_sys::HtmlElement // web_sys::HtmlElement
); // );
impl_from_signal_html_element!(RwSignal<Option<HtmlElement<HtmlEl>>>, web_sys::HtmlElement); // impl_from_signal_html_element!(RwSignal<Option<HtmlElement<HtmlEl>>>, web_sys::HtmlElement);
impl_from_signal_html_element!(Memo<Option<HtmlElement<HtmlEl>>>, web_sys::HtmlElement); // impl_from_signal_html_element!(Memo<Option<HtmlElement<HtmlEl>>>, web_sys::HtmlElement);

148
src/core/elements_maybe_signal.rs
View file

@ -1,7 +1,7 @@
use crate::core::ElementMaybeSignal; use crate::core::ElementMaybeSignal;
use crate::{UseDocument, UseWindow}; use crate::{UseDocument, UseWindow};
use cfg_if::cfg_if; use cfg_if::cfg_if;
use leptos::html::ElementDescriptor; use leptos::html::{ElementType, HtmlElement};
use leptos::prelude::wrappers::read::Signal; use leptos::prelude::wrappers::read::Signal;
use leptos::prelude::*; use leptos::prelude::*;
use std::marker::PhantomData; use std::marker::PhantomData;
@ -18,9 +18,9 @@ pub enum ElementsMaybeSignal<T, E>
where where
T: Into<E> + Clone + 'static, T: Into<E> + Clone + 'static,
{ {
Static(Vec<Option<T>>), Static(Vec<Option<SendWrapper<T>>>),
Dynamic(Signal<Vec<Option<T>>>), Dynamic(Signal<Vec<Option<SendWrapper<T>>>>),
_Phantom(PhantomData<E>), _Phantom(PhantomData<fn() -> E>),
} }
impl<T, E> Default for ElementsMaybeSignal<T, E> impl<T, E> Default for ElementsMaybeSignal<T, E>
@ -256,7 +256,7 @@ macro_rules! impl_from_node_ref {
($ty:ty) => { ($ty:ty) => {
impl<R> From<NodeRef<R>> for ElementsMaybeSignal<$ty, $ty> impl<R> From<NodeRef<R>> for ElementsMaybeSignal<$ty, $ty>
where where
R: ElementDescriptor + Clone + 'static, R: ElementType + Clone + 'static,
{ {
fn from(node_ref: NodeRef<R>) -> Self { fn from(node_ref: NodeRef<R>) -> Self {
Self::Dynamic(Signal::derive(move || { Self::Dynamic(Signal::derive(move || {
@ -278,11 +278,12 @@ impl_from_node_ref!(web_sys::Element);
macro_rules! impl_from_html_element { macro_rules! impl_from_html_element {
($ty:ty) => { ($ty:ty) => {
impl<HtmlEl> From<HtmlElement<HtmlEl>> for ElementsMaybeSignal<$ty, $ty> impl<E, At, Ch, Rndr> From<HtmlElement<E, At, Ch, Rndr>> for ElementsMaybeSignal<$ty, $ty>
where where
HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty>, E: ElementType,
E::Output: std::ops::Deref<Target = $ty>,
{ {
fn from(value: HtmlElement<HtmlEl>) -> Self { fn from(value: HtmlElement<E, At, Ch, Rndr>) -> Self {
let el: &$ty = value.deref(); let el: &$ty = value.deref();
Self::Static(vec![Some(el.clone())]) Self::Static(vec![Some(el.clone())])
} }
@ -539,7 +540,7 @@ macro_rules! impl_from_multi_node_ref {
($ty:ty) => { ($ty:ty) => {
impl<R> From<&[NodeRef<R>]> for ElementsMaybeSignal<$ty, $ty> impl<R> From<&[NodeRef<R>]> for ElementsMaybeSignal<$ty, $ty>
where where
R: ElementDescriptor + Clone + 'static, R: ElementType + Clone + 'static,
{ {
fn from(node_refs: &[NodeRef<R>]) -> Self { fn from(node_refs: &[NodeRef<R>]) -> Self {
let node_refs = node_refs.to_vec(); let node_refs = node_refs.to_vec();
@ -549,7 +550,7 @@ macro_rules! impl_from_multi_node_ref {
impl<R, const C: usize> From<[NodeRef<R>; C]> for ElementsMaybeSignal<$ty, $ty> impl<R, const C: usize> From<[NodeRef<R>; C]> for ElementsMaybeSignal<$ty, $ty>
where where
R: ElementDescriptor + Clone + 'static, R: ElementType + Clone + 'static,
{ {
fn from(node_refs: [NodeRef<R>; C]) -> Self { fn from(node_refs: [NodeRef<R>; C]) -> Self {
let node_refs = node_refs.to_vec(); let node_refs = node_refs.to_vec();
@ -559,7 +560,7 @@ macro_rules! impl_from_multi_node_ref {
impl<R> From<Vec<NodeRef<R>>> for ElementsMaybeSignal<$ty, $ty> impl<R> From<Vec<NodeRef<R>>> for ElementsMaybeSignal<$ty, $ty>
where where
R: ElementDescriptor + Clone + 'static, R: ElementType + Clone + 'static,
{ {
fn from(node_refs: Vec<NodeRef<R>>) -> Self { fn from(node_refs: Vec<NodeRef<R>>) -> Self {
let node_refs = node_refs.clone(); let node_refs = node_refs.clone();
@ -572,66 +573,71 @@ macro_rules! impl_from_multi_node_ref {
impl_from_multi_node_ref!(web_sys::EventTarget); impl_from_multi_node_ref!(web_sys::EventTarget);
impl_from_multi_node_ref!(web_sys::Element); impl_from_multi_node_ref!(web_sys::Element);
// From multiple leptos::html::HTMLElement ///////////////////////////////////////// // // From multiple leptos::html::HTMLElement /////////////////////////////////////////
//
macro_rules! impl_from_multi_html_element { // macro_rules! impl_from_multi_html_element {
($ty:ty) => { // ($ty:ty) => {
impl<HtmlEl> From<&[HtmlElement<HtmlEl>]> for ElementsMaybeSignal<$ty, $ty> // impl<E, At, Ch, Rndr> From<&[HtmlElement<E, At, Ch, Rndr>]>
where // for ElementsMaybeSignal<$ty, $ty>
HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty>, // where
{ // E: ElementType,
fn from(value: &[HtmlElement<HtmlEl>]) -> Self { // E::Output: std::ops::Deref<Target = $ty>,
Self::Static( // {
value // fn from(value: &[HtmlElement<E, At, Ch, Rndr>]) -> Self {
.iter() // Self::Static(
.map(|el| { // value
let el: &$ty = el.deref(); // .iter()
Some(el.clone()) // .map(|el| {
}) // let el: &$ty = el.deref();
.collect(), // Some(el.clone())
) // })
} // .collect(),
} // )
// }
impl<HtmlEl, const C: usize> From<[HtmlElement<HtmlEl>; C]> // }
for ElementsMaybeSignal<$ty, $ty> //
where // impl<E, At, Ch, Rndr, const C: usize> From<[HtmlElement<E, At, Ch, Rndr>; C]>
HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty>, // for ElementsMaybeSignal<$ty, $ty>
{ // where
fn from(value: [HtmlElement<HtmlEl>; C]) -> Self { // E: ElementType,
Self::Static( // E::Output: std::ops::Deref<Target = $ty>,
value // {
.iter() // fn from(value: [HtmlElement<E, At, Ch, Rndr>; C]) -> Self {
.map(|el| { // Self::Static(
let el: &$ty = el.deref(); // value
Some(el.clone()) // .iter()
}) // .map(|el| {
.collect(), // let el: &$ty = el.deref();
) // Some(el.clone())
} // })
} // .collect(),
// )
impl<HtmlEl> From<Vec<HtmlElement<HtmlEl>>> for ElementsMaybeSignal<$ty, $ty> // }
where // }
HtmlEl: ElementDescriptor + std::ops::Deref<Target = $ty>, //
{ // impl<E, At, Ch, Rndr> From<Vec<HtmlElement<E, At, Ch, Rndr>>>
fn from(value: Vec<HtmlElement<HtmlEl>>) -> Self { // for ElementsMaybeSignal<$ty, $ty>
Self::Static( // where
value // E: ElementType,
.iter() // E::Output: std::ops::Deref<Target = $ty>,
.map(|el| { // {
let el: &$ty = el.deref(); // fn from(value: Vec<HtmlElement<E, At, Ch, Rndr>>) -> Self {
Some(el.clone()) // Self::Static(
}) // value
.collect(), // .iter()
) // .map(|el| {
} // let el: &$ty = el.deref();
} // Some(el.clone())
}; // })
} // .collect(),
// )
impl_from_multi_html_element!(web_sys::EventTarget); // }
impl_from_multi_html_element!(web_sys::Element); // }
// };
// }
//
// impl_from_multi_html_element!(web_sys::EventTarget);
// impl_from_multi_html_element!(web_sys::Element);
// From ElementMaybeSignal ////////////////////////////////////////////////////////////// // From ElementMaybeSignal //////////////////////////////////////////////////////////////

3
src/use_cycle_list.rs
View file

@ -1,6 +1,5 @@
use crate::core::MaybeRwSignal; use crate::core::MaybeRwSignal;
use default_struct_builder::DefaultBuilder; use default_struct_builder::DefaultBuilder;
use leptos::prelude::wrappers::read::Signal;
use leptos::prelude::*; use leptos::prelude::*;
/// Cycle through a list of items. /// Cycle through a list of items.
@ -156,7 +155,7 @@ where
let _ = { let _ = {
let set = set.clone(); let set = set.clone();
leptos::watch(move || list.get(), move |_, _, _| set(index.get()), false) watch(move || list.get(), move |_, _, _| set(index.get()), false)
}; };
UseCycleListReturn { UseCycleListReturn {

4
src/use_interval_fn.rs
View file

@ -5,6 +5,7 @@ use default_struct_builder::DefaultBuilder;
use leptos::leptos_dom::helpers::IntervalHandle; use leptos::leptos_dom::helpers::IntervalHandle;
use leptos::prelude::diagnostics::SpecialNonReactiveZone; use leptos::prelude::diagnostics::SpecialNonReactiveZone;
use leptos::prelude::*; use leptos::prelude::*;
use send_wrapper::SendWrapper;
use std::cell::Cell; use std::cell::Cell;
use std::rc::Rc; use std::rc::Rc;
use std::time::Duration; use std::time::Duration;
@ -140,7 +141,8 @@ where
on_cleanup(stop_watch); on_cleanup(stop_watch);
} }
on_cleanup(pause.clone()); let pause_cleanup = SendWrapper::new(pause.clone());
on_cleanup(move || pause_cleanup());
Pausable { Pausable {
is_active: is_active.into(), is_active: is_active.into(),

6
src/watch_with_options.rs
View file

@ -130,7 +130,7 @@ where
let filtered_callback = let filtered_callback =
create_filter_wrapper(options.filter.filter_fn(), wrapped_callback.clone()); create_filter_wrapper(options.filter.filter_fn(), wrapped_callback.clone());
leptos::watch( leptos::prelude::watch(
deps, deps,
move |deps_value, previous_deps_value, did_run_before| { move |deps_value, previous_deps_value, did_run_before| {
cur_deps_value.replace(Some(deps_value.clone())); cur_deps_value.replace(Some(deps_value.clone()));
@ -139,7 +139,7 @@ where
let callback_value = if options.immediate && did_run_before.is_none() { let callback_value = if options.immediate && did_run_before.is_none() {
Some(wrapped_callback()) Some(wrapped_callback())
} else { } else {
filtered_callback().take() filtered_callback().lock().unwrap().take()
}; };
prev_callback_value.replace(callback_value); prev_callback_value.replace(callback_value);
@ -197,5 +197,5 @@ where
W: Clone + 'static, W: Clone + 'static,
T: Clone + 'static, T: Clone + 'static,
{ {
leptos::watch(deps, callback, false) leptos::prelude::watch(deps, callback, false)
} }