Don't blur when clicking a non-focusable child of the active element.

The active element will retain the focus, so no events should be fired.

Fixes some, but not all, instances of #2312.

Author: juangj

common/src/web/javascriptPage.html

@@ -239,6 +239,16 @@ <h1>Type Stuff</h1>
     <span id="hideMe" onclick="this.style.display = 'none';">Click to hide me.</span>
 </div>
 
+<div id="hideOnBlur" tabindex="0"
+     style="width: 100px; height: 100px; border: 1px solid red"
+     onblur="appendMessage('blur'); this.style.display = 'none';">
+  <div id="hideOnBlurChild"
+       style="width: 30px; height: 30px; border: 1px solid blue">
+    x
+  </div>
+  Focusable. Will hide when focus is lost.
+</div>
+
 <div style="margin-top: 10px;">
   Click actions delayed by 3000ms:
   <div id="clickToShow" onclick="delayedShowHide(3000, true);"

java/client/test/org/openqa/selenium/CorrectEventFiringTest.java

@@ -335,6 +335,26 @@ public void testSendingKeysToAFocusedElementShouldNotBlurThatElement() {
     assertEventNotFired("blur");
   }
 
+  @JavascriptEnabled
+  @Ignore(value = {SAFARI, HTMLUNIT})
+  @Test
+  public void testClickingAnUnfocusableChildShouldNotBlurTheParent() {
+    assumeFalse(isOldIe(driver));
+    driver.get(pages.javascriptPage);
+    // Click on parent, giving it the focus.
+    WebElement parent = driver.findElement(By.id("hideOnBlur"));
+    parent.click();
+    assertEventNotFired("blur");
+    // Click on child. It is not focusable, so focus should stay on the parent.
+    driver.findElement(By.id("hideOnBlurChild")).click();
+    assertTrue("#hideOnBlur should still be displayed after click",
+               parent.isDisplayed());
+    assertEventNotFired("blur");
+    // Click elsewhere, and let the element disappear.
+    driver.findElement(By.id("result")).click();
+    assertEventFired("blur");
+  }
+
   @JavascriptEnabled
   @Test
   public void testSubmittingFormFromFormElementShouldFireOnSubmitForThatForm() {

javascript/atoms/device.js

@@ -452,8 +452,14 @@ bot.Device.prototype.clickElement = function(coord, button, opt_force,
  * @protected
  */
 bot.Device.prototype.focusOnElement = function() {
-  // Focusing on an <option> always focuses on the parent <select>.
-  var elementToFocus = this.select_ || this.element_;
+  var elementToFocus = goog.dom.getAncestor(
+      this.element_,
+      function (node) {
+        return !!node && bot.dom.isElement(node) &&
+            bot.dom.isFocusable(/** @type {!Element} */ (node));
+      },
+      true /* Return this.element_ if it is focusable. */);
+  elementToFocus = elementToFocus || this.element_;
 
   var activeElement = bot.dom.getActiveElement(elementToFocus);
   if (elementToFocus == activeElement) {

javascript/atoms/dom.js

@@ -173,15 +173,19 @@ bot.dom.FOCUSABLE_FORM_FIELDS_ = [
 
 /**
  * Returns whether a node is a focusable element.  An element may receive focus
- * if it is a form field or has a positive tabindex.
+ * if it is a form field, has a non-negative tabindex, or is editable.
  * @param {!Element} element The node to test.
  * @return {boolean} Whether the node is focusable.
  */
 bot.dom.isFocusable = function(element) {
-  return goog.array.some(bot.dom.FOCUSABLE_FORM_FIELDS_, function(tagName) {
+  return goog.array.some(bot.dom.FOCUSABLE_FORM_FIELDS_, tagNameMatches) ||
+      (bot.dom.getAttribute(element, 'tabindex') != null &&
+          Number(bot.dom.getProperty(element, 'tabIndex')) >= 0) ||
+      bot.dom.isEditable(element);
+
+  function tagNameMatches(tagName) {
     return element.tagName.toUpperCase() == tagName;
-  }) || (bot.dom.getAttribute(element, 'tabindex') != null &&
-         Number(bot.dom.getProperty(element, 'tabIndex')) >= 0);
+  }
 };
 
 

javascript/atoms/test/focus_test.html

@@ -141,6 +141,36 @@
       });
     }
 
+    function testShouldRetainFocusIfFirstFocusableAncestorIsAlreadyActive() {
+      if (!bot.test.isWindowFocused()) {
+        return;
+      }
+
+      var parent = document.getElementById('hideOnBlur');
+      var child = document.getElementById('hideOnBlurChild');
+      recordBlurAndFocus(parent);
+
+      expect(eventType.FOCUS, parent);
+      bot.action.focusOnElement(parent);
+      return timeout().then(function() {
+        assertHasExpectedEventOrder();
+        assertElementIsActiveElement(parent);
+
+        bot.action.focusOnElement(child);
+        // No additional events expected. The parent should retain focus.
+        return timeout();
+      }).then(function() {
+        assertHasExpectedEventOrder();
+        assertElementIsActiveElement(parent);
+
+        bot.action.focusOnElement(text1);
+        expect(eventType.BLUR, parent);
+        return timeout();
+      }).then(function() {
+        assertHasExpectedEventOrder();
+      });
+    }
+
     function testFocusOnHiddenElementThrows() {
       var element = document.getElementById('invisibleText');
       assertThrows(goog.partial(bot.action.focusOnElement, element));
@@ -217,6 +247,15 @@
       <div><strong>Disabled textbox</strong></div>
       <input id="disabledText" type="text" value="I'm disabled" disabled/>
     </div>
+    <div id="hideOnBlur" tabindex="0"
+         style="width: 100px; height: 100px; border: 1px solid red"
+         onblur="this.style.display = 'none';">
+      <div id="hideOnBlurChild"
+           style="width: 30px; height: 30px; border: 1px solid blue">
+        x
+      </div>
+      Focusable. Will hide when focus is lost.
+    </div>
     <script type="text/javascript">
       function log(msg) {
         goog.dom.$('testLog').appendChild(