Hook up synthetic click activation to script_task and <>.click()

3 files changed, 32 insertions, 5 deletions

diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
index 75ad910ee2e..728f0ee573d 100644
--- a/components/script/dom/htmlelement.rs
+++ b/components/script/dom/htmlelement.rs
@@ -7,14 +7,15 @@ use dom::attr::AttrHelpers;
 use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
 use dom::bindings::codegen::Bindings::HTMLElementBinding;
 use dom::bindings::codegen::Bindings::HTMLElementBinding::HTMLElementMethods;
+use dom::bindings::codegen::Bindings::HTMLInputElementBinding::HTMLInputElementMethods;
 use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLFrameSetElementDerived};
-use dom::bindings::codegen::InheritTypes::EventTargetCast;
+use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLInputElementCast};
 use dom::bindings::codegen::InheritTypes::{HTMLElementDerived, HTMLBodyElementDerived};
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflectable, Reflector};
 use dom::document::Document;
-use dom::element::{Element, ElementTypeId, ElementTypeId_, HTMLElementTypeId};
+use dom::element::{Element, ElementTypeId, ElementTypeId_, HTMLElementTypeId, ActivationElementHelpers};
 use dom::eventtarget::{EventTarget, EventTargetHelpers, NodeTargetTypeId};
 use dom::node::{Node, ElementNodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
@@ -91,6 +92,17 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> {
             win.SetOnload(listener)
         }
     }
+
+    // https://html.spec.whatwg.org/multipage/interaction.html#dom-click
+    fn Click(self) {
+        let maybe_input = HTMLInputElementCast::to_ref(self);
+        match maybe_input {
+            Some(i) if i.Disabled() => return,
+            _ => ()
+        }
+        let element: JSRef<Element> = ElementCast::from_ref(self);
+        element.as_maybe_activatable().map(|a| a.synthetic_click_activation(false, false, false, false));
+    }
 }
 
 impl<'a> VirtualMethods for JSRef<'a, HTMLElement> {
diff --git a/components/script/dom/webidls/HTMLElement.webidl b/components/script/dom/webidls/HTMLElement.webidl
index 10be66c62e3..359ef11f0a7 100644
--- a/components/script/dom/webidls/HTMLElement.webidl
+++ b/components/script/dom/webidls/HTMLElement.webidl
@@ -23,7 +23,7 @@ interface HTMLElement : Element {
 
   // user interaction
            attribute boolean hidden;
-  //void click();
+  void click();
   //         attribute long tabIndex;
   //void focus();
   //void blur();
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index acbd2cfbab3..9ccf7653af5 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -893,9 +893,9 @@ impl ScriptTask {
                                           None, props.key_code).root();
         let event = EventCast::from_ref(*keyevent);
         let _ = target.DispatchEvent(event);
-
+        let mut prevented = event.DefaultPrevented();
         // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#keys-cancelable-keys
-        if state != Released && props.is_printable() && !event.DefaultPrevented() {
+        if state != Released && props.is_printable() && !prevented {
             // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#keypress-event-order
             let event = KeyboardEvent::new(*window, "keypress".to_string(), true, true, Some(*window),
                                            0, props.key.to_string(), props.code.to_string(),
@@ -904,9 +904,24 @@ impl ScriptTask {
                                            props.char_code, 0).root();
             let _ = target.DispatchEvent(EventCast::from_ref(*event));
 
+            let ev = EventCast::from_ref(*event);
+            prevented = ev.DefaultPrevented();
             // TODO: if keypress event is canceled, prevent firing input events
         }
 
+        // This behavior is unspecced
+        // We are supposed to dispatch synthetic click activation for Space and/or Return,
+        // however *when* we do it is up to us
+        // I'm dispatching it after the key event so the script has a chance to cancel it
+        // https://www.w3.org/Bugs/Public/show_bug.cgi?id=27337
+        match key {
+            Key::KeySpace | Key::KeyEnter if !prevented && state == Released => {
+                // TODO handle space and enter slightly differently
+                let maybe_elem: Option<JSRef<Element>> = ElementCast::to_ref(target);
+                maybe_elem.map(|el| el.as_maybe_activatable().map(|a| a.synthetic_click_activation(ctrl, alt, shift, meta)));
+            }
+            _ => ()
+        }
         window.flush_layout();
     }