From c409fecaaf5ec5e0c082900fa03631528f143dbd Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Sat, 17 Dec 2022 01:52:17 -0800
Subject: [PATCH] fix: sync with master

---
 packages/core/src/arena.rs | 2 +-
 packages/web/src/dom.rs    | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/arena.rs b/packages/core/src/arena.rs
index e876f09e1..380cfd90c 100644
--- a/packages/core/src/arena.rs
+++ b/packages/core/src/arena.rs
@@ -152,7 +152,7 @@ impl VirtualDom {
         listeners.drain(..).for_each(|listener| {
             let listener = unsafe { &*listener };
             if let AttributeValue::Listener(l) = &listener.value {
-                _ = l.take();
+                _ = l.0.take();
             }
         });
     }
diff --git a/packages/web/src/dom.rs b/packages/web/src/dom.rs
index 29a73b386..8fe1d7eb1 100644
--- a/packages/web/src/dom.rs
+++ b/packages/web/src/dom.rs
@@ -197,11 +197,9 @@ impl WebsysDom {
                 },
                 SetText { value, id } => i.set_text(id.0 as u32, value),
                 NewEventListener { name, id, .. } => {
-                    i.new_event_listener(name, id.0 as u32, event_bubbles(&name[2..]) as u8);
-                }
-                RemoveEventListener { name, id } => {
-                    i.remove_event_listener(name, id.0 as u32, event_bubbles(&name[2..]) as u8)
+                    i.new_event_listener(name, id.0 as u32);
                 }
+                RemoveEventListener { name, id } => i.remove_event_listener(name, id.0 as u32),
                 Remove { id } => i.remove(id.0 as u32),
                 PushRoot { id } => i.push_root(id.0 as u32),
             }