Merge branch 'master' of https://github.com/DioxusLabs/dioxus into rusty-mousedata

 Conflicts:

	packages/tui/src/hooks.rs

packages/tui/src/hooks.rs

@@ -344,12 +344,13 @@ impl InnerInputState {
 
             {
                 // mouseup
+                if was_released {
                     let mut will_bubble = FxHashSet::default();
                     for node in dom.get_listening_sorted("mouseup") {
                         let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap();
                         let currently_contains = layout_contains_point(node_layout, new_pos);
 
-                    if currently_contains && was_released {
+                        if currently_contains {
                             try_create_event(
                                 "mouseup",
                                 Arc::new(prepare_mouse_data(mouse_data, node_layout)),
@@ -361,18 +362,17 @@ impl InnerInputState {
                         }
                     }
                 }
+            }
 
             {
                 // click
+                if mouse_data.trigger_button() == Some(DioxusMouseButton::Primary) && was_released {
                     let mut will_bubble = FxHashSet::default();
                     for node in dom.get_listening_sorted("click") {
                         let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap();
                         let currently_contains = layout_contains_point(node_layout, new_pos);
 
-                    if currently_contains
+                        if currently_contains {
-                        && was_released
-                        && mouse_data.trigger_button() == Some(DioxusMouseButton::Primary)
-                    {
                             try_create_event(
                                 "click",
                                 Arc::new(prepare_mouse_data(mouse_data, node_layout)),
@@ -384,18 +384,18 @@ impl InnerInputState {
                         }
                     }
                 }
+            }
 
             {
                 // contextmenu
+                if mouse_data.trigger_button() == Some(DioxusMouseButton::Secondary) && was_released
+                {
                     let mut will_bubble = FxHashSet::default();
                     for node in dom.get_listening_sorted("contextmenu") {
                         let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap();
                         let currently_contains = layout_contains_point(node_layout, new_pos);
 
-                    if currently_contains
+                        if currently_contains {
-                        && was_released
-                        && mouse_data.trigger_button() == Some(DioxusMouseButton::Secondary)
-                    {
                             try_create_event(
                                 "contextmenu",
                                 Arc::new(prepare_mouse_data(mouse_data, node_layout)),
@@ -407,16 +407,19 @@ impl InnerInputState {
                         }
                     }
                 }
+            }
 
             {
                 // wheel
+                if let Some(w) = wheel_data {
+                    if wheel_delta != 0.0 {
                         let mut will_bubble = FxHashSet::default();
                         for node in dom.get_listening_sorted("wheel") {
-                    let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap();
+                            let node_layout =
+                                layout.layout(node.state.layout.node.unwrap()).unwrap();
                             let currently_contains = layout_contains_point(node_layout, new_pos);
 
-                    if let Some(w) = wheel_data {
+                            if currently_contains {
-                        if currently_contains && wheel_delta != 0.0 {
                                 try_create_event(
                                     "wheel",
                                     Arc::new(w.clone()),
@@ -429,6 +432,7 @@ impl InnerInputState {
                         }
                     }
                 }
+            }
 
             {
                 // mouseleave

packages/tui/src/lib.rs

@@ -129,7 +129,7 @@ fn render_vdom(
                 terminal.clear().unwrap();
             }
 
-            let to_rerender: fxhash::FxHashSet<usize> = vec![0].into_iter().collect();
+            let mut to_rerender: fxhash::FxHashSet<usize> = vec![0].into_iter().collect();
             let mut resized = true;
 
             loop {
@@ -226,7 +226,7 @@ fn render_vdom(
                     // update the style and layout
                     let mut any_map = AnyMap::new();
                     any_map.insert(stretch.clone());
-                    let _to_rerender = rdom.update_state(vdom, to_update, any_map).unwrap();
+                    to_rerender = rdom.update_state(vdom, to_update, any_map).unwrap();
                 }
             }