diff --git a/.idea/icon.svg b/.idea/icon.svg index fb9d78d..09f8e86 100644 --- a/.idea/icon.svg +++ b/.idea/icon.svg @@ -2,6 +2,17 @@ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> + + style="fill-rule:nonzero;"/> \ No newline at end of file diff --git a/.idea/leptos-use.iml b/.idea/leptos-use.iml index 9a57ee7..e4cba54 100644 --- a/.idea/leptos-use.iml +++ b/.idea/leptos-use.iml @@ -48,6 +48,10 @@ + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index c925260..b21db9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Braking Changes πŸ›  +- Leptos version is now 0.5 +- No `cx: Scope` params are supported/needed anymore because of the changes in Leptos. + Please check the release notes of Leptos 0.5 for how to upgrade. - `watch` is now deprecated in favor of `leptos::watch`. `watch_with_options` will continue to exist. diff --git a/Cargo.toml b/Cargo.toml index 213d0ae..6ba2f57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "leptos-use" -version = "0.6.0" +version = "0.7.0-alpha" edition = "2021" authors = ["Marc-Stefan Cassola"] categories = ["gui", "web-programming"] @@ -13,7 +13,7 @@ repository = "https://github.com/Synphonyte/leptos-use" homepage = "https://leptos-use.rs" [dependencies] -leptos = "0.4" +leptos = "0.5.0-alpha" wasm-bindgen = "0.2" js-sys = "0.3" default-struct-builder = "0.4" @@ -80,5 +80,3 @@ all-features = true rustdoc-args = ["--cfg=web_sys_unstable_apis"] rustc-args = ["--cfg=web_sys_unstable_apis"] -[dev-dependencies] -leptos = "0.4" diff --git a/README.md b/README.md index a70e763..75c44b4 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ use leptos::*; use leptos_use::{use_mouse, UseMouseReturn}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let UseMouseReturn { x, y, .. } = use_mouse(cx); +fn Demo() -> impl IntoView { + let UseMouseReturn { x, y, .. } = use_mouse(); view! { cx, {x} " x " {y} @@ -89,3 +89,4 @@ To scaffold a new function quickly you can run `template/createfn.sh`. It requir |---------------|---------------------------| | <= 0.3 | 0.3 | | 0.4, 0.5, 0.6 | 0.4 | +| main | 0.5.0-alpha | diff --git a/docs/book/src/SUMMARY.md b/docs/book/src/SUMMARY.md index 0542b5d..5f40d76 100644 --- a/docs/book/src/SUMMARY.md +++ b/docs/book/src/SUMMARY.md @@ -62,6 +62,11 @@ - [watch_with_options](watch/watch_with_options.md) - [whenever](watch/whenever.md) +# Reactivity + +- [signal_debounced](reactivity/signal_debounced.md) +- [signal_throttled](reactivity/signal_throttled.md) + # Utilities - [is_err](utilities/is_err.md) diff --git a/docs/book/src/get_started.md b/docs/book/src/get_started.md index 46cc788..9a40e34 100644 --- a/docs/book/src/get_started.md +++ b/docs/book/src/get_started.md @@ -19,8 +19,8 @@ use leptos::*; use leptos_use::{use_mouse, UseMouseReturn}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let UseMouseReturn { x, y, .. } = use_mouse(cx); +fn Demo() -> impl IntoView { + let UseMouseReturn { x, y, .. } = use_mouse(); view! { cx, {x} " x " {y} diff --git a/docs/book/src/server_side_rendering.md b/docs/book/src/server_side_rendering.md index ace770e..8f16416 100644 --- a/docs/book/src/server_side_rendering.md +++ b/docs/book/src/server_side_rendering.md @@ -41,7 +41,7 @@ create_effect( cx, move |_| { // window() doesn't work on the server - use_event_listener(cx, window(), "resize", move |_| { + use_event_listener(window(), "resize", move |_| { // ... }) }, diff --git a/examples/Cargo.toml b/examples/Cargo.toml index e238422..4c3dec2 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -3,6 +3,8 @@ resolver = "2" members = [ "on_click_outside", + "signal_debounced", + "signal_throttled", "use_abs", "use_active_element", "use_breakpoints", diff --git a/examples/on_click_outside/Cargo.toml b/examples/on_click_outside/Cargo.toml index 6a27995..a055bb2 100644 --- a/examples/on_click_outside/Cargo.toml +++ b/examples/on_click_outside/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/on_click_outside/src/main.rs b/examples/on_click_outside/src/main.rs index 93ee27a..6571e51 100644 --- a/examples/on_click_outside/src/main.rs +++ b/examples/on_click_outside/src/main.rs @@ -4,16 +4,15 @@ use leptos_use::docs::demo_or_body; use leptos_use::on_click_outside; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (show_modal, set_show_modal) = create_signal(cx, false); - let modal_ref = create_node_ref::
(cx); +fn Demo() -> impl IntoView { + let (show_modal, set_show_modal) = create_signal(false); + let modal_ref = create_node_ref::
(); - let _ = on_click_outside(cx, modal_ref, move |_| set_show_modal.set(false)); + let _ = on_click_outside(modal_ref, move |_| set_show_modal.set(false)); - view! { cx, - + view! { - +
@@ -70,7 +69,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, } + mount_to(demo_or_body(), || { + view! { } }) } diff --git a/examples/signal_debounced/Cargo.toml b/examples/signal_debounced/Cargo.toml index ab90674..e185e4f 100644 --- a/examples/signal_debounced/Cargo.toml +++ b/examples/signal_debounced/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/signal_debounced/src/main.rs b/examples/signal_debounced/src/main.rs index 35fcef7..a947e2d 100644 --- a/examples/signal_debounced/src/main.rs +++ b/examples/signal_debounced/src/main.rs @@ -3,19 +3,17 @@ use leptos_use::docs::demo_or_body; use leptos_use::signal_debounced; #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { + // signal_debounced(); - signal_debounced(cx); - - view! { cx, - } + view! {} } fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, } + mount_to(demo_or_body(), || { + view! { } }) } diff --git a/examples/signal_throttled/Cargo.toml b/examples/signal_throttled/Cargo.toml index 384d3f7..b948721 100644 --- a/examples/signal_throttled/Cargo.toml +++ b/examples/signal_throttled/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/signal_throttled/src/main.rs b/examples/signal_throttled/src/main.rs index daca4c0..0be60a7 100644 --- a/examples/signal_throttled/src/main.rs +++ b/examples/signal_throttled/src/main.rs @@ -3,19 +3,17 @@ use leptos_use::docs::demo_or_body; use leptos_use::signal_throttled; #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { + // signal_throttled(); - signal_throttled(cx); - - view! { cx, - } + view! {} } fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, } + mount_to(demo_or_body(), || { + view! { } }) } diff --git a/examples/ssr/Cargo.toml b/examples/ssr/Cargo.toml index 1479522..bf11447 100644 --- a/examples/ssr/Cargo.toml +++ b/examples/ssr/Cargo.toml @@ -11,16 +11,16 @@ axum = { version = "0.6.4", optional = true } console_error_panic_hook = "0.1" console_log = "1" cfg-if = "1" -leptos = { version = "0.4", features = ["nightly"] } -leptos_axum = { version = "0.4", optional = true } -leptos_meta = { version = "0.4", features = ["nightly"] } -leptos_router = { version = "0.4", features = ["nightly"] } +leptos = { version = "0.5.0-alpha", features = ["nightly"] } +leptos_axum = { version = "0.5.0-alpha", optional = true } +leptos_meta = { version = "0.5.0-alpha", features = ["nightly"] } +leptos_router = { version = "0.5.0-alpha", features = ["nightly"] } leptos-use = { path = "../..", features = ["storage"] } log = "0.4" simple_logger = "4" tokio = { version = "1.25.0", optional = true } tower = { version = "0.4.13", optional = true } -tower-http = { version = "0.4", features = ["fs"], optional = true } +tower-http = { version = "0.5.0-alpha", features = ["fs"], optional = true } wasm-bindgen = "=0.2.87" thiserror = "1.0.38" tracing = { version = "0.1.37", optional = true } diff --git a/examples/ssr/src/app.rs b/examples/ssr/src/app.rs index 99647ed..018718e 100644 --- a/examples/ssr/src/app.rs +++ b/examples/ssr/src/app.rs @@ -9,28 +9,26 @@ use leptos_use::{ }; #[component] -pub fn App(cx: Scope) -> impl IntoView { +pub fn App() -> impl IntoView { // Provides context that manages stylesheets, titles, meta tags, etc. - provide_meta_context(cx); + provide_meta_context(); view! { - cx, - <Router fallback=|cx| { + <Router fallback=|| { let mut outside_errors = Errors::default(); outside_errors.insert_with_default_key(AppError::NotFound); - view! { cx, - <ErrorTemplate outside_errors/> + view! { <ErrorTemplate outside_errors/> } - .into_view(cx) + .into_view() }> <main> <Routes> - <Route path="" view=|cx| view! { cx, <HomePage/> }/> + <Route path="" view=|| view! { <HomePage/> }/> </Routes> </main> </Router> @@ -39,27 +37,27 @@ pub fn App(cx: Scope) -> impl IntoView { /// Renders the home page of your application. #[component] -fn HomePage(cx: Scope) -> impl IntoView { +fn HomePage() -> impl IntoView { // Creates a reactive value to update the button - let (count, set_count, _) = use_local_storage(cx, "count-state", 0); + let (count, set_count, _) = use_local_storage("count-state", 0); let on_click = move |_| set_count.update(|count| *count += 1); let nf = use_intl_number_format( UseIntlNumberFormatOptions::default().locale("zh-Hans-CN-u-nu-hanidec"), ); - let zh_count = nf.format::<i32>(cx, count); + let zh_count = nf.format::<i32>(count); - let (key, set_key) = create_signal(cx, "".to_string()); + let (key, set_key) = create_signal("".to_string()); - create_effect(cx, move |_| { + create_effect(move |_| { // window() doesn't work on the server - let _ = use_event_listener(cx, window(), keypress, move |evt: KeyboardEvent| { + let _ = use_event_listener(window(), keypress, move |evt: KeyboardEvent| { set_key(evt.key()) }); }); - let (debounce_value, set_debounce_value) = create_signal(cx, "not called"); + let (debounce_value, set_debounce_value) = create_signal("not called"); let debounced_fn = use_debounce_fn( move || { @@ -69,8 +67,7 @@ fn HomePage(cx: Scope) -> impl IntoView { ); debounced_fn(); - view! { cx, - <h1>"Leptos-Use SSR Example"</h1> + view! { <h1>"Leptos-Use SSR Example"</h1> <button on:click=on_click>"Click Me: " { count }</button> <p>"Locale \"zh-Hans-CN-u-nu-hanidec\": " { zh_count }</p> <p>"Press any key: " { key }</p> diff --git a/examples/ssr/src/error_template.rs b/examples/ssr/src/error_template.rs index 3a947fa..083aeab 100644 --- a/examples/ssr/src/error_template.rs +++ b/examples/ssr/src/error_template.rs @@ -24,12 +24,11 @@ impl AppError { // Feel free to do more complicated things here than just displaying the error. #[component] pub fn ErrorTemplate( - cx: Scope, #[prop(optional)] outside_errors: Option<Errors>, #[prop(optional)] errors: Option<RwSignal<Errors>>, ) -> impl IntoView { let errors = match outside_errors { - Some(e) => create_rw_signal(cx, e), + Some(e) => create_rw_signal(e), None => match errors { Some(e) => e, None => panic!("No Errors found and we expected errors!"), @@ -48,26 +47,24 @@ pub fn ErrorTemplate( // Only the response code for the first error is actually sent from the server // this may be customized by the specific application cfg_if! { if #[cfg(feature="ssr")] { - let response = use_context::<ResponseOptions>(cx); + let response = use_context::<ResponseOptions>(); if let Some(response) = response { response.set_status(errors[0].status_code()); } }} - view! {cx, - <h1>{if errors.len() > 1 {"Errors"} else {"Error"}}</h1> + view! { <h1>{if errors.len() > 1 {"Errors"} else {"Error"}}</h1> <For // a function that returns the items we're iterating over; a signal is fine each= move || {errors.clone().into_iter().enumerate()} // a unique key for each item as a reference key=|(index, _error)| *index // renders each item to a view - view= move |cx, error| { + view= move |error| { let error_string = error.1.to_string(); let error_code= error.1.status_code(); view! { - cx, - <h2>{error_code.to_string()}</h2> + <h2>{error_code.to_string()}</h2> <p>"Error: " {error_string}</p> } } diff --git a/examples/ssr/src/fileserv.rs b/examples/ssr/src/fileserv.rs index 07fade7..acc1635 100644 --- a/examples/ssr/src/fileserv.rs +++ b/examples/ssr/src/fileserv.rs @@ -20,7 +20,7 @@ cfg_if! { if #[cfg(feature = "ssr")] { if res.status() == StatusCode::OK { res.into_response() } else { - let handler = leptos_axum::render_app_to_stream(options.to_owned(), move |cx| view!{cx, <App/>}); + let handler = leptos_axum::render_app_to_stream(options.to_owned(), move || view!{<App/>}); handler(req).await.into_response() } } diff --git a/examples/ssr/src/lib.rs b/examples/ssr/src/lib.rs index 7190a49..91f1c26 100644 --- a/examples/ssr/src/lib.rs +++ b/examples/ssr/src/lib.rs @@ -14,8 +14,8 @@ cfg_if! { if #[cfg(feature = "hydrate")] { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - leptos::mount_to_body(move |cx| { - view! { cx, <App/> } + leptos::mount_to_body(move || { + view! { <App/> } }); } }} diff --git a/examples/ssr/src/main.rs b/examples/ssr/src/main.rs index 1930efc..a9dfaa5 100644 --- a/examples/ssr/src/main.rs +++ b/examples/ssr/src/main.rs @@ -17,12 +17,12 @@ async fn main() { let conf = get_configuration(None).await.unwrap(); let leptos_options = conf.leptos_options; let addr = leptos_options.site_addr; - let routes = generate_route_list(|cx| view! { cx, <App/> }).await; + let routes = generate_route_list(|| view! { <App/> }).await; // build our application with a route let app = Router::new() .route("/api/*fn_name", post(leptos_axum::handle_server_fns)) - .leptos_routes(&leptos_options, routes, |cx| view! { cx, <App/> }) + .leptos_routes(&leptos_options, routes, || view! { <App/> }) .fallback(file_and_error_handler) .with_state(leptos_options); diff --git a/examples/use_abs/Cargo.toml b/examples/use_abs/Cargo.toml index 6c8b6a0..3c7001a 100644 --- a/examples/use_abs/Cargo.toml +++ b/examples/use_abs/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_abs/src/main.rs b/examples/use_abs/src/main.rs index 5807441..2ae19df 100644 --- a/examples/use_abs/src/main.rs +++ b/examples/use_abs/src/main.rs @@ -3,13 +3,12 @@ use leptos_use::docs::demo_or_body; use leptos_use::math::use_abs; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (value, set_value) = create_signal(cx, -32.25); +fn Demo() -> impl IntoView { + let (value, set_value) = create_signal(-32.25); - let result: Signal<f64> = use_abs(cx, value); + let result: Signal<f64> = use_abs(value); - view! { cx, - <input + view! { <input class="block" prop:value=move || value.get() on:input=move |e| set_value.set(event_target_value(&e).parse().unwrap()) @@ -27,7 +26,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_active_element/Cargo.toml b/examples/use_active_element/Cargo.toml index 24f4c0b..f3dfb7f 100644 --- a/examples/use_active_element/Cargo.toml +++ b/examples/use_active_element/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_active_element/src/main.rs b/examples/use_active_element/src/main.rs index 9685e60..9849a28 100644 --- a/examples/use_active_element/src/main.rs +++ b/examples/use_active_element/src/main.rs @@ -3,26 +3,25 @@ use leptos_use::docs::{demo_or_body, Note}; use leptos_use::use_active_element; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let active_element = use_active_element(cx); +fn Demo() -> impl IntoView { + let active_element = use_active_element(); let key = move || { format!( "{:?}", - active_element.get() + active_element + .get() .map(|el| el.dataset().get("id")) .unwrap_or_default() ) }; - view! { cx, - <Note class="mb-3">"Select the inputs below to see the changes"</Note> + view! { <Note class="mb-3">"Select the inputs below to see the changes"</Note> <div class="grid grid-cols-1 md:grid-cols-3 gap-2"> <For each=move || (1..7) key=|i| *i - view=move |cx, i| view! { cx, - <input type="text" data-id=i class="!my-0 !min-w-0" placeholder=i /> + view=move |i| view! { <input type="text" data-id=i class="!my-0 !min-w-0" placeholder=i /> } /> </div> @@ -38,7 +37,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_breakpoints/Cargo.toml b/examples/use_breakpoints/Cargo.toml index fa998c7..47788ee 100644 --- a/examples/use_breakpoints/Cargo.toml +++ b/examples/use_breakpoints/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_breakpoints/src/main.rs b/examples/use_breakpoints/src/main.rs index b304392..63cfc09 100644 --- a/examples/use_breakpoints/src/main.rs +++ b/examples/use_breakpoints/src/main.rs @@ -3,10 +3,10 @@ use leptos_use::docs::{demo_or_body, BooleanDisplay}; use leptos_use::{breakpoints_tailwind, use_breakpoints, BreakpointsTailwind}; #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { let breakpoints = breakpoints_tailwind(); - let screen_size = use_breakpoints(cx, breakpoints.clone()); + let screen_size = use_breakpoints(breakpoints.clone()); use BreakpointsTailwind::*; @@ -24,8 +24,7 @@ fn Demo(cx: Scope) -> impl IntoView { let label_classes = "justify-self-end".to_string(); let svg_classes = "align-middle ml-3 mr-1 opacity-60".to_string(); - view! { cx, - <div class="grid grid-cols-2 gap-x-4 gap-y-3"> + view! { <div class="grid grid-cols-2 gap-x-4 gap-y-3"> <div class=label_classes.clone()>"Current breakpoints :"</div> <code>{move || format!("{:?}", current.get()) }</code> @@ -145,7 +144,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_ceil/Cargo.toml b/examples/use_ceil/Cargo.toml index bd4c13f..67a16d5 100644 --- a/examples/use_ceil/Cargo.toml +++ b/examples/use_ceil/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_ceil/src/main.rs b/examples/use_ceil/src/main.rs index 09fe956..1eaada8 100644 --- a/examples/use_ceil/src/main.rs +++ b/examples/use_ceil/src/main.rs @@ -3,13 +3,12 @@ use leptos_use::docs::demo_or_body; use leptos_use::math::use_ceil; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (value, set_value) = create_signal(cx, 4.15); +fn Demo() -> impl IntoView { + let (value, set_value) = create_signal(4.15); - let result: Signal<f64> = use_ceil(cx, value); + let result: Signal<f64> = use_ceil(value); - view! { cx, - <input + view! { <input class="block" prop:value=move || value.get() on:input=move |e| set_value.set(event_target_value(&e).parse().unwrap()) @@ -27,7 +26,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_color_mode/Cargo.toml b/examples/use_color_mode/Cargo.toml index 82f1179..15e9757 100644 --- a/examples/use_color_mode/Cargo.toml +++ b/examples/use_color_mode/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_color_mode/src/main.rs b/examples/use_color_mode/src/main.rs index 48439ac..7a7c2ce 100644 --- a/examples/use_color_mode/src/main.rs +++ b/examples/use_color_mode/src/main.rs @@ -7,9 +7,8 @@ use leptos_use::{ }; #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { let UseColorModeReturn { mode, set_mode, .. } = use_color_mode_with_options( - cx, UseColorModeOptions::default() .custom_modes(vec![ "rust".into(), @@ -17,11 +16,10 @@ fn Demo(cx: Scope) -> impl IntoView { "navy".into(), "ayu".into(), ]) - .initial_value(ColorMode::from(html(cx).class_name())), + .initial_value(ColorMode::from(html().class_name())), ); let UseCycleListReturn { state, next, .. } = use_cycle_list_with_options( - cx, vec![ ColorMode::Light, ColorMode::Custom("rust".into()), @@ -32,8 +30,7 @@ fn Demo(cx: Scope) -> impl IntoView { UseCycleListOptions::default().initial_value(Some((mode, set_mode).into())), ); - view! { cx, - <button on:click=move |_| next()> + view! { <button on:click=move |_| next()> { move || format!("{}", state.get()) } </button> <Note>"Click to change the color mode"</Note> @@ -44,7 +41,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_css_var/Cargo.toml b/examples/use_css_var/Cargo.toml index 946ae4a..0daf92f 100644 --- a/examples/use_css_var/Cargo.toml +++ b/examples/use_css_var/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_css_var/src/main.rs b/examples/use_css_var/src/main.rs index 07f0877..2388185 100644 --- a/examples/use_css_var/src/main.rs +++ b/examples/use_css_var/src/main.rs @@ -4,10 +4,10 @@ use leptos_use::docs::demo_or_body; use leptos_use::{use_css_var_with_options, UseCssVarOptions}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let el = create_node_ref::<Div>(cx); +fn Demo() -> impl IntoView { + let el = create_node_ref::<Div>(); let (color, set_color) = - use_css_var_with_options(cx, "--color", UseCssVarOptions::default().target(el)); + use_css_var_with_options("--color", UseCssVarOptions::default().target(el)); let switch_color = move |_| { if color.get() == "#df8543" { set_color.set("#7fa998".to_string()); @@ -16,9 +16,9 @@ fn Demo(cx: Scope) -> impl IntoView { } }; - let elv = create_node_ref::<Div>(cx); - let (key, set_key) = create_signal(cx, "--color".to_string()); - let (color_val, _) = use_css_var_with_options(cx, key, UseCssVarOptions::default().target(elv)); + let elv = create_node_ref::<Div>(); + let (key, set_key) = create_signal("--color".to_string()); + let (color_val, _) = use_css_var_with_options(key, UseCssVarOptions::default().target(elv)); let change_var = move |_| { if key.get() == "--color" { set_key.set("--color-one".to_string()); @@ -33,8 +33,7 @@ fn Demo(cx: Scope) -> impl IntoView { ) }; - view! { cx, - <div> + view! { <div> <div node_ref=el style="--color: #7fa998; color: var(--color)"> "Sample text, " {color} </div> @@ -54,7 +53,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_cycle_list/Cargo.toml b/examples/use_cycle_list/Cargo.toml index e3b95b2..3b712b4 100644 --- a/examples/use_cycle_list/Cargo.toml +++ b/examples/use_cycle_list/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_cycle_list/src/main.rs b/examples/use_cycle_list/src/main.rs index dc8dabd..c272078 100644 --- a/examples/use_cycle_list/src/main.rs +++ b/examples/use_cycle_list/src/main.rs @@ -3,18 +3,14 @@ use leptos_use::docs::demo_or_body; use leptos_use::{use_cycle_list, UseCycleListReturn}; #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { let UseCycleListReturn { state, next, prev, .. - } = use_cycle_list( - cx, - vec![ - "Dog", "Cat", "Lizard", "Shark", "Whale", "Dolphin", "Octopus", "Seal", - ], - ); + } = use_cycle_list(vec![ + "Dog", "Cat", "Lizard", "Shark", "Whale", "Dolphin", "Octopus", "Seal", + ]); - view! { cx, - <div> + view! { <div> <div class="text-primary text-lg font-bold">{state}</div> <button on:click=move |_| { prev() }>"Prev"</button> <button on:click=move |_| { next() }>"Next"</button> @@ -26,7 +22,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_debounce_fn/Cargo.toml b/examples/use_debounce_fn/Cargo.toml index f3ff6d2..5ee6a0b 100644 --- a/examples/use_debounce_fn/Cargo.toml +++ b/examples/use_debounce_fn/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_debounce_fn/src/main.rs b/examples/use_debounce_fn/src/main.rs index 5fdeb5d..a2cb9f8 100644 --- a/examples/use_debounce_fn/src/main.rs +++ b/examples/use_debounce_fn/src/main.rs @@ -3,9 +3,9 @@ use leptos_use::docs::{demo_or_body, Note}; use leptos_use::{use_debounce_fn_with_options, DebounceOptions}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (click_count, set_click_count) = create_signal(cx, 0); - let (debounced_count, set_debounced_count) = create_signal(cx, 0); +fn Demo() -> impl IntoView { + let (click_count, set_click_count) = create_signal(0); + let (debounced_count, set_debounced_count) = create_signal(0); let debounced_fn = use_debounce_fn_with_options( move || set_debounced_count.set(debounced_count.get_untracked() + 1), @@ -13,8 +13,7 @@ fn Demo(cx: Scope) -> impl IntoView { DebounceOptions::default().max_wait(Some(5000.0)), ); - view! { cx, - <button + view! { <button on:click=move |_| { set_click_count.set(click_count.get_untracked() + 1); debounced_fn(); @@ -32,7 +31,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_document_visibility/Cargo.toml b/examples/use_document_visibility/Cargo.toml index 66c39d0..aad19cd 100644 --- a/examples/use_document_visibility/Cargo.toml +++ b/examples/use_document_visibility/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_document_visibility/src/main.rs b/examples/use_document_visibility/src/main.rs index cc6166a..54b0e92 100644 --- a/examples/use_document_visibility/src/main.rs +++ b/examples/use_document_visibility/src/main.rs @@ -1,33 +1,36 @@ use leptos::*; use leptos_use::docs::demo_or_body; -use leptos_use::{use_document_visibility, watch}; +use leptos_use::use_document_visibility; use std::time::Duration; #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { let start_message = "πŸ’‘ Minimize the page or switch tab then return"; - let (message, set_message) = create_signal(cx, start_message); - let visibility = use_document_visibility(cx); + let (message, set_message) = create_signal(start_message); + let visibility = use_document_visibility(); - let _ = watch(cx, visibility, move |cur, prev, _| { - if let Some(prev) = prev { - if *cur == web_sys::VisibilityState::Visible - && *prev == web_sys::VisibilityState::Hidden - { - set_message("πŸŽ‰ Welcome back!"); + let _ = watch( + visibility, + move |cur, prev, _| { + if let Some(prev) = prev { + if *cur == web_sys::VisibilityState::Visible + && *prev == web_sys::VisibilityState::Hidden + { + set_message("πŸŽ‰ Welcome back!"); - set_timeout( - move || { - set_message(start_message); - }, - Duration::from_millis(3000), - ) + set_timeout( + move || { + set_message(start_message); + }, + Duration::from_millis(3000), + ) + } } - } - }); + }, + false, + ); - view! { cx, - <div>{ message }</div> + view! { <div>{ message }</div> } } @@ -35,7 +38,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_draggable/Cargo.toml b/examples/use_draggable/Cargo.toml index f81409d..e6e0a11 100644 --- a/examples/use_draggable/Cargo.toml +++ b/examples/use_draggable/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_draggable/src/main.rs b/examples/use_draggable/src/main.rs index 6e02a1f..ff1a082 100644 --- a/examples/use_draggable/src/main.rs +++ b/examples/use_draggable/src/main.rs @@ -5,13 +5,12 @@ use leptos_use::docs::demo_or_body; use leptos_use::{use_draggable_with_options, UseDraggableOptions, UseDraggableReturn}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let el = create_node_ref::<Div>(cx); +fn Demo() -> impl IntoView { + let el = create_node_ref::<Div>(); let inner_width = window().inner_width().unwrap().as_f64().unwrap(); let UseDraggableReturn { x, y, style, .. } = use_draggable_with_options( - cx, el, UseDraggableOptions::default() .initial_value(Position { @@ -21,8 +20,7 @@ fn Demo(cx: Scope) -> impl IntoView { .prevent_default(true), ); - view! { cx, - <p class="italic op50 text-center"> + view! { <p class="italic op50 text-center"> Check the floating box </p> <div @@ -42,7 +40,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_drop_zone/Cargo.toml b/examples/use_drop_zone/Cargo.toml index 59b996f..0e9992e 100644 --- a/examples/use_drop_zone/Cargo.toml +++ b/examples/use_drop_zone/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_drop_zone/src/main.rs b/examples/use_drop_zone/src/main.rs index 8c5eddf..086acd5 100644 --- a/examples/use_drop_zone/src/main.rs +++ b/examples/use_drop_zone/src/main.rs @@ -4,24 +4,22 @@ use leptos_use::docs::{demo_or_body, BooleanDisplay}; use leptos_use::{use_drop_zone_with_options, UseDropZoneOptions, UseDropZoneReturn}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (dropped, set_dropped) = create_signal(cx, false); +fn Demo() -> impl IntoView { + let (dropped, set_dropped) = create_signal(false); - let drop_zone_el = create_node_ref::<Div>(cx); + let drop_zone_el = create_node_ref::<Div>(); let UseDropZoneReturn { is_over_drop_zone, files, } = use_drop_zone_with_options( - cx, drop_zone_el, UseDropZoneOptions::default() .on_drop(move |_| set_dropped(true)) .on_enter(move |_| set_dropped(false)), ); - view! { cx, - <div class="flex"> + view! { <div class="flex"> <div class="w-full h-auto relative"> <p>Drop files into dropZone</p> <img width="64" src="use_drop_zone/demo/img/leptos-use-logo.svg" alt="Drop me"/> @@ -36,9 +34,8 @@ fn Demo(cx: Scope) -> impl IntoView { dropped: <BooleanDisplay value=dropped /> </div> <div class="flex flex-wrap justify-center items-center"> - <For each=files key=|f| f.name() view=move |cx, file| { - view! { cx, - <div class="w-200px bg-black-200/10 ma-2 pa-6"> + <For each=files key=|f| f.name() view=move |file| { + view! { <div class="w-200px bg-black-200/10 ma-2 pa-6"> <p>Name: {file.name()}</p> <p>Size: {file.size()}</p> <p>Type: {file.type_()}</p> @@ -57,7 +54,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_element_hover/Cargo.toml b/examples/use_element_hover/Cargo.toml index cfa9443..fb518a3 100644 --- a/examples/use_element_hover/Cargo.toml +++ b/examples/use_element_hover/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_element_hover/src/main.rs b/examples/use_element_hover/src/main.rs index 4304ea4..5f3b9c2 100644 --- a/examples/use_element_hover/src/main.rs +++ b/examples/use_element_hover/src/main.rs @@ -4,19 +4,17 @@ use leptos_use::docs::demo_or_body; use leptos_use::{use_element_hover_with_options, UseElementHoverOptions}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let el = create_node_ref::<Button>(cx); +fn Demo() -> impl IntoView { + let el = create_node_ref::<Button>(); let is_hovered = use_element_hover_with_options( - cx, el, UseElementHoverOptions::default() .delay_enter(200) .delay_leave(600), ); - view! { cx, - <button node_ref=el>{ move || if is_hovered.get() { "Thank you!" } else { "Hover me" } }</button> + view! { <button node_ref=el>{ move || if is_hovered.get() { "Thank you!" } else { "Hover me" } }</button> } } @@ -24,7 +22,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_element_size/Cargo.toml b/examples/use_element_size/Cargo.toml index 8b1cc7a..62ccdbc 100644 --- a/examples/use_element_size/Cargo.toml +++ b/examples/use_element_size/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_element_size/src/main.rs b/examples/use_element_size/src/main.rs index 0cd8b9e..781c8b2 100644 --- a/examples/use_element_size/src/main.rs +++ b/examples/use_element_size/src/main.rs @@ -4,15 +4,14 @@ use leptos_use::docs::{demo_or_body, Note}; use leptos_use::{use_element_size, UseElementSizeReturn}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let el = create_node_ref::<Textarea>(cx); +fn Demo() -> impl IntoView { + let el = create_node_ref::<Textarea>(); - let UseElementSizeReturn { width, height } = use_element_size(cx, el); + let UseElementSizeReturn { width, height } = use_element_size(el); let text = move || format!("width: {}\nheight: {}", width.get(), height.get()); - view! { cx, - <Note class="mb-2">"Resize the box to see changes"</Note> + view! { <Note class="mb-2">"Resize the box to see changes"</Note> <textarea node_ref=el readonly @@ -26,7 +25,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_element_visibility/Cargo.toml b/examples/use_element_visibility/Cargo.toml index 9b38d0d..9fc10c6 100644 --- a/examples/use_element_visibility/Cargo.toml +++ b/examples/use_element_visibility/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_element_visibility/src/main.rs b/examples/use_element_visibility/src/main.rs index e9637d9..9c88ac9 100644 --- a/examples/use_element_visibility/src/main.rs +++ b/examples/use_element_visibility/src/main.rs @@ -4,13 +4,12 @@ use leptos_use::docs::{demo_or_body, BooleanDisplay, Note}; use leptos_use::use_element_visibility; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let el = create_node_ref::<Div>(cx); +fn Demo() -> impl IntoView { + let el = create_node_ref::<Div>(); - let is_visible = use_element_visibility(cx, el); + let is_visible = use_element_visibility(el); - view! { cx, - <div> + view! { <div> <Note class="mb-4">"Info on the right bottom corner"</Note> <div node_ref=el class="max-w-lg relative area dark:bg-gray-800 shadow-lg z-60"> "Target Element (scroll down)" @@ -28,7 +27,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_event_listener/Cargo.toml b/examples/use_event_listener/Cargo.toml index 4d45d97..1790534 100644 --- a/examples/use_event_listener/Cargo.toml +++ b/examples/use_event_listener/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_event_listener/src/main.rs b/examples/use_event_listener/src/main.rs index cc3a971..77a0c36 100644 --- a/examples/use_event_listener/src/main.rs +++ b/examples/use_event_listener/src/main.rs @@ -4,14 +4,14 @@ use leptos::*; use leptos_use::use_event_listener; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let _ = use_event_listener(cx, window(), keydown, |evt| { +fn Demo() -> impl IntoView { + let _ = use_event_listener(window(), keydown, |evt| { log!("window keydown: '{}'", evt.key()); }); - let element = create_node_ref::<A>(cx); + let element = create_node_ref::<A>(); - let _ = use_event_listener(cx, element, click, |evt| { + let _ = use_event_listener(element, click, |evt| { log!( "click from element '{:?}'", event_target::<web_sys::HtmlElement>(&evt).inner_text() @@ -20,10 +20,9 @@ fn Demo(cx: Scope) -> impl IntoView { evt.prevent_default(); }); - let (cond, set_cond) = create_signal(cx, true); + let (cond, set_cond) = create_signal(true); - view! { cx, - <p>"Check in the dev tools console"</p> + view! { <p>"Check in the dev tools console"</p> <p> <label> <input @@ -35,8 +34,7 @@ fn Demo(cx: Scope) -> impl IntoView { </p> <Show when=move || cond.get() - fallback=move |cx| view! { cx, - <a node_ref=element href="#"> + fallback=move || view! { <a node_ref=element href="#"> "Condition" <b>" false "</b> "[click me]" @@ -56,9 +54,8 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to_body(|cx| { - view! {cx, - <Demo /> + mount_to_body(|| { + view! { <Demo /> } }) } diff --git a/examples/use_favicon/Cargo.toml b/examples/use_favicon/Cargo.toml index 14fc3a3..3150aaf 100644 --- a/examples/use_favicon/Cargo.toml +++ b/examples/use_favicon/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_favicon/src/main.rs b/examples/use_favicon/src/main.rs index 52f55a1..96d9e68 100644 --- a/examples/use_favicon/src/main.rs +++ b/examples/use_favicon/src/main.rs @@ -3,17 +3,14 @@ use leptos_use::docs::demo_or_body; use leptos_use::{use_favicon_with_options, UseFaviconOptions}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (_, set_icon) = use_favicon_with_options( - cx, - UseFaviconOptions::default().base_url("use_favicon/demo/img/"), - ); +fn Demo() -> impl IntoView { + let (_, set_icon) = + use_favicon_with_options(UseFaviconOptions::default().base_url("use_favicon/demo/img/")); let classes = "border border-solid border-b-4 rounded p-2 block border-gray-500/50 bg-[--bg] active:translate-y-1 active:border-b".to_string(); let img_classes = "block".to_string(); - view! { cx, - <p>"Click on an icon to change the favicon"</p> + view! { <p>"Click on an icon to change the favicon"</p> <p class="flex gap-2"> <a class=classes.clone() href="#" on:click=move |e| { e.prevent_default(); @@ -57,7 +54,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_floor/Cargo.toml b/examples/use_floor/Cargo.toml index 44aea64..b206f52 100644 --- a/examples/use_floor/Cargo.toml +++ b/examples/use_floor/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_floor/src/main.rs b/examples/use_floor/src/main.rs index 981f571..17804bd 100644 --- a/examples/use_floor/src/main.rs +++ b/examples/use_floor/src/main.rs @@ -3,13 +3,12 @@ use leptos_use::docs::demo_or_body; use leptos_use::math::use_floor; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (value, set_value) = create_signal(cx, 5.95); +fn Demo() -> impl IntoView { + let (value, set_value) = create_signal(5.95); - let result: Signal<f64> = use_floor(cx, value); + let result: Signal<f64> = use_floor(value); - view! { cx, - <input + view! { <input class="block" prop:value=move || value.get() on:input=move |e| set_value.set(event_target_value(&e).parse().unwrap()) @@ -27,7 +26,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_intersection_observer/Cargo.toml b/examples/use_intersection_observer/Cargo.toml index 7ebddca..b689b81 100644 --- a/examples/use_intersection_observer/Cargo.toml +++ b/examples/use_intersection_observer/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_intersection_observer/src/main.rs b/examples/use_intersection_observer/src/main.rs index f053297..b82f922 100644 --- a/examples/use_intersection_observer/src/main.rs +++ b/examples/use_intersection_observer/src/main.rs @@ -7,10 +7,10 @@ use leptos_use::{ }; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let root = create_node_ref::<Div>(cx); - let target = create_node_ref::<Div>(cx); - let (is_visible, set_visible) = create_signal(cx, false); +fn Demo() -> impl IntoView { + let root = create_node_ref::<Div>(); + let target = create_node_ref::<Div>(); + let (is_visible, set_visible) = create_signal(false); let UseIntersectionObserverReturn { is_active, @@ -18,7 +18,6 @@ fn Demo(cx: Scope) -> impl IntoView { resume, .. } = use_intersection_observer_with_options( - cx, target, move |entries, _| { set_visible.set(entries[0].is_intersecting()); @@ -26,8 +25,7 @@ fn Demo(cx: Scope) -> impl IntoView { UseIntersectionObserverOptions::default().root(Some(root)), ); - view! { cx, - <div class="text-center"> + view! { <div class="text-center"> <label class="checkbox"> <input type="checkbox" @@ -89,7 +87,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_interval/Cargo.toml b/examples/use_interval/Cargo.toml index 8e879aa..03c0abf 100644 --- a/examples/use_interval/Cargo.toml +++ b/examples/use_interval/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_interval/src/main.rs b/examples/use_interval/src/main.rs index d37aaf5..66afee3 100644 --- a/examples/use_interval/src/main.rs +++ b/examples/use_interval/src/main.rs @@ -3,11 +3,10 @@ use leptos_use::docs::demo_or_body; use leptos_use::{use_interval, UseIntervalReturn}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let UseIntervalReturn { counter, .. } = use_interval(cx, 200); +fn Demo() -> impl IntoView { + let UseIntervalReturn { counter, .. } = use_interval(200); - view! { cx, - <div> + view! { <div> <p>"Interval fired: " { counter }</p> </div> } @@ -17,7 +16,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_interval_fn/Cargo.toml b/examples/use_interval_fn/Cargo.toml index 047c454..dcd84d6 100644 --- a/examples/use_interval_fn/Cargo.toml +++ b/examples/use_interval_fn/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_interval_fn/src/main.rs b/examples/use_interval_fn/src/main.rs index 074aa4d..59184a9 100644 --- a/examples/use_interval_fn/src/main.rs +++ b/examples/use_interval_fn/src/main.rs @@ -4,7 +4,7 @@ use leptos_use::use_interval_fn; use leptos_use::utils::Pausable; #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { let greetings = [ "Hello", "Hi", @@ -18,16 +18,15 @@ fn Demo(cx: Scope) -> impl IntoView { "ΠŸΡ€ΠΈΠ²Π΅Ρ‚", ]; - let (word, set_word) = create_signal(cx, greetings[0]); - let (interval, set_interval) = create_signal(cx, 500_u64); - let (index, set_index) = create_signal(cx, 0); + let (word, set_word) = create_signal(greetings[0]); + let (interval, set_interval) = create_signal(500_u64); + let (index, set_index) = create_signal(0); let Pausable { pause, resume, is_active, } = use_interval_fn( - cx, move || { set_index.set((index.get() + 1) % greetings.len()); set_word.set(greetings[index.get()]); @@ -35,8 +34,7 @@ fn Demo(cx: Scope) -> impl IntoView { interval, ); - view! { cx, - <p>{move || word.get()}</p> + view! { <p>{move || word.get()}</p> <p> "Interval:" <input @@ -48,17 +46,15 @@ fn Demo(cx: Scope) -> impl IntoView { </p> <Show when=move || is_active.get() - fallback=move |cx| { + fallback=move || { let resume = resume.clone(); - view! {cx, - <button on:click=move |_| resume()>"Resume"</button> + view! { <button on:click=move |_| resume()>"Resume"</button> } } > { let pause = pause.clone(); - view! {cx, - <button on:click=move |_| pause()>"Pause"</button> + view! { <button on:click=move |_| pause()>"Pause"</button> } } </Show> @@ -69,7 +65,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_intl_number_format/Cargo.toml b/examples/use_intl_number_format/Cargo.toml index 007983d..5000bfb 100644 --- a/examples/use_intl_number_format/Cargo.toml +++ b/examples/use_intl_number_format/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_intl_number_format/src/main.rs b/examples/use_intl_number_format/src/main.rs index 2e97d7c..e9623df 100644 --- a/examples/use_intl_number_format/src/main.rs +++ b/examples/use_intl_number_format/src/main.rs @@ -3,8 +3,8 @@ use leptos_use::docs::demo_or_body; use leptos_use::{use_intl_number_format, NumberStyle, UseIntlNumberFormatOptions}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (number, set_number) = create_signal(cx, 123456.78); +fn Demo() -> impl IntoView { + let (number, set_number) = create_signal(123456.78); let de_nf = use_intl_number_format( UseIntlNumberFormatOptions::default() @@ -12,7 +12,7 @@ fn Demo(cx: Scope) -> impl IntoView { .style(NumberStyle::Currency) .currency("EUR"), ); - let de_num = de_nf.format::<f64>(cx, number); + let de_num = de_nf.format::<f64>(number); let ja_nf = use_intl_number_format( UseIntlNumberFormatOptions::default() @@ -20,17 +20,16 @@ fn Demo(cx: Scope) -> impl IntoView { .style(NumberStyle::Currency) .currency("JPY"), ); - let ja_num = ja_nf.format::<f64>(cx, number); + let ja_num = ja_nf.format::<f64>(number); let in_nf = use_intl_number_format( UseIntlNumberFormatOptions::default() .locale("en-IN") .maximum_significant_digits(3), ); - let in_num = in_nf.format::<f64>(cx, number); + let in_num = in_nf.format::<f64>(number); - view! { cx, - <input + view! { <input class="block" prop:value=number on:input=move |e| set_number(event_target_value(&e).parse().unwrap()) @@ -50,7 +49,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_media_query/Cargo.toml b/examples/use_media_query/Cargo.toml index 511c838..05dbbed 100644 --- a/examples/use_media_query/Cargo.toml +++ b/examples/use_media_query/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_media_query/src/main.rs b/examples/use_media_query/src/main.rs index 90f2329..75fd6c0 100644 --- a/examples/use_media_query/src/main.rs +++ b/examples/use_media_query/src/main.rs @@ -3,12 +3,11 @@ use leptos_use::docs::{demo_or_body, BooleanDisplay}; use leptos_use::use_media_query; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let is_large_screen = use_media_query(cx, "(min-width: 1024px)"); - let is_dark_preferred = use_media_query(cx, "(prefers-color-scheme: dark)"); +fn Demo() -> impl IntoView { + let is_large_screen = use_media_query("(min-width: 1024px)"); + let is_dark_preferred = use_media_query("(prefers-color-scheme: dark)"); - view! { cx, - <p>"Is large screen: " <BooleanDisplay value=is_large_screen /></p> + view! { <p>"Is large screen: " <BooleanDisplay value=is_large_screen /></p> <p>"Is dark preferred: " <BooleanDisplay value=is_dark_preferred /></p> } } @@ -17,7 +16,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_mouse/Cargo.toml b/examples/use_mouse/Cargo.toml index d90d93f..57c6542 100644 --- a/examples/use_mouse/Cargo.toml +++ b/examples/use_mouse/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_mouse/src/main.rs b/examples/use_mouse/src/main.rs index bc66717..d15df65 100644 --- a/examples/use_mouse/src/main.rs +++ b/examples/use_mouse/src/main.rs @@ -22,20 +22,18 @@ impl UseMouseEventExtractor for Extractor { } #[component] -fn Demo(cx: Scope) -> impl IntoView { - let el = create_node_ref::<Div>(cx); +fn Demo() -> impl IntoView { + let el = create_node_ref::<Div>(); - let mouse_default = use_mouse(cx); + let mouse_default = use_mouse(); let mouse_with_extractor = use_mouse_with_options( - cx, UseMouseOptions::default() .target(el) .coord_type(UseMouseCoordType::Custom(Extractor)), ); - view! { cx, - <div node_ref=el> + view! { <div node_ref=el> <p class="font-semibold">"Basic Usage"</p> <pre lang="yaml"> { move || format!(r#" x: {} @@ -59,7 +57,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_mutation_observer/Cargo.toml b/examples/use_mutation_observer/Cargo.toml index 6460ee3..ae88b67 100644 --- a/examples/use_mutation_observer/Cargo.toml +++ b/examples/use_mutation_observer/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_mutation_observer/src/main.rs b/examples/use_mutation_observer/src/main.rs index b09e74b..b5c3654 100644 --- a/examples/use_mutation_observer/src/main.rs +++ b/examples/use_mutation_observer/src/main.rs @@ -5,17 +5,16 @@ use leptos_use::use_mutation_observer_with_options; use std::time::Duration; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let el = create_node_ref::<Div>(cx); - let (messages, set_messages) = create_signal(cx, vec![]); - let (class_name, set_class_name) = create_signal(cx, String::new()); - let (style, set_style) = create_signal(cx, String::new()); +fn Demo() -> impl IntoView { + let el = create_node_ref::<Div>(); + let (messages, set_messages) = create_signal(vec![]); + let (class_name, set_class_name) = create_signal(String::new()); + let (style, set_style) = create_signal(String::new()); let mut init = web_sys::MutationObserverInit::new(); init.attributes(true); use_mutation_observer_with_options( - cx, el, move |mutations, _| { if let Some(mutation) = mutations.first() { @@ -41,16 +40,14 @@ fn Demo(cx: Scope) -> impl IntoView { Duration::from_millis(1550), ); - let enum_msgs = Signal::derive(cx, move || { - messages.get().into_iter().enumerate().collect::<Vec<_>>() - }); + let enum_msgs = + Signal::derive(move || messages.get().into_iter().enumerate().collect::<Vec<_>>()); - view! { cx, - <div node_ref=el class=move || class_name.get() style=move || style.get()> + view! { <div node_ref=el class=move || class_name.get() style=move || style.get()> <For each=move || enum_msgs.get() key=|message| message.0 // list only grows so this is fine here - view=|cx, message| view! { cx, <div>"Mutation Attribute: " <code>{message.1}</code></div> } + view=|message| view! { <div>"Mutation Attribute: " <code>{message.1}</code></div> } /> </div> } @@ -60,7 +57,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_raf_fn/Cargo.toml b/examples/use_raf_fn/Cargo.toml index d5a120c..d7069f8 100644 --- a/examples/use_raf_fn/Cargo.toml +++ b/examples/use_raf_fn/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_raf_fn/src/main.rs b/examples/use_raf_fn/src/main.rs index df12e80..0742a76 100644 --- a/examples/use_raf_fn/src/main.rs +++ b/examples/use_raf_fn/src/main.rs @@ -3,19 +3,18 @@ use leptos_use::docs::demo_or_body; use leptos_use::{use_raf_fn, utils::Pausable}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (count, set_count) = create_signal(cx, 0); +fn Demo() -> impl IntoView { + let (count, set_count) = create_signal(0); let Pausable { pause, resume, is_active, - } = use_raf_fn(cx, move |_| { + } = use_raf_fn(move |_| { set_count.update(|count| *count += 1); }); - view! { cx, - <div>Count: { count }</div> + view! { <div>Count: { count }</div> <button on:click=move |_| pause() disabled=move || !is_active()>Pause</button> <button on:click=move |_| resume() disabled=is_active>Resume</button> } @@ -25,7 +24,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_resize_observer/Cargo.toml b/examples/use_resize_observer/Cargo.toml index ef3b271..1178cff 100644 --- a/examples/use_resize_observer/Cargo.toml +++ b/examples/use_resize_observer/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_resize_observer/src/main.rs b/examples/use_resize_observer/src/main.rs index abbd4c5..9ea1548 100644 --- a/examples/use_resize_observer/src/main.rs +++ b/examples/use_resize_observer/src/main.rs @@ -4,11 +4,11 @@ use leptos_use::docs::{demo_or_body, Note}; use leptos_use::use_resize_observer; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let el = create_node_ref::<Textarea>(cx); - let (text, set_text) = create_signal(cx, "".to_string()); +fn Demo() -> impl IntoView { + let el = create_node_ref::<Textarea>(); + let (text, set_text) = create_signal("".to_string()); - use_resize_observer(cx, el, move |entries, _| { + use_resize_observer(el, move |entries, _| { let rect = entries[0].content_rect(); set_text.set(format!( "width: {:.0}\nheight: {:.0}", @@ -17,8 +17,7 @@ fn Demo(cx: Scope) -> impl IntoView { )); }); - view! { cx, - <Note class="mb-2">"Resize the box to see changes"</Note> + view! { <Note class="mb-2">"Resize the box to see changes"</Note> <textarea node_ref=el readonly @@ -32,7 +31,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_round/Cargo.toml b/examples/use_round/Cargo.toml index 72f105c..32ed722 100644 --- a/examples/use_round/Cargo.toml +++ b/examples/use_round/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_round/src/main.rs b/examples/use_round/src/main.rs index 34ca7fa..ab8dd55 100644 --- a/examples/use_round/src/main.rs +++ b/examples/use_round/src/main.rs @@ -3,13 +3,12 @@ use leptos_use::docs::demo_or_body; use leptos_use::math::use_round; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (value, set_value) = create_signal(cx, 5.95); +fn Demo() -> impl IntoView { + let (value, set_value) = create_signal(5.95); - let result: Signal<f64> = use_round(cx, value); + let result: Signal<f64> = use_round(value); - view! { cx, - <input + view! { <input class="block" prop:value=move || value.get() on:input=move |e| set_value.set(event_target_value(&e).parse().unwrap()) @@ -27,7 +26,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_scroll/Cargo.toml b/examples/use_scroll/Cargo.toml index b425e2d..8298f0a 100644 --- a/examples/use_scroll/Cargo.toml +++ b/examples/use_scroll/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_scroll/src/main.rs b/examples/use_scroll/src/main.rs index 0c8ca35..0df3d36 100644 --- a/examples/use_scroll/src/main.rs +++ b/examples/use_scroll/src/main.rs @@ -6,10 +6,10 @@ use leptos_use::{use_scroll_with_options, ScrollBehavior, UseScrollOptions, UseS use web_sys::Event; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let el = create_node_ref::<Div>(cx); - let (smooth, set_smooth) = create_signal(cx, false); - let behavior = Signal::derive(cx, move || { +fn Demo() -> impl IntoView { + let el = create_node_ref::<Div>(); + let (smooth, set_smooth) = create_signal(false); + let behavior = Signal::derive(move || { if smooth.get() { ScrollBehavior::Smooth } else { @@ -35,7 +35,6 @@ fn Demo(cx: Scope) -> impl IntoView { directions, .. } = use_scroll_with_options( - cx, el, UseScrollOptions::default() .behavior(behavior) @@ -43,8 +42,7 @@ fn Demo(cx: Scope) -> impl IntoView { .on_scroll(on_scroll.clone()), ); - view! { cx, - <div class="flex"> + view! { <div class="flex"> <div node_ref=el class="w-[300px] h-[300px] m-auto my-auto overflow-scroll bg-gray-500/5 rounded"> <div class="w-[500px] h-[400px] relative"> <div class="absolute left-0 top-0 bg-gray-500/5 px-2 py-1"> @@ -124,35 +122,35 @@ fn Demo(cx: Scope) -> impl IntoView { <div class="text-right opacity-75"> "Top Arrived" </div> - <BooleanDisplay value=Signal::derive(cx, move || arrived_state.get().top) /> + <BooleanDisplay value=Signal::derive(move || arrived_state.get().top) /> <div class="text-right opacity-75"> "Right Arrived" </div> - <BooleanDisplay value=Signal::derive(cx, move || arrived_state.get().right) /> + <BooleanDisplay value=Signal::derive(move || arrived_state.get().right) /> <div class="text-right opacity-75"> "Bottom Arrived" </div> - <BooleanDisplay value=Signal::derive(cx, move || arrived_state.get().bottom) /> + <BooleanDisplay value=Signal::derive(move || arrived_state.get().bottom) /> <div class="text-right opacity-75"> "Left Arrived" </div> - <BooleanDisplay value=Signal::derive(cx, move || arrived_state.get().left) /> + <BooleanDisplay value=Signal::derive(move || arrived_state.get().left) /> <div class="text-right opacity-75"> "Scrolling Up" </div> - <BooleanDisplay value=Signal::derive(cx, move || directions.get().top) /> + <BooleanDisplay value=Signal::derive(move || directions.get().top) /> <div class="text-right opacity-75"> "Scrolling Right" </div> - <BooleanDisplay value=Signal::derive(cx, move || directions.get().right) /> + <BooleanDisplay value=Signal::derive(move || directions.get().right) /> <div class="text-right opacity-75"> "Scrolling Down" </div> - <BooleanDisplay value=Signal::derive(cx, move || directions.get().bottom) /> + <BooleanDisplay value=Signal::derive(move || directions.get().bottom) /> <div class="text-right opacity-75"> "Scrolling Left" </div> - <BooleanDisplay value=Signal::derive(cx, move || directions.get().left) /> + <BooleanDisplay value=Signal::derive(move || directions.get().left) /> </div> </div> </div> @@ -163,7 +161,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_storage/Cargo.toml b/examples/use_storage/Cargo.toml index 3dee334..b3a5f63 100644 --- a/examples/use_storage/Cargo.toml +++ b/examples/use_storage/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_storage/src/main.rs b/examples/use_storage/src/main.rs index 0b7fcdf..81f40e3 100644 --- a/examples/use_storage/src/main.rs +++ b/examples/use_storage/src/main.rs @@ -12,7 +12,7 @@ pub struct BananaState { } #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { let the_default = BananaState { name: "Banana".to_string(), color: "Yellow".to_string(), @@ -20,12 +20,11 @@ fn Demo(cx: Scope) -> impl IntoView { count: 0, }; - let (state, set_state, _) = use_storage(cx, "banana-state", the_default.clone()); + let (state, set_state, _) = use_storage("banana-state", the_default.clone()); - let (state2, ..) = use_storage(cx, "banana-state", the_default.clone()); + let (state2, ..) = use_storage("banana-state", the_default.clone()); - view! { cx, - <input + view! { <input class="block" prop:value=move || state.get().name on:input=move |e| set_state.update(|s| s.name = event_target_value(&e)) @@ -60,7 +59,7 @@ fn Demo(cx: Scope) -> impl IntoView { { move || format!("{:#?}", state2.get()) } </pre> - <Note>"The values are persistant. When you reload the page the values will be the same."</Note> + <Note>"The values are persistent. When you reload the page the values will be the same."</Note> } } @@ -68,7 +67,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_throttle_fn/Cargo.toml b/examples/use_throttle_fn/Cargo.toml index 9b5d184..76383c6 100644 --- a/examples/use_throttle_fn/Cargo.toml +++ b/examples/use_throttle_fn/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_throttle_fn/src/main.rs b/examples/use_throttle_fn/src/main.rs index 81b6377..17ccc49 100644 --- a/examples/use_throttle_fn/src/main.rs +++ b/examples/use_throttle_fn/src/main.rs @@ -3,14 +3,16 @@ use leptos_use::docs::{demo_or_body, Note}; use leptos_use::use_throttle_fn; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (click_count, set_click_count) = create_signal(cx, 0); - let (throttled_count, set_throttled_count) = create_signal(cx, 0); +fn Demo() -> impl IntoView { + let (click_count, set_click_count) = create_signal(0); + let (throttled_count, set_throttled_count) = create_signal(0); - let throttled_fn = use_throttle_fn(move || set_throttled_count.set(throttled_count.get_untracked() + 1), 1000.0); + let throttled_fn = use_throttle_fn( + move || set_throttled_count.set(throttled_count.get_untracked() + 1), + 1000.0, + ); - view! { cx, - <button + view! { <button on:click=move |_| { set_click_count.set(click_count.get_untracked() + 1); throttled_fn(); @@ -28,7 +30,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_websocket/Cargo.toml b/examples/use_websocket/Cargo.toml index 0a0a3b7..5d882ca 100644 --- a/examples/use_websocket/Cargo.toml +++ b/examples/use_websocket/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_websocket/src/main.rs b/examples/use_websocket/src/main.rs index 3d76f06..1dde4bf 100644 --- a/examples/use_websocket/src/main.rs +++ b/examples/use_websocket/src/main.rs @@ -8,8 +8,8 @@ use leptos_use::{ use web_sys::{CloseEvent, Event}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (history, set_history) = create_signal(cx, vec![]); +fn Demo() -> impl IntoView { + let (history, set_history) = create_signal(vec![]); fn update_history(&history: &WriteSignal<Vec<String>>, message: String) { let _ = &history.update(|history: &mut Vec<_>| history.push(message)); @@ -27,7 +27,7 @@ fn Demo(cx: Scope) -> impl IntoView { open, close, .. - } = use_websocket(cx, "wss://echo.websocket.events/".to_string()); + } = use_websocket("wss://echo.websocket.events/".to_string()); let send_message = move |_| { let m = "Hello, world!".to_string(); @@ -52,13 +52,13 @@ fn Demo(cx: Scope) -> impl IntoView { close(); }; - create_effect(cx, move |_| { + create_effect(move |_| { if let Some(m) = message.get() { update_history(&set_history, format! {"[message]: {:?}", m}); }; }); - create_effect(cx, move |_| { + create_effect(move |_| { if let Some(m) = message_bytes.get() { update_history(&set_history, format! {"[message_bytes]: {:?}", m}); }; @@ -68,7 +68,7 @@ fn Demo(cx: Scope) -> impl IntoView { // use_websocket_with_options // ---------------------------- - let (history2, set_history2) = create_signal(cx, vec![]); + let (history2, set_history2) = create_signal(vec![]); let on_open_callback = move |e: Event| { set_history2.update(|history: &mut Vec<_>| { @@ -107,7 +107,6 @@ fn Demo(cx: Scope) -> impl IntoView { message_bytes: message_bytes2, .. } = use_websocket_with_options( - cx, "wss://echo.websocket.events/".to_string(), UseWebSocketOptions::default() .manual(true) @@ -139,13 +138,13 @@ fn Demo(cx: Scope) -> impl IntoView { let status2 = move || ready_state2.get().to_string(); - create_effect(cx, move |_| { + create_effect(move |_| { if let Some(m) = message2.get() { update_history(&set_history2, format! {"[message]: {:?}", m}); }; }); - create_effect(cx, move |_| { + create_effect(move |_| { if let Some(m) = message_bytes2.get() { update_history(&set_history2, format! {"[message_bytes]: {:?}", m}); }; @@ -153,8 +152,7 @@ fn Demo(cx: Scope) -> impl IntoView { let connected2 = move || ready_state2.get() == UseWebSocketReadyState::Open; - view! { cx, - <div class="container"> + view! { <div class="container"> <div class="flex flex-col lg:flex-row gap-4"> <div class="w-full lg:w-1/2"> <h1 class="text-xl lg:text-4xl mb-2">"use_websocket"</h1> @@ -170,8 +168,8 @@ fn Demo(cx: Scope) -> impl IntoView { <For each=move || history.get().into_iter().enumerate() key=|(index, _)| *index - view=move |cx, (_, message)| { - view! {cx, <div>{message}</div> } + view=move |(_, message)| { + view! { <div>{message}</div> } } /> @@ -191,8 +189,8 @@ fn Demo(cx: Scope) -> impl IntoView { <For each=move || history2.get().into_iter().enumerate() key=|(index, _)| *index - view=move |cx, (_, message)| { - view! {cx, <li>{message}</li> } + view=move |(_, message)| { + view! { <li>{message}</li> } } /> </ul> @@ -208,7 +206,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Info); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_window_focus/Cargo.toml b/examples/use_window_focus/Cargo.toml index f39eee7..02a4269 100644 --- a/examples/use_window_focus/Cargo.toml +++ b/examples/use_window_focus/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_window_focus/src/main.rs b/examples/use_window_focus/src/main.rs index cf971f7..675bfe4 100644 --- a/examples/use_window_focus/src/main.rs +++ b/examples/use_window_focus/src/main.rs @@ -1,25 +1,28 @@ use leptos::*; use leptos_use::docs::demo_or_body; -use leptos_use::{use_window_focus, watch}; +use leptos_use::use_window_focus; #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { let start_message = "πŸ’‘ Click somewhere outside of the document to unfocus."; - let (message, set_message) = create_signal(cx, start_message); + let (message, set_message) = create_signal(start_message); - let focused = use_window_focus(cx); + let focused = use_window_focus(); - let _ = watch(cx, focused, move |focused, _, _| { - if *focused { - set_message(start_message); - } else { - set_message("β„Ή Tab is unfocused") - } - }); + let _ = watch( + focused, + move |focused, _, _| { + if *focused { + set_message(start_message); + } else { + set_message("β„Ή Tab is unfocused") + } + }, + false, + ); - view! { cx, - <div>{ message }</div> + view! { <div>{ message }</div> } } @@ -27,7 +30,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/use_window_scroll/Cargo.toml b/examples/use_window_scroll/Cargo.toml index 0925dc9..14d6fe8 100644 --- a/examples/use_window_scroll/Cargo.toml +++ b/examples/use_window_scroll/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/use_window_scroll/src/main.rs b/examples/use_window_scroll/src/main.rs index 84b545e..ad7519b 100644 --- a/examples/use_window_scroll/src/main.rs +++ b/examples/use_window_scroll/src/main.rs @@ -3,8 +3,8 @@ use leptos_use::docs::{demo_or_body, Note}; use leptos_use::use_window_scroll; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (x, y) = use_window_scroll(cx); +fn Demo() -> impl IntoView { + let (x, y) = use_window_scroll(); let div = document().create_element("div").unwrap(); div.set_attribute( @@ -15,8 +15,7 @@ fn Demo(cx: Scope) -> impl IntoView { document().body().unwrap().append_child(&div).unwrap(); - view! { cx, - <div>See scroll values in the lower right corner of the screen.</div> + view! { <div>See scroll values in the lower right corner of the screen.</div> <div class="float m-5 area shadow-lg"> <Note class="mb-2">Scroll value</Note> <div> @@ -31,7 +30,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/watch_debounced/Cargo.toml b/examples/watch_debounced/Cargo.toml index 10d51ea..84a09c2 100644 --- a/examples/watch_debounced/Cargo.toml +++ b/examples/watch_debounced/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/watch_debounced/src/main.rs b/examples/watch_debounced/src/main.rs index 80997a6..f97630b 100644 --- a/examples/watch_debounced/src/main.rs +++ b/examples/watch_debounced/src/main.rs @@ -3,12 +3,11 @@ use leptos_use::docs::{demo_or_body, Note}; use leptos_use::{watch_debounced_with_options, WatchDebouncedOptions}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (input, set_input) = create_signal(cx, "".to_string()); - let (updated, set_updated) = create_signal(cx, 0); +fn Demo() -> impl IntoView { + let (input, set_input) = create_signal("".to_string()); + let (updated, set_updated) = create_signal(0); let _ = watch_debounced_with_options( - cx, move || input.get(), move |_, _, _| { set_updated.update(|x| *x += 1); @@ -17,8 +16,7 @@ fn Demo(cx: Scope) -> impl IntoView { WatchDebouncedOptions::default().max_wait(Some(5000.0)), ); - view! { cx, - <input + view! { <input class="block" prop:value=move || input.get() on:input=move |e| set_input.set(event_target_value(&e)) @@ -40,7 +38,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/watch_pausable/Cargo.toml b/examples/watch_pausable/Cargo.toml index 02ac718..f71ef47 100644 --- a/examples/watch_pausable/Cargo.toml +++ b/examples/watch_pausable/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/watch_pausable/src/main.rs b/examples/watch_pausable/src/main.rs index b7691b7..60b694f 100644 --- a/examples/watch_pausable/src/main.rs +++ b/examples/watch_pausable/src/main.rs @@ -4,10 +4,10 @@ use leptos_use::docs::{demo_or_body, Note}; use leptos_use::{watch_pausable, WatchPausableReturn}; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let input = create_node_ref::<Input>(cx); - let (log, set_log) = create_signal(cx, "".to_string()); - let (source, set_source) = create_signal(cx, "".to_string()); +fn Demo() -> impl IntoView { + let input = create_node_ref::<Input>(); + let (log, set_log) = create_signal("".to_string()); + let (source, set_source) = create_signal("".to_string()); let WatchPausableReturn { pause, @@ -15,7 +15,6 @@ fn Demo(cx: Scope) -> impl IntoView { is_active, .. } = watch_pausable( - cx, move || source.get(), move |v, _, _| { set_log.update(|log| *log = format!("{log}Changed to \"{v}\"\n")); @@ -34,8 +33,7 @@ fn Demo(cx: Scope) -> impl IntoView { resume(); }; - view! { cx, - <Note class="mb-2">"Type something below to trigger the watch"</Note> + view! { <Note class="mb-2">"Type something below to trigger the watch"</Note> <input node_ref=input class="block" @@ -58,7 +56,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/examples/watch_throttled/Cargo.toml b/examples/watch_throttled/Cargo.toml index aaeafeb..cab4ec8 100644 --- a/examples/watch_throttled/Cargo.toml +++ b/examples/watch_throttled/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { version = "0.4", features = ["nightly", "csr"] } +leptos = { version = "0.5.0-alpha", features = ["nightly", "csr"] } console_error_panic_hook = "0.1" console_log = "1" log = "0.4" diff --git a/examples/watch_throttled/src/main.rs b/examples/watch_throttled/src/main.rs index 8cc46f0..0007f0d 100644 --- a/examples/watch_throttled/src/main.rs +++ b/examples/watch_throttled/src/main.rs @@ -3,12 +3,11 @@ use leptos_use::docs::{demo_or_body, Note}; use leptos_use::watch_throttled; #[component] -fn Demo(cx: Scope) -> impl IntoView { - let (input, set_input) = create_signal(cx, "".to_string()); - let (updated, set_updated) = create_signal(cx, 0); +fn Demo() -> impl IntoView { + let (input, set_input) = create_signal("".to_string()); + let (updated, set_updated) = create_signal(0); let _ = watch_throttled( - cx, move || input.get(), move |_, _, _| { set_updated.update(|x| *x += 1); @@ -16,8 +15,7 @@ fn Demo(cx: Scope) -> impl IntoView { 1000.0, ); - view! { cx, - <input + view! { <input class="block" prop:value=move || input.get() on:input=move |e| set_input.set(event_target_value(&e)) @@ -37,7 +35,7 @@ fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/src/core/element_maybe_signal.rs b/src/core/element_maybe_signal.rs index 4759c30..aaf5139 100644 --- a/src/core/element_maybe_signal.rs +++ b/src/core/element_maybe_signal.rs @@ -127,35 +127,26 @@ where // From static element ////////////////////////////////////////////////////////////// -impl<T, E> From<(Scope, T)> for ElementMaybeSignal<T, E> +impl<T, E> From<T> for ElementMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(value: (Scope, T)) -> Self { - ElementMaybeSignal::Static(Some(value.1)) + fn from(value: T) -> Self { + ElementMaybeSignal::Static(Some(value)) } } -impl<T, E> From<(Scope, Option<T>)> for ElementMaybeSignal<T, E> +impl<T, E> From<Option<T>> for ElementMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, Option<T>)) -> Self { - ElementMaybeSignal::Static(target.1) + fn from(target: Option<T>) -> Self { + ElementMaybeSignal::Static(target) } } // From string (selector) /////////////////////////////////////////////////////////////// -impl<'a, E> From<(Scope, &'a str)> for ElementMaybeSignal<web_sys::Element, E> -where - E: From<web_sys::Element> + 'static, -{ - fn from(target: (Scope, &'a str)) -> Self { - Self::Static(document().query_selector(target.1).unwrap_or_default()) - } -} - impl<'a, E> From<&'a str> for ElementMaybeSignal<web_sys::Element, E> where E: From<web_sys::Element> + 'static, @@ -174,18 +165,14 @@ where } } -impl<E> From<(Scope, Signal<String>)> for ElementMaybeSignal<web_sys::Element, E> +impl<E> From<Signal<String>> for ElementMaybeSignal<web_sys::Element, E> where E: From<web_sys::Element> + 'static, { - fn from(target: (Scope, Signal<String>)) -> Self { - let (cx, signal) = target; - + fn from(signal: Signal<String>) -> Self { Self::Dynamic( - create_memo(cx, move |_| { - document().query_selector(&signal.get()).unwrap_or_default() - }) - .into(), + create_memo(move |_| document().query_selector(&signal.get()).unwrap_or_default()) + .into(), ) } } @@ -194,12 +181,12 @@ where macro_rules! impl_from_signal_option { ($ty:ty) => { - impl<T, E> From<(Scope, $ty)> for ElementMaybeSignal<T, E> + impl<T, E> From<$ty> for ElementMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, $ty)) -> Self { - Self::Dynamic(target.1.into()) + fn from(target: $ty) -> Self { + Self::Dynamic(target.into()) } } }; @@ -212,14 +199,12 @@ impl_from_signal_option!(Memo<Option<T>>); macro_rules! impl_from_signal { ($ty:ty) => { - impl<T, E> From<(Scope, $ty)> for ElementMaybeSignal<T, E> + impl<T, E> From<$ty> for ElementMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, $ty)) -> Self { - let (cx, signal) = target; - - Self::Dynamic(Signal::derive(cx, move || Some(signal.get()))) + fn from(signal: $ty) -> Self { + Self::Dynamic(Signal::derive(move || Some(signal.get()))) } } }; @@ -234,14 +219,12 @@ impl_from_signal!(Memo<T>); macro_rules! impl_from_node_ref { ($ty:ty) => { - impl<R> From<(Scope, NodeRef<R>)> for ElementMaybeSignal<$ty, $ty> + impl<R> From<NodeRef<R>> for ElementMaybeSignal<$ty, $ty> where R: ElementDescriptor + Clone + 'static, { - fn from(target: (Scope, NodeRef<R>)) -> Self { - let (cx, node_ref) = target; - - Self::Dynamic(Signal::derive(cx, move || { + fn from(node_ref: NodeRef<R>) -> Self { + Self::Dynamic(Signal::derive(move || { node_ref.get().map(move |el| { let el = el.into_any(); let el: $ty = el.deref().clone().into(); diff --git a/src/core/elements_maybe_signal.rs b/src/core/elements_maybe_signal.rs index d00f852..d78dfc8 100644 --- a/src/core/elements_maybe_signal.rs +++ b/src/core/elements_maybe_signal.rs @@ -128,32 +128,32 @@ where // From single static element ////////////////////////////////////////////////////////////// -impl<T, E> From<(Scope, T)> for ElementsMaybeSignal<T, E> +impl<T, E> From<T> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(value: (Scope, T)) -> Self { - ElementsMaybeSignal::Static(vec![Some(value.1)]) + fn from(value: T) -> Self { + ElementsMaybeSignal::Static(vec![Some(value)]) } } -impl<T, E> From<(Scope, Option<T>)> for ElementsMaybeSignal<T, E> +impl<T, E> From<Option<T>> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, Option<T>)) -> Self { - ElementsMaybeSignal::Static(vec![target.1]) + fn from(target: Option<T>) -> Self { + ElementsMaybeSignal::Static(vec![target]) } } // From string (selector) /////////////////////////////////////////////////////////////// -impl<'a, E> From<(Scope, &'a str)> for ElementsMaybeSignal<web_sys::Node, E> +impl<'a, E> From<&'a str> for ElementsMaybeSignal<web_sys::Node, E> where E: From<web_sys::Node> + 'static, { - fn from(target: (Scope, &'a str)) -> Self { - if let Ok(node_list) = document().query_selector_all(target.1) { + fn from(target: &'a str) -> Self { + if let Ok(node_list) = document().query_selector_all(target) { let mut list = Vec::with_capacity(node_list.length() as usize); for i in 0..node_list.length() { let node = node_list.get(i).expect("checked the range"); @@ -167,15 +167,13 @@ where } } -impl<E> From<(Scope, Signal<String>)> for ElementsMaybeSignal<web_sys::Node, E> +impl<E> From<Signal<String>> for ElementsMaybeSignal<web_sys::Node, E> where E: From<web_sys::Node> + 'static, { - fn from(target: (Scope, Signal<String>)) -> Self { - let (cx, signal) = target; - + fn from(signal: Signal<String>) -> Self { Self::Dynamic( - create_memo(cx, move |_| { + create_memo(move |_| { if let Ok(node_list) = document().query_selector_all(&signal.get()) { let mut list = Vec::with_capacity(node_list.length() as usize); for i in 0..node_list.length() { @@ -196,13 +194,12 @@ where macro_rules! impl_from_signal_option { ($ty:ty) => { - impl<T, E> From<(Scope, $ty)> for ElementsMaybeSignal<T, E> + impl<T, E> From<$ty> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, $ty)) -> Self { - let (cx, signal) = target; - Self::Dynamic(Signal::derive(cx, move || vec![signal.get()])) + fn from(signal: $ty) -> Self { + Self::Dynamic(Signal::derive(move || vec![signal.get()])) } } }; @@ -215,14 +212,12 @@ impl_from_signal_option!(Memo<Option<T>>); macro_rules! impl_from_signal { ($ty:ty) => { - impl<T, E> From<(Scope, $ty)> for ElementsMaybeSignal<T, E> + impl<T, E> From<$ty> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, $ty)) -> Self { - let (cx, signal) = target; - - Self::Dynamic(Signal::derive(cx, move || vec![Some(signal.get())])) + fn from(signal: $ty) -> Self { + Self::Dynamic(Signal::derive(move || vec![Some(signal.get())])) } } }; @@ -237,14 +232,12 @@ impl_from_signal!(Memo<T>); macro_rules! impl_from_node_ref { ($ty:ty) => { - impl<R> From<(Scope, NodeRef<R>)> for ElementsMaybeSignal<$ty, $ty> + impl<R> From<NodeRef<R>> for ElementsMaybeSignal<$ty, $ty> where R: ElementDescriptor + Clone + 'static, { - fn from(target: (Scope, NodeRef<R>)) -> Self { - let (cx, node_ref) = target; - - Self::Dynamic(Signal::derive(cx, move || { + fn from(node_ref: NodeRef<R>) -> Self { + Self::Dynamic(Signal::derive(move || { vec![node_ref.get().map(move |el| { let el = el.into_any(); let el: $ty = el.deref().clone().into(); @@ -261,74 +254,69 @@ impl_from_node_ref!(web_sys::Element); // From multiple static elements ////////////////////////////////////////////////////////////// -impl<T, E> From<(Scope, &[T])> for ElementsMaybeSignal<T, E> +impl<T, E> From<&[T]> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, &[T])) -> Self { - Self::Static(target.1.iter().map(|t| Some(t.clone())).collect()) + fn from(target: &[T]) -> Self { + Self::Static(target.iter().map(|t| Some(t.clone())).collect()) } } -impl<T, E> From<(Scope, &[Option<T>])> for ElementsMaybeSignal<T, E> +impl<T, E> From<&[Option<T>]> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, &[Option<T>])) -> Self { - Self::Static(target.1.to_vec()) + fn from(target: &[Option<T>]) -> Self { + Self::Static(target.to_vec()) } } // From signal of vec //////////////////////////////////////////////////////////////// -impl<T, E> From<(Scope, Signal<Vec<T>>)> for ElementsMaybeSignal<T, E> +impl<T, E> From<Signal<Vec<T>>> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, Signal<Vec<T>>)) -> Self { - let (cx, signal) = target; - Self::Dynamic(Signal::derive(cx, move || { + fn from(signal: Signal<Vec<T>>) -> Self { + Self::Dynamic(Signal::derive(move || { signal.get().into_iter().map(|t| Some(t)).collect() })) } } -impl<T, E> From<(Scope, Signal<Vec<Option<T>>>)> for ElementsMaybeSignal<T, E> +impl<T, E> From<Signal<Vec<Option<T>>>> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, Signal<Vec<Option<T>>>)) -> Self { - Self::Dynamic(target.1) + fn from(target: Signal<Vec<Option<T>>>) -> Self { + Self::Dynamic(target) } } // From multiple signals ////////////////////////////////////////////////////////////// -impl<T, E> From<(Scope, &[Signal<T>])> for ElementsMaybeSignal<T, E> +impl<T, E> From<&[Signal<T>]> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, &[Signal<T>])) -> Self { - let (cx, list) = target; - + fn from(list: &[Signal<T>]) -> Self { let list = list.to_vec(); - Self::Dynamic(Signal::derive(cx, move || { + Self::Dynamic(Signal::derive(move || { list.iter().map(|t| Some(t.get())).collect() })) } } -impl<T, E> From<(Scope, &[Signal<Option<T>>])> for ElementsMaybeSignal<T, E> +impl<T, E> From<&[Signal<Option<T>>]> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, &[Signal<Option<T>>])) -> Self { - let (cx, list) = target; - + fn from(list: &[Signal<Option<T>>]) -> Self { let list = list.to_vec(); - Self::Dynamic(Signal::derive(cx, move || { + Self::Dynamic(Signal::derive(move || { list.iter().map(|t| t.get()).collect() })) } @@ -338,16 +326,14 @@ where macro_rules! impl_from_multi_node_ref { ($ty:ty) => { - impl<R> From<(Scope, &[NodeRef<R>])> for ElementsMaybeSignal<$ty, $ty> + impl<R> From<&[NodeRef<R>]> for ElementsMaybeSignal<$ty, $ty> where R: ElementDescriptor + Clone + 'static, { - fn from(target: (Scope, &[NodeRef<R>])) -> Self { - let (cx, node_refs) = target; - + fn from(node_refs: &[NodeRef<R>]) -> Self { let node_refs = node_refs.to_vec(); - Self::Dynamic(Signal::derive(cx, move || { + Self::Dynamic(Signal::derive(move || { node_refs .iter() .map(|node_ref| { @@ -369,16 +355,14 @@ impl_from_multi_node_ref!(web_sys::Element); // From ElementMaybeSignal ////////////////////////////////////////////////////////////// -impl<T, E> From<(Scope, ElementMaybeSignal<T, E>)> for ElementsMaybeSignal<T, E> +impl<T, E> From<ElementMaybeSignal<T, E>> for ElementsMaybeSignal<T, E> where T: Into<E> + Clone + 'static, { - fn from(target: (Scope, ElementMaybeSignal<T, E>)) -> Self { - let (cx, signal) = target; - + fn from(signal: ElementMaybeSignal<T, E>) -> Self { match signal { ElementMaybeSignal::Dynamic(signal) => { - Self::Dynamic(Signal::derive(cx, move || vec![signal.get()])) + Self::Dynamic(Signal::derive(move || vec![signal.get()])) } ElementMaybeSignal::Static(el) => Self::Static(vec![el]), ElementMaybeSignal::_Phantom(_) => unreachable!(), diff --git a/src/core/maybe_rw_signal.rs b/src/core/maybe_rw_signal.rs index f380221..6aad544 100644 --- a/src/core/maybe_rw_signal.rs +++ b/src/core/maybe_rw_signal.rs @@ -77,12 +77,12 @@ impl From<&str> for MaybeRwSignal<String> { } impl<T: Clone> MaybeRwSignal<T> { - pub fn into_signal(self, cx: Scope) -> (Signal<T>, WriteSignal<T>) { + pub fn into_signal(self) -> (Signal<T>, WriteSignal<T>) { match self { Self::DynamicRead(s) => { - let (r, w) = create_signal(cx, s.get_untracked()); + let (r, w) = create_signal(s.get_untracked()); - create_effect(cx, move |_| { + create_effect(move |_| { w.update(move |w| { *w = s.get(); }); @@ -92,7 +92,7 @@ impl<T: Clone> MaybeRwSignal<T> { } Self::DynamicRw(r, w) => (r, w), Self::Static(v) => { - let (r, w) = create_signal(cx, v.clone()); + let (r, w) = create_signal(v.clone()); (Signal::from(r), w) } } diff --git a/src/docs/boolean_display.rs b/src/docs/boolean_display.rs index ad6a300..3fbba42 100644 --- a/src/docs/boolean_display.rs +++ b/src/docs/boolean_display.rs @@ -2,7 +2,6 @@ use leptos::*; #[component] pub fn BooleanDisplay( - cx: Scope, #[prop(into)] value: MaybeSignal<bool>, #[prop(optional, into)] class: String, #[prop(default = "true")] true_str: &'static str, @@ -19,8 +18,7 @@ pub fn BooleanDisplay( ) }; - view! { cx, - <span class=class> + view! { <span class=class> { move || if value.get() { true_str} else { false_str } } </span> } diff --git a/src/docs/note.rs b/src/docs/note.rs index 4430119..a0c4b87 100644 --- a/src/docs/note.rs +++ b/src/docs/note.rs @@ -1,10 +1,9 @@ use leptos::*; #[component] -pub fn Note(cx: Scope, #[prop(optional, into)] class: String, children: Children) -> impl IntoView { +pub fn Note(#[prop(optional, into)] class: String, children: Children) -> impl IntoView { let class = format!("note {class}"); - view! { cx, - <div class=class>{ children(cx) }</div> + view! { <div class=class>{ children() }</div> } } diff --git a/src/is_err.rs b/src/is_err.rs index 5698220..95102b3 100644 --- a/src/is_err.rs +++ b/src/is_err.rs @@ -11,15 +11,14 @@ use_derive_signal!( /// # use leptos_use::is_err; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { + /// # fn Demo() -> impl IntoView { /// let (example, set_example) = create_signal( - /// cx, /// if js_sys::Math::random() < 0.5 { Ok("Example") } else { Err(()) } /// ); /// - /// let is_error = is_err(cx, example); + /// let is_error = is_err(example); /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` is_err<Result<T, ()>, T: 'static> -> bool diff --git a/src/is_none.rs b/src/is_none.rs index 7bd9375..d70ff97 100644 --- a/src/is_none.rs +++ b/src/is_none.rs @@ -11,15 +11,14 @@ use_derive_signal!( /// # use leptos_use::is_none; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { + /// # fn Demo() -> impl IntoView { /// let (example, set_example) = create_signal( - /// cx, /// if js_sys::Math::random() < 0.5 { Some("Example") } else { None } /// ); /// - /// let is_empty = is_none(cx, example); + /// let is_empty = is_none(example); /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` is_none<Option<T>, T: 'static> -> bool diff --git a/src/is_ok.rs b/src/is_ok.rs index 9be36cc..38cefcb 100644 --- a/src/is_ok.rs +++ b/src/is_ok.rs @@ -11,15 +11,14 @@ use_derive_signal!( /// # use leptos_use::is_ok; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { + /// # fn Demo() -> impl IntoView { /// let (example, set_example) = create_signal( - /// cx, /// if js_sys::Math::random() < 0.5 { Ok("Example") } else { Err(()) } /// ); /// - /// let is_ok = is_ok(cx, example); + /// let is_ok = is_ok(example); /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` is_ok<Result<T, ()>, T: 'static> -> bool diff --git a/src/is_some.rs b/src/is_some.rs index d32a424..c75ec07 100644 --- a/src/is_some.rs +++ b/src/is_some.rs @@ -11,15 +11,14 @@ use_derive_signal!( /// # use leptos_use::is_some; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { + /// # fn Demo() -> impl IntoView { /// let (example, set_example) = create_signal( - /// cx, /// if js_sys::Math::random() < 0.5 { Some("Example") } else { None } /// ); /// - /// let not_empty = is_some(cx, example); + /// let not_empty = is_some(example); /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` is_some<Option<T>, T: 'static> -> bool diff --git a/src/math/shared.rs b/src/math/shared.rs index 0bd3ba1..fded77a 100644 --- a/src/math/shared.rs +++ b/src/math/shared.rs @@ -4,7 +4,7 @@ macro_rules! use_partial_cmp { $ord:pat ) => { $(#[$outer])* - pub fn $fn_name<C, S, N>(cx: Scope, container: S) -> Signal<Option<N>> + pub fn $fn_name<C, S, N>(container: S) -> Signal<Option<N>> where S: Into<MaybeSignal<C>>, C: 'static, @@ -13,7 +13,7 @@ macro_rules! use_partial_cmp { { let container = container.into(); - create_memo(cx, move |_| { + create_memo(move |_| { container.with(|container| { if container.into_iter().count() == 0 { return None; @@ -45,13 +45,13 @@ macro_rules! use_simple_math { ) => { paste! { $(#[$outer])* - pub fn [<use_ $fn_name>]<S, N>(cx: Scope, x: S) -> Signal<N> + pub fn [<use_ $fn_name>]<S, N>(x: S) -> Signal<N> where S: Into<MaybeSignal<N>>, N: Float, { let x = x.into(); - Signal::derive(cx, move || x.get().$fn_name()) + Signal::derive(move || x.get().$fn_name()) } } }; diff --git a/src/math/use_abs.rs b/src/math/use_abs.rs index 6d8ce57..2c6e00c 100644 --- a/src/math/use_abs.rs +++ b/src/math/use_abs.rs @@ -17,12 +17,12 @@ use_simple_math!( /// # use leptos_use::math::use_abs; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (value, set_value) = create_signal(cx, -32.25); - /// let result: Signal<f64> = use_abs(cx, value); // 32.25 + /// # fn Demo() -> impl IntoView { + /// let (value, set_value) = create_signal(-32.25); + /// let result: Signal<f64> = use_abs(value); // 32.25 /// # /// # assert_eq!(result.get(), 32.25); - /// # view! { cx, } + /// # view! { } /// # } /// ``` // #[doc(cfg(feature = "math"))] diff --git a/src/math/use_ceil.rs b/src/math/use_ceil.rs index 270841f..0ddcba3 100644 --- a/src/math/use_ceil.rs +++ b/src/math/use_ceil.rs @@ -17,12 +17,12 @@ use_simple_math!( /// # use leptos_use::math::use_ceil; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (value, set_value) = create_signal(cx, 44.15); - /// let result: Signal<f64> = use_ceil(cx, value); // 45 + /// # fn Demo() -> impl IntoView { + /// let (value, set_value) = create_signal(44.15); + /// let result: Signal<f64> = use_ceil(value); // 45 /// # /// # assert_eq!(result.get(), 45.0); - /// # view! { cx, } + /// # view! { } /// # } /// ``` // #[doc(cfg(feature = "math"))] diff --git a/src/math/use_floor.rs b/src/math/use_floor.rs index 1b1409c..9079260 100644 --- a/src/math/use_floor.rs +++ b/src/math/use_floor.rs @@ -17,12 +17,12 @@ use_simple_math!( /// # use leptos_use::math::use_floor; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (value, set_value) = create_signal(cx, 45.95); - /// let result: Signal<f64> = use_floor(cx, value); // 45 + /// # fn Demo() -> impl IntoView { + /// let (value, set_value) = create_signal(45.95); + /// let result: Signal<f64> = use_floor(value); // 45 /// # /// # assert_eq!(result.get(), 45.0); - /// # view! { cx, } + /// # view! { } /// # } /// ``` // #[doc(cfg(feature = "math"))] diff --git a/src/math/use_max.rs b/src/math/use_max.rs index 56dafac..4fb6ac3 100644 --- a/src/math/use_max.rs +++ b/src/math/use_max.rs @@ -18,12 +18,12 @@ use_partial_cmp!( /// # use leptos_use::math::use_max; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (values, set_values) = create_signal(cx, vec![1.0, 2.0, 3.0, f32::NAN, 4.0, 5.0]); - /// let result = use_max::<Vec<f32>, _, _>(cx, values); // Some(5.0) + /// # fn Demo() -> impl IntoView { + /// let (values, set_values) = create_signal(vec![1.0, 2.0, 3.0, f32::NAN, 4.0, 5.0]); + /// let result = use_max::<Vec<f32>, _, _>(values); // Some(5.0) /// # /// # assert_eq!(result.get(), Some(5.0)); - /// # view! { cx, } + /// # view! { } /// # } /// ``` // #[doc(cfg(feature = "math"))] diff --git a/src/math/use_min.rs b/src/math/use_min.rs index dc8b353..9dcaaf1 100644 --- a/src/math/use_min.rs +++ b/src/math/use_min.rs @@ -18,12 +18,12 @@ use_partial_cmp!( /// # use leptos_use::math::use_min; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (values, set_values) = create_signal(cx, vec![1.0, 2.0, 3.0, f32::NAN, 4.0, 5.0]); - /// let result = use_min::<Vec<f32>, _, _>(cx, values); // Some(1.0) + /// # fn Demo() -> impl IntoView { + /// let (values, set_values) = create_signal(vec![1.0, 2.0, 3.0, f32::NAN, 4.0, 5.0]); + /// let result = use_min::<Vec<f32>, _, _>(values); // Some(1.0) /// # /// # assert_eq!(result.get(), Some(1.0)); - /// # view! { cx, } + /// # view! { } /// # } /// ``` // #[doc(cfg(feature = "math"))] diff --git a/src/math/use_round.rs b/src/math/use_round.rs index 114e505..a322ef4 100644 --- a/src/math/use_round.rs +++ b/src/math/use_round.rs @@ -17,12 +17,12 @@ use_simple_math!( /// # use leptos_use::math::use_round; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (value, set_value) = create_signal(cx, 45.95); - /// let result: Signal<f64> = use_round(cx, value); // 46 + /// # fn Demo() -> impl IntoView { + /// let (value, set_value) = create_signal(45.95); + /// let result: Signal<f64> = use_round(value); // 46 /// # /// # assert_eq!(result.get(), 46.0); - /// # view! { cx, } + /// # view! { } /// # } /// ``` // #[doc(cfg(feature = "math"))] diff --git a/src/on_click_outside.rs b/src/on_click_outside.rs index 6f4dd01..fcce00d 100644 --- a/src/on_click_outside.rs +++ b/src/on_click_outside.rs @@ -29,12 +29,12 @@ static IOS_WORKAROUND: RwLock<bool> = RwLock::new(false); /// # use leptos_use::on_click_outside; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let target = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// let target = create_node_ref::<Div>(); /// -/// on_click_outside(cx, target, move |event| { log!("{:?}", event); }); +/// on_click_outside(target, move |event| { log!("{:?}", event); }); /// -/// view! { cx, +/// view! { /// <div node_ref=target>"Hello World"</div> /// <div>"Outside element"</div> /// } @@ -49,15 +49,14 @@ static IOS_WORKAROUND: RwLock<bool> = RwLock::new(false); /// ## Server-Side Rendering /// /// Please refer to ["Functions with Target Elements"](https://leptos-use.rs/server_side_rendering.html#functions-with-target-elements) -pub fn on_click_outside<El, T, F>(cx: Scope, target: El, handler: F) -> impl FnOnce() + Clone +pub fn on_click_outside<El, T, F>(target: El, handler: F) -> impl FnOnce() + Clone where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, F: FnMut(web_sys::Event) + Clone + 'static, { on_click_outside_with_options::<_, _, _, web_sys::EventTarget>( - cx, target, handler, OnClickOutsideOptions::default(), @@ -66,14 +65,13 @@ where /// Version of `on_click_outside` that takes an `OnClickOutsideOptions`. See `on_click_outside` for more details. pub fn on_click_outside_with_options<El, T, F, I>( - cx: Scope, target: El, handler: F, options: OnClickOutsideOptions<I>, ) -> impl FnOnce() + Clone where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, F: FnMut(web_sys::Event) + Clone + 'static, I: Into<web_sys::EventTarget> + Clone + 'static, @@ -119,7 +117,7 @@ where }) }; - let target = (cx, target).into(); + let target = (target).into(); let listener = { let should_listen = Rc::clone(&should_listen); @@ -156,7 +154,6 @@ where options.passive(true).capture(capture); use_event_listener_with_options::<_, web_sys::Window, _, _>( - cx, window(), click, move |event| listener(event.into()), @@ -172,7 +169,6 @@ where options.passive(true); use_event_listener_with_options::<_, web_sys::Window, _, _>( - cx, window(), pointerdown, move |event| { @@ -189,7 +185,6 @@ where let remove_blur_listener = if detect_iframes { Some(use_event_listener::<_, web_sys::Window, _, _>( - cx, window(), blur, move |event| { diff --git a/src/signal_debounced.rs b/src/signal_debounced.rs index 9b21ae3..f602408 100644 --- a/src/signal_debounced.rs +++ b/src/signal_debounced.rs @@ -17,11 +17,11 @@ signal_filtered!( /// # use leptos_use::signal_debounced; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (input, set_input) = create_signal(cx, ""); - /// let debounced = signal_debounced(cx, input, 1000.0); + /// # fn Demo() -> impl IntoView { + /// let (input, set_input) = create_signal(""); + /// let debounced = signal_debounced(input, 1000.0); /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` /// @@ -34,16 +34,15 @@ signal_filtered!( /// # use leptos_use::{signal_debounced_with_options, DebounceOptions}; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (input, set_input) = create_signal(cx, ""); + /// # fn Demo() -> impl IntoView { + /// let (input, set_input) = create_signal(""); /// let debounced = signal_debounced_with_options( - /// cx, /// input, /// 1000.0, /// DebounceOptions::default().max_wait(Some(500.0)) /// ); /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` /// diff --git a/src/signal_throttled.rs b/src/signal_throttled.rs index 2b4c5ba..6b550a9 100644 --- a/src/signal_throttled.rs +++ b/src/signal_throttled.rs @@ -17,11 +17,11 @@ signal_filtered!( /// # use leptos_use::signal_throttled; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (input, set_input) = create_signal(cx, ""); - /// let throttled = signal_throttled(cx, input, 1000.0); + /// # fn Demo() -> impl IntoView { + /// let (input, set_input) = create_signal(""); + /// let throttled = signal_throttled(input, 1000.0); /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` /// @@ -34,16 +34,15 @@ signal_filtered!( /// # use leptos_use::{signal_throttled_with_options, ThrottleOptions}; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (input, set_input) = create_signal(cx, ""); + /// # fn Demo() -> impl IntoView { + /// let (input, set_input) = create_signal(""); /// let throttled = signal_throttled_with_options( - /// cx, /// input, /// 1000.0, /// ThrottleOptions::default().leading(false).trailing(true) /// ); /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` /// diff --git a/src/storage/shared.rs b/src/storage/shared.rs index 5704251..2eb8233 100644 --- a/src/storage/shared.rs +++ b/src/storage/shared.rs @@ -12,7 +12,6 @@ macro_rules! use_specific_storage { paste! { $(#[$outer])* pub fn [<use_ $storage_name _storage>]<T, D>( - cx: Scope, key: &str, defaults: D, ) -> (Signal<T>, WriteSignal<T>, impl Fn() + Clone) @@ -21,7 +20,7 @@ macro_rules! use_specific_storage { D: Into<MaybeRwSignal<T>>, T: Clone, { - [<use_ $storage_name _storage_with_options>](cx, key, defaults, UseSpecificStorageOptions::default()) + [<use_ $storage_name _storage_with_options>](key, defaults, UseSpecificStorageOptions::default()) } /// Version of @@ -30,7 +29,6 @@ macro_rules! use_specific_storage { #[$simple_func] /// for how to use. pub fn [<use_ $storage_name _storage_with_options>]<T, D>( - cx: Scope, key: &str, defaults: D, options: UseSpecificStorageOptions<T>, @@ -40,7 +38,7 @@ macro_rules! use_specific_storage { D: Into<MaybeRwSignal<T>>, T: Clone, { - use_storage_with_options(cx, key, defaults, options.into_storage_options(StorageType::[<$storage_name:camel>])) + use_storage_with_options(key, defaults, options.into_storage_options(StorageType::[<$storage_name:camel>])) } } }; diff --git a/src/storage/use_storage.rs b/src/storage/use_storage.rs index 2f72857..bb5dbc9 100644 --- a/src/storage/use_storage.rs +++ b/src/storage/use_storage.rs @@ -42,10 +42,9 @@ const CUSTOM_STORAGE_EVENT_NAME: &str = "leptos-use-storage"; /// pub greeting: String, /// } /// -/// # pub fn Demo(cx: Scope) -> impl IntoView { +/// # pub fn Demo() -> impl IntoView { /// // bind struct. Must be serializable. /// let (state, set_state, _) = use_storage( -/// cx, /// "my-state", /// MyState { /// hello: "hi".to_string(), @@ -54,19 +53,18 @@ const CUSTOM_STORAGE_EVENT_NAME: &str = "leptos-use-storage"; /// ); // returns Signal<MyState> /// /// // bind bool. -/// let (flag, set_flag, remove_flag) = use_storage(cx, "my-flag", true); // returns Signal<bool> +/// let (flag, set_flag, remove_flag) = use_storage("my-flag", true); // returns Signal<bool> /// /// // bind number -/// let (count, set_count, _) = use_storage(cx, "my-count", 0); // returns Signal<i32> +/// let (count, set_count, _) = use_storage("my-count", 0); // returns Signal<i32> /// /// // bind string with SessionStorage /// let (id, set_id, _) = use_storage_with_options( -/// cx, /// "my-id", /// "some_string_id".to_string(), /// UseStorageOptions::default().storage_type(StorageType::Session), /// ); -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -85,7 +83,7 @@ const CUSTOM_STORAGE_EVENT_NAME: &str = "leptos-use-storage"; /// hello: String, /// } /// -/// let (state, .. ) = use_storage(cx, "my-state", MyState { hello: "hello" }); +/// let (state, .. ) = use_storage("my-state", MyState { hello: "hello" }); /// ``` /// /// Now, in a newer version you added a field `greeting` to `MyState`. @@ -98,7 +96,6 @@ const CUSTOM_STORAGE_EVENT_NAME: &str = "leptos-use-storage"; /// } /// /// let (state, .. ) = use_storage( -/// cx, /// "my-state", /// MyState { hello: "hi", greeting: "whatsup" }, /// ); // fails to deserialize -> default value @@ -122,9 +119,8 @@ const CUSTOM_STORAGE_EVENT_NAME: &str = "leptos-use-storage"; /// pub greeting: String, /// } /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { +/// # pub fn Demo() -> impl IntoView { /// let (state, set_state, _) = use_storage_with_options( -/// cx, /// "my-state", /// MyState { /// hello: "hi".to_string(), @@ -140,7 +136,7 @@ const CUSTOM_STORAGE_EVENT_NAME: &str = "leptos-use-storage"; /// }), /// ); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -150,30 +146,25 @@ const CUSTOM_STORAGE_EVENT_NAME: &str = "leptos-use-storage"; /// /// ## Server-Side Rendering /// -/// On the server this falls back to a `create_signal(cx, default)` and an empty remove function. +/// On the server this falls back to a `create_signal(default)` and an empty remove function. /// /// ## See also /// /// * [`use_local_storage`] /// * [`use_session_storage`] // #[doc(cfg(feature = "storage"))] -pub fn use_storage<T, D>( - cx: Scope, - key: &str, - defaults: D, -) -> (Signal<T>, WriteSignal<T>, impl Fn() + Clone) +pub fn use_storage<T, D>(key: &str, defaults: D) -> (Signal<T>, WriteSignal<T>, impl Fn() + Clone) where for<'de> T: Serialize + Deserialize<'de> + Clone + 'static, D: Into<MaybeRwSignal<T>>, T: Clone, { - use_storage_with_options(cx, key, defaults, UseStorageOptions::default()) + use_storage_with_options(key, defaults, UseStorageOptions::default()) } /// Version of [`use_storage`] that accepts [`UseStorageOptions`]. See [`use_storage`] for how to use. // #[doc(cfg(feature = "storage"))] pub fn use_storage_with_options<T, D>( - cx: Scope, key: &str, defaults: D, options: UseStorageOptions<T>, @@ -194,7 +185,7 @@ where filter, } = options; - let (data, set_data) = defaults.into_signal(cx); + let (data, set_data) = defaults.into_signal(); let raw_init = data.get(); @@ -310,8 +301,7 @@ where resume: resume_watch, .. } = watch_pausable_with_options( - cx, - move || data.get(), + move || data.get(), move |data, _, _| write.clone()(data), WatchOptions::default().filter(filter), ); @@ -365,10 +355,9 @@ where move |event: web_sys::StorageEvent| upd.clone()(Some(event.into())); if listen_to_storage_changes { - let _ = use_event_listener(cx, window(), ev::storage, update_from_storage_event); + let _ = use_event_listener(window(), ev::storage, update_from_storage_event); let _ = use_event_listener( - cx, - window(), + window(), ev::Custom::new(CUSTOM_STORAGE_EVENT_NAME), update_from_custom_event, ); diff --git a/src/use_active_element.rs b/src/use_active_element.rs index c60aabd..98b8d0f 100644 --- a/src/use_active_element.rs +++ b/src/use_active_element.rs @@ -20,40 +20,39 @@ use web_sys::AddEventListenerOptions; /// use leptos_use::use_active_element; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let active_element = use_active_element(cx); +/// # fn Demo() -> impl IntoView { +/// let active_element = use_active_element(); /// -/// create_effect(cx, move |_| { +/// create_effect(move |_| { /// log!("focus changed to {:?}", active_element.get()); /// }); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// /// ## Server-Side Rendering /// /// On the server this returns a `Signal` that always contains the value `None`. -pub fn use_active_element(cx: Scope) -> Signal<Option<HtmlElement<AnyElement>>> { +pub fn use_active_element() -> Signal<Option<HtmlElement<AnyElement>>> { cfg_if! { if #[cfg(feature = "ssr")] { let get_active_element = || { None }; } else { let get_active_element = move || { document() .active_element() - .map(|el| el.to_leptos_element(cx)) + .map(|el| el.to_leptos_element()) }; }} - let (active_element, set_active_element) = create_signal(cx, get_active_element()); + let (active_element, set_active_element) = create_signal(get_active_element()); cfg_if! { if #[cfg(not(feature = "ssr"))] { let mut listener_options = AddEventListenerOptions::new(); listener_options.capture(true); let _ = use_event_listener_with_options( - cx, - window(), + window(), blur, move |event| { if event.related_target().is_some() { @@ -66,8 +65,7 @@ pub fn use_active_element(cx: Scope) -> Signal<Option<HtmlElement<AnyElement>>> ); let _ = use_event_listener_with_options( - cx, - window(), + window(), focus, move |_| { set_active_element.update(|el| *el = get_active_element()); diff --git a/src/use_breakpoints.rs b/src/use_breakpoints.rs index ebc7aee..0f6da51 100644 --- a/src/use_breakpoints.rs +++ b/src/use_breakpoints.rs @@ -18,9 +18,9 @@ use std::hash::Hash; /// # use leptos_use::{use_breakpoints, BreakpointsTailwind, breakpoints_tailwind}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// # -/// let screen_width = use_breakpoints(cx, breakpoints_tailwind()); +/// let screen_width = use_breakpoints(breakpoints_tailwind()); /// /// use BreakpointsTailwind::*; /// @@ -29,7 +29,7 @@ use std::hash::Hash; /// let lg_and_smaller = screen_width.le(Lg); /// let smaller_than_lg = screen_width.lt(Lg); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -69,14 +69,14 @@ use std::hash::Hash; /// } /// /// #[component] -/// fn Demo(cx: Scope) -> impl IntoView { -/// let screen_width = use_breakpoints(cx, my_breakpoints()); +/// fn Demo() -> impl IntoView { +/// let screen_width = use_breakpoints(my_breakpoints()); /// /// use MyBreakpoints::*; /// /// let laptop = screen_width.between(Laptop, Desktop); /// -/// view! { cx, } +/// view! { } /// } /// ``` /// @@ -89,9 +89,9 @@ use std::hash::Hash; /// # use leptos_use::{use_breakpoints, BreakpointsTailwind, breakpoints_tailwind}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// # -/// let screen_width = use_breakpoints(cx, breakpoints_tailwind()); +/// let screen_width = use_breakpoints(breakpoints_tailwind()); /// /// use BreakpointsTailwind::*; /// @@ -100,7 +100,7 @@ use std::hash::Hash; /// let lg_and_smaller = screen_width.is_le(Lg); /// let smaller_than_lg = screen_width.is_lt(Lg); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -109,16 +109,14 @@ use std::hash::Hash; /// Since internally this uses [`use_media_query`], which returns always `false` on the server, /// the returned methods also will return `false`. pub fn use_breakpoints<K: Eq + Hash + Debug + Clone>( - cx: Scope, breakpoints: HashMap<K, u32>, ) -> UseBreakpointsReturn<K> { - UseBreakpointsReturn { cx, breakpoints } + UseBreakpointsReturn { breakpoints } } /// Return type of [`use_breakpoints`] #[derive(Clone)] pub struct UseBreakpointsReturn<K: Eq + Hash + Debug + Clone> { - cx: Scope, breakpoints: HashMap<K, u32>, } @@ -165,7 +163,7 @@ macro_rules! impl_cmp_reactively { #[$attr] pub fn $fn(&self, key: K) -> Signal<bool> { if let Some(value) = self.breakpoints.get(&key) { - use_media_query(self.cx, format_media_query!($cmp, $suffix, value)) + use_media_query(format_media_query!($cmp, $suffix, value)) } else { self.not_found_signal(key) } @@ -195,7 +193,7 @@ impl<K: Eq + Hash + Debug + Clone> UseBreakpointsReturn<K> { fn not_found_signal(&self, key: K) -> Signal<bool> { error!("Breakpoint \"{:?}\" not found", key); - Signal::derive(self.cx, || false) + Signal::derive(|| false) } fn not_found(&self, key: K) -> bool { @@ -228,7 +226,7 @@ impl<K: Eq + Hash + Debug + Clone> UseBreakpointsReturn<K> { pub fn between(&self, min_key: K, max_key: K) -> Signal<bool> { if let Some(min) = self.breakpoints.get(&min_key) { if let Some(max) = self.breakpoints.get(&max_key) { - use_media_query(self.cx, Self::between_media_query(min, max)) + use_media_query(Self::between_media_query(min, max)) } else { self.not_found_signal(max_key) } @@ -254,7 +252,7 @@ impl<K: Eq + Hash + Debug + Clone> UseBreakpointsReturn<K> { pub fn current(&self) -> Signal<Vec<K>> { let this = self.clone(); - Signal::derive(self.cx, move || { + Signal::derive(move || { this.breakpoints .keys() .filter(|k| this.ge((**k).clone()).get()) diff --git a/src/use_color_mode.rs b/src/use_color_mode.rs index 4582ab6..a4f1d1c 100644 --- a/src/use_color_mode.rs +++ b/src/use_color_mode.rs @@ -30,14 +30,14 @@ use wasm_bindgen::JsCast; /// use leptos_use::{use_color_mode, UseColorModeReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let UseColorModeReturn { /// mode, // Signal<ColorMode::dark | ColorMode::light> /// set_mode, /// .. -/// } = use_color_mode(cx); +/// } = use_color_mode(); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -53,8 +53,8 @@ use wasm_bindgen::JsCast; /// use leptos_use::{ColorMode, use_color_mode, UseColorModeReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// # let UseColorModeReturn { mode, set_mode, .. } = use_color_mode(cx); +/// # fn Demo() -> impl IntoView { +/// # let UseColorModeReturn { mode, set_mode, .. } = use_color_mode(); /// # /// mode.get(); // ColorMode::Dark or ColorMode::Light /// @@ -62,7 +62,7 @@ use wasm_bindgen::JsCast; /// /// set_mode.set(ColorMode::Auto); // change to auto mode /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -73,9 +73,8 @@ use wasm_bindgen::JsCast; /// use leptos_use::{use_color_mode_with_options, UseColorModeOptions, UseColorModeReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let UseColorModeReturn { mode, set_mode, .. } = use_color_mode_with_options( -/// cx, /// UseColorModeOptions::default() /// .attribute("theme") // instead of writing to `class` /// .custom_modes(vec![ @@ -85,7 +84,7 @@ use wasm_bindgen::JsCast; /// ]), /// ); // Signal<ColorMode::Dark | ColorMode::Light | ColorMode::Custom("dim") | ColorMode::Custom("cafe")> /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -98,18 +97,15 @@ use wasm_bindgen::JsCast; /// * [`use_dark`] /// * [`use_preferred_dark`] /// * [`use_storage`] -pub fn use_color_mode(cx: Scope) -> UseColorModeReturn { - use_color_mode_with_options(cx, UseColorModeOptions::default()) +pub fn use_color_mode() -> UseColorModeReturn { + use_color_mode_with_options(UseColorModeOptions::default()) } /// Version of [`use_color_mode`] that takes a `UseColorModeOptions`. See [`use_color_mode`] for how to use. -pub fn use_color_mode_with_options<El, T>( - cx: Scope, - options: UseColorModeOptions<El, T>, -) -> UseColorModeReturn +pub fn use_color_mode_with_options<El, T>(options: UseColorModeOptions<El, T>) -> UseColorModeReturn where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { let UseColorModeOptions { @@ -136,9 +132,9 @@ where ]) .collect(); - let preferred_dark = use_preferred_dark(cx); + let preferred_dark = use_preferred_dark(); - let system = Signal::derive(cx, move || { + let system = Signal::derive(move || { if preferred_dark.get() { ColorMode::Dark } else { @@ -147,7 +143,6 @@ where }); let (store, set_store) = get_store_signal( - cx, initial_value, storage_signal, &storage_key, @@ -156,7 +151,7 @@ where listen_to_storage_changes, ); - let state = Signal::derive(cx, move || { + let state = Signal::derive(move || { let value = store.get(); if value == ColorMode::Auto { system.get() @@ -165,7 +160,7 @@ where } }); - let target = (cx, target).into(); + let target = (target).into(); let update_html_attrs = { move |target: ElementMaybeSignal<T, web_sys::Element>, @@ -228,7 +223,7 @@ where }); }; - create_effect(cx, { + create_effect({ let on_changed = on_changed.clone(); move |_| { @@ -236,14 +231,11 @@ where } }); - on_cleanup(cx, move || { + on_cleanup(move || { on_changed(state.get()); }); - let mode = Signal::derive( - cx, - move || if emit_auto { store.get() } else { state.get() }, - ); + let mode = Signal::derive(move || if emit_auto { store.get() } else { state.get() }); UseColorModeReturn { mode, @@ -268,7 +260,6 @@ pub enum ColorMode { cfg_if! { if #[cfg(feature = "storage")] { fn get_store_signal( - cx: Scope, initial_value: MaybeRwSignal<ColorMode>, storage_signal: Option<RwSignal<ColorMode>>, storage_key: &str, @@ -281,8 +272,7 @@ cfg_if! { if #[cfg(feature = "storage")] { (store.into(), set_store) } else if storage_enabled { let (store, set_store, _) = use_storage_with_options( - cx, - storage_key, + storage_key, initial_value, UseStorageOptions::default() .listen_to_storage_changes(listen_to_storage_changes) @@ -291,12 +281,11 @@ cfg_if! { if #[cfg(feature = "storage")] { (store, set_store) } else { - initial_value.into_signal(cx) + initial_value.into_signal() } } } else { fn get_store_signal( - cx: Scope, initial_value: MaybeRwSignal<ColorMode>, storage_signal: Option<RwSignal<ColorMode>>, _storage_key: &String, @@ -308,7 +297,7 @@ cfg_if! { if #[cfg(feature = "storage")] { let (store, set_store) = storage_signal.split(); (store.into(), set_store) } else { - initial_value.into_signal(cx) + initial_value.into_signal() } } }} @@ -358,7 +347,7 @@ pub struct UseColorModeOnChangeArgs { pub struct UseColorModeOptions<El, T> where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { /// Element that the color mode will be applied to. Defaults to `"html"`. diff --git a/src/use_css_var.rs b/src/use_css_var.rs index 254fbe5..64185f8 100644 --- a/src/use_css_var.rs +++ b/src/use_css_var.rs @@ -22,12 +22,12 @@ use wasm_bindgen::{JsCast, JsValue}; /// # use leptos_use::use_css_var; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let (color, set_color) = use_css_var(cx, "--color"); +/// # fn Demo() -> impl IntoView { +/// let (color, set_color) = use_css_var("--color"); /// /// set_color.set("red".to_string()); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -38,11 +38,11 @@ use wasm_bindgen::{JsCast, JsValue}; /// # use leptos_use::use_css_var; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let (key, set_key) = create_signal(cx, "--color".to_string()); -/// let (color, set_color) = use_css_var(cx, key); +/// # fn Demo() -> impl IntoView { +/// let (key, set_key) = create_signal("--color".to_string()); +/// let (color, set_color) = use_css_var(key); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -55,11 +55,10 @@ use wasm_bindgen::{JsCast, JsValue}; /// # use leptos_use::{use_css_var_with_options, UseCssVarOptions}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let el = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// let el = create_node_ref::<Div>(); /// /// let (color, set_color) = use_css_var_with_options( -/// cx, /// "--color", /// UseCssVarOptions::default() /// .target(el) @@ -67,7 +66,7 @@ use wasm_bindgen::{JsCast, JsValue}; /// .observe(true), /// ); /// -/// view! { cx, +/// view! { /// <div node_ref=el>"..."</div> /// } /// # } @@ -75,24 +74,22 @@ use wasm_bindgen::{JsCast, JsValue}; /// /// ## Server-Side Rendering /// -/// On the server this simply returns `create_signal(cx, options.initial_value)`. +/// On the server this simply returns `create_signal(options.initial_value)`. pub fn use_css_var( - cx: Scope, prop: impl Into<MaybeSignal<String>>, ) -> (ReadSignal<String>, WriteSignal<String>) { - use_css_var_with_options(cx, prop, UseCssVarOptions::default()) + use_css_var_with_options(prop, UseCssVarOptions::default()) } /// Version of [`use_css_var`] that takes a `UseCssVarOptions`. See [`use_css_var`] for how to use. pub fn use_css_var_with_options<P, El, T>( - cx: Scope, prop: P, options: UseCssVarOptions<El, T>, ) -> (ReadSignal<String>, WriteSignal<String>) where P: Into<MaybeSignal<String>>, El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { let UseCssVarOptions { @@ -102,10 +99,10 @@ where .. } = options; - let (variable, set_variable) = create_signal(cx, initial_value.clone()); + let (variable, set_variable) = create_signal(initial_value.clone()); cfg_if! { if #[cfg(not(feature = "ssr"))] { - let el_signal = (cx, target).into(); + let el_signal = (target).into(); let prop = prop.into(); let update_css_var = { @@ -138,8 +135,7 @@ where vec![JsValue::from_str("style")], )); use_mutation_observer_with_options::<ElementMaybeSignal<T, web_sys::Element>, T, _>( - cx, - el_signal, + el_signal, move |_, _| update_css_var(), init, ); @@ -153,16 +149,14 @@ where let prop = prop.clone(); let _ = watch_with_options( - cx, - move || (el_signal.get(), prop.get()), + move || (el_signal.get(), prop.get()), move |_, _, _| update_css_var(), WatchOptions::default().immediate(true), ); } let _ = watch( - cx, - move || variable.get(), + move || variable.get(), move |val, _, _| { if let Some(el) = el_signal.get() { let el = el.into().unchecked_into::<web_sys::HtmlElement>(); @@ -182,7 +176,7 @@ where pub struct UseCssVarOptions<El, T> where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { /// The target element to read the variable from and set the variable on. diff --git a/src/use_cycle_list.rs b/src/use_cycle_list.rs index a3acc3b..9f094f0 100644 --- a/src/use_cycle_list.rs +++ b/src/use_cycle_list.rs @@ -15,9 +15,8 @@ use leptos::*; /// use leptos_use::{use_cycle_list, UseCycleListReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let UseCycleListReturn { state, next, prev, .. } = use_cycle_list( -/// cx, /// vec!["Dog", "Cat", "Lizard", "Shark", "Whale", "Dolphin", "Octopus", "Seal"] /// ); /// @@ -27,11 +26,10 @@ use leptos::*; /// /// log!("{}", state.get()); // "Seal" /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` pub fn use_cycle_list<T, L>( - cx: Scope, list: L, ) -> UseCycleListReturn< T, @@ -44,11 +42,10 @@ where T: Clone + PartialEq + 'static, L: Into<MaybeSignal<Vec<T>>>, { - use_cycle_list_with_options(cx, list, UseCycleListOptions::default()) + use_cycle_list_with_options(list, UseCycleListOptions::default()) } pub fn use_cycle_list_with_options<T, L>( - cx: Scope, list: L, options: UseCycleListOptions<T>, ) -> UseCycleListReturn< @@ -83,12 +80,12 @@ where } }; - let (state, set_state) = get_initial_value().into_signal(cx); + let (state, set_state) = get_initial_value().into_signal(); let index = { let list = list.clone(); - create_memo(cx, move |_| { + create_memo(move |_| { list.with(|list| { let index = get_position(&state.get(), list); @@ -157,12 +154,7 @@ where let _ = { let set = set.clone(); - leptos::watch( - cx, - move || list.get(), - move |_, _, _| set(index.get()), - false, - ) + leptos::watch(move || list.get(), move |_, _, _| set(index.get()), false) }; UseCycleListReturn { diff --git a/src/use_debounce_fn.rs b/src/use_debounce_fn.rs index 44c938a..a80e080 100644 --- a/src/use_debounce_fn.rs +++ b/src/use_debounce_fn.rs @@ -20,7 +20,7 @@ use std::rc::Rc; /// # use leptos_use::use_debounce_fn; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let mut debounced_fn = use_debounce_fn( /// || { /// // do something @@ -29,7 +29,7 @@ use std::rc::Rc; /// ); /// /// window_event_listener(resize, move |_| { debounced_fn(); }); -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -43,7 +43,7 @@ use std::rc::Rc; /// # use leptos_use::utils::DebounceOptions; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let mut debounced_fn = use_debounce_fn_with_options( /// || { /// // do something @@ -54,7 +54,7 @@ use std::rc::Rc; /// ); /// /// window_event_listener(resize, move |_| { debounced_fn(); }); -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// diff --git a/src/use_document_visibility.rs b/src/use_document_visibility.rs index 4b0185b..fe8b328 100644 --- a/src/use_document_visibility.rs +++ b/src/use_document_visibility.rs @@ -18,27 +18,27 @@ use leptos::*; /// # use leptos_use::use_document_visibility; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let visibility = use_document_visibility(cx); +/// # fn Demo() -> impl IntoView { +/// let visibility = use_document_visibility(); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// /// ## Server-Side Rendering /// /// On the server this returns a `Signal` that always contains the value `web_sys::VisibilityState::Hidden`. -pub fn use_document_visibility(cx: Scope) -> Signal<web_sys::VisibilityState> { +pub fn use_document_visibility() -> Signal<web_sys::VisibilityState> { cfg_if! { if #[cfg(feature = "ssr")] { let inital_visibility = web_sys::VisibilityState::Hidden; } else { let inital_visibility = document().visibility_state(); }} - let (visibility, set_visibility) = create_signal(cx, inital_visibility); + let (visibility, set_visibility) = create_signal(inital_visibility); cfg_if! { if #[cfg(not(feature = "ssr"))] { - let _ = use_event_listener(cx, document(), visibilitychange, move |_| { + let _ = use_event_listener(document(), visibilitychange, move |_| { set_visibility.set(document().visibility_state()); }); }} diff --git a/src/use_draggable.rs b/src/use_draggable.rs index 91ead28..714b3c9 100644 --- a/src/use_draggable.rs +++ b/src/use_draggable.rs @@ -23,8 +23,8 @@ use web_sys::PointerEvent; /// use leptos_use::core::Position; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let el = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// let el = create_node_ref::<Div>(); /// /// // `style` is a helper string "left: {x}px; top: {y}px;" /// let UseDraggableReturn { @@ -33,21 +33,20 @@ use web_sys::PointerEvent; /// style, /// .. /// } = use_draggable_with_options( -/// cx, /// el, /// UseDraggableOptions::default().initial_value(Position { x: 40.0, y: 40.0 }), /// ); /// -/// view! { cx, +/// view! { /// <div node_ref=el style=move || format!("position: fixed; {}", style.get())> /// Drag me! I am at { x }, { y } /// </div> /// } /// # } /// ``` -pub fn use_draggable<El, T>(cx: Scope, target: El) -> UseDraggableReturn +pub fn use_draggable<El, T>(target: El) -> UseDraggableReturn where - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, { use_draggable_with_options::< @@ -57,22 +56,21 @@ where web_sys::EventTarget, web_sys::EventTarget, web_sys::EventTarget, - >(cx, target, UseDraggableOptions::default()) + >(target, UseDraggableOptions::default()) } /// Version of [`use_draggable`] that takes a `UseDraggableOptions`. See [`use_draggable`] for how to use. pub fn use_draggable_with_options<El, T, DragEl, DragT, HandleEl, HandleT>( - cx: Scope, target: El, options: UseDraggableOptions<DragEl, DragT, HandleEl, HandleT>, ) -> UseDraggableReturn where - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, DragEl: Clone, - (Scope, DragEl): Into<ElementMaybeSignal<DragT, web_sys::EventTarget>>, + DragEl: Into<ElementMaybeSignal<DragT, web_sys::EventTarget>>, DragT: Into<web_sys::EventTarget> + Clone + 'static, - (Scope, HandleEl): Into<ElementMaybeSignal<HandleT, web_sys::EventTarget>>, + HandleEl: Into<ElementMaybeSignal<HandleT, web_sys::EventTarget>>, HandleT: Into<web_sys::EventTarget> + Clone + 'static, { let UseDraggableOptions { @@ -89,18 +87,18 @@ where .. } = options; - let target = (cx, target).into(); + let target = (target).into(); let dragging_handle = if let Some(handle) = handle { - let handle = (cx, handle).into(); - Signal::derive(cx, move || handle.get().map(|handle| handle.into())) + let handle = (handle).into(); + Signal::derive(move || handle.get().map(|handle| handle.into())) } else { let target = target.clone(); - Signal::derive(cx, move || target.get().map(|target| target.into())) + Signal::derive(move || target.get().map(|target| target.into())) }; - let (position, set_position) = initial_value.into_signal(cx); - let (start_position, set_start_position) = create_signal(cx, None::<Position>); + let (position, set_position) = initial_value.into_signal(); + let (start_position, set_start_position) = create_signal(None::<Position>); let filter_event = move |event: &PointerEvent| { let ty = event.pointer_type(); @@ -189,21 +187,18 @@ where listener_options.capture(true); let _ = use_event_listener_with_options( - cx, dragging_handle, pointerdown, on_pointer_down, listener_options.clone(), ); let _ = use_event_listener_with_options( - cx, dragging_element.clone(), pointermove, on_pointer_move, listener_options.clone(), ); let _ = use_event_listener_with_options( - cx, dragging_element, pointerup, on_pointer_up, @@ -211,12 +206,12 @@ where ); UseDraggableReturn { - x: Signal::derive(cx, move || position.get().x), - y: Signal::derive(cx, move || position.get().y), + x: Signal::derive(move || position.get().x), + y: Signal::derive(move || position.get().y), position, set_position, - is_dragging: Signal::derive(cx, move || start_position.get().is_some()), - style: Signal::derive(cx, move || { + is_dragging: Signal::derive(move || start_position.get().is_some()), + style: Signal::derive(move || { let position = position.get(); format!("left: {}px; top: {}px;", position.x, position.y) }), @@ -227,9 +222,9 @@ where #[derive(DefaultBuilder)] pub struct UseDraggableOptions<DragEl, DragT, HandleEl, HandleT> where - (Scope, DragEl): Into<ElementMaybeSignal<DragT, web_sys::EventTarget>>, + DragEl: Into<ElementMaybeSignal<DragT, web_sys::EventTarget>>, DragT: Into<web_sys::EventTarget> + Clone + 'static, - (Scope, HandleEl): Into<ElementMaybeSignal<HandleT, web_sys::EventTarget>>, + HandleEl: Into<ElementMaybeSignal<HandleT, web_sys::EventTarget>>, HandleT: Into<web_sys::EventTarget> + Clone + 'static, { /// Only start the dragging when click on the element directly. Defaults to `false`. diff --git a/src/use_drop_zone.rs b/src/use_drop_zone.rs index 93a6dec..964d4be 100644 --- a/src/use_drop_zone.rs +++ b/src/use_drop_zone.rs @@ -19,8 +19,8 @@ use leptos::*; /// # use leptos_use::{use_drop_zone_with_options, UseDropZoneOptions, UseDropZoneReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let drop_zone_el = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// let drop_zone_el = create_node_ref::<Div>(); /// /// let on_drop = |event| { /// // called when files are dropped on zone @@ -30,12 +30,11 @@ use leptos::*; /// is_over_drop_zone, /// .. /// } = use_drop_zone_with_options( -/// cx, /// drop_zone_el, /// UseDropZoneOptions::default().on_drop(on_drop) /// ); /// -/// view! { cx, +/// view! { /// <div node_ref=drop_zone_el> /// "Drop files here" /// </div> @@ -46,24 +45,23 @@ use leptos::*; /// ## Server-Side Rendering /// /// Please refer to ["Functions with Target Elements"](https://leptos-use.rs/server_side_rendering.html#functions-with-target-elements) -pub fn use_drop_zone<El, T>(cx: Scope, target: El) -> UseDropZoneReturn +pub fn use_drop_zone<El, T>(target: El) -> UseDropZoneReturn where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, { - use_drop_zone_with_options(cx, target, UseDropZoneOptions::default()) + use_drop_zone_with_options(target, UseDropZoneOptions::default()) } /// Version of [`use_drop_zone`] that takes a `UseDropZoneOptions`. See [`use_drop_zone`] for how to use. pub fn use_drop_zone_with_options<El, T>( - cx: Scope, target: El, options: UseDropZoneOptions, ) -> UseDropZoneReturn where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, { let UseDropZoneOptions { @@ -73,10 +71,10 @@ where mut on_over, } = options; - let (is_over_drop_zone, set_over_drop_zone) = create_signal(cx, false); - let (files, set_files) = create_signal(cx, Vec::<web_sys::File>::new()); + let (is_over_drop_zone, set_over_drop_zone) = create_signal(false); + let (files, set_files) = create_signal(Vec::<web_sys::File>::new()); - let counter = store_value(cx, 0_usize); + let counter = store_value(0_usize); let update_files = move |event: &web_sys::DragEvent| { if let Some(data_transfer) = event.data_transfer() { @@ -92,7 +90,7 @@ where } }; - let _ = use_event_listener(cx, target.clone(), dragenter, move |event| { + let _ = use_event_listener(target.clone(), dragenter, move |event| { event.prevent_default(); counter.update_value(|counter| *counter += 1); set_over_drop_zone.set(true); @@ -105,7 +103,7 @@ where }); }); - let _ = use_event_listener(cx, target.clone(), dragover, move |event| { + let _ = use_event_listener(target.clone(), dragover, move |event| { event.prevent_default(); update_files(&event); on_over(UseDropZoneEvent { @@ -114,7 +112,7 @@ where }); }); - let _ = use_event_listener(cx, target.clone(), dragleave, move |event| { + let _ = use_event_listener(target.clone(), dragleave, move |event| { event.prevent_default(); counter.update_value(|counter| *counter -= 1); if counter.get_value() == 0 { @@ -129,7 +127,7 @@ where }); }); - let _ = use_event_listener(cx, target, drop, move |event| { + let _ = use_event_listener(target, drop, move |event| { event.prevent_default(); counter.update_value(|counter| *counter = 0); set_over_drop_zone.set(false); diff --git a/src/use_element_hover.rs b/src/use_element_hover.rs index a363cdb..3b8be30 100644 --- a/src/use_element_hover.rs +++ b/src/use_element_hover.rs @@ -21,11 +21,11 @@ use web_sys::AddEventListenerOptions; /// # use leptos_use::use_element_hover; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let el = create_node_ref::<Button>(cx); -/// let is_hovered = use_element_hover(cx, el); +/// # fn Demo() -> impl IntoView { +/// let el = create_node_ref::<Button>(); +/// let is_hovered = use_element_hover(el); /// -/// view! { cx, +/// view! { /// <button node_ref=el>{ move || format!("{:?}", is_hovered.get()) }</button> /// } /// # } @@ -34,25 +34,24 @@ use web_sys::AddEventListenerOptions; /// ## Server-Side Rendering /// /// Please refer to ["Functions with Target Elements"](https://leptos-use.rs/server_side_rendering.html#functions-with-target-elements) -pub fn use_element_hover<El, T>(cx: Scope, el: El) -> Signal<bool> +pub fn use_element_hover<El, T>(el: El) -> Signal<bool> where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, { - use_element_hover_with_options(cx, el, UseElementHoverOptions::default()) + use_element_hover_with_options(el, UseElementHoverOptions::default()) } /// Version of [`use_element_hover`] that takes a `UseElementHoverOptions`. See [`use_element_hover`] for how to use. pub fn use_element_hover_with_options<El, T>( - cx: Scope, el: El, options: UseElementHoverOptions, ) -> Signal<bool> where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, { let UseElementHoverOptions { @@ -60,7 +59,7 @@ where delay_leave, } = options; - let (is_hovered, set_hovered) = create_signal(cx, false); + let (is_hovered, set_hovered) = create_signal(false); let mut timer: Option<TimeoutHandle> = None; @@ -86,20 +85,14 @@ where listener_options.passive(true); let _ = use_event_listener_with_options( - cx, el.clone(), mouseenter, move |_| toggle(true), listener_options.clone(), ); - let _ = use_event_listener_with_options( - cx, - el, - mouseleave, - move |_| toggle(false), - listener_options, - ); + let _ = + use_event_listener_with_options(el, mouseleave, move |_| toggle(false), listener_options); is_hovered.into() } diff --git a/src/use_element_size.rs b/src/use_element_size.rs index 4b429ad..64e4f3b 100644 --- a/src/use_element_size.rs +++ b/src/use_element_size.rs @@ -25,12 +25,12 @@ use wasm_bindgen::JsCast; /// # use leptos_use::{use_element_size, UseElementSizeReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let el = create_node_ref(cx); +/// # fn Demo() -> impl IntoView { +/// let el = create_node_ref(); /// -/// let UseElementSizeReturn { width, height } = use_element_size(cx, el); +/// let UseElementSizeReturn { width, height } = use_element_size(el); /// -/// view! { cx, +/// view! { /// <div node_ref=el> /// "Width: " {width} /// "Height: " {height} @@ -46,31 +46,30 @@ use wasm_bindgen::JsCast; /// ## See also /// /// - [`use_resize_observer`] -pub fn use_element_size<El, T>(cx: Scope, target: El) -> UseElementSizeReturn +pub fn use_element_size<El, T>(target: El) -> UseElementSizeReturn where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { - use_element_size_with_options(cx, target, UseElementSizeOptions::default()) + use_element_size_with_options(target, UseElementSizeOptions::default()) } /// Version of [`use_element_size`] that takes a `UseElementSizeOptions`. See [`use_element_size`] for how to use. pub fn use_element_size_with_options<El, T>( - cx: Scope, target: El, options: UseElementSizeOptions, ) -> UseElementSizeReturn where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { let window = window(); let box_ = options.box_; let initial_size = options.initial_size; - let target = (cx, target).into(); + let target = (target).into(); let is_svg = { let target = target.clone(); @@ -88,14 +87,13 @@ where } }; - let (width, set_width) = create_signal(cx, options.initial_size.width); - let (height, set_height) = create_signal(cx, options.initial_size.height); + let (width, set_width) = create_signal(options.initial_size.width); + let (height, set_height) = create_signal(options.initial_size.height); { let target = target.clone(); let _ = use_resize_observer_with_options::<ElementMaybeSignal<T, web_sys::Element>, _, _>( - cx, target.clone(), move |entries, _| { let entry = &entries[0]; @@ -150,7 +148,6 @@ where } let _ = watch_with_options( - cx, move || target.get(), move |ele, _, _| { if ele.is_some() { diff --git a/src/use_element_visibility.rs b/src/use_element_visibility.rs index 8aa4d6e..d71d8d0 100644 --- a/src/use_element_visibility.rs +++ b/src/use_element_visibility.rs @@ -18,12 +18,12 @@ use std::marker::PhantomData; /// # use leptos_use::use_element_visibility; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let el = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// let el = create_node_ref::<Div>(); /// -/// let is_visible = use_element_visibility(cx, el); +/// let is_visible = use_element_visibility(el); /// -/// view! { cx, +/// view! { /// <div node_ref=el> /// <h1>{is_visible}</h1> /// </div> @@ -38,35 +38,32 @@ use std::marker::PhantomData; /// ## See also /// /// * [`use_intersection_observer`] -pub fn use_element_visibility<El, T>(cx: Scope, target: El) -> Signal<bool> +pub fn use_element_visibility<El, T>(target: El) -> Signal<bool> where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { use_element_visibility_with_options::<El, T, web_sys::Element, web_sys::Element>( - cx, target, UseElementVisibilityOptions::default(), ) } pub fn use_element_visibility_with_options<El, T, ContainerEl, ContainerT>( - cx: Scope, target: El, options: UseElementVisibilityOptions<ContainerEl, ContainerT>, ) -> Signal<bool> where - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, - (Scope, ContainerEl): Into<ElementMaybeSignal<ContainerT, web_sys::Element>>, + ContainerEl: Into<ElementMaybeSignal<ContainerT, web_sys::Element>>, ContainerT: Into<web_sys::Element> + Clone + 'static, { - let (is_visible, set_visible) = create_signal(cx, false); + let (is_visible, set_visible) = create_signal(false); use_intersection_observer_with_options( - cx, - (cx, target).into(), + (target).into(), move |entries, _| { set_visible.set(entries[0].is_intersecting()); }, @@ -80,7 +77,7 @@ where #[derive(DefaultBuilder)] pub struct UseElementVisibilityOptions<El, T> where - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { /// A `web_sys::Element` or `web_sys::Document` object which is an ancestor of the intended `target`, diff --git a/src/use_event_listener.rs b/src/use_event_listener.rs index c4b0746..f80a645 100644 --- a/src/use_event_listener.rs +++ b/src/use_event_listener.rs @@ -19,11 +19,11 @@ use wasm_bindgen::JsCast; /// # use leptos_use::use_event_listener; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// use_event_listener(cx, document(), visibilitychange, |evt| { +/// # fn Demo() -> impl IntoView { +/// use_event_listener(document(), visibilitychange, |evt| { /// log!("{:?}", evt); /// }); -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -36,19 +36,19 @@ use wasm_bindgen::JsCast; /// # use leptos_use::use_event_listener; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let element = create_node_ref(cx); +/// # fn Demo() -> impl IntoView { +/// let element = create_node_ref(); /// -/// use_event_listener(cx, element, click, |evt| { +/// use_event_listener(element, click, |evt| { /// log!("click from element {:?}", event_target::<web_sys::HtmlDivElement>(&evt)); /// }); /// -/// let (cond, set_cond) = create_signal(cx, true); +/// let (cond, set_cond) = create_signal(true); /// -/// view! { cx, +/// view! { /// <Show /// when=move || cond.get() -/// fallback=move |cx| view! { cx, <div node_ref=element>"Condition false"</div> } +/// fallback=move || view! { <div node_ref=element>"Condition false"</div> } /// > /// <div node_ref=element>"Condition true"</div> /// </Show> @@ -65,34 +65,28 @@ use wasm_bindgen::JsCast; /// # use leptos_use::use_event_listener; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let cleanup = use_event_listener(cx, document().body(), keydown, |evt: KeyboardEvent| { +/// # fn Demo() -> impl IntoView { +/// let cleanup = use_event_listener(document().body(), keydown, |evt: KeyboardEvent| { /// log!("{}", &evt.key()); /// }); /// /// cleanup(); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// /// ## Server-Side Rendering /// /// Please refer to ["Functions with Target Elements"](https://leptos-use.rs/server_side_rendering.html#functions-with-target-elements) -pub fn use_event_listener<Ev, El, T, F>( - cx: Scope, - target: El, - event: Ev, - handler: F, -) -> impl Fn() + Clone +pub fn use_event_listener<Ev, El, T, F>(target: El, event: Ev, handler: F) -> impl Fn() + Clone where Ev: EventDescriptor + 'static, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, F: FnMut(<Ev as EventDescriptor>::EventType) + 'static, { use_event_listener_with_options( - cx, target, event, handler, @@ -102,7 +96,6 @@ where /// Version of [`use_event_listener`] that takes `web_sys::AddEventListenerOptions`. See the docs for [`use_event_listener`] for how to use. pub fn use_event_listener_with_options<Ev, El, T, F>( - cx: Scope, target: El, event: Ev, handler: F, @@ -110,7 +103,7 @@ pub fn use_event_listener_with_options<Ev, El, T, F>( ) -> impl Fn() + Clone where Ev: EventDescriptor + 'static, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, F: FnMut(<Ev as EventDescriptor>::EventType) + 'static, { @@ -130,7 +123,7 @@ where let event_name = event.name(); - let signal = (cx, target).into(); + let signal = (target).into(); let prev_element: Rc<RefCell<Option<web_sys::EventTarget>>> = Rc::new(RefCell::new(signal.get_untracked().map(|e| e.into()))); @@ -149,7 +142,6 @@ where let cleanup_prev_element = cleanup_prev_element.clone(); watch_with_options( - cx, move || signal.get().map(|e| e.into()), move |element, _, _| { cleanup_prev_element(); @@ -172,7 +164,7 @@ where cleanup_prev_element(); }; - on_cleanup(cx, stop.clone()); + on_cleanup(stop.clone()); stop } diff --git a/src/use_favicon.rs b/src/use_favicon.rs index 93f5040..f970f44 100644 --- a/src/use_favicon.rs +++ b/src/use_favicon.rs @@ -19,13 +19,13 @@ use wasm_bindgen::JsCast; /// # use leptos_use::use_favicon; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// # -/// let (icon, set_icon) = use_favicon(cx); +/// let (icon, set_icon) = use_favicon(); /// /// set_icon.set(Some("dark.png".to_string())); // change current icon /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -39,33 +39,31 @@ use wasm_bindgen::JsCast; /// # use leptos_use::{use_favicon_with_options, UseFaviconOptions, use_preferred_dark}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// # -/// let is_dark = use_preferred_dark(cx); +/// let is_dark = use_preferred_dark(); /// /// let (icon, _) = use_favicon_with_options( -/// cx, /// UseFaviconOptions::default().new_icon( -/// Signal::derive(cx, move || { +/// Signal::derive(move || { /// Some((if is_dark.get() { "dark.png" } else { "light.png" }).to_string()) /// }), /// ) /// ); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// /// ## Server-Side Rendering /// /// On the server only the signals work but no favicon will be changed obviously. -pub fn use_favicon(cx: Scope) -> (Signal<Option<String>>, WriteSignal<Option<String>>) { - use_favicon_with_options(cx, UseFaviconOptions::default()) +pub fn use_favicon() -> (Signal<Option<String>>, WriteSignal<Option<String>>) { + use_favicon_with_options(UseFaviconOptions::default()) } /// Version of [`use_favicon`] that accepts a `UseFaviconOptions`. See [`use_favicon`] for more details. pub fn use_favicon_with_options( - cx: Scope, options: UseFaviconOptions, ) -> (Signal<Option<String>>, WriteSignal<Option<String>>) { let UseFaviconOptions { @@ -74,7 +72,7 @@ pub fn use_favicon_with_options( rel, } = options; - let (favicon, set_favicon) = new_icon.into_signal(cx); + let (favicon, set_favicon) = new_icon.into_signal(); cfg_if! { if #[cfg(not(feature = "ssr"))] { let link_selector = format!("link[rel*=\"{rel}\"]"); @@ -94,8 +92,7 @@ pub fn use_favicon_with_options( }; let _ = watch( - cx, - move || favicon.get(), + move || favicon.get(), move |new_icon, prev_icon, _| { if Some(new_icon) != prev_icon { if let Some(new_icon) = new_icon { diff --git a/src/use_intersection_observer.rs b/src/use_intersection_observer.rs index b43581f..fd462c3 100644 --- a/src/use_intersection_observer.rs +++ b/src/use_intersection_observer.rs @@ -23,19 +23,18 @@ use wasm_bindgen::prelude::*; /// # use leptos_use::use_intersection_observer; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let el = create_node_ref::<Div>(cx); -/// let (is_visible, set_visible) = create_signal(cx, false); +/// # fn Demo() -> impl IntoView { +/// let el = create_node_ref::<Div>(); +/// let (is_visible, set_visible) = create_signal(false); /// /// use_intersection_observer( -/// cx, /// el, /// move |entries, _| { /// set_visible.set(entries[0].is_intersecting()); /// }, /// ); /// -/// view! { cx, +/// view! { /// <div node_ref=el> /// <h1>"Hello World"</h1> /// </div> @@ -51,17 +50,15 @@ use wasm_bindgen::prelude::*; /// /// * [`use_element_visibility`] pub fn use_intersection_observer<El, T, F>( - cx: Scope, target: El, callback: F, ) -> UseIntersectionObserverReturn<impl Fn() + Clone, impl Fn() + Clone, impl Fn() + Clone> where - (Scope, El): Into<ElementsMaybeSignal<T, web_sys::Element>>, + El: Into<ElementsMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, F: FnMut(Vec<web_sys::IntersectionObserverEntry>, web_sys::IntersectionObserver) + 'static, { use_intersection_observer_with_options::<El, T, web_sys::Element, web_sys::Element, F>( - cx, target, callback, UseIntersectionObserverOptions::default(), @@ -70,15 +67,14 @@ where /// Version of [`use_intersection_observer`] that takes a [`UseIntersectionObserverOptions`]. See [`use_intersection_observer`] for how to use. pub fn use_intersection_observer_with_options<El, T, RootEl, RootT, F>( - cx: Scope, target: El, mut callback: F, options: UseIntersectionObserverOptions<RootEl, RootT>, ) -> UseIntersectionObserverReturn<impl Fn() + Clone, impl Fn() + Clone, impl Fn() + Clone> where - (Scope, El): Into<ElementsMaybeSignal<T, web_sys::Element>>, + El: Into<ElementsMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, - (Scope, RootEl): Into<ElementMaybeSignal<RootT, web_sys::Element>>, + RootEl: Into<ElementMaybeSignal<RootT, web_sys::Element>>, RootT: Into<web_sys::Element> + Clone + 'static, F: FnMut(Vec<web_sys::IntersectionObserverEntry>, web_sys::IntersectionObserver) + 'static, { @@ -104,7 +100,7 @@ where ) .into_js_value(); - let (is_active, set_active) = create_signal(cx, immediate); + let (is_active, set_active) = create_signal(immediate); let observer: Rc<RefCell<Option<web_sys::IntersectionObserver>>> = Rc::new(RefCell::new(None)); @@ -118,14 +114,13 @@ where } }; - let targets = (cx, target).into(); - let root = root.map(|root| (cx, root).into()); + let targets = (target).into(); + let root = root.map(|root| (root).into()); let stop_watch = { let cleanup = cleanup.clone(); watch_with_options( - cx, move || { ( targets.get(), @@ -182,7 +177,7 @@ where } }; - on_cleanup(cx, stop.clone()); + on_cleanup(stop.clone()); let pause = { let cleanup = cleanup.clone(); @@ -208,7 +203,7 @@ where #[derive(DefaultBuilder)] pub struct UseIntersectionObserverOptions<El, T> where - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { /// If `true`, the `IntersectionObserver` will be attached immediately. Otherwise it diff --git a/src/use_interval.rs b/src/use_interval.rs index 27b49b0..244a321 100644 --- a/src/use_interval.rs +++ b/src/use_interval.rs @@ -17,15 +17,15 @@ use leptos::*; /// # use leptos_use::{use_interval, UseIntervalReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let UseIntervalReturn { /// counter, /// reset, /// is_active, /// pause, /// resume -/// } = use_interval( cx, 200 ); -/// # view! { cx, } +/// } = use_interval( 200 ); +/// # view! { } /// # } /// ``` /// @@ -33,18 +33,16 @@ use leptos::*; /// /// On the server this function will simply be ignored. pub fn use_interval<N>( - cx: Scope, interval: N, ) -> UseIntervalReturn<impl Fn() + Clone, impl Fn() + Clone, impl Fn() + Clone> where N: Into<MaybeSignal<u64>>, { - use_interval_with_options(cx, interval, UseIntervalOptions::default()) + use_interval_with_options(interval, UseIntervalOptions::default()) } /// Version of [`use_interval`] that takes `UseIntervalOptions`. See [`use_interval`] for how to use. pub fn use_interval_with_options<N>( - cx: Scope, interval: N, options: UseIntervalOptions, ) -> UseIntervalReturn<impl Fn() + Clone, impl Fn() + Clone, impl Fn() + Clone> @@ -56,7 +54,7 @@ where callback, } = options; - let (counter, set_counter) = create_signal(cx, 0u64); + let (counter, set_counter) = create_signal(0u64); let update = move || set_counter.update(|count| *count += 1); let reset = move || set_counter.set(0); @@ -71,7 +69,6 @@ where pause, resume, } = use_interval_fn_with_options( - cx, cb, interval, UseIntervalFnOptions { diff --git a/src/use_interval_fn.rs b/src/use_interval_fn.rs index dc8072b..9984ab5 100644 --- a/src/use_interval_fn.rs +++ b/src/use_interval_fn.rs @@ -23,15 +23,14 @@ use std::time::Duration; /// # use leptos_use::utils::Pausable; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let Pausable { pause, resume, is_active } = use_interval_fn( -/// cx, /// || { /// // do something /// }, /// 1000, /// ); -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -39,7 +38,6 @@ use std::time::Duration; /// /// On the server this function will simply be ignored. pub fn use_interval_fn<CbFn, N>( - cx: Scope, callback: CbFn, interval: N, ) -> Pausable<impl Fn() + Clone, impl Fn() + Clone> @@ -47,12 +45,11 @@ where CbFn: Fn() + Clone + 'static, N: Into<MaybeSignal<u64>>, { - use_interval_fn_with_options(cx, callback, interval, UseIntervalFnOptions::default()) + use_interval_fn_with_options(callback, interval, UseIntervalFnOptions::default()) } /// Version of [`use_interval_fn`] that takes `UseIntervalFnOptions`. See [`use_interval_fn`] for how to use. pub fn use_interval_fn_with_options<CbFn, N>( - cx: Scope, callback: CbFn, interval: N, options: UseIntervalFnOptions, @@ -68,7 +65,7 @@ where let timer: Rc<Cell<Option<IntervalHandle>>> = Rc::new(Cell::new(None)); - let (is_active, set_active) = create_signal(cx, false); + let (is_active, set_active) = create_signal(false); let clean = { let timer = Rc::clone(&timer); @@ -119,7 +116,6 @@ where let resume = resume.clone(); let stop_watch = watch( - cx, move || interval.get(), move |_, _, _| { if is_active.get() { @@ -128,10 +124,10 @@ where }, false, ); - on_cleanup(cx, stop_watch); + on_cleanup(stop_watch); } - on_cleanup(cx, pause.clone()); + on_cleanup(pause.clone()); Pausable { is_active: is_active.into(), diff --git a/src/use_intl_number_format.rs b/src/use_intl_number_format.rs index 94bd69e..ef74094 100644 --- a/src/use_intl_number_format.rs +++ b/src/use_intl_number_format.rs @@ -23,14 +23,14 @@ use wasm_bindgen::{JsCast, JsValue}; /// # use leptos_use::{use_intl_number_format, UseIntlNumberFormatOptions}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let (number, set_number) = create_signal(cx, 3500); +/// # fn Demo() -> impl IntoView { +/// let (number, set_number) = create_signal(3500); /// /// let number_format = use_intl_number_format(UseIntlNumberFormatOptions::default()); /// -/// let formatted = number_format.format::<u16>(cx, number); // "3,500" if in US English locale +/// let formatted = number_format.format::<u16>(number); // "3,500" if in US English locale /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -45,42 +45,42 @@ use wasm_bindgen::{JsCast, JsValue}; /// # use leptos_use::{use_intl_number_format, UseIntlNumberFormatOptions}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let number = 123456.789_f32; /// /// // German uses comma as decimal separator and period for thousands /// let number_format = use_intl_number_format( /// UseIntlNumberFormatOptions::default().locale("de-DE"), /// ); -/// let formatted = number_format.format(cx, number); // 123.456,789 +/// let formatted = number_format.format(number); // 123.456,789 /// /// // Arabic in most Arabic speaking countries uses real Arabic digits /// let number_format = use_intl_number_format( /// UseIntlNumberFormatOptions::default().locale("ar-EG"), /// ); -/// let formatted = number_format.format(cx, number); // Ω‘Ω’Ω£Ω€Ω₯Ω¦Ω«Ω§Ω¨Ω© +/// let formatted = number_format.format(number); // Ω‘Ω’Ω£Ω€Ω₯Ω¦Ω«Ω§Ω¨Ω© /// /// // India uses thousands/lakh/crore separators /// let number_format = use_intl_number_format( /// UseIntlNumberFormatOptions::default().locale("en-IN"), /// ); -/// let formatted = number_format.format(cx, number); // 1,23,456.789 +/// let formatted = number_format.format(number); // 1,23,456.789 /// /// // the nu extension key requests a numbering system, e.g. Chinese decimal /// let number_format = use_intl_number_format( /// UseIntlNumberFormatOptions::default().locale("zh-Hans-CN-u-nu-hanidec"), /// ); -/// let formatted = number_format.format(cx, number); // δΈ€δΊŒδΈ‰,ε››δΊ”ε…­.七八九 +/// let formatted = number_format.format(number); // δΈ€δΊŒδΈ‰,ε››δΊ”ε…­.七八九 /// /// // when requesting a language that may not be supported, such as /// // Balinese, include a fallback language, in this case Indonesian /// let number_format = use_intl_number_format( /// UseIntlNumberFormatOptions::default().locales(vec!["ban".to_string(), "id".to_string()]), /// ); -/// let formatted = number_format.format(cx, number); // 123.456,789 +/// let formatted = number_format.format(number); // 123.456,789 /// /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -93,7 +93,7 @@ use wasm_bindgen::{JsCast, JsValue}; /// # use leptos_use::{NumberStyle, UnitDisplay, use_intl_number_format, UseIntlNumberFormatOptions}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let number = 123456.789_f64; /// /// // request a currency format @@ -103,7 +103,7 @@ use wasm_bindgen::{JsCast, JsValue}; /// .style(NumberStyle::Currency) /// .currency("EUR"), /// ); -/// let formatted = number_format.format(cx, number); // 123.456,79 € +/// let formatted = number_format.format(number); // 123.456,79 € /// /// // the Japanese yen doesn't use a minor unit /// let number_format = use_intl_number_format( @@ -112,7 +112,7 @@ use wasm_bindgen::{JsCast, JsValue}; /// .style(NumberStyle::Currency) /// .currency("JPY"), /// ); -/// let formatted = number_format.format(cx, number); // οΏ₯123,457 +/// let formatted = number_format.format(number); // οΏ₯123,457 /// /// // limit to three significant digits /// let number_format = use_intl_number_format( @@ -120,7 +120,7 @@ use wasm_bindgen::{JsCast, JsValue}; /// .locale("en-IN") /// .maximum_significant_digits(3), /// ); -/// let formatted = number_format.format(cx, number); // 1,23,000 +/// let formatted = number_format.format(number); // 1,23,000 /// /// // Formatting with units /// let number_format = use_intl_number_format( @@ -129,7 +129,7 @@ use wasm_bindgen::{JsCast, JsValue}; /// .style(NumberStyle::Unit) /// .unit("kilometer-per-hour"), /// ); -/// let formatted = number_format.format(cx, 50); // 50 km/h +/// let formatted = number_format.format(50); // 50 km/h /// /// let number_format = use_intl_number_format( /// UseIntlNumberFormatOptions::default() @@ -138,9 +138,9 @@ use wasm_bindgen::{JsCast, JsValue}; /// .unit("liter") /// .unit_display(UnitDisplay::Long), /// ); -/// let formatted = number_format.format(cx, 16); // 16 litres +/// let formatted = number_format.format(16); // 16 litres /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -603,7 +603,7 @@ pub struct UseIntlNumberFormatOptions { /// # use leptos_use::{use_intl_number_format, UseIntlNumberFormatOptions, NumberStyle}; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { + /// # fn Demo() -> impl IntoView { /// let nf = use_intl_number_format( /// UseIntlNumberFormatOptions::default() /// .style(NumberStyle::Currency) @@ -612,11 +612,11 @@ pub struct UseIntlNumberFormatOptions { /// .rounding_increment(5), /// ); /// - /// let formatted = nf.format(cx, 11.29); // "$11.30" - /// let formatted = nf.format(cx, 11.25); // "$11.25" - /// let formatted = nf.format(cx, 11.22); // "$11.20" + /// let formatted = nf.format(11.29); // "$11.30" + /// let formatted = nf.format(11.25); // "$11.25" + /// let formatted = nf.format(11.22); // "$11.20" /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` /// @@ -814,7 +814,7 @@ cfg_if! { if #[cfg(feature = "ssr")] { impl UseIntlNumberFormatReturn { /// Formats a number according to the [locale and formatting options](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#parameters) of this `Intl.NumberFormat` object. /// See [`use_intl_number_format`] for more information. - pub fn format<N>(&self, cx: Scope, number: impl Into<MaybeSignal<N>>) -> Signal<String> + pub fn format<N>(&self, number: impl Into<MaybeSignal<N>>) -> Signal<String> where N: Clone + Display + 'static, js_sys::Number: From<N>, @@ -822,13 +822,13 @@ impl UseIntlNumberFormatReturn { let number = number.into(); cfg_if! { if #[cfg(feature = "ssr")] { - Signal::derive(cx, move || { + Signal::derive(move || { format!("{}", number.get()) }) } else { let number_format = self.js_intl_number_format.clone(); - Signal::derive(cx, move || { + Signal::derive(move || { if let Ok(result) = number_format .format() .call1(&number_format, &js_sys::Number::from(number.get()).into()) @@ -848,7 +848,7 @@ impl UseIntlNumberFormatReturn { /// # use leptos_use::{NumberStyle, use_intl_number_format, UseIntlNumberFormatOptions}; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { + /// # fn Demo() -> impl IntoView { /// let nf = use_intl_number_format( /// UseIntlNumberFormatOptions::default() /// .locale("en-US") @@ -857,13 +857,13 @@ impl UseIntlNumberFormatReturn { /// .maximum_fraction_digits(0), /// ); /// - /// let formatted = nf.format_range(cx, 3, 5); // "$3 – $5" + /// let formatted = nf.format_range(3, 5); // "$3 – $5" /// /// // Note: the "approximately equals" symbol is added if /// // startRange and endRange round to the same values. - /// let formatted = nf.format_range(cx, 2.9, 3.1); // "~$3" + /// let formatted = nf.format_range(2.9, 3.1); // "~$3" /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` /// @@ -872,7 +872,7 @@ impl UseIntlNumberFormatReturn { /// # use leptos_use::{NumberStyle, use_intl_number_format, UseIntlNumberFormatOptions}; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { + /// # fn Demo() -> impl IntoView { /// let nf = use_intl_number_format( /// UseIntlNumberFormatOptions::default() /// .locale("es-ES") @@ -881,15 +881,14 @@ impl UseIntlNumberFormatReturn { /// .maximum_fraction_digits(0), /// ); /// - /// let formatted = nf.format_range(cx, 3, 5); // "3-5 €" - /// let formatted = nf.format_range(cx, 2.9, 3.1); // "~3 €" + /// let formatted = nf.format_range(3, 5); // "3-5 €" + /// let formatted = nf.format_range(2.9, 3.1); // "~3 €" /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` pub fn format_range<NStart, NEnd>( &self, - cx: Scope, start: impl Into<MaybeSignal<NStart>>, end: impl Into<MaybeSignal<NEnd>>, ) -> Signal<String> @@ -903,13 +902,13 @@ impl UseIntlNumberFormatReturn { let end = end.into(); cfg_if! { if #[cfg(feature = "ssr")] { - Signal::derive(cx, move || { + Signal::derive(move || { format!("{} - {}", start.get(), end.get()) }) } else { let number_format = self.js_intl_number_format.clone(); - Signal::derive(cx, move || { + Signal::derive(move || { if let Ok(function) = Reflect::get(&number_format, &"formatRange".into()) { let function = function.unchecked_into::<js_sys::Function>(); @@ -930,7 +929,7 @@ impl UseIntlNumberFormatReturn { // TODO : Allows locale-aware formatting of strings produced by this `Intl.NumberFormat` object. // pub fn format_to_parts<N>( // &self, - // cx: Scope, + // , // number: impl Into<MaybeSignal<N>>, // ) -> Signal<Vec<String>> // where @@ -940,7 +939,7 @@ impl UseIntlNumberFormatReturn { // let number = number.into(); // let number_format = self.js_intl_number_format.clone(); // - // Signal::derive(cx, move || { + // Signal::derive(move || { // let array = number_format.format_to_parts(number.get().into()); // // array diff --git a/src/use_media_query.rs b/src/use_media_query.rs index 88beeb3..3363276 100644 --- a/src/use_media_query.rs +++ b/src/use_media_query.rs @@ -21,13 +21,13 @@ use std::rc::Rc; /// # use leptos_use::use_media_query; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// # -/// let is_large_screen = use_media_query(cx, "(min-width: 1024px)"); +/// let is_large_screen = use_media_query("(min-width: 1024px)"); /// -/// let is_dark_preferred = use_media_query(cx, "(prefers-color-scheme: dark)"); +/// let is_dark_preferred = use_media_query("(prefers-color-scheme: dark)"); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -39,10 +39,10 @@ use std::rc::Rc; /// /// * [`use_preferred_dark`] /// * [`use_preferred_contrast`] -pub fn use_media_query(cx: Scope, query: impl Into<MaybeSignal<String>>) -> Signal<bool> { +pub fn use_media_query(query: impl Into<MaybeSignal<String>>) -> Signal<bool> { let query = query.into(); - let (matches, set_matches) = create_signal(cx, false); + let (matches, set_matches) = create_signal(false); cfg_if! { if #[cfg(not(feature = "ssr"))] { let media_query: Rc<RefCell<Option<web_sys::MediaQueryList>>> = Rc::new(RefCell::new(None)); @@ -75,8 +75,7 @@ pub fn use_media_query(cx: Scope, query: impl Into<MaybeSignal<String>>) -> Sign set_matches.set(media_query.matches()); remove_listener.replace(Some(Box::new(use_event_listener( - cx, - media_query.clone(), + media_query.clone(), change, listener.borrow().clone(), )))); @@ -92,9 +91,9 @@ pub fn use_media_query(cx: Scope, query: impl Into<MaybeSignal<String>>) -> Sign .replace(Box::new(move |_| update()) as Box<dyn CloneableFnMutWithArg<web_sys::Event>>); } - create_effect(cx, move |_| update()); + create_effect(move |_| update()); - on_cleanup(cx, cleanup); + on_cleanup(cleanup); }} matches.into() diff --git a/src/use_mouse.rs b/src/use_mouse.rs index b9d3833..b76b84b 100644 --- a/src/use_mouse.rs +++ b/src/use_mouse.rs @@ -23,11 +23,11 @@ use web_sys::AddEventListenerOptions; /// # use leptos_use::{use_mouse, UseMouseReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let UseMouseReturn { /// x, y, source_type, .. -/// } = use_mouse(cx); -/// # view! { cx, } +/// } = use_mouse(); +/// # view! { } /// # } /// ``` /// @@ -39,14 +39,13 @@ use web_sys::AddEventListenerOptions; /// # use leptos_use::{use_mouse_with_options, UseMouseOptions, UseMouseReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let UseMouseReturn { /// x, y, .. /// } = use_mouse_with_options( -/// cx, /// UseMouseOptions::default().touch(false) /// ); -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -72,42 +71,38 @@ use web_sys::AddEventListenerOptions; /// } /// /// #[component] -/// fn Demo(cx: Scope) -> impl IntoView { -/// let element = create_node_ref::<Div>(cx); +/// fn Demo() -> impl IntoView { +/// let element = create_node_ref::<Div>(); /// /// let UseMouseReturn { /// x, y, source_type, .. /// } = use_mouse_with_options( -/// cx, /// UseMouseOptions::default() /// .target(element) /// .coord_type(UseMouseCoordType::Custom(MyExtractor)) /// ); -/// view! { cx, <div node_ref=element></div> } +/// view! { <div node_ref=element></div> } /// } /// ``` /// /// ## Server-Side Rendering /// /// On the server this returns simple `Signal`s with the `initial_value`s. -pub fn use_mouse(cx: Scope) -> UseMouseReturn { - use_mouse_with_options(cx, Default::default()) +pub fn use_mouse() -> UseMouseReturn { + use_mouse_with_options(Default::default()) } /// Variant of [`use_mouse`] that accepts options. Please see [`use_mouse`] for how to use. -pub fn use_mouse_with_options<El, T, Ex>( - cx: Scope, - options: UseMouseOptions<El, T, Ex>, -) -> UseMouseReturn +pub fn use_mouse_with_options<El, T, Ex>(options: UseMouseOptions<El, T, Ex>) -> UseMouseReturn where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, Ex: UseMouseEventExtractor + Clone + 'static, { - let (x, set_x) = create_signal(cx, options.initial_value.x); - let (y, set_y) = create_signal(cx, options.initial_value.y); - let (source_type, set_source_type) = create_signal(cx, UseMouseSourceType::Unset); + let (x, set_x) = create_signal(options.initial_value.x); + let (y, set_y) = create_signal(options.initial_value.y); + let (source_type, set_source_type) = create_signal(UseMouseSourceType::Unset); let mouse_handler = { let coord_type = options.coord_type.clone(); @@ -167,38 +162,33 @@ where event_listener_options.passive(true); let _ = use_event_listener_with_options( - cx, - target.clone(), + target.clone(), mousemove, mouse_handler, event_listener_options.clone(), ); let _ = use_event_listener_with_options( - cx, - target.clone(), + target.clone(), dragover, drag_handler, event_listener_options.clone(), ); if options.touch && !matches!(options.coord_type, UseMouseCoordType::Movement) { let _ = use_event_listener_with_options( - cx, - target.clone(), + target.clone(), touchstart, touch_handler.clone(), event_listener_options.clone(), ); let _ = use_event_listener_with_options( - cx, - target.clone(), + target.clone(), touchmove, touch_handler, event_listener_options.clone(), ); if options.reset_on_touch_ends { let _ = use_event_listener_with_options( - cx, - target, + target, touchend, move |_| reset(), event_listener_options.clone(), @@ -221,7 +211,7 @@ where pub struct UseMouseOptions<El, T, Ex> where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::EventTarget>>, + El: Into<ElementMaybeSignal<T, web_sys::EventTarget>>, T: Into<web_sys::EventTarget> + Clone + 'static, Ex: UseMouseEventExtractor + Clone, { diff --git a/src/use_mutation_observer.rs b/src/use_mutation_observer.rs index f96d726..beb217f 100644 --- a/src/use_mutation_observer.rs +++ b/src/use_mutation_observer.rs @@ -22,15 +22,14 @@ use web_sys::MutationObserverInit; /// # use leptos_use::use_mutation_observer_with_options; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let el = create_node_ref::<Pre>(cx); -/// let (text, set_text) = create_signal(cx, "".to_string()); +/// # fn Demo() -> impl IntoView { +/// let el = create_node_ref::<Pre>(); +/// let (text, set_text) = create_signal("".to_string()); /// /// let mut init = web_sys::MutationObserverInit::new(); /// init.attributes(true); /// /// use_mutation_observer_with_options( -/// cx, /// el, /// move |mutations, _| { /// if let Some(mutation) = mutations.first() { @@ -40,7 +39,7 @@ use web_sys::MutationObserverInit; /// init, /// ); /// -/// view! { cx, +/// view! { /// <pre node_ref=el>{ text }</pre> /// } /// # } @@ -50,27 +49,25 @@ use web_sys::MutationObserverInit; /// /// Please refer to ["Functions with Target Elements"](https://leptos-use.rs/server_side_rendering.html#functions-with-target-elements) pub fn use_mutation_observer<El, T, F>( - cx: Scope, target: El, callback: F, ) -> UseMutationObserverReturn<impl Fn() + Clone> where - (Scope, El): Into<ElementsMaybeSignal<T, web_sys::Element>>, + El: Into<ElementsMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, F: FnMut(Vec<web_sys::MutationRecord>, web_sys::MutationObserver) + 'static, { - use_mutation_observer_with_options(cx, target, callback, MutationObserverInit::default()) + use_mutation_observer_with_options(target, callback, MutationObserverInit::default()) } /// Version of [`use_mutation_observer`] that takes a `web_sys::MutationObserverInit`. See [`use_mutation_observer`] for how to use. pub fn use_mutation_observer_with_options<El, T, F>( - cx: Scope, target: El, mut callback: F, options: web_sys::MutationObserverInit, ) -> UseMutationObserverReturn<impl Fn() + Clone> where - (Scope, El): Into<ElementsMaybeSignal<T, web_sys::Element>>, + El: Into<ElementsMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, F: FnMut(Vec<web_sys::MutationRecord>, web_sys::MutationObserver) + 'static, { @@ -90,7 +87,7 @@ where let observer: Rc<RefCell<Option<web_sys::MutationObserver>>> = Rc::new(RefCell::new(None)); - let is_supported = use_supported(cx, || JsValue::from("MutationObserver").js_in(&window())); + let is_supported = use_supported(|| JsValue::from("MutationObserver").js_in(&window())); let cleanup = { let observer = Rc::clone(&observer); @@ -104,13 +101,12 @@ where } }; - let targets = (cx, target).into(); + let targets = (target).into(); let stop_watch = { let cleanup = cleanup.clone(); leptos::watch( - cx, move || targets.get(), move |targets, _, _| { cleanup(); @@ -136,7 +132,7 @@ where stop_watch(); }; - on_cleanup(cx, stop.clone()); + on_cleanup(stop.clone()); UseMutationObserverReturn { is_supported, stop } } diff --git a/src/use_preferred_contrast.rs b/src/use_preferred_contrast.rs index 7255282..86c3ebe 100644 --- a/src/use_preferred_contrast.rs +++ b/src/use_preferred_contrast.rs @@ -11,11 +11,11 @@ use std::fmt::Display; /// # use leptos_use::use_preferred_contrast; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// # -/// let preferred_contrast = use_preferred_contrast(cx); +/// let preferred_contrast = use_preferred_contrast(); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -27,12 +27,12 @@ use std::fmt::Display; /// /// * [`use_media_query`] /// * [`use_preferred_dark`] -pub fn use_preferred_contrast(cx: Scope) -> Signal<PreferredContrast> { - let is_more = use_media_query(cx, "(prefers-contrast: more)"); - let is_less = use_media_query(cx, "(prefers-contrast: less)"); - let is_custom = use_media_query(cx, "(prefers-contrast: custom)"); +pub fn use_preferred_contrast() -> Signal<PreferredContrast> { + let is_more = use_media_query("(prefers-contrast: more)"); + let is_less = use_media_query("(prefers-contrast: less)"); + let is_custom = use_media_query("(prefers-contrast: custom)"); - Signal::derive(cx, move || { + Signal::derive(move || { if is_more.get() { PreferredContrast::More } else if is_less.get() { diff --git a/src/use_preferred_dark.rs b/src/use_preferred_dark.rs index ab56b8c..0f44831 100644 --- a/src/use_preferred_dark.rs +++ b/src/use_preferred_dark.rs @@ -10,11 +10,11 @@ use leptos::*; /// # use leptos_use::use_preferred_dark; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// # -/// let is_dark_preferred = use_preferred_dark(cx); +/// let is_dark_preferred = use_preferred_dark(); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -26,6 +26,6 @@ use leptos::*; /// /// * [`use_media_query`] /// * [`use_preferred_contrast`] -pub fn use_preferred_dark(cx: Scope) -> Signal<bool> { - use_media_query(cx, "(prefers-color-scheme: dark)") +pub fn use_preferred_dark() -> Signal<bool> { + use_media_query("(prefers-color-scheme: dark)") } diff --git a/src/use_raf_fn.rs b/src/use_raf_fn.rs index 9616f89..237cf00 100644 --- a/src/use_raf_fn.rs +++ b/src/use_raf_fn.rs @@ -21,38 +21,36 @@ use wasm_bindgen::JsCast; /// use leptos_use::utils::Pausable; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let (count, set_count) = create_signal(cx, 0); +/// # fn Demo() -> impl IntoView { +/// let (count, set_count) = create_signal(0); /// -/// let Pausable { pause, resume, is_active } = use_raf_fn(cx, move |_| { +/// let Pausable { pause, resume, is_active } = use_raf_fn(move |_| { /// set_count.update(|count| *count += 1); /// }); /// -/// view! { cx, <div>Count: { count }</div> } +/// view! { <div>Count: { count }</div> } /// } /// ``` /// /// You can use `use_raf_fn_with_options` and set `immediate` to `false`. In that case /// you have to call `resume()` before the `callback` is executed. pub fn use_raf_fn( - cx: Scope, callback: impl Fn(UseRafFnCallbackArgs) + Clone + 'static, ) -> Pausable<impl Fn() + Clone, impl Fn() + Clone> { - use_raf_fn_with_options(cx, callback, UseRafFnOptions::default()) + use_raf_fn_with_options(callback, UseRafFnOptions::default()) } /// Version of [`use_raf_fn`] that takes a `UseRafFnOptions`. See [`use_raf_fn`] for how to use. pub fn use_raf_fn_with_options( - cx: Scope, callback: impl Fn(UseRafFnCallbackArgs) + Clone + 'static, options: UseRafFnOptions, ) -> Pausable<impl Fn() + Clone, impl Fn() + Clone> { let UseRafFnOptions { immediate } = options; - let previous_frame_timestamp = store_value(cx, 0.0_f64); - let raf_handle = store_value(cx, None::<i32>); + let previous_frame_timestamp = store_value(0.0_f64); + let raf_handle = store_value(None::<i32>); - let (is_active, set_active) = create_signal(cx, false); + let (is_active, set_active) = create_signal(false); let loop_ref = Rc::new(RefCell::new(Box::new(|_: f64| {}) as Box<dyn Fn(f64)>)); @@ -122,7 +120,7 @@ pub fn use_raf_fn_with_options( resume(); } - on_cleanup(cx, pause); + on_cleanup(pause); Pausable { resume, diff --git a/src/use_resize_observer.rs b/src/use_resize_observer.rs index 5a8de9a..9dfdaf3 100644 --- a/src/use_resize_observer.rs +++ b/src/use_resize_observer.rs @@ -1,5 +1,5 @@ use crate::core::ElementsMaybeSignal; -use crate::{use_supported, watch}; +use crate::use_supported; use default_struct_builder::DefaultBuilder; use leptos::*; use std::cell::RefCell; @@ -25,12 +25,11 @@ use wasm_bindgen::prelude::*; /// # use leptos_use::use_resize_observer; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let el = create_node_ref(cx); -/// let (text, set_text) = create_signal(cx, "".to_string()); +/// # fn Demo() -> impl IntoView { +/// let el = create_node_ref(); +/// let (text, set_text) = create_signal("".to_string()); /// /// use_resize_observer( -/// cx, /// el, /// move |entries, observer| { /// let rect = entries[0].content_rect(); @@ -38,7 +37,7 @@ use wasm_bindgen::prelude::*; /// }, /// ); /// -/// view! { cx, +/// view! { /// <div node_ref=el>{ move || text.get() }</div> /// } /// # } @@ -52,27 +51,25 @@ use wasm_bindgen::prelude::*; /// /// - [`use_element_size`] pub fn use_resize_observer<El, T, F>( - cx: Scope, target: El, // TODO : multiple elements? callback: F, ) -> UseResizeObserverReturn<impl Fn() + Clone> where - (Scope, El): Into<ElementsMaybeSignal<T, web_sys::Element>>, + El: Into<ElementsMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, F: FnMut(Vec<web_sys::ResizeObserverEntry>, web_sys::ResizeObserver) + 'static, { - use_resize_observer_with_options(cx, target, callback, UseResizeObserverOptions::default()) + use_resize_observer_with_options(target, callback, UseResizeObserverOptions::default()) } /// Version of [`use_resize_observer`] that takes a `web_sys::ResizeObserverOptions`. See [`use_resize_observer`] for how to use. pub fn use_resize_observer_with_options<El, T, F>( - cx: Scope, target: El, // TODO : multiple elements? mut callback: F, options: UseResizeObserverOptions, ) -> UseResizeObserverReturn<impl Fn() + Clone> where - (Scope, El): Into<ElementsMaybeSignal<T, web_sys::Element>>, + El: Into<ElementsMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, F: FnMut(Vec<web_sys::ResizeObserverEntry>, web_sys::ResizeObserver) + 'static, { @@ -92,7 +89,7 @@ where let observer: Rc<RefCell<Option<web_sys::ResizeObserver>>> = Rc::new(RefCell::new(None)); - let is_supported = use_supported(cx, || JsValue::from("ResizeObserver").js_in(&window())); + let is_supported = use_supported(|| JsValue::from("ResizeObserver").js_in(&window())); let cleanup = { let observer = Rc::clone(&observer); @@ -106,13 +103,12 @@ where } }; - let targets = (cx, target).into(); + let targets = (target).into(); let stop_watch = { let cleanup = cleanup.clone(); watch( - cx, move || targets.get(), move |targets, _, _| { cleanup(); @@ -130,6 +126,7 @@ where observer.replace(Some(obs)); } }, + false, ) }; @@ -138,7 +135,7 @@ where stop_watch(); }; - on_cleanup(cx, stop.clone()); + on_cleanup(stop.clone()); UseResizeObserverReturn { is_supported, stop } } diff --git a/src/use_scroll.rs b/src/use_scroll.rs index 6cc5aa9..daed2a2 100644 --- a/src/use_scroll.rs +++ b/src/use_scroll.rs @@ -23,14 +23,14 @@ use wasm_bindgen::JsCast; /// # use leptos_use::{use_scroll, UseScrollReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let element = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// let element = create_node_ref::<Div>(); /// /// let UseScrollReturn { /// x, y, set_x, set_y, is_scrolling, arrived_state, directions, .. -/// } = use_scroll(cx, element); +/// } = use_scroll(element); /// -/// view! { cx, +/// view! { /// <div node_ref=element>"..."</div> /// } /// # } @@ -48,8 +48,8 @@ use wasm_bindgen::JsCast; /// # use leptos_use::{use_scroll_with_options, UseScrollReturn, UseScrollOptions, ScrollOffset}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// # let element = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// # let element = create_node_ref::<Div>(); /// # /// let UseScrollReturn { /// x, @@ -61,7 +61,6 @@ use wasm_bindgen::JsCast; /// directions, /// .. /// } = use_scroll_with_options( -/// cx, /// element, /// UseScrollOptions::default().offset(ScrollOffset { /// top: 30.0, @@ -71,8 +70,7 @@ use wasm_bindgen::JsCast; /// }), /// ); /// # -/// # view! { cx, -/// # <div node_ref=element>"..."</div> +/// # view! { /// # <div node_ref=element>"..."</div> /// # } /// # } /// ``` @@ -88,14 +86,14 @@ use wasm_bindgen::JsCast; /// # use leptos_use::{use_scroll, UseScrollReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let element = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// let element = create_node_ref::<Div>(); /// /// let UseScrollReturn { /// x, y, set_x, set_y, .. -/// } = use_scroll(cx, element); +/// } = use_scroll(element); /// -/// view! { cx, +/// view! { /// <div node_ref=element>"..."</div> /// <button on:click=move |_| set_x(x.get_untracked() + 10.0)>"Scroll right 10px"</button> /// <button on:click=move |_| set_y(y.get_untracked() + 10.0)>"Scroll down 10px"</button> @@ -116,19 +114,17 @@ use wasm_bindgen::JsCast; /// # use leptos_use::{use_scroll_with_options, UseScrollReturn, UseScrollOptions, ScrollBehavior}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// # let element = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// # let element = create_node_ref::<Div>(); /// # /// let UseScrollReturn { /// x, y, set_x, set_y, .. /// } = use_scroll_with_options( -/// cx, /// element, /// UseScrollOptions::default().behavior(ScrollBehavior::Smooth), /// ); /// # -/// # view! { cx, -/// # <div node_ref=element>"..."</div> +/// # view! { /// # <div node_ref=element>"..."</div> /// # } /// # } /// ``` @@ -142,25 +138,23 @@ use wasm_bindgen::JsCast; /// # use leptos_use::{use_scroll_with_options, UseScrollReturn, UseScrollOptions, ScrollBehavior}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// # let element = create_node_ref::<Div>(cx); +/// # fn Demo() -> impl IntoView { +/// # let element = create_node_ref::<Div>(); /// # -/// let (smooth, set_smooth) = create_signal(cx, false); +/// let (smooth, set_smooth) = create_signal(false); /// -/// let behavior = Signal::derive(cx, move || { +/// let behavior = Signal::derive(move || { /// if smooth.get() { ScrollBehavior::Smooth } else { ScrollBehavior::Auto } /// }); /// /// let UseScrollReturn { /// x, y, set_x, set_y, .. /// } = use_scroll_with_options( -/// cx, /// element, /// UseScrollOptions::default().behavior(behavior), /// ); /// # -/// # view! { cx, -/// # <div node_ref=element>"..."</div> +/// # view! { /// # <div node_ref=element>"..."</div> /// # } /// # } /// ``` @@ -168,31 +162,27 @@ use wasm_bindgen::JsCast; /// ## Server-Side Rendering /// /// Please refer to ["Functions with Target Elements"](https://leptos-use.rs/server_side_rendering.html#functions-with-target-elements) -pub fn use_scroll<El, T>(cx: Scope, element: El) -> UseScrollReturn +pub fn use_scroll<El, T>(element: El) -> UseScrollReturn where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { - use_scroll_with_options(cx, element, Default::default()) + use_scroll_with_options(element, Default::default()) } /// Version of [`use_scroll`] with options. See [`use_scroll`] for how to use. #[allow(unused_variables)] -pub fn use_scroll_with_options<El, T>( - cx: Scope, - element: El, - options: UseScrollOptions, -) -> UseScrollReturn +pub fn use_scroll_with_options<El, T>(element: El, options: UseScrollOptions) -> UseScrollReturn where El: Clone, - (Scope, El): Into<ElementMaybeSignal<T, web_sys::Element>>, + El: Into<ElementMaybeSignal<T, web_sys::Element>>, T: Into<web_sys::Element> + Clone + 'static, { - let (internal_x, set_internal_x) = create_signal(cx, 0.0); - let (internal_y, set_internal_y) = create_signal(cx, 0.0); + let (internal_x, set_internal_x) = create_signal(0.0); + let (internal_y, set_internal_y) = create_signal(0.0); - let signal = (cx, element).into(); + let signal = (element).into(); let behavior = options.behavior; let scroll_to = { @@ -226,26 +216,20 @@ where let set_y = Box::new(move |y| scroll_to(None, Some(y))); - let (is_scrolling, set_is_scrolling) = create_signal(cx, false); + let (is_scrolling, set_is_scrolling) = create_signal(false); - let arrived_state = create_rw_signal( - cx, - Directions { - left: true, - right: false, - top: true, - bottom: false, - }, - ); - let directions = create_rw_signal( - cx, - Directions { - left: false, - right: false, - top: false, - bottom: false, - }, - ); + let arrived_state = create_rw_signal(Directions { + left: true, + right: false, + top: true, + bottom: false, + }); + let directions = create_rw_signal(Directions { + left: false, + right: false, + top: false, + bottom: false, + }); let on_scroll_end = { let on_stop = options.on_stop.clone(); @@ -359,7 +343,7 @@ where let target = { let signal = signal.clone(); - Signal::derive(cx, move || { + Signal::derive(move || { let element = signal.get(); element.map(|element| element.into().unchecked_into::<web_sys::EventTarget>()) }) @@ -385,7 +369,6 @@ where web_sys::EventTarget, _, >( - cx, target, ev::scroll, handler, @@ -398,7 +381,6 @@ where web_sys::EventTarget, _, >( - cx, target, ev::scroll, on_scroll_handler, @@ -412,7 +394,6 @@ where web_sys::EventTarget, _, >( - cx, target, scrollend, on_scroll_end, diff --git a/src/use_supported.rs b/src/use_supported.rs index 9e2ec86..4c3bcab 100644 --- a/src/use_supported.rs +++ b/src/use_supported.rs @@ -9,18 +9,17 @@ use leptos::*; /// # use leptos_use::use_supported; /// # use wasm_bindgen::JsValue; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { +/// # pub fn Demo() -> impl IntoView { /// let is_supported = use_supported( -/// cx, /// || JsValue::from("getBattery").js_in(&window().navigator()) /// ); /// /// if is_supported.get() { /// // do something /// } -/// # view! { cx, } +/// # view! { } /// # } /// ``` -pub fn use_supported(cx: Scope, callback: impl Fn() -> bool + 'static) -> Signal<bool> { - Signal::derive(cx, callback) +pub fn use_supported(callback: impl Fn() -> bool + 'static) -> Signal<bool> { + Signal::derive(callback) } diff --git a/src/use_throttle_fn.rs b/src/use_throttle_fn.rs index a3bf15f..985cdb8 100644 --- a/src/use_throttle_fn.rs +++ b/src/use_throttle_fn.rs @@ -21,14 +21,14 @@ pub use crate::utils::ThrottleOptions; /// # use leptos_use::use_throttle_fn; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let mut throttled_fn = use_throttle_fn( /// || { /// // do something, it will be called at most 1 time per second /// }, /// 1000.0, /// ); -/// view! { cx, +/// view! { /// <button on:click=move |_| { throttled_fn(); }> /// "Smash me!" /// </button> @@ -42,7 +42,7 @@ pub use crate::utils::ThrottleOptions; /// # use leptos::*; /// # use leptos_use::{ThrottleOptions, use_throttle_fn_with_options}; /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let throttled_fn = use_throttle_fn_with_options( /// || { /// // do something, it will be called at most 1 time per second @@ -52,7 +52,7 @@ pub use crate::utils::ThrottleOptions; /// .leading(true) /// .trailing(true), /// ); -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// diff --git a/src/use_to_string.rs b/src/use_to_string.rs index b5b6b98..6cceb16 100644 --- a/src/use_to_string.rs +++ b/src/use_to_string.rs @@ -11,11 +11,11 @@ use_derive_signal!( /// # use leptos_use::use_to_string; /// # /// # #[component] - /// # fn Demo(cx: Scope) -> impl IntoView { - /// let (number, set_number) = create_signal(cx, 3.14_f64); - /// let str = use_to_string::<_, f64>(cx, number); + /// # fn Demo() -> impl IntoView { + /// let (number, set_number) = create_signal(3.14_f64); + /// let str = use_to_string::<_, f64>(number); /// # - /// # view! { cx, } + /// # view! { } /// # } /// ``` use_to_string<T, T: ToString + 'static> -> String diff --git a/src/use_websocket.rs b/src/use_websocket.rs index a9524a0..1c040fe 100644 --- a/src/use_websocket.rs +++ b/src/use_websocket.rs @@ -26,7 +26,7 @@ use crate::utils::CloneableFnWithArg; /// # use leptos_use::{use_websocket, UseWebSocketReadyState, UseWebsocketReturn}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { +/// # fn Demo() -> impl IntoView { /// let UseWebsocketReturn { /// ready_state, /// message, @@ -36,7 +36,7 @@ use crate::utils::CloneableFnWithArg; /// open, /// close, /// .. -/// } = use_websocket(cx, "wss://echo.websocket.events/".to_string()); +/// } = use_websocket("wss://echo.websocket.events/".to_string()); /// /// let send_message = move |_| { /// let m = "Hello, world!".to_string(); @@ -60,7 +60,7 @@ use crate::utils::CloneableFnWithArg; /// close(); /// }; /// -/// view! { cx, +/// view! { /// <div> /// <p>"status: " {status}</p> /// @@ -80,7 +80,6 @@ use crate::utils::CloneableFnWithArg; /// /// On the server the returned functions amount to noops. pub fn use_websocket( - cx: Scope, url: String, ) -> UseWebsocketReturn< impl Fn() + Clone + 'static, @@ -88,12 +87,11 @@ pub fn use_websocket( impl Fn(String) + Clone + 'static, impl Fn(Vec<u8>) + Clone + 'static, > { - use_websocket_with_options(cx, url, UseWebSocketOptions::default()) + use_websocket_with_options(url, UseWebSocketOptions::default()) } /// Version of [`use_websocket`] that takes `UseWebSocketOptions`. See [`use_websocket`] for how to use. pub fn use_websocket_with_options( - cx: Scope, url: String, options: UseWebSocketOptions, ) -> UseWebsocketReturn< @@ -102,32 +100,32 @@ pub fn use_websocket_with_options( impl Fn(String) + Clone + 'static, impl Fn(Vec<u8>) + Clone, > { - let (ready_state, set_ready_state) = create_signal(cx, UseWebSocketReadyState::Closed); - let (message, set_message) = create_signal(cx, None); - let (message_bytes, set_message_bytes) = create_signal(cx, None); - let ws_ref: StoredValue<Option<WebSocket>> = store_value(cx, None); + let (ready_state, set_ready_state) = create_signal(UseWebSocketReadyState::Closed); + let (message, set_message) = create_signal(None); + let (message_bytes, set_message_bytes) = create_signal(None); + let ws_ref: StoredValue<Option<WebSocket>> = store_value(None); let reconnect_limit = options.reconnect_limit.unwrap_or(3); - let reconnect_timer_ref: StoredValue<Option<TimeoutHandle>> = store_value(cx, None); + let reconnect_timer_ref: StoredValue<Option<TimeoutHandle>> = store_value(None); let manual = options.manual; - let reconnect_times_ref: StoredValue<u64> = store_value(cx, 0); - let unmounted_ref = store_value(cx, false); + let reconnect_times_ref: StoredValue<u64> = store_value(0); + let unmounted_ref = store_value(false); - let connect_ref: StoredValue<Option<Rc<dyn Fn()>>> = store_value(cx, None); + let connect_ref: StoredValue<Option<Rc<dyn Fn()>>> = store_value(None); cfg_if! { if #[cfg(not(feature = "ssr"))] { - let on_open_ref = store_value(cx, options.on_open); - let on_message_ref = store_value(cx, options.on_message); - let on_message_bytes_ref = store_value(cx, options.on_message_bytes); - let on_error_ref = store_value(cx, options.on_error); - let on_close_ref = store_value(cx, options.on_close); + let on_open_ref = store_value(options.on_open); + let on_message_ref = store_value(options.on_message); + let on_message_bytes_ref = store_value(options.on_message_bytes); + let on_error_ref = store_value(options.on_error); + let on_close_ref = store_value(options.on_close); let reconnect_interval = options.reconnect_interval.unwrap_or(3 * 1000); let protocols = options.protocols; - let reconnect_ref: StoredValue<Option<Rc<dyn Fn()>>> = store_value(cx, None); + let reconnect_ref: StoredValue<Option<Rc<dyn Fn()>>> = store_value(None); reconnect_ref.set_value({ let ws = ws_ref.get_value(); Some(Rc::new(move || { @@ -319,14 +317,14 @@ pub fn use_websocket_with_options( }; // Open connection (not called if option `manual` is true) - create_effect(cx, move |_| { + create_effect(move |_| { if !manual { open(); } }); // clean up (unmount) - on_cleanup(cx, move || { + on_cleanup(move || { unmounted_ref.set_value(true); close(); }); diff --git a/src/use_window_focus.rs b/src/use_window_focus.rs index bc8749e..35ddbc0 100644 --- a/src/use_window_focus.rs +++ b/src/use_window_focus.rs @@ -19,28 +19,28 @@ use leptos::*; /// # use leptos_use::use_window_focus; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let focused = use_window_focus(cx); +/// # fn Demo() -> impl IntoView { +/// let focused = use_window_focus(); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// /// ## Server-Side Rendering /// /// On the server this returns a `Signal` that is always `true`. -pub fn use_window_focus(cx: Scope) -> Signal<bool> { +pub fn use_window_focus() -> Signal<bool> { cfg_if! { if #[cfg(feature = "ssr")] { let initial_focus = true; } else { let initial_focus = document().has_focus().unwrap_or_default(); }} - let (focused, set_focused) = create_signal(cx, initial_focus); + let (focused, set_focused) = create_signal(initial_focus); cfg_if! { if #[cfg(not(feature = "ssr"))] { - let _ = use_event_listener(cx, window(), blur, move |_| set_focused.set(false)); - let _ = use_event_listener(cx, window(), focus, move |_| set_focused.set(true)); + let _ = use_event_listener(window(), blur, move |_| set_focused.set(false)); + let _ = use_event_listener(window(), focus, move |_| set_focused.set(true)); }} focused.into() diff --git a/src/use_window_scroll.rs b/src/use_window_scroll.rs index 64a1606..8906a38 100644 --- a/src/use_window_scroll.rs +++ b/src/use_window_scroll.rs @@ -19,17 +19,17 @@ use web_sys::AddEventListenerOptions; /// # use leptos_use::use_window_scroll; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// let (x, y) = use_window_scroll(cx); +/// # fn Demo() -> impl IntoView { +/// let (x, y) = use_window_scroll(); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// /// ## Server-Side Rendering /// /// On the server this returns `Signal`s that are always `0.0`. -pub fn use_window_scroll(cx: Scope) -> (Signal<f64>, Signal<f64>) { +pub fn use_window_scroll() -> (Signal<f64>, Signal<f64>) { cfg_if! { if #[cfg(feature = "ssr")] { let initial_x = 0.0; let initial_y = 0.0; @@ -37,8 +37,8 @@ pub fn use_window_scroll(cx: Scope) -> (Signal<f64>, Signal<f64>) { let initial_x = window().scroll_x().unwrap_or_default(); let initial_y = window().scroll_y().unwrap_or_default(); }} - let (x, set_x) = create_signal(cx, initial_x); - let (y, set_y) = create_signal(cx, initial_y); + let (x, set_x) = create_signal(initial_x); + let (y, set_y) = create_signal(initial_y); cfg_if! { if #[cfg(not(feature = "ssr"))] { let mut options = AddEventListenerOptions::new(); @@ -46,8 +46,7 @@ pub fn use_window_scroll(cx: Scope) -> (Signal<f64>, Signal<f64>) { options.passive(true); let _ = use_event_listener_with_options( - cx, - window(), + window(), scroll, move |_| { set_x.set(window().scroll_x().unwrap_or_default()); diff --git a/src/utils/filters/pausable.rs b/src/utils/filters/pausable.rs index e551a0f..536b833 100644 --- a/src/utils/filters/pausable.rs +++ b/src/utils/filters/pausable.rs @@ -20,7 +20,6 @@ where } pub fn pausable_wrapper<F, Arg, R>( - cx: Scope, function: F, ) -> PausableWrapperReturn< impl Fn() + Clone, @@ -33,7 +32,7 @@ where R: 'static, F: Fn(Arg) -> R + Clone, { - let (active, set_active) = create_signal(cx, true); + let (active, set_active) = create_signal(true); let pause = move || { set_active(false); diff --git a/src/utils/signal_filtered.rs b/src/utils/signal_filtered.rs index cb37a9f..3a81446 100644 --- a/src/utils/signal_filtered.rs +++ b/src/utils/signal_filtered.rs @@ -9,7 +9,6 @@ macro_rules! signal_filtered { paste! { $(#[$outer])* pub fn [<signal_ $filter_name d>]<S, T>( - cx: Scope, value: S, ms: impl Into<MaybeSignal<f64>> + 'static, ) -> Signal<T> @@ -17,7 +16,7 @@ macro_rules! signal_filtered { S: Into<Signal<T>>, T: Clone + 'static, { - [<signal_ $filter_name d_with_options>](cx, value, ms, [<$filter_name:camel Options>]::default()) + [<signal_ $filter_name d_with_options>](value, ms, [<$filter_name:camel Options>]::default()) } /// Version of @@ -29,7 +28,6 @@ macro_rules! signal_filtered { #[$simple_func_doc] /// for how to use. pub fn [<signal_ $filter_name d_with_options>]<S, T>( - cx: Scope, value: S, ms: impl Into<MaybeSignal<f64>> + 'static, options: [<$filter_name:camel Options>], @@ -45,7 +43,7 @@ macro_rules! signal_filtered { return value; } - let (filtered, set_filtered) = create_signal(cx, value.get_untracked()); + let (filtered, set_filtered) = create_signal(value.get_untracked()); let update = [<use_ $filter_name _fn_with_options>]( move || set_filtered.set(value.get_untracked()), @@ -53,7 +51,7 @@ macro_rules! signal_filtered { options, ); - let _ = watch(cx, move || value.get(), move |_, _, _| update(), false); + let _ = watch(move || value.get(), move |_, _, _| update(), false); filtered.into() } diff --git a/src/utils/use_derive_signal.rs b/src/utils/use_derive_signal.rs index 048726a..1bb1212 100644 --- a/src/utils/use_derive_signal.rs +++ b/src/utils/use_derive_signal.rs @@ -5,12 +5,12 @@ macro_rules! use_derive_signal { $($body:tt)+ ) => { $(#[$outer])* - pub fn $name<V $(, $( $type_param ),* )? >(cx: Scope, value: V) -> Signal<$return_type> + pub fn $name<V $(, $( $type_param ),* )? >(value: V) -> Signal<$return_type> where V: Into<MaybeSignal<$inner_signal_type $(< $( $inner_type_param ),+ >)?>> $(, $( $type_param $( : $first_bound $(+ $rest_bound)* )? ),+ )? { let value = value.into(); - Signal::derive(cx, move || value.with($($body)+)) + Signal::derive(move || value.with($($body)+)) } }; } diff --git a/src/watch_debounced.rs b/src/watch_debounced.rs index 9083319..c23d0b5 100644 --- a/src/watch_debounced.rs +++ b/src/watch_debounced.rs @@ -14,11 +14,10 @@ use leptos::*; /// # use leptos::*; /// # use leptos_use::watch_debounced; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// # let (source, set_source) = create_signal(cx, 0); +/// # pub fn Demo() -> impl IntoView { +/// # let (source, set_source) = create_signal(0); /// # /// watch_debounced( -/// cx, /// move || source.get(), /// move |_, _, _| { /// log!("changed!"); @@ -26,11 +25,11 @@ use leptos::*; /// 500.0, /// ); /// -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// -/// This really is only shorthand shorthand for `watch_with_options(cx, deps, callback, WatchOptions::default().debounce(ms))`. +/// This really is only shorthand shorthand for `watch_with_options(deps, callback, WatchOptions::default().debounce(ms))`. /// /// There's also `watch_debounced_with_options` where you can specify the other watch options (except `filter`). /// @@ -38,11 +37,10 @@ use leptos::*; /// # use leptos::*; /// # use leptos_use::{watch_debounced_with_options, WatchDebouncedOptions}; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// # let (source, set_source) = create_signal(cx, 0); +/// # pub fn Demo() -> impl IntoView { +/// # let (source, set_source) = create_signal(0); /// # /// watch_debounced_with_options( -/// cx, /// move || source.get(), /// move |_, _, _| { /// log!("changed!"); @@ -51,7 +49,7 @@ use leptos::*; /// WatchDebouncedOptions::default().max_wait(Some(1000.0)), /// ); /// -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -70,24 +68,18 @@ use leptos::*; /// /// * [`watch`] /// * [`watch_throttled`] -pub fn watch_debounced<W, T, DFn, CFn>( - cx: Scope, - deps: DFn, - callback: CFn, - ms: f64, -) -> impl Fn() + Clone +pub fn watch_debounced<W, T, DFn, CFn>(deps: DFn, callback: CFn, ms: f64) -> impl Fn() + Clone where DFn: Fn() -> W + 'static, CFn: Fn(&W, Option<&W>, Option<T>) -> T + Clone + 'static, W: Clone + 'static, T: Clone + 'static, { - watch_with_options(cx, deps, callback, WatchOptions::default().debounce(ms)) + watch_with_options(deps, callback, WatchOptions::default().debounce(ms)) } /// Version of `watch_debounced` that accepts `WatchDebouncedOptions`. See [`watch_debounced`] for how to use. pub fn watch_debounced_with_options<W, T, DFn, CFn>( - cx: Scope, deps: DFn, callback: CFn, ms: f64, @@ -100,7 +92,6 @@ where T: Clone + 'static, { watch_with_options( - cx, deps, callback, WatchOptions::default() diff --git a/src/watch_pausable.rs b/src/watch_pausable.rs index 254e3e2..7f0a7c7 100644 --- a/src/watch_pausable.rs +++ b/src/watch_pausable.rs @@ -13,8 +13,8 @@ use leptos::*; /// # use leptos::*; /// # use leptos_use::{watch_pausable, WatchPausableReturn}; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// let (source, set_source) = create_signal(cx, "foo".to_string()); +/// # pub fn Demo() -> impl IntoView { +/// let (source, set_source) = create_signal("foo".to_string()); /// /// let WatchPausableReturn { /// stop, @@ -22,7 +22,6 @@ use leptos::*; /// resume, /// .. /// } = watch_pausable( -/// cx, /// move || source.get(), /// |v, _, _| { /// log!("Changed to {}", v); @@ -38,7 +37,7 @@ use leptos::*; /// resume(); /// /// set_source.set("hello".to_string()); // > "Changed to hello" -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -54,7 +53,6 @@ use leptos::*; /// /// * [`watch`] pub fn watch_pausable<W, T, DFn, CFn>( - cx: Scope, deps: DFn, callback: CFn, ) -> WatchPausableReturn<impl Fn() + Clone, impl Fn() + Clone, impl Fn() + Clone> @@ -64,12 +62,11 @@ where W: Clone + 'static, T: Clone + 'static, { - watch_pausable_with_options(cx, deps, callback, WatchOptions::default()) + watch_pausable_with_options(deps, callback, WatchOptions::default()) } /// Version of `watch_pausable` that accepts `WatchOptions`. See [`watch_pausable`] for how to use. pub fn watch_pausable_with_options<W, T, DFn, CFn>( - cx: Scope, deps: DFn, callback: CFn, options: WatchOptions, @@ -80,7 +77,7 @@ where W: Clone + 'static, T: Clone + 'static, { - let (is_active, set_active) = create_signal(cx, true); + let (is_active, set_active) = create_signal(true); let pausable_callback = move |val: &W, prev_val: Option<&W>, prev_ret: Option<Option<T>>| { if is_active.get_untracked() { @@ -90,7 +87,7 @@ where } }; - let stop = watch_with_options(cx, deps, pausable_callback, options); + let stop = watch_with_options(deps, pausable_callback, options); let pause = move || { set_active.set(false); diff --git a/src/watch_throttled.rs b/src/watch_throttled.rs index 8775721..535fb54 100644 --- a/src/watch_throttled.rs +++ b/src/watch_throttled.rs @@ -1,6 +1,5 @@ use crate::{watch_with_options, ThrottleOptions, WatchOptions}; use default_struct_builder::DefaultBuilder; -use leptos::*; /// A throttled version of [`watch`]. /// @@ -14,11 +13,10 @@ use leptos::*; /// # use leptos::*; /// # use leptos_use::watch_throttled; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// # let (source, set_source) = create_signal(cx, 0); +/// # pub fn Demo() -> impl IntoView { +/// # let (source, set_source) = create_signal(0); /// # /// watch_throttled( -/// cx, /// move || source.get(), /// move |_, _, _| { /// log!("changed!"); @@ -26,11 +24,11 @@ use leptos::*; /// 500.0, /// ); /// -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// -/// This really is only shorthand shorthand for `watch_with_options(cx, deps, callback, WatchOptions::default().throttle(ms))`. +/// This really is only shorthand shorthand for `watch_with_options(deps, callback, WatchOptions::default().throttle(ms))`. /// /// There's also `watch_throttled_with_options` where you can specify the other watch options (except `filter`). /// @@ -38,11 +36,10 @@ use leptos::*; /// # use leptos::*; /// # use leptos_use::{watch_throttled_with_options, WatchThrottledOptions}; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// # let (source, set_source) = create_signal(cx, 0); +/// # pub fn Demo() -> impl IntoView { +/// # let (source, set_source) = create_signal(0); /// # /// watch_throttled_with_options( -/// cx, /// move || source.get(), /// move |_, _, _| { /// log!("changed!"); @@ -51,7 +48,7 @@ use leptos::*; /// WatchThrottledOptions::default().leading(true).trailing(false), /// ); /// -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -70,24 +67,18 @@ use leptos::*; /// /// * [`watch`] /// * [`watch_debounced`] -pub fn watch_throttled<W, T, DFn, CFn>( - cx: Scope, - deps: DFn, - callback: CFn, - ms: f64, -) -> impl Fn() + Clone +pub fn watch_throttled<W, T, DFn, CFn>(deps: DFn, callback: CFn, ms: f64) -> impl Fn() + Clone where DFn: Fn() -> W + 'static, CFn: Fn(&W, Option<&W>, Option<T>) -> T + Clone + 'static, W: Clone + 'static, T: Clone + 'static, { - watch_with_options(cx, deps, callback, WatchOptions::default().throttle(ms)) + watch_with_options(deps, callback, WatchOptions::default().throttle(ms)) } /// Version of `watch_throttled` that accepts `WatchThrottledOptions`. See [`watch_throttled`] for how to use. pub fn watch_throttled_with_options<W, T, DFn, CFn>( - cx: Scope, deps: DFn, callback: CFn, ms: f64, @@ -100,7 +91,6 @@ where T: Clone + 'static, { watch_with_options( - cx, deps, callback, WatchOptions::default() diff --git a/src/watch_with_options.rs b/src/watch_with_options.rs index 8d98d95..b0ab20d 100644 --- a/src/watch_with_options.rs +++ b/src/watch_with_options.rs @@ -19,11 +19,10 @@ use std::rc::Rc; /// # use leptos::*; /// # use leptos_use::{watch_with_options, WatchOptions}; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// let (num, set_num) = create_signal(cx, 0); +/// # pub fn Demo() -> impl IntoView { +/// let (num, set_num) = create_signal(0); /// /// watch_with_options( -/// cx, /// move || num.get(), /// move |num, _, _| { /// log!("Number {}", num); @@ -32,7 +31,7 @@ use std::rc::Rc; /// ); // > "Number 0" /// /// set_num.set(1); // > "Number 1" -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -44,18 +43,17 @@ use std::rc::Rc; /// # use leptos::*; /// # use leptos_use::{watch_with_options, WatchOptions}; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// # let (num, set_num) = create_signal(cx, 0); +/// # pub fn Demo() -> impl IntoView { +/// # let (num, set_num) = create_signal(0); /// # /// watch_with_options( -/// cx, /// move || num.get(), /// move |num, _, _| { /// log!("Number {}", num); /// }, /// WatchOptions::default().throttle(100.0), // there's also `throttle_with_options` /// ); -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -63,18 +61,17 @@ use std::rc::Rc; /// # use leptos::*; /// # use leptos_use::{watch_with_options, WatchOptions}; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// # let (num, set_num) = create_signal(cx, 0); +/// # pub fn Demo() -> impl IntoView { +/// # let (num, set_num) = create_signal(0); /// # /// watch_with_options( -/// cx, /// move || num.get(), /// move |num, _, _| { /// log!("number {}", num); /// }, /// WatchOptions::default().debounce(100.0), // there's also `debounce_with_options` /// ); -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -91,7 +88,6 @@ use std::rc::Rc; /// Version of `watch` that accepts `WatchOptions`. See [`watch`] for how to use. pub fn watch_with_options<W, T, DFn, CFn>( - cx: Scope, deps: DFn, callback: CFn, options: WatchOptions, @@ -127,7 +123,6 @@ where create_filter_wrapper(options.filter.filter_fn(), wrapped_callback.clone()); leptos::watch( - cx, deps, move |deps_value, previous_deps_value, did_run_before| { cur_deps_value.replace(Some(deps_value.clone())); @@ -144,7 +139,7 @@ where options.immediate, ) - // create_effect(cx, move |did_run_before| { + // create_effect(move |did_run_before| { // if !is_active.get() { // return; // } @@ -187,12 +182,12 @@ impl WatchOptions { #[deprecated(since = "0.7.0", note = "Use `leptos::watch` instead")] #[inline(always)] -pub fn watch<W, T, DFn, CFn>(cx: Scope, deps: DFn, callback: CFn) -> impl Fn() + Clone +pub fn watch<W, T, DFn, CFn>(deps: DFn, callback: CFn) -> impl Fn() + Clone where DFn: Fn() -> W + 'static, CFn: Fn(&W, Option<&W>, Option<T>) -> T + Clone + 'static, W: Clone + 'static, T: Clone + 'static, { - leptos::watch(cx, deps, callback, false) + leptos::watch(deps, callback, false) } diff --git a/src/whenever.rs b/src/whenever.rs index 194468e..74c9bde 100644 --- a/src/whenever.rs +++ b/src/whenever.rs @@ -1,5 +1,4 @@ use crate::{watch_with_options, WatchOptions}; -use leptos::*; /// Shorthand for watching a signal to be `true`. /// @@ -9,12 +8,12 @@ use leptos::*; /// # use leptos::*; /// # use leptos_use::whenever; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// let (is_ready, set_ready) = create_signal(cx, false); +/// # pub fn Demo() -> impl IntoView { +/// let (is_ready, set_ready) = create_signal(false); /// -/// whenever(cx, move || is_ready.get(), |v, _, _| log!("{}", v)); +/// whenever(move || is_ready.get(), |v, _, _| log!("{}", v)); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -26,13 +25,13 @@ use leptos::*; /// # use leptos::*; /// # use leptos_use::whenever; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// # let (is_ready, set_ready) = create_signal(cx, false); -/// whenever(cx, move || is_ready.get(), |value, prev_value, _| { +/// # pub fn Demo() -> impl IntoView { +/// # let (is_ready, set_ready) = create_signal(false); +/// whenever(move || is_ready.get(), |value, prev_value, _| { /// log!("before: {prev_value:?}; now: {value}"); /// }); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -44,15 +43,14 @@ use leptos::*; /// # use leptos::*; /// # use leptos_use::whenever; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// # let (counter, set_counter) = create_signal(cx, 0); +/// # pub fn Demo() -> impl IntoView { +/// # let (counter, set_counter) = create_signal(0); /// whenever( -/// cx, /// move || counter.get() == 7, /// |_, _, _| log!("counter is 7 now!"), /// ); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -64,16 +62,15 @@ use leptos::*; /// # use leptos::*; /// # use leptos_use::{WatchOptions, whenever_with_options}; /// # -/// # pub fn Demo(cx: Scope) -> impl IntoView { -/// # let (counter, set_counter) = create_signal(cx, 0); +/// # pub fn Demo() -> impl IntoView { +/// # let (counter, set_counter) = create_signal(0); /// whenever_with_options( -/// cx, /// move || counter.get() == 7, /// |_, _, _| log!("counter is 7 now!"), /// WatchOptions::default().immediate(true), /// ); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ``` /// @@ -82,18 +79,17 @@ use leptos::*; /// On the server this works just fine except if you throttle or debounce in which case the callback /// will never be called except if you set `immediate` to `true` in which case the callback will be /// called exactly once. -pub fn whenever<T, DFn, CFn>(cx: Scope, source: DFn, callback: CFn) -> impl Fn() + Clone +pub fn whenever<T, DFn, CFn>(source: DFn, callback: CFn) -> impl Fn() + Clone where DFn: Fn() -> bool + 'static, CFn: Fn(bool, Option<bool>, Option<T>) -> T + Clone + 'static, T: Clone + 'static, { - whenever_with_options(cx, source, callback, WatchOptions::default()) + whenever_with_options(source, callback, WatchOptions::default()) } /// Version of `whenever` that accepts `WatchOptions`. See [`whenever`] for how to use. pub fn whenever_with_options<T, DFn, CFn>( - cx: Scope, source: DFn, callback: CFn, options: WatchOptions, @@ -104,7 +100,6 @@ where T: Clone + 'static, { watch_with_options( - cx, source, move |value, prev_value, prev_return| { if *value { diff --git a/template/.ffizer.yaml b/template/.ffizer.yaml index 2990f0e..58c6216 100644 --- a/template/.ffizer.yaml +++ b/template/.ffizer.yaml @@ -1,11 +1,6 @@ variables: - name: function_name ask: Name of the function - - name: scope - ask: "Is the first parameter `cx: Scope`?" - select_in_values: - - "cx" - - "" - name: category ask: Documentation category (lower case) - name: module diff --git a/template/examples/{{ function_name }}/src/main.ffizer.hbs.rs b/template/examples/{{ function_name }}/src/main.ffizer.hbs.rs index b1669e0..fef870c 100644 --- a/template/examples/{{ function_name }}/src/main.ffizer.hbs.rs +++ b/template/examples/{{ function_name }}/src/main.ffizer.hbs.rs @@ -3,19 +3,18 @@ use leptos_use::docs::demo_or_body; use leptos_use{{#if module}}::{{ module }}{{/if}}::{{ function_name }}; #[component] -fn Demo(cx: Scope) -> impl IntoView { +fn Demo() -> impl IntoView { - {{ function_name }}({{#if scope }}cx{{/if}}); + {{ function_name }}(); - view! { cx, - } + view! { } } fn main() { _ = console_log::init_with_level(log::Level::Debug); console_error_panic_hook::set_once(); - mount_to(demo_or_body(), |cx| { - view! { cx, <Demo /> } + mount_to(demo_or_body(), || { + view! { <Demo /> } }) } diff --git a/template/src/{{ module }}/{{ function_name }}.ffizer.hbs.rs b/template/src/{{ module }}/{{ function_name }}.ffizer.hbs.rs index 5119af5..90841fd 100644 --- a/template/src/{{ module }}/{{ function_name }}.ffizer.hbs.rs +++ b/template/src/{{ module }}/{{ function_name }}.ffizer.hbs.rs @@ -14,20 +14,20 @@ use leptos::*; /// # use leptos_use{{#if module}}::{{ module }}{{/if}}::{{ function_name }}; /// # /// # #[component] -/// # fn Demo(cx: Scope) -> impl IntoView { -/// {{ function_name }}({{#if scope }}cx{{/if}}); +/// # fn Demo() -> impl IntoView { +/// {{ function_name }}(); /// # -/// # view! { cx, } +/// # view! { } /// # } /// ```{{#if feature}} // #[doc(cfg(feature = "{{feature}}"))]{{/if}} -pub fn {{ function_name }}({{#if scope }}cx: Scope{{/if}}) -> {{ to_pascal_case function_name }}Return { - {{ function_name }}_with_options({{#if scope }}cx, {{/if}}{{ to_pascal_case function_name }}Options::default()) +pub fn {{ function_name }}() -> {{ to_pascal_case function_name }}Return { + {{ function_name }}_with_options({{ to_pascal_case function_name }}Options::default()) } /// Version of [`{{ function_name }}`] that takes a `{{ to_pascal_case function_name }}Options`. See [`{{ function_name }}`] for how to use.{{#if feature}} // #[doc(cfg(feature = "{{feature}}"))]{{/if}} -pub fn {{ function_name }}_with_options({{#if scope }}cx: Scope, {{/if}}options: {{ to_pascal_case function_name }}Options) -> {{ to_pascal_case function_name }}Return { +pub fn {{ function_name }}_with_options(options: {{ to_pascal_case function_name }}Options) -> {{ to_pascal_case function_name }}Return { {{ to_pascal_case function_name }}Return {} }