@@ -268,7 +272,7 @@ pub fn Todo(cx: Scope, todo: Todo) -> impl IntoView {
{move || {
editing()
.then(|| {
- view! { cx,
+ view! {
Todo {
- Todo::new_with_completed(cx, self.id, self.title, self.completed)
+ pub fn into_todo(self, ) -> Todo {
+ Todo::new_with_completed(self.id, self.title, self.completed)
}
}
diff --git a/benchmarks/src/todomvc/mod.rs b/benchmarks/src/todomvc/mod.rs
index c006ee97f..608f9a88b 100644
--- a/benchmarks/src/todomvc/mod.rs
+++ b/benchmarks/src/todomvc/mod.rs
@@ -12,8 +12,8 @@ fn leptos_todomvc_ssr(b: &mut Bencher) {
b.iter(|| {
use crate::todomvc::leptos::*;
- let html = ::leptos::ssr::render_to_string(|cx| {
- view! { cx, }
+ let html = ::leptos::ssr::render_to_string(|| {
+ view! { }
});
assert!(html.len() > 1);
});
diff --git a/docs/COMMON_BUGS.md b/docs/COMMON_BUGS.md
index ffc8c75a8..a22661cd0 100644
--- a/docs/COMMON_BUGS.md
+++ b/docs/COMMON_BUGS.md
@@ -9,10 +9,10 @@ This document is intended as a running list of common issues, with example code
**Issue**: Sometimes you want to update a reactive signal in a way that depends on another signal.
```rust
-let (a, set_a) = create_signal(cx, 0);
-let (b, set_b) = create_signal(cx, false);
+let (a, set_a) = create_signal(0);
+let (b, set_b) = create_signal(false);
-create_effect(cx, move |_| {
+create_effect(move |_| {
if a() > 5 {
set_b(true);
}
@@ -24,7 +24,7 @@ This creates an inefficient chain of updates, and can easily lead to infinite lo
**Solution**: Follow the rule, _What can be derived, should be derived._ In this case, this has the benefit of massively reducing the code size, too!
```rust
-let (a, set_a) = create_signal(cx, 0);
+let (a, set_a) = create_signal(0);
let b = move || a () > 5;
```
@@ -34,19 +34,19 @@ Sometimes you have nested signals: for example, hash-map that can change over ti
```rust
#[component]
-pub fn App(cx: Scope) -> impl IntoView {
- let resources = create_rw_signal(cx, HashMap::new());
+pub fn App() -> impl IntoView {
+ let resources = create_rw_signal(HashMap::new());
let update = move |id: usize| {
resources.update(|resources| {
resources
.entry(id)
- .or_insert_with(|| create_rw_signal(cx, 0))
+ .or_insert_with(|| create_rw_signal(0))
.update(|amount| *amount += 1)
})
};
- view! { cx,
+ view! {
@@ -55,17 +55,17 @@ pub fn App(cx: Scope) -> impl IntoView {
}
```
-Clicking the button twice will cause a panic, because of the nested signal *read*. Calling the `update` function on `resources` immediately takes out a mutable borrow on `resources`, then updates the `resource` signal—which re-runs the effect that reads from the signals, which tries to immutably access `resources` and panics. It's the nested update here which causes a problem, because the inner update triggers and effect that tries to read both signals while the outer is still updating.
+Clicking the button twice will cause a panic, because of the nested signal _read_. Calling the `update` function on `resources` immediately takes out a mutable borrow on `resources`, then updates the `resource` signal—which re-runs the effect that reads from the signals, which tries to immutably access `resources` and panics. It's the nested update here which causes a problem, because the inner update triggers and effect that tries to read both signals while the outer is still updating.
-You can fix this fairly easily by using the [`Scope::batch()`](https://docs.rs/leptos/latest/leptos/struct.Scope.html#method.batch) method:
+You can fix this fairly easily by using the [`batch()`](https://docs.rs/leptos/latest/leptos/fn.batch.html) method:
```rust
let update = move |id: usize| {
- cx.batch(move || {
+ batch(move || {
resources.update(|resources| {
resources
.entry(id)
- .or_insert_with(|| create_rw_signal(cx, 0))
+ .or_insert_with(|| create_rw_signal(0))
.update(|amount| *amount += 1)
})
});
@@ -83,11 +83,11 @@ Many DOM attributes can be updated either by setting an attribute on the DOM nod
This means that in practice, attributes like `value` or `checked` on an `` element only update the _default_ value for the ``. If you want to reactively update the value, you should use `prop:value` instead to set the `value` property.
```rust
-let (a, set_a) = create_signal(cx, "Starting value".to_string());
+let (a, set_a) = create_signal("Starting value".to_string());
let on_input = move |ev| set_a(event_target_value(&ev));
view! {
- cx,
+
// ❌ reactivity doesn't work as expected: typing only updates the default
// of each input, so if you start typing in the second input, it won't
// update the first one
@@ -97,11 +97,11 @@ view! {
```
```rust
-let (a, set_a) = create_signal(cx, "Starting value".to_string());
+let (a, set_a) = create_signal("Starting value".to_string());
let on_input = move |ev| set_a(event_target_value(&ev));
view! {
- cx,
+
// ✅ works as intended by setting the value *property*
diff --git a/docs/book/src/02_getting_started.md b/docs/book/src/02_getting_started.md
index 34f37fd8c..3958c6467 100644
--- a/docs/book/src/02_getting_started.md
+++ b/docs/book/src/02_getting_started.md
@@ -27,6 +27,7 @@ cargo add leptos --features=csr,nightly
```
Or you can leave off `nightly` if you're using stable Rust
+
```bash
cargo add leptos --features=csr
```
@@ -64,7 +65,7 @@ And add a simple “Hello, world!” to your `main.rs`
use leptos::*;
fn main() {
- mount_to_body(|cx| view! { cx,
"Hello, world!"
})
+ mount_to_body(|| view! {
"Hello, world!"
})
}
```
diff --git a/docs/book/src/15_global_state.md b/docs/book/src/15_global_state.md
index e17845a21..5fa73f655 100644
--- a/docs/book/src/15_global_state.md
+++ b/docs/book/src/15_global_state.md
@@ -29,15 +29,15 @@ all its children and descendants using `provide_context`.
```rust
#[component]
-fn App(cx: Scope) -> impl IntoView {
+fn App() -> impl IntoView {
// here we create a signal in the root that can be consumed
// anywhere in the app.
- let (count, set_count) = create_signal(cx, 0);
+ let (count, set_count) = create_signal(0);
// we'll pass the setter to specific components,
// but provide the count itself to the whole app via context
- provide_context(cx, count);
+ provide_context(count);
- view! { cx,
+ view! {
// SetterButton is allowed to modify the count
// These consumers can only read from it
@@ -57,14 +57,14 @@ fn App(cx: Scope) -> impl IntoView {
```rust
/// A component that does some "fancy" math with the global count
#[component]
-fn FancyMath(cx: Scope) -> impl IntoView {
+fn FancyMath() -> impl IntoView {
// here we consume the global count signal with `use_context`
- let count = use_context::>(cx)
+ let count = use_context::>()
// we know we just provided this in the parent component
.expect("there to be a `count` signal provided");
let is_even = move || count() & 1 == 0;
- view! { cx,
+ view! {
"The number "
{count}
@@ -89,17 +89,17 @@ struct GlobalState {
}
impl GlobalState {
- pub fn new(cx: Scope) -> Self {
+ pub fn new() -> Self {
Self {
- count: create_rw_signal(cx, 0),
- name: create_rw_signal(cx, "Bob".to_string())
+ count: create_rw_signal(0),
+ name: create_rw_signal("Bob".to_string())
}
}
}
#[component]
-fn App(cx: Scope) -> impl IntoView {
- provide_context(cx, GlobalState::new(cx));
+fn App() -> impl IntoView {
+ provide_context(GlobalState::new());
// etc.
}
@@ -117,8 +117,8 @@ struct GlobalState {
}
#[component]
-fn App(cx: Scope) -> impl IntoView {
- provide_context(cx, create_rw_signal(GlobalState::default()));
+fn App() -> impl IntoView {
+ provide_context(create_rw_signal(GlobalState::default()));
// etc.
}
@@ -127,8 +127,8 @@ fn App(cx: Scope) -> impl IntoView {
But there’s a problem: because our whole state is wrapped in one signal, updating the value of one field will cause reactive updates in parts of the UI that only depend on the other.
```rust
-let state = expect_context::>(cx);
-view! { cx,
+let state = expect_context::>();
+view! {
{move || state.with(|state| state.name.clone())}
}
@@ -143,12 +143,12 @@ Here, instead of reading from the state signal directly, we create “slices”
```rust
/// A component that updates the count in the global state.
#[component]
-fn GlobalStateCounter(cx: Scope) -> impl IntoView {
- let state = expect_context::>(cx);
+fn GlobalStateCounter() -> impl IntoView {
+ let state = expect_context::>();
// `create_slice` lets us create a "lens" into the data
let (count, set_count) = create_slice(
- cx,
+
// we take a slice *from* `state`
state,
// our getter returns a "slice" of the data
@@ -157,7 +157,7 @@ fn GlobalStateCounter(cx: Scope) -> impl IntoView {
|state, n| state.count = n,
);
- view! { cx,
+ view! {