From 302f3cb6e30a2e943df17e3ecbdf0a5c7f6c9f77 Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:37:53 -0800
Subject: [PATCH] Fixes

---
 Cargo.lock       | 22 ++++++++--------------
 Cargo.toml       |  6 +++---
 examples/demo.rs |  9 +++++----
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b6978ae..0bbae4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1730,8 +1730,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 [[package]]
 name = "dioxus"
 version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d9e3b0725e520250bf23213f996d241cca29cea4360a9bf08a44e0033f8e569"
+source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda"
 dependencies = [
  "dioxus-core",
  "dioxus-core-macro",
@@ -1743,8 +1742,7 @@ dependencies = [
 [[package]]
 name = "dioxus-core"
 version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f33186615b2e90bceab24a195b3cfad4e0b4d91a33ec44a94845876bfb25c13"
+source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda"
 dependencies = [
  "bumpalo",
  "futures-channel",
@@ -1760,8 +1758,7 @@ dependencies = [
 [[package]]
 name = "dioxus-core-macro"
 version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21afaccb28587aed0ba98856335912f5ce7052c0aafa74b213829a3b8bfd2345"
+source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda"
 dependencies = [
  "constcat",
  "dioxus-core",
@@ -1781,8 +1778,7 @@ checksum = "2ea539174bb236e0e7dc9c12b19b88eae3cb574dedbd0252a2d43ea7e6de13e2"
 [[package]]
 name = "dioxus-hooks"
 version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb23ce82df4fb13e9ddaa01d1469f1f32d683dd4636204bd0a0eaf434b65946"
+source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda"
 dependencies = [
  "dioxus-core",
  "dioxus-debug-cell",
@@ -1795,8 +1791,7 @@ dependencies = [
 [[package]]
 name = "dioxus-hot-reload"
 version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7d8c9e89e866a6b84b8ad696f0ff2f6f6563d2235eb99acc6952f19e516cc09"
+source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda"
 dependencies = [
  "chrono",
  "dioxus-core",
@@ -1814,8 +1809,7 @@ dependencies = [
 [[package]]
 name = "dioxus-html"
 version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "828a42a2d70688a2412a8538c8b5a5eceadf68f682f899dc4455a0169db39dfd"
+source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda"
 dependencies = [
  "async-channel 1.9.0",
  "async-trait",
@@ -1833,8 +1827,7 @@ dependencies = [
 [[package]]
 name = "dioxus-rsx"
 version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c974133c7c95497a486d587e40449927711430b308134b9cd374b8d35eceafb3"
+source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda"
 dependencies = [
  "dioxus-core",
  "internment",
@@ -1842,6 +1835,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.41",
+ "tracing",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 69024e2..4357a3a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,14 +5,14 @@ edition = "2021"
 
 [dependencies]
 bevy = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" }
-dioxus = { version = "0.4", default-features = false, features = [
+dioxus = { git = "https://github.com/ealmloff/dioxus", branch = "fix-event-bubbling", default-features = false, features = [
     "macro",
     "hooks",
 ] }
-dioxus-rsx = { version = "0.4", default-features = false, features = [
+dioxus-rsx = { git = "https://github.com/ealmloff/dioxus", branch = "fix-event-bubbling", default-features = false, features = [
     "hot_reload",
 ], optional = true }
-dioxus-hot-reload = { version = "0.4", default-features = false, features = [
+dioxus-hot-reload = { git = "https://github.com/ealmloff/dioxus", branch = "fix-event-bubbling", default-features = false, features = [
     "custom_file_watcher",
 ], optional = true }
 bevy_mod_picking = { version = "0.17", default-features = false, features = [
diff --git a/examples/demo.rs b/examples/demo.rs
index be90917..7fb8da9 100644
--- a/examples/demo.rs
+++ b/examples/demo.rs
@@ -61,12 +61,13 @@ fn SceneTree<'a>(cx: Scope, selected_entity: &'a UseState<Option<Entity>>) -> El
                 rsx! {
                     for (entity, name) in entities {
                         node {
-                            onclick: move |_| {
+                            onclick: move |event| {
                                 if Some(entity) == ***selected_entity {
                                     selected_entity.set(None);
                                 } else {
                                     selected_entity.set(Some(entity));
                                 }
+                                event.stop_propagation();
                             },
                             padding: "8",
                             background_color: if Some(entity) == ***selected_entity { INDIGO_600 } else { NEUTRAL_800 },
@@ -79,12 +80,12 @@ fn SceneTree<'a>(cx: Scope, selected_entity: &'a UseState<Option<Entity>>) -> El
                 }
             }
             node {
-                onclick: move |_| spawn_entity(),
-                onmouse_enter: enter,
-                onmouse_exit: exit,
                 padding: "8",
                 background_color: if spawn_entity_hovered { NEUTRAL_600 } else { NEUTRAL_800 },
                 text {
+                    onclick: move |_| spawn_entity(),
+                    onmouse_enter: enter,
+                    onmouse_exit: exit,
                     text: "Spawn Entity",
                     text_size: "18"
                 }