mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Implement the :focus pseudo-class selector
Fixes #5460. This supports for simple focusable elements that are their own DOM anchors, like text `input` fields.
This commit is contained in:
parent
ad6c511a5e
commit
791fa3757d
10 changed files with 106 additions and 9 deletions
|
@ -454,7 +454,20 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
|
|||
/// transaction, or none if no elements requested it.
|
||||
fn commit_focus_transaction(self) {
|
||||
//TODO: dispatch blur, focus, focusout, and focusin events
|
||||
|
||||
if let Some(ref elem) = self.focused.get().root() {
|
||||
let node: JSRef<Node> = NodeCast::from_ref(elem.r());
|
||||
node.set_focus_state(false);
|
||||
}
|
||||
|
||||
self.focused.assign(self.possibly_focused.get());
|
||||
|
||||
if let Some(ref elem) = self.focused.get().root() {
|
||||
let node: JSRef<Node> = NodeCast::from_ref(elem.r());
|
||||
node.set_focus_state(true);
|
||||
}
|
||||
// TODO: Update the focus state for all elements in the focus chain.
|
||||
// https://html.spec.whatwg.org/multipage/interaction.html#focus-chain
|
||||
}
|
||||
|
||||
/// Handles any updates when the document's title has changed.
|
||||
|
|
|
@ -1461,6 +1461,13 @@ impl<'a> style::node::TElement<'a> for JSRef<'a, Element> {
|
|||
let node: JSRef<Node> = NodeCast::from_ref(self);
|
||||
node.get_hover_state()
|
||||
}
|
||||
fn get_focus_state(self) -> bool {
|
||||
// TODO: Also check whether the top-level browsing context has the system focus,
|
||||
// and whether this element is a browsing context container.
|
||||
// https://html.spec.whatwg.org/multipage/scripting.html#selector-focus
|
||||
let node: JSRef<Node> = NodeCast::from_ref(self);
|
||||
node.get_focus_state()
|
||||
}
|
||||
fn get_id(self) -> Option<Atom> {
|
||||
self.get_attribute(ns!(""), &atom!("id")).map(|attr| {
|
||||
let attr = attr.root();
|
||||
|
|
|
@ -152,6 +152,8 @@ bitflags! {
|
|||
#[doc = "Specifies whether or not there is an authentic click in progress on \
|
||||
this element."]
|
||||
const CLICK_IN_PROGRESS = 0x100,
|
||||
#[doc = "Specifies whether this node has the focus."]
|
||||
const IN_FOCUS_STATE = 0x200,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -440,6 +442,9 @@ pub trait NodeHelpers<'a> {
|
|||
fn get_hover_state(self) -> bool;
|
||||
fn set_hover_state(self, state: bool);
|
||||
|
||||
fn get_focus_state(self) -> bool;
|
||||
fn set_focus_state(self, state: bool);
|
||||
|
||||
fn get_disabled_state(self) -> bool;
|
||||
fn set_disabled_state(self, state: bool);
|
||||
|
||||
|
@ -618,6 +623,14 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
|
|||
self.set_flag(IN_HOVER_STATE, state)
|
||||
}
|
||||
|
||||
fn get_focus_state(self) -> bool {
|
||||
self.get_flag(IN_FOCUS_STATE)
|
||||
}
|
||||
|
||||
fn set_focus_state(self, state: bool) {
|
||||
self.set_flag(IN_FOCUS_STATE, state)
|
||||
}
|
||||
|
||||
fn get_disabled_state(self) -> bool {
|
||||
self.get_flag(IN_DISABLED_STATE)
|
||||
}
|
||||
|
@ -1036,6 +1049,8 @@ pub trait RawLayoutNodeHelpers {
|
|||
#[allow(unsafe_code)]
|
||||
unsafe fn get_hover_state_for_layout(&self) -> bool;
|
||||
#[allow(unsafe_code)]
|
||||
unsafe fn get_focus_state_for_layout(&self) -> bool;
|
||||
#[allow(unsafe_code)]
|
||||
unsafe fn get_disabled_state_for_layout(&self) -> bool;
|
||||
#[allow(unsafe_code)]
|
||||
unsafe fn get_enabled_state_for_layout(&self) -> bool;
|
||||
|
@ -1050,6 +1065,11 @@ impl RawLayoutNodeHelpers for Node {
|
|||
}
|
||||
#[inline]
|
||||
#[allow(unsafe_code)]
|
||||
unsafe fn get_focus_state_for_layout(&self) -> bool {
|
||||
self.flags.get().contains(IN_FOCUS_STATE)
|
||||
}
|
||||
#[inline]
|
||||
#[allow(unsafe_code)]
|
||||
unsafe fn get_disabled_state_for_layout(&self) -> bool {
|
||||
self.flags.get().contains(IN_DISABLED_STATE)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue