Merge pull request #1858 from egegungordu/attr-diff-loop-fix

Fix attribute diff infinite loop

packages/core/src/diff.rs

@@ -145,19 +145,27 @@ impl<'b> VirtualDom {
                                 (Some(left), Some(right)) => {
                                     // check which name is greater
                                     match left.name.cmp(right.name) {
-                                        std::cmp::Ordering::Less => self.remove_attribute(
-                                            left.name,
-                                            left.namespace,
-                                            mounted_id,
-                                        ),
-                                        std::cmp::Ordering::Greater => self.write_attribute(
-                                            right_template,
-                                            right,
-                                            idx,
-                                            mounted_id,
-                                        ),
+                                        std::cmp::Ordering::Less => {
+                                            self.remove_attribute(
+                                                left.name,
+                                                left.namespace,
+                                                mounted_id,
+                                            );
+                                            left_iter.next();
+                                        }
+                                        std::cmp::Ordering::Greater => {
+                                            self.write_attribute(
+                                                right_template,
+                                                right,
+                                                idx,
+                                                mounted_id,
+                                            );
+                                            right_iter.next();
+                                        }
                                         std::cmp::Ordering::Equal => {
-                                            self.diff_attribute(left, right, mounted_id)
+                                            self.diff_attribute(left, right, mounted_id);
+                                            left_iter.next();
+                                            right_iter.next();
                                         }
                                     }
                                 }

packages/core/tests/diff_element.rs

@@ -1,6 +1,6 @@
 use dioxus::core::Mutation::*;
 use dioxus::prelude::*;
-use dioxus_core::ElementId;
+use dioxus_core::{AttributeValue, ElementId};
 
 #[test]
 fn text_diff() {
@@ -82,3 +82,122 @@ fn element_swap() {
         ]
     );
 }
+
+#[test]
+fn attribute_diff() {
+    fn app(cx: Scope) -> Element {
+        let gen = cx.generation();
+
+        // attributes have to be sorted by name
+        let attrs = match gen % 5 {
+            0 => cx.bump().alloc([Attribute::new(
+                "a",
+                AttributeValue::Text("hello"),
+                None,
+                false,
+            )]) as &[Attribute],
+            1 => cx.bump().alloc([
+                Attribute::new("a", AttributeValue::Text("hello"), None, false),
+                Attribute::new("b", AttributeValue::Text("hello"), None, false),
+                Attribute::new("c", AttributeValue::Text("hello"), None, false),
+            ]) as &[Attribute],
+            2 => cx.bump().alloc([
+                Attribute::new("c", AttributeValue::Text("hello"), None, false),
+                Attribute::new("d", AttributeValue::Text("hello"), None, false),
+                Attribute::new("e", AttributeValue::Text("hello"), None, false),
+            ]) as &[Attribute],
+            3 => cx.bump().alloc([Attribute::new(
+                "d",
+                AttributeValue::Text("world"),
+                None,
+                false,
+            )]) as &[Attribute],
+            _ => unreachable!(),
+        };
+
+        cx.render(rsx!(
+            div {
+                ..*attrs,
+                "hello"
+            }
+        ))
+    }
+
+    let mut vdom = VirtualDom::new(app);
+    _ = vdom.rebuild();
+
+    vdom.mark_dirty(ScopeId::ROOT);
+    assert_eq!(
+        vdom.render_immediate().santize().edits,
+        [
+            SetAttribute {
+                name: "b",
+                value: (&AttributeValue::Text("hello",)).into(),
+                id: ElementId(1,),
+                ns: None,
+            },
+            SetAttribute {
+                name: "c",
+                value: (&AttributeValue::Text("hello",)).into(),
+                id: ElementId(1,),
+                ns: None,
+            },
+        ]
+    );
+
+    vdom.mark_dirty(ScopeId::ROOT);
+    assert_eq!(
+        vdom.render_immediate().santize().edits,
+        [
+            SetAttribute {
+                name: "a",
+                value: (&AttributeValue::None).into(),
+                id: ElementId(1,),
+                ns: None,
+            },
+            SetAttribute {
+                name: "b",
+                value: (&AttributeValue::None).into(),
+                id: ElementId(1,),
+                ns: None,
+            },
+            SetAttribute {
+                name: "d",
+                value: (&AttributeValue::Text("hello",)).into(),
+                id: ElementId(1,),
+                ns: None,
+            },
+            SetAttribute {
+                name: "e",
+                value: (&AttributeValue::Text("hello",)).into(),
+                id: ElementId(1,),
+                ns: None,
+            },
+        ]
+    );
+
+    vdom.mark_dirty(ScopeId::ROOT);
+    assert_eq!(
+        vdom.render_immediate().santize().edits,
+        [
+            SetAttribute {
+                name: "c",
+                value: (&AttributeValue::None).into(),
+                id: ElementId(1,),
+                ns: None,
+            },
+            SetAttribute {
+                name: "d",
+                value: (&AttributeValue::Text("world",)).into(),
+                id: ElementId(1,),
+                ns: None,
+            },
+            SetAttribute {
+                name: "e",
+                value: (&AttributeValue::None).into(),
+                id: ElementId(1,),
+                ns: None,
+            },
+        ]
+    );
+}