Merge pull request #51 from PolymerElements/paper-menu-89

Prevent retargeting of events from shadow descendants of light children.
PolymerElements · May 5, 2016 · 319f828 · 319f828
2 parents c1d38a2 + aa1e6e0
commit 319f828
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/iron-control-state.html b/iron-control-state.html
@@ -73,7 +73,8 @@
 
       if (event.target === this) {
         this._setFocused(event.type === 'focus');
-      } else if (!this.shadowRoot && !this.isLightDescendant(event.target)) {
+      } else if (!this.shadowRoot &&
+          !this.isLightDescendant(Polymer.dom(event).localTarget)) {
         this.fire(event.type, {sourceEvent: event}, {
           node: this,
           bubbles: event.bubbles,

diff --git a/test/focused-state.html b/test/focused-state.html
@@ -31,10 +31,11 @@
     </template>
   </test-fixture>
 
-   <test-fixture id="LightDOM">
+  <test-fixture id="LightDOM">
     <template>
       <test-light-dom>
         <input id="input">
+        <nested-focusable></nested-focusable>
       </test-light-dom>
     </template>
   </test-fixture>
@@ -119,11 +120,13 @@
 
 
     suite('elements in the light dom', function() {
-      var lightDOM, input;
+      var lightDOM, input, lightDescendantShadowInput;
 
       setup(function() {
         lightDOM = fixture('LightDOM');
         input = document.querySelector('#input');
+        lightDescendantShadowInput = Polymer.dom(lightDOM)
+            .querySelector('nested-focusable').$.input;
       });
 
       test('should not fire the focus event', function() {
@@ -138,6 +141,18 @@
         expect(nFocusEvents).to.be.equal(0);
       });
 
+      test('should not fire the focus event from shadow descendants', function() {
+        var nFocusEvents = 0;
+
+        lightDOM.addEventListener('focus', function() {
+          nFocusEvents += 1;
+        });
+
+        MockInteractions.focus(lightDescendantShadowInput);
+
+        expect(nFocusEvents).to.be.equal(0);
+      });
+
     });
 
   </script>