Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bubbling of events originating in user shadow dom #2627

Merged
merged 1 commit into from Apr 20, 2022
Merged

Fix bubbling of events originating in user shadow dom #2627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/yew/Cargo.toml
View file
Open in desktop
Expand Up @@ -54,6 +54,7 @@ features = [
"NodeList",
"PointerEvent",
"ProgressEvent",
"ShadowRoot",
"Text",
"TouchEvent",
"TransitionEvent",
Expand Down Expand Up @@ -81,7 +82,6 @@ trybuild = "1"
[dev-dependencies.web-sys]
version = "0.3"
features = [
"ShadowRoot",
"ShadowRootInit",
"ShadowRootMode",
]
Expand Down
13 changes: 10 additions & 3 deletions packages/yew/src/dom_bundle/subtree_root.rs
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ use std::hash::{Hash, Hasher};
use std::rc::{Rc, Weak};
use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
use wasm_bindgen::{prelude::wasm_bindgen, JsCast};
use web_sys::{Element, Event, EventTarget as HtmlEventTarget};
use web_sys::{Element, Event, EventTarget as HtmlEventTarget, ShadowRoot};

/// DOM-Types that capture (bubbling) events. This generally includes event targets,
/// but also subtree roots.
Expand Down Expand Up @@ -239,6 +239,13 @@ struct BrandingSearchResult {
closest_branded_ancestor: Element,
}

fn shadow_aware_parent(el: &Element) -> Option<Element> {
match el.parent_element() {
s @ Some(_) => s,
None => el.parent_node()?.dyn_ref::<ShadowRoot>().map(|h| h.host()),
}
}

/// Deduce the subtree an element is part of. This already partially starts the bubbling
/// process, as long as no listeners are encountered.
/// Subtree roots are always branded with their own subtree id.
Expand All @@ -254,7 +261,7 @@ fn find_closest_branded_element(mut el: Element, do_bubble: bool) -> Option<Bran
if let Some(tree_id) = el.subtree_id() {
break tree_id;
}
el = el.parent_element()?;
el = shadow_aware_parent(&el)?;
};
Some(BrandingSearchResult {
branding: responsible_tree_id,
Expand All @@ -276,7 +283,7 @@ fn start_bubbling_from(
if !should_bubble {
return None;
}
let parent = element.parent_element()?;
let parent = shadow_aware_parent(element)?;
subtree.bubble_to_inner_element(parent, true)
})
}
Expand Down