eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-25 17:15:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

script: make all keyboard events composed (#44094)

Browse Source 
Adjust event targeting for keyboard events when a shadow host is
involved. This is needed to not interfere with keyboard default action
like tabindex focusing.

Testing: Updated WPT tests expectations
Fixes: #43809

---------

Signed-off-by: webbeef <me@webbeef.org>
This commit is contained in:
webbeef
2026-04-10 18:16:05 -07:00
committed by GitHub
parent 1444aa942b
commit 80e8441231
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/script/dom/document/document_event_handler.rs
View File

@@ -1380,10 +1380,7 @@ impl DocumentEventHandler {
let event = keyevent.upcast::<Event>();
// FIXME: https://github.com/servo/servo/issues/43809
if event.type_() != atom!("keydown") {
event.set_composed(true);
}
event.set_composed(true);
event.fire(target, can_gc);

15
components/script/dom/event/event.rs
View File

@@ -327,6 +327,10 @@ impl Event {
let mut target = DomRoot::from_ref(target);
// Save the original dispatch target. Keyboard default actions need the
// element the event was originally fired on, not the retargeted host.
let original_target = target.clone();
// Step 1. Set event’s dispatch flag.
self.set_flags(EventFlags::Dispatch);
@@ -637,7 +641,16 @@ impl Event {
// https://w3c.github.io/uievents/#default-action
// https://dom.spec.whatwg.org/#action-versus-occurance
if !self.DefaultPrevented() {
if let Some(target) = self.GetTarget() {
if self.is::<KeyboardEvent>() {
// For keyboard events, use the original dispatch target rather than
// event.GetTarget(). Composed keyboard events may retarget across
// shadow boundaries, but the default action (character input, Tab
// navigation) should use the element the event was originally fired on.
if let Some(node) = original_target.downcast::<Node>() {
let vtable = vtable_for(node);
vtable.handle_event(self, can_gc);
}
} else if let Some(target) = self.GetTarget() {
if let Some(node) = target.downcast::<Node>() {
let vtable = vtable_for(node);
vtable.handle_event(self, can_gc);

3
tests/wpt/meta/html/semantics/disabled-elements/event-propagate-disabled-keyboard.tentative.html.ini vendored
View File

@@ -1,6 +1,3 @@
[event-propagate-disabled-keyboard.tentative.html]
[Untrusted key events on <custom-control disabled="">Text</custom-control>, observed from <form>]
expected: FAIL
[Trusted key events on <custom-control disabled="">Text</custom-control>, observed from <form>]
expected: FAIL

3
tests/wpt/meta/uievents/keyboard/keyboardevent-composed.html.ini vendored
View File

@@ -1,3 +0,0 @@
[keyboardevent-composed.html]
[keydown event must be composed]
expected: FAIL