Boxed and mapped signals preparing for stores

Cargo.toml

@@ -129,7 +129,7 @@ members = [
     "packages/playwright-tests/nested-suspense",
     "packages/playwright-tests/cli-optimization",
     "packages/playwright-tests/wasm-split-harness",
-    "packages/playwright-tests/default-features-disabled",
+    "packages/playwright-tests/default-features-disabled"
 ]
 
 [workspace.package]

example-projects/ecommerce-site/src/components/product_page.rs

@@ -36,7 +36,7 @@ impl FromStr for Size {
 }
 
 #[component]
-pub fn product_page(product_id: ReadOnlySignal<usize>) -> Element {
+pub fn product_page(product_id: ReadSignal<usize>) -> Element {
     let mut quantity = use_signal(|| 1);
     let mut size = use_signal(Size::default);
 

example-projects/fullstack-hackernews/src/main.rs

@@ -32,7 +32,7 @@ pub fn App() -> Element {
 }
 
 #[component]
-fn Homepage(story: ReadOnlySignal<PreviewState>) -> Element {
+fn Homepage(story: ReadSignal<PreviewState>) -> Element {
     rsx! {
         document::Link { rel: "stylesheet", href: asset!("/assets/hackernews.css") }
         div { display: "flex", flex_direction: "row", width: "100%",
@@ -84,7 +84,7 @@ fn Stories() -> Element {
 }
 
 #[component]
-fn StoryListing(story: ReadOnlySignal<i64>) -> Element {
+fn StoryListing(story: ReadSignal<i64>) -> Element {
     let story = use_server_future(move || get_story(story()))?;
 
     let StoryItem {
@@ -167,7 +167,7 @@ impl Display for PreviewState {
 }
 
 #[component]
-fn Preview(story: ReadOnlySignal<PreviewState>) -> Element {
+fn Preview(story: ReadSignal<PreviewState>) -> Element {
     let PreviewState {
         active_story: Some(id),
     } = story()

examples/backgrounded_futures.rs

@@ -36,7 +36,7 @@ fn app() -> Element {
 }
 
 #[component]
-fn Child(count: Signal<i32>) -> Element {
+fn Child(count: WriteSignal<i32>) -> Element {
     let mut early_return = use_signal(|| false);
 
     let early = rsx! {

examples/bevy/src/main.rs

@@ -75,7 +75,7 @@ fn app() -> Element {
 }
 
 #[component]
-fn ColorControl(label: &'static str, color_str: Signal<String>) -> Element {
+fn ColorControl(label: &'static str, color_str: WriteSignal<String>) -> Element {
     rsx!(div {
         class: "color-control",
         { label },

examples/dog_app.rs

@@ -60,7 +60,7 @@ fn app() -> Element {
 }
 
 #[component]
-fn BreedPic(breed: Signal<String>) -> Element {
+fn BreedPic(breed: WriteSignal<String>) -> Element {
     // This resource will restart whenever the breed changes
     let mut fut = use_resource(move || async move {
         #[derive(serde::Deserialize, Debug)]

examples/hash_fragment_state.rs

@@ -81,7 +81,7 @@ impl FromStr for State {
 }
 
 #[component]
-fn Home(url_hash: ReadOnlySignal<State>) -> Element {
+fn Home(url_hash: ReadSignal<State>) -> Element {
     // The initial state of the state comes from the url hash
     let mut state = use_signal(&*url_hash);
 

examples/memo_chain.rs

@@ -28,7 +28,7 @@ fn app() -> Element {
 }
 
 #[component]
-fn Child(state: Memo<isize>, items: Memo<Vec<isize>>, depth: ReadOnlySignal<usize>) -> Element {
+fn Child(state: Memo<isize>, items: Memo<Vec<isize>>, depth: ReadSignal<usize>) -> Element {
     // These memos don't get re-computed when early returns happen
     let state = use_memo(move || state() + 1);
     let item = use_memo(move || items()[depth() - 1]);

examples/query_segment_search.rs

@@ -63,9 +63,9 @@ fn Home() -> Element {
     }
 }
 
-// Instead of accepting String and usize directly, we use ReadOnlySignal to make the parameters `Copy` and let us subscribe to them automatically inside the meme
+// Instead of accepting String and usize directly, we use ReadSignal to make the parameters `Copy` and let us subscribe to them automatically inside the meme
 #[component]
-fn Search(query: ReadOnlySignal<String>, word_count: ReadOnlySignal<usize>) -> Element {
+fn Search(query: ReadSignal<String>, word_count: ReadSignal<usize>) -> Element {
     const ITEMS: &[&str] = &[
         "hello",
         "world",

examples/router_resource.rs

@@ -1,7 +1,7 @@
 //! Example: Updating components with use_resource
 //! -----------------
 //!
-//! This example shows how to use ReadOnlySignal to make props reactive
+//! This example shows how to use ReadSignal to make props reactive
 //! when linking to it from the same component, when using use_resource
 
 use dioxus::prelude::*;
@@ -25,15 +25,15 @@ fn App() -> Element {
     }
 }
 
-// We use id: ReadOnlySignal<i32> instead of id: i32 to make id work with reactive hooks
-// Any i32 we pass in will automatically be converted into a ReadOnlySignal<i32>
+// We use id: ReadSignal<i32> instead of id: i32 to make id work with reactive hooks
+// Any i32 we pass in will automatically be converted into a ReadSignal<i32>
 #[component]
-fn Blog(id: ReadOnlySignal<i32>) -> Element {
+fn Blog(id: ReadSignal<i32>) -> Element {
     async fn future(n: i32) -> i32 {
         n
     }
 
-    // Because we accept ReadOnlySignal<i32> instead of i32, the resource will automatically subscribe to the id when we read it
+    // Because we accept ReadSignal<i32> instead of i32, the resource will automatically subscribe to the id when we read it
     let res = use_resource(move || future(id()));
 
     match res() {

examples/signals.rs

@@ -3,7 +3,7 @@
 //! This simple example implements a counter that can be incremented, decremented, and paused. It also demonstrates
 //! that background tasks in use_futures can modify the value as well.
 //!
-//! Most signals implement Into<ReadOnlySignal<T>>, making ReadOnlySignal a good default type when building new
+//! Most signals implement Into<ReadSignal<T>>, making ReadSignal a good default type when building new
 //! library components that don't need to modify their values.
 
 use async_std::task::sleep;
@@ -81,7 +81,7 @@ fn app() -> Element {
 }
 
 #[component]
-fn Child(mut count: ReadOnlySignal<i32>) -> Element {
+fn Child(mut count: ReadSignal<i32>) -> Element {
     println!("rendering child with count {count}");
 
     rsx! {

examples/todomvc.rs

@@ -110,7 +110,7 @@ fn app() -> Element {
 }
 
 #[component]
-fn TodoHeader(mut todos: Signal<HashMap<u32, TodoItem>>) -> Element {
+fn TodoHeader(mut todos: WriteSignal<HashMap<u32, TodoItem>>) -> Element {
     let mut draft = use_signal(|| "".to_string());
     let mut todo_id = use_signal(|| 0);
 
@@ -146,7 +146,7 @@ fn TodoHeader(mut todos: Signal<HashMap<u32, TodoItem>>) -> Element {
 /// This takes the ID of the todo and the todos signal as props
 /// We can use these together to memoize the todo contents and checked state
 #[component]
-fn TodoEntry(mut todos: Signal<HashMap<u32, TodoItem>>, id: u32) -> Element {
+fn TodoEntry(mut todos: WriteSignal<HashMap<u32, TodoItem>>, id: u32) -> Element {
     let mut is_editing = use_signal(|| false);
 
     // To avoid re-rendering this component when the todo list changes, we isolate our reads to memos
@@ -208,9 +208,9 @@ fn TodoEntry(mut todos: Signal<HashMap<u32, TodoItem>>, id: u32) -> Element {
 
 #[component]
 fn ListFooter(
-    mut todos: Signal<HashMap<u32, TodoItem>>,
-    active_todo_count: ReadOnlySignal<usize>,
-    mut filter: Signal<FilterState>,
+    mut todos: WriteSignal<HashMap<u32, TodoItem>>,
+    active_todo_count: ReadSignal<usize>,
+    mut filter: WriteSignal<FilterState>,
 ) -> Element {
     // We use a memoized signal to calculate whether we should show the "Clear completed" button.
     // This will recompute whenever the todos change, and if the value is true, the button will be shown.

examples/weather_app.rs

@@ -108,7 +108,7 @@ fn Forecast(weather: WeatherResponse) -> Element {
 }
 
 #[component]
-fn SearchBox(mut country: Signal<WeatherLocation>) -> Element {
+fn SearchBox(mut country: WriteSignal<WeatherLocation>) -> Element {
     let mut input = use_signal(|| "".to_string());
 
     let locations = use_resource(move || async move { get_locations(&input()).await });

examples/wgpu-texture/src/main.rs

@@ -87,7 +87,7 @@ fn app() -> Element {
 }
 
 #[component]
-fn ColorControl(label: &'static str, color_str: Signal<String>) -> Element {
+fn ColorControl(label: &'static str, color_str: WriteSignal<String>) -> Element {
     rsx!(div {
         class: "color-control",
         { label },

packages/core-macro/docs/component.md

@@ -51,7 +51,7 @@ You can use the `#[props()]` attribute to modify the behavior of the props the c
 Props also act slightly differently when used with:
 
 - [`Option<T>`](#optional-props) - The field is automatically optional with a default value of `None`.
-- [`ReadOnlySignal<T>`](#reactive-props) - The props macro will automatically convert `T` into `ReadOnlySignal<T>` when it is passed as a prop.
+- [`ReadSignal<T>`](#reactive-props) - The props macro will automatically convert `T` into `ReadSignal<T>` when it is passed as a prop.
 - [`String`](#formatted-props) - The props macro will accept formatted strings for any prop field with the type `String`.
 - [`children`](#children-props) - The props macro will accept child elements if you include the `children` prop.
 
@@ -257,14 +257,14 @@ fn Counter(count: i32) -> Element {
 
 To fix this issue you can either:
 
-1. Make the prop reactive by wrapping it in `ReadOnlySignal` (recommended):
+1. Make the prop reactive by wrapping it in `ReadSignal` (recommended):
 
-`ReadOnlySignal` is a `Copy` reactive value. Dioxus will automatically convert any value into a `ReadOnlySignal` when it is passed as a prop.
+`ReadSignal` is a `Copy` reactive value. Dioxus will automatically convert any value into a `ReadSignal` when it is passed as a prop.
 
 ```rust, no_run
 # use dioxus::prelude::*;
 #[component]
-fn Counter(count: ReadOnlySignal<i32>) -> Element {
+fn Counter(count: ReadSignal<i32>) -> Element {
     // Since we made count reactive, the memo will automatically rerun when count changes.
     let doubled_count = use_memo(move || count() * 2);
     rsx! {

packages/core-macro/docs/props.md

@@ -47,7 +47,7 @@ You can use the `#[props()]` attribute to modify the behavior of the props deriv
 Props also act slightly differently when used with:
 
 - [`Option<T>`](#optional-props) - The field is automatically optional with a default value of `None`.
-- [`ReadOnlySignal<T>`](#reactive-props) - The props macro will automatically convert `T` into `ReadOnlySignal<T>` when it is passed as a prop.
+- [`ReadSignal<T>`](#reactive-props) - The props macro will automatically convert `T` into `ReadSignal<T>` when it is passed as a prop.
 - [`String`](#formatted-props) - The props macro will accept formatted strings for any prop field with the type `String`.
 - [`children`](#children-props) - The props macro will accept child elements if you include the `children` prop.
 
@@ -270,14 +270,14 @@ fn Counter(count: i32) -> Element {
 
 To fix this issue you can either:
 
-1. Make the prop reactive by wrapping it in `ReadOnlySignal` (recommended):
+1. Make the prop reactive by wrapping it in `ReadSignal` (recommended):
 
-`ReadOnlySignal` is a `Copy` reactive value. Dioxus will automatically convert any value into a `ReadOnlySignal` when it is passed as a prop.
+`ReadSignal` is a `Copy` reactive value. Dioxus will automatically convert any value into a `ReadSignal` when it is passed as a prop.
 
 ```rust, no_run
 # use dioxus::prelude::*;
 #[component]
-fn Counter(count: ReadOnlySignal<i32>) -> Element {
+fn Counter(count: ReadSignal<i32>) -> Element {
     // Since we made count reactive, the memo will automatically rerun when count changes.
     let doubled_count = use_memo(move || count() * 2);
     rsx! {

packages/core-macro/src/props/mod.rs

@@ -172,7 +172,7 @@ mod util {
 }
 
 mod field_info {
-    use crate::props::type_from_inside_option;
+    use crate::props::{looks_like_write_type, type_from_inside_option};
     use proc_macro2::TokenStream;
     use quote::{format_ident, quote};
     use syn::spanned::Spanned;
@@ -221,6 +221,11 @@ mod field_info {
                     builder_attr.auto_into = false;
                 }
 
+                // Write and Store fields automatically use impl Into
+                if looks_like_write_type(&field.ty) {
+                    builder_attr.auto_into = true;
+                }
+
                 // extended field is automatically empty
                 if !builder_attr.extends.is_empty() {
                     builder_attr.default = Some(
@@ -503,9 +508,9 @@ fn type_from_inside_option(ty: &Type) -> Option<&Type> {
     let seg = path.segments.last()?;
 
     // If the segment is a supported optional type, provide the inner type.
-    // Return the inner type if the pattern is `Option<T>` or `ReadOnlySignal<Option<T>>``
-    if seg.ident == "ReadOnlySignal" {
-        // Get the inner type. E.g. the `u16` in `ReadOnlySignal<u16>` or `Option` in `ReadOnlySignal<Option<bool>>`
+    // Return the inner type if the pattern is `Option<T>` or `ReadSignal<Option<T>>``
+    if seg.ident == "ReadOnlySignal" || seg.ident == "ReadSignal" {
+        // Get the inner type. E.g. the `u16` in `ReadSignal<u16>` or `Option` in `ReadSignal<Option<bool>>`
         let inner_type = extract_inner_type_from_segment(seg)?;
         let Type::Path(inner_path) = inner_type else {
             // If it isn't a path, the inner type isn't option
@@ -614,13 +619,13 @@ mod struct_info {
             generics
         }
 
-        /// Checks if the props have any fields that should be owned by the child. For example, when converting T to `ReadOnlySignal<T>`, the new signal should be owned by the child
+        /// Checks if the props have any fields that should be owned by the child. For example, when converting T to `ReadSignal<T>`, the new signal should be owned by the child
         fn has_child_owned_fields(&self) -> bool {
             self.fields.iter().any(|f| child_owned_type(f.ty))
         }
 
         fn memoize_impl(&self) -> Result<TokenStream, Error> {
-            // First check if there are any ReadOnlySignal fields, if there are not, we can just use the partialEq impl
+            // First check if there are any ReadSignal fields, if there are not, we can just use the partialEq impl
             let signal_fields: Vec<_> = self
                 .included_fields()
                 .filter(|f| looks_like_signal_type(f.ty))
@@ -1745,6 +1750,20 @@ fn looks_like_signal_type(ty: &Type) -> bool {
             path_without_generics == parse_quote!(dioxus_core::ReadOnlySignal)
                 || path_without_generics == parse_quote!(prelude::ReadOnlySignal)
                 || path_without_generics == parse_quote!(ReadOnlySignal)
+                || path_without_generics == parse_quote!(dioxus_core::prelude::ReadSignal)
+                || path_without_generics == parse_quote!(prelude::ReadSignal)
+                || path_without_generics == parse_quote!(ReadSignal)
+        }
+        None => false,
+    }
+}
+
+fn looks_like_write_type(ty: &Type) -> bool {
+    match extract_base_type_without_generics(ty) {
+        Some(path_without_generics) => {
+            path_without_generics == parse_quote!(dioxus_core::prelude::WriteSignal)
+                || path_without_generics == parse_quote!(prelude::WriteSignal)
+                || path_without_generics == parse_quote!(WriteSignal)
         }
         None => false,
     }
@@ -1778,6 +1797,17 @@ fn test_looks_like_type() {
         ReadOnlySignal<Option<i32>, UnsyncStorage>
     )));
 
+    assert!(!looks_like_signal_type(&parse_quote!(
+        Option<ReadSignal<i32>>
+    )));
+    assert!(looks_like_signal_type(&parse_quote!(ReadSignal<i32>)));
+    assert!(looks_like_signal_type(
+        &parse_quote!(ReadSignal<i32, SyncStorage>)
+    ));
+    assert!(looks_like_signal_type(&parse_quote!(
+        ReadSignal<Option<i32>, UnsyncStorage>
+    )));
+
     assert!(looks_like_callback_type(&parse_quote!(
         Option<EventHandler>
     )));

packages/core-macro/tests/rsx.rs

@@ -52,13 +52,13 @@ mod test_default_into {
 
         // Test default values for signals
         #[props(default)]
-        read_only_w_default: ReadOnlySignal<bool>,
+        read_only_w_default: ReadSignal<bool>,
 
         #[props(default = true)]
-        read_only_w_default_val: ReadOnlySignal<bool>,
+        read_only_w_default_val: ReadSignal<bool>,
 
-        #[props(default = ReadOnlySignal::new(Signal::new(true)))]
-        read_only_w_default_val_explicit: ReadOnlySignal<bool>,
+        #[props(default = ReadSignal::new(Signal::new(true)))]
+        read_only_w_default_val_explicit: ReadSignal<bool>,
 
         // Test default values for callbacks/event handlers
         #[props(default)]
@@ -108,7 +108,7 @@ mod test_optional_signals {
     fn UsesComponents() -> Element {
         rsx! {
             PropsStruct {
-                regular_read_signal: ReadOnlySignal::new(Signal::new(1234)),
+                regular_read_signal: ReadSignal::new(Signal::new(1234)),
             }
             PropsStruct {
                 optional_read_signal: 1234,
@@ -126,8 +126,8 @@ mod test_optional_signals {
     // Test props as struct param.
     #[derive(Props, Clone, PartialEq)]
     struct MyTestProps {
-        pub optional_read_signal: ReadOnlySignal<Option<u16>>,
-        pub regular_read_signal: ReadOnlySignal<u16>,
+        pub optional_read_signal: ReadSignal<Option<u16>>,
+        pub regular_read_signal: ReadSignal<u16>,
     }
 
     #[component]
@@ -137,7 +137,7 @@ mod test_optional_signals {
 
     // Test props as params.
     #[component]
-    fn PropParams(opt_read_sig: ReadOnlySignal<Option<u16>>) -> Element {
+    fn PropParams(opt_read_sig: ReadSignal<Option<u16>>) -> Element {
         rsx! { "hi!" }
     }