chore: warning

(closes #4512)

.github/workflows/run-cargo-make-task.yml

@@ -103,7 +103,7 @@ jobs:
         id: pnpm-cache
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         if: contains(inputs.directory, 'examples')
         name: Setup pnpm cache
         with:

Cargo.toml

@@ -49,45 +49,45 @@ any_spawner = { path = "./any_spawner/", version = "0.3.0" }
 const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1" }
 either_of = { path = "./either_of/", version = "0.1.6" }
 hydration_context = { path = "./hydration_context", version = "0.3.0" }
-leptos = { path = "./leptos", version = "0.8.14" }
+leptos = { path = "./leptos", version = "0.8.15" }
 leptos_config = { path = "./leptos_config", version = "0.8.8" }
 leptos_dom = { path = "./leptos_dom", version = "0.8.7" }
 leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.5" }
 leptos_integration_utils = { path = "./integrations/utils", version = "0.8.7" }
-leptos_macro = { path = "./leptos_macro", version = "0.8.12" }
-leptos_router = { path = "./router", version = "0.8.10" }
+leptos_macro = { path = "./leptos_macro", version = "0.8.13" }
+leptos_router = { path = "./router", version = "0.8.11" }
 leptos_router_macro = { path = "./router_macro", version = "0.8.6" }
 leptos_server = { path = "./leptos_server", version = "0.8.6" }
 leptos_meta = { path = "./meta", version = "0.8.5" }
 next_tuple = { path = "./next_tuple", version = "0.1.0" }
 oco_ref = { path = "./oco", version = "0.2.1" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.2.11" }
-reactive_stores = { path = "./reactive_stores", version = "0.3.0" }
+reactive_graph = { path = "./reactive_graph", version = "0.2.12" }
+reactive_stores = { path = "./reactive_stores", version = "0.3.1" }
 reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.6" }
-server_fn = { path = "./server_fn", version = "0.8.8" }
+server_fn = { path = "./server_fn", version = "0.8.9" }
 server_fn_macro = { path = "./server_fn_macro", version = "0.8.8" }
 server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.5" }
 tachys = { path = "./tachys", version = "0.2.11" }
 
 # members deps
-async-once-cell = { default-features = false, version = "0.5.3" }
+async-once-cell = { default-features = false, version = "0.5.4" }
 itertools = { default-features = false, version = "0.14.0" }
-convert_case = { default-features = false, version = "0.8.0" }
-serde_json = { default-features = false, version = "1.0.143" }
-trybuild = { default-features = false, version = "1.0.110" }
-typed-builder = { default-features = false, version = "0.22.0" }
-typed-builder-macro = { default-features = false, version = "0.22.0" }
+convert_case = { default-features = false, version = "0.10.0" }
+serde_json = { default-features = false, version = "1.0.145" }
+trybuild = { default-features = false, version = "1.0.114" }
+typed-builder = { default-features = false, version = "0.23.2" }
+typed-builder-macro = { default-features = false, version = "0.23.2" }
 thiserror = { default-features = false, version = "2.0.17" }
-wasm-bindgen = { default-features = false, version = "0.2.100" }
-indexmap = { default-features = false, version = "2.11.0" }
+wasm-bindgen = { default-features = false, version = "0.2.106" }
+indexmap = { default-features = false, version = "2.12.1" }
 rstml = { default-features = false, version = "0.12.1" }
 rustc_version = { default-features = false, version = "0.4.1" }
 guardian = { default-features = false, version = "1.3.0" }
 rustc-hash = { default-features = false, version = "2.1.1" }
-actix-web = { default-features = false, version = "4.11.0" }
-tracing = { default-features = false, version = "0.1.41" }
-slotmap = { default-features = false, version = "1.0.7" }
+actix-web = { default-features = false, version = "4.12.1" }
+tracing = { default-features = false, version = "0.1.44" }
+slotmap = { default-features = false, version = "1.1.1" }
 futures = { default-features = false, version = "0.3.31" }
 dashmap = { default-features = false, version = "6.1.0" }
 pin-project-lite = { default-features = false, version = "0.2.16" }
@@ -97,41 +97,41 @@ html-escape = { default-features = false, version = "0.2.13" }
 proc-macro-error2 = { default-features = false, version = "2.0.1" }
 const_format = { default-features = false, version = "0.2.35" }
 gloo-net = { default-features = false, version = "0.6.0" }
-url = { default-features = false, version = "2.5.4" }
-tokio = { default-features = false, version = "1.47.1" }
+url = { default-features = false, version = "2.5.7" }
+tokio = { default-features = false, version = "1.48.0" }
 base64 = { default-features = false, version = "0.22.1" }
-cfg-if = { default-features = false, version = "1.0.3" }
-wasm-bindgen-futures = { default-features = false, version = "0.4.50" }
+cfg-if = { default-features = false, version = "1.0.4" }
+wasm-bindgen-futures = { default-features = false, version = "0.4.56" }
 tower = { default-features = false, version = "0.5.2" }
-proc-macro2 = { default-features = false, version = "1.0.101" }
-serde = { default-features = false, version = "1.0.219" }
+proc-macro2 = { default-features = false, version = "1.0.103" }
+serde = { default-features = false, version = "1.0.228" }
 parking_lot = { default-features = false, version = "0.12.5" }
-axum = { default-features = false, version = "0.8.6" }
+axum = { default-features = false, version = "0.8.7" }
 serde_qs = { default-features = false, version = "0.15.0" }
-syn = { default-features = false, version = "2.0.106" }
+syn = { default-features = false, version = "2.0.111" }
 xxhash-rust = { default-features = false, version = "0.8.15" }
 paste = { default-features = false, version = "1.0.15" }
-quote = { default-features = false, version = "1.0.41" }
-web-sys = { default-features = false, version = "0.3.77" }
-js-sys = { default-features = false, version = "0.3.77" }
-rand = { default-features = false, version = "0.9.1" }
-serde-lite = { default-features = false, version = "0.5.0" }
+quote = { default-features = false, version = "1.0.42" }
+web-sys = { default-features = false, version = "0.3.83" }
+js-sys = { default-features = false, version = "0.3.83" }
+rand = { default-features = false, version = "0.9.2" }
+serde-lite = { default-features = false, version = "0.5.1" }
 tokio-tungstenite = { default-features = false, version = "0.28.0" }
 serial_test = { default-features = false, version = "3.2.0" }
 erased = { default-features = false, version = "0.1.2" }
-glib = { default-features = false, version = "0.20.12" }
+glib = { default-features = false, version = "0.21.5" }
 async-trait = { default-features = false, version = "0.1.89" }
 linear-map = { default-features = false, version = "1.2.0" }
 anyhow = { default-features = false, version = "1.0.100" }
 walkdir = { default-features = false, version = "2.5.0" }
 actix-ws = { default-features = false, version = "0.3.0" }
-tower-http = { default-features = false, version = "0.6.4" }
+tower-http = { default-features = false, version = "0.6.8" }
 prettyplease = { default-features = false, version = "0.2.37" }
 inventory = { default-features = false, version = "0.3.21" }
-config = { default-features = false, version = "0.15.14" }
-camino = { default-features = false, version = "1.2.1" }
+config = { default-features = false, version = "0.15.19" }
+camino = { default-features = false, version = "1.2.2" }
 ciborium = { default-features = false, version = "0.2.2" }
-bitcode = { default-features = false, version = "0.6.6" }
+bitcode = { default-features = false, version = "0.6.9" }
 multer = { default-features = false, version = "3.1.0" }
 leptos-spin-macro = { default-features = false, version = "0.2.0" }
 sledgehammer_utils = { default-features = false, version = "0.3.1" }
@@ -139,38 +139,38 @@ sledgehammer_bindgen = { default-features = false, version = "0.6.0" }
 wasm-streams = { default-features = false, version = "0.4.2" }
 rkyv = { default-features = false, version = "0.8.12" }
 temp-env = { default-features = false, version = "0.3.6" }
-uuid = { default-features = false, version = "1.18.0" }
-bytes = { default-features = false, version = "1.10.1" }
-http = { default-features = false, version = "1.3.1" }
-regex = { default-features = false, version = "1.11.3" }
+uuid = { default-features = false, version = "1.19.0" }
+bytes = { default-features = false, version = "1.11.0" }
+http = { default-features = false, version = "1.4.0" }
+regex = { default-features = false, version = "1.12.2" }
 drain_filter_polyfill = { default-features = false, version = "0.1.3" }
 tempfile = { default-features = false, version = "3.23.0" }
 futures-lite = { default-features = false, version = "2.6.1" }
-log = { default-features = false, version = "0.4.27" }
+log = { default-features = false, version = "0.4.29" }
 percent-encoding = { default-features = false, version = "2.3.2" }
-async-executor = { default-features = false, version = "1.13.2" }
-const-str = { default-features = false, version = "0.6.4" }
+async-executor = { default-features = false, version = "1.13.3" }
+const-str = { default-features = false, version = "0.7.1" }
 http-body-util = { default-features = false, version = "0.1.3" }
-hyper = { default-features = false, version = "1.7.0" }
+hyper = { default-features = false, version = "1.8.1" }
 postcard = { default-features = false, version = "1.1.3" }
 rmp-serde = { default-features = false, version = "1.3.0" }
-reqwest = { default-features = false, version = "0.12.23" }
+reqwest = { default-features = false, version = "0.12.26" }
 tower-layer = { default-features = false, version = "0.3.3" }
 attribute-derive = { default-features = false, version = "0.10.5" }
-insta = { default-features = false, version = "1.43.1" }
-codee = { default-features = false, version = "0.3.0" }
+insta = { default-features = false, version = "1.45.0" }
+codee = { default-features = false, version = "0.3.5" }
 actix-http = { default-features = false, version = "3.11.2" }
-wasm-bindgen-test = { default-features = false, version = "0.3.50" }
+wasm-bindgen-test = { default-features = false, version = "0.3.56" }
 rustversion = { default-features = false, version = "1.0.22" }
-getrandom = { default-features = false, version = "0.3.3" }
-actix-files = { default-features = false, version = "0.6.6" }
+getrandom = { default-features = false, version = "0.3.4" }
+actix-files = { default-features = false, version = "0.6.9" }
 async-lock = { default-features = false, version = "3.4.1" }
 base16 = { default-features = false, version = "0.2.1" }
 digest = { default-features = false, version = "0.10.7" }
-sha2 = { default-features = false, version = "0.10.8" }
-subsecond = { default-features = false, version = "0.7.0-rc.0" }
-dioxus-cli-config = { default-features = false, version = "0.7.0-rc.0" }
-dioxus-devtools = { default-features = false, version = "0.7.0-rc.0" }
+sha2 = { default-features = false, version = "0.10.9" }
+subsecond = { default-features = false, version = "0.7.2" }
+dioxus-cli-config = { default-features = false, version = "0.7.2" }
+dioxus-devtools = { default-features = false, version = "0.7.2" }
 wasm_split_helpers = { default-features = false, version = "0.2.0" }
 
 [profile.release]

leptos/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos"
-version = "0.8.14"
+version = "0.8.15"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = "0.8.12"
+version = "0.8.14"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos_macro/src/view/component_builder.rs

@@ -176,7 +176,9 @@ pub(crate) fn component_to_tokens(
     let spreads = (!(spreads.is_empty())).then(|| {
         if cfg!(feature = "__internal_erase_components") {
             quote! {
-                .add_any_attr(vec![#(#spreads.into_any_attr(),)*])
+                .add_any_attr({
+                    vec![#(::leptos::attr::any_attribute::IntoAnyAttribute::into_any_attr(#spreads),)*]
+                })
             }
         } else {
             quote! {

reactive_graph/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.2.11"
+version = "0.2.12"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -32,7 +32,7 @@ indexmap = { workspace = true, default-features = true }
 paste = { workspace = true, default-features = true }
 
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
-web-sys = { version = "0.3.77", features = ["console"] }
+web-sys = { version = "0.3.83", features = ["console"] }
 
 [dev-dependencies]
 tokio = { features = [

reactive_stores/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_stores"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

reactive_stores/src/arc_field.rs

@@ -29,6 +29,7 @@ where
     #[cfg(any(debug_assertions, leptos_debuginfo))]
     defined_at: &'static Location<'static>,
     path: Arc<dyn Fn() -> StorePath + Send + Sync>,
+    path_unkeyed: Arc<dyn Fn() -> StorePath + Send + Sync>,
     get_trigger: Arc<dyn Fn(StorePath) -> StoreFieldTrigger + Send + Sync>,
     get_trigger_unkeyed:
         Arc<dyn Fn(StorePath) -> StoreFieldTrigger + Send + Sync>,
@@ -113,6 +114,10 @@ impl<T> StoreField for ArcField<T> {
         (self.path)()
     }
 
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        (self.path_unkeyed)()
+    }
+
     fn reader(&self) -> Option<Self::Reader> {
         (self.read)().map(StoreFieldReader::new)
     }
@@ -137,6 +142,9 @@ where
             #[cfg(any(debug_assertions, leptos_debuginfo))]
             defined_at: Location::caller(),
             path: Arc::new(move || value.path().into_iter().collect()),
+            path_unkeyed: Arc::new(move || {
+                value.path_unkeyed().into_iter().collect()
+            }),
             get_trigger: Arc::new(move |path| value.get_trigger(path)),
             get_trigger_unkeyed: Arc::new(move |path| {
                 value.get_trigger_unkeyed(path)
@@ -163,6 +171,10 @@ where
                 let value = value.clone();
                 move || value.path().into_iter().collect()
             }),
+            path_unkeyed: Arc::new({
+                let value = value.clone();
+                move || value.path_unkeyed().into_iter().collect()
+            }),
             get_trigger: Arc::new({
                 let value = value.clone();
                 move |path| value.get_trigger(path)
@@ -211,6 +223,10 @@ where
                 let value = value.clone();
                 move || value.path().into_iter().collect()
             }),
+            path_unkeyed: Arc::new({
+                let value = value.clone();
+                move || value.path_unkeyed().into_iter().collect()
+            }),
             get_trigger: Arc::new({
                 let value = value.clone();
                 move |path| value.get_trigger(path)
@@ -258,6 +274,10 @@ where
                 let value = value.clone();
                 move || value.path().into_iter().collect()
             }),
+            path_unkeyed: Arc::new({
+                let value = value.clone();
+                move || value.path_unkeyed().into_iter().collect()
+            }),
             get_trigger: Arc::new({
                 let value = value.clone();
                 move |path| value.get_trigger(path)
@@ -306,6 +326,10 @@ where
                 let value = value.clone();
                 move || value.path().into_iter().collect()
             }),
+            path_unkeyed: Arc::new({
+                let value = value.clone();
+                move || value.path_unkeyed().into_iter().collect()
+            }),
             get_trigger: Arc::new({
                 let value = value.clone();
                 move |path| value.get_trigger(path)
@@ -358,6 +382,10 @@ where
                 let value = value.clone();
                 move || value.path().into_iter().collect()
             }),
+            path_unkeyed: Arc::new({
+                let value = value.clone();
+                move || value.path_unkeyed().into_iter().collect()
+            }),
             get_trigger: Arc::new({
                 let value = value.clone();
                 move |path| value.get_trigger(path)
@@ -396,6 +424,7 @@ impl<T> Clone for ArcField<T> {
             #[cfg(any(debug_assertions, leptos_debuginfo))]
             defined_at: self.defined_at,
             path: self.path.clone(),
+            path_unkeyed: self.path_unkeyed.clone(),
             get_trigger: Arc::clone(&self.get_trigger),
             get_trigger_unkeyed: Arc::clone(&self.get_trigger_unkeyed),
             read: Arc::clone(&self.read),

reactive_stores/src/deref.rs

@@ -76,6 +76,11 @@ where
     fn path(&self) -> impl IntoIterator<Item = StorePathSegment> {
         self.inner.path()
     }
+
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        self.inner.path_unkeyed()
+    }
+
     fn reader(&self) -> Option<Self::Reader> {
         let inner = self.inner.reader()?;
         Some(Mapped::new_with_guard(inner, |n| n.deref()))

reactive_stores/src/field.rs

@@ -73,6 +73,13 @@ where
             .unwrap_or_default()
     }
 
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        self.inner
+            .try_get_value()
+            .map(|inner| inner.path_unkeyed().into_iter().collect::<Vec<_>>())
+            .unwrap_or_default()
+    }
+
     fn reader(&self) -> Option<Self::Reader> {
         self.inner.try_get_value().and_then(|inner| inner.reader())
     }

reactive_stores/src/iter.rs

@@ -80,6 +80,13 @@ where
             .chain(iter::once(self.index.into()))
     }
 
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        self.inner
+            .path_unkeyed()
+            .into_iter()
+            .chain(iter::once(self.index.into()))
+    }
+
     fn get_trigger(&self, path: StorePath) -> StoreFieldTrigger {
         self.inner.get_trigger(path)
     }

reactive_stores/src/keyed.rs

@@ -106,6 +106,13 @@ where
             .chain(iter::once(self.path_segment))
     }
 
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        self.inner
+            .path_unkeyed()
+            .into_iter()
+            .chain(iter::once(self.path_segment))
+    }
+
     fn get_trigger(&self, path: StorePath) -> StoreFieldTrigger {
         self.inner.get_trigger(path)
     }
@@ -169,6 +176,7 @@ where
 {
     inner: KeyedSubfield<Inner, Prev, K, T>,
     guard: Option<Guard>,
+    untracked: bool,
 }
 
 impl<Inner, Prev, K, T, Guard> Deref
@@ -220,6 +228,7 @@ where
     K: Debug + Send + Sync + PartialEq + Eq + Hash + 'static,
 {
     fn untrack(&mut self) {
+        self.untracked = true;
         if let Some(inner) = self.guard.as_mut() {
             inner.untrack();
         }
@@ -244,7 +253,10 @@ where
         // now that the write lock is release, we can get a read lock to refresh this keyed field
         // based on the new value
         self.inner.update_keys();
-        self.inner.notify();
+
+        if !self.untracked {
+            self.inner.notify();
+        }
 
         // reactive updates happen on the next tick
     }
@@ -337,6 +349,7 @@ where
         Some(KeyedSubfieldWriteGuard {
             inner: self.clone(),
             guard: Some(guard),
+            untracked: false,
         })
     }
 
@@ -348,6 +361,7 @@ where
         Some(KeyedSubfieldWriteGuard {
             inner: self.clone(),
             guard: Some(guard),
+            untracked: true,
         })
     }
 }
@@ -444,6 +458,24 @@ where
         inner.into_iter().chain(this)
     }
 
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        let inner =
+            self.inner.path_unkeyed().into_iter().collect::<StorePath>();
+        let keys = self
+            .inner
+            .keys()
+            .expect("using keys on a store with no keys");
+        let this = keys
+            .with_field_keys(
+                inner.clone(),
+                |keys| (keys.get(&self.key), vec![]),
+                || self.inner.latest_keys(),
+            )
+            .flatten()
+            .map(|(_, idx)| StorePathSegment(idx));
+        inner.into_iter().chain(this)
+    }
+
     fn get_trigger(&self, path: StorePath) -> StoreFieldTrigger {
         self.inner.get_trigger(path)
     }
@@ -721,18 +753,19 @@ mod tests {
         effect::Effect,
         traits::{GetUntracked, ReadUntracked, Set, Track, Write},
     };
+    use reactive_stores::Patch;
     use std::sync::{
         atomic::{AtomicUsize, Ordering},
         Arc,
     };
 
-    #[derive(Debug, Store, Default)]
+    #[derive(Debug, Store, Default, Patch)]
     struct Todos {
         #[store(key: usize = |todo| todo.id)]
         todos: Vec<Todo>,
     }
 
-    #[derive(Debug, Store, Default, Clone, PartialEq, Eq)]
+    #[derive(Debug, Store, Default, Clone, PartialEq, Eq, Patch)]
     struct Todo {
         id: usize,
         label: String,
@@ -853,4 +886,41 @@ mod tests {
         assert_eq!(b_count.load(Ordering::Relaxed), 1);
         assert_eq!(c_count.load(Ordering::Relaxed), 1);
     }
+
+    #[tokio::test]
+    async fn untracked_write_on_keyed_subfield_shouldnt_notify() {
+        _ = any_spawner::Executor::init_tokio();
+
+        let store = Store::new(data());
+        assert_eq!(store.read_untracked().todos.len(), 3);
+
+        // create an effect to read from the keyed subfield
+        let todos_count = Arc::new(AtomicUsize::new(0));
+        Effect::new_sync({
+            let todos_count = Arc::clone(&todos_count);
+            move || {
+                store.todos().track();
+                todos_count.fetch_add(1, Ordering::Relaxed);
+            }
+        });
+
+        tick().await;
+        assert_eq!(todos_count.load(Ordering::Relaxed), 1);
+
+        // writing to keyed subfield notifies the iterator
+        store.todos().write().push(Todo {
+            id: 13,
+            label: "D".into(),
+        });
+        tick().await;
+        assert_eq!(todos_count.load(Ordering::Relaxed), 2);
+
+        // but an untracked write doesn't
+        store.todos().write_untracked().push(Todo {
+            id: 14,
+            label: "E".into(),
+        });
+        tick().await;
+        assert_eq!(todos_count.load(Ordering::Relaxed), 2);
+    }
 }

reactive_stores/src/lib.rs

@@ -833,7 +833,7 @@ mod tests {
     use reactive_graph::{
         effect::Effect,
         owner::StoredValue,
-        traits::{Read, ReadUntracked, Set, Update, Write},
+        traits::{Read, ReadUntracked, Set, Track, Update, Write},
     };
     use std::sync::{
         atomic::{AtomicUsize, Ordering},
@@ -1375,4 +1375,34 @@ mod tests {
 
         assert_eq!(combined_count.load(Ordering::Relaxed), 3);
     }
+
+    #[tokio::test]
+    async fn untracked_write_on_subfield_shouldnt_notify() {
+        _ = any_spawner::Executor::init_tokio();
+
+        let name_count = Arc::new(AtomicUsize::new(0));
+
+        let store = Store::new(data());
+
+        let tracked_field = store.user();
+
+        Effect::new_sync({
+            let name_count = Arc::clone(&name_count);
+            move |_| {
+                tracked_field.track();
+                name_count.fetch_add(1, Ordering::Relaxed);
+            }
+        });
+
+        tick().await;
+        assert_eq!(name_count.load(Ordering::Relaxed), 1);
+
+        tracked_field.write().push('!');
+        tick().await;
+        assert_eq!(name_count.load(Ordering::Relaxed), 2);
+
+        tracked_field.write_untracked().push('!');
+        tick().await;
+        assert_eq!(name_count.load(Ordering::Relaxed), 2);
+    }
 }

reactive_stores/src/patch.rs

@@ -30,7 +30,7 @@ where
     type Value = T::Value;
 
     fn patch(&self, new: Self::Value) {
-        let path = self.path().into_iter().collect::<StorePath>();
+        let path = self.path_unkeyed().into_iter().collect::<StorePath>();
         if let Some(mut writer) = self.writer() {
             // don't track the writer for the whole store
             writer.untrack();

reactive_stores/src/store_field.rs

@@ -38,6 +38,13 @@ pub trait StoreField: Sized {
     #[track_caller]
     fn path(&self) -> impl IntoIterator<Item = StorePathSegment>;
 
+    /// The path of this field (see [`StorePath`]). Uses unkeyed indices for any keyed fields.
+    #[track_caller]
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        // TODO remove default impl next time we do a breaking release
+        self.path()
+    }
+
     /// Reactively tracks this field.
     #[track_caller]
     fn track_field(&self) {
@@ -129,7 +136,9 @@ where
         trigger
     }
 
+    #[track_caller]
     fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        let caller = std::panic::Location::caller();
         let orig_path = path.clone();
 
         let mut path = StorePath::with_capacity(orig_path.len());
@@ -140,7 +149,13 @@ where
                 let key = self
                     .keys
                     .get_key_for_index(&(path.clone(), segment.0))
-                    .expect("could not find key for index");
+                    .unwrap_or_else(|| {
+                        panic!(
+                            "could not find key for index {:?} at {}",
+                            &(path.clone(), segment.0),
+                            caller
+                        )
+                    });
                 path.push(key);
             } else {
                 path.push(*segment);
@@ -154,6 +169,11 @@ where
         iter::empty()
     }
 
+    #[track_caller]
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        iter::empty()
+    }
+
     #[track_caller]
     fn reader(&self) -> Option<Self::Reader> {
         Plain::try_new(Arc::clone(&self.value))
@@ -205,6 +225,14 @@ where
             .unwrap_or_default()
     }
 
+    #[track_caller]
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        self.inner
+            .try_get_value()
+            .map(|n| n.path_unkeyed().into_iter().collect::<Vec<_>>())
+            .unwrap_or_default()
+    }
+
     #[track_caller]
     fn reader(&self) -> Option<Self::Reader> {
         self.inner.try_get_value().and_then(|n| n.reader())

reactive_stores/src/subfield.rs

@@ -84,6 +84,13 @@ where
             .chain(iter::once(self.path_segment))
     }
 
+    fn path_unkeyed(&self) -> impl IntoIterator<Item = StorePathSegment> {
+        self.inner
+            .path_unkeyed()
+            .into_iter()
+            .chain(iter::once(self.path_segment))
+    }
+
     fn get_trigger(&self, path: StorePath) -> StoreFieldTrigger {
         self.inner.get_trigger(path)
     }

router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = "0.8.10"
+version = "0.8.11"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"

server_fn/Cargo.toml

@@ -5,7 +5,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "RPC for any web framework."
 readme = "../README.md"
-version = "0.8.8"
+version = "0.8.9"
 rust-version.workspace = true
 edition.workspace = true
 
@@ -32,7 +32,7 @@ dashmap = { workspace = true, default-features = true }
 
 ## servers
 # actix
-actix-web = { optional = true, workspace = true, default-features = false }
+actix-web = { optional = true, workspace = true, default-features = false, features = ["ws"] }
 actix-ws = { optional = true, workspace = true, default-features = true }
 
 # axum

tachys/src/view/any_view.rs

@@ -693,13 +693,18 @@ impl Render for AnyViewWithAttrs {
     fn rebuild(self, state: &mut Self::State) {
         self.view.rebuild(&mut state.view);
 
-        let elements = state.elements();
-        // FIXME this seems wrong but I think the previous version was also broken!
-        if let Some(element) = elements.first() {
-            self.attrs.rebuild(&mut (
-                element.clone(),
-                std::mem::take(&mut state.attrs),
-            ));
+        // at this point, we have rebuilt the inner view
+        // now we need to update attributes that were spread onto this
+        // this approach is not ideal, but it avoids two edge cases:
+        // 1) merging attributes from two unrelated views (https://github.com/leptos-rs/leptos/issues/4268)
+        // 2) failing to re-create attributes from the same view (https://github.com/leptos-rs/leptos/issues/4512)
+        for element in state.elements() {
+            // first, remove the previous set of attributes
+            self.attrs
+                .clone()
+                .rebuild(&mut (element.clone(), Vec::new()));
+            // then, add the new set of attributes
+            self.attrs.clone().build(&element);
         }
     }
 }
@@ -824,6 +829,7 @@ impl AddAnyAttr for AnyViewWithAttrs {
 /// State for any view with attributes spread onto it.
 pub struct AnyViewWithAttrsState {
     view: AnyViewState,
+    #[allow(dead_code)] // keeps attribute states alive until dropped
     attrs: Vec<AnyAttributeState>,
 }