Fixes #46: Polymer.dom(..).activeElement gets _activeElement (Sha…

…dyDOM) if available.
Polymer · Nov 3, 2016 · 66af285 · 66af285
1 parent 009edc5
commit 66af285
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/src/utils/polymer.dom.html b/src/utils/polymer.dom.html
@@ -248,6 +248,10 @@
       return list;
     }
 
+    get activeElement() {
+      let node = this.node;
+      return node._activeElement !== undefined ? node._activeElement : node.activeElement;
+    }
   }
 
   function forwardMethods(proto, methods) {
@@ -293,7 +297,6 @@
   ]);
 
   forwardReadOnlyProperties(DomApi.prototype, [
-    'activeElement',
     'parentNode', 'firstChild', 'lastChild',
     'nextSibling', 'previousSibling', 'firstElementChild',
     'lastElementChild', 'nextElementSibling', 'previousElementSibling',

diff --git a/test/unit/polymer-dom.html b/test/unit/polymer-dom.html
@@ -59,6 +59,19 @@
     </script>
   </dom-module>
 
+  <dom-module id="x-focusable-in-shadow">
+    <template>
+      <input id="focusable"></input>
+    </template>
+    <script>
+    HTMLImports.whenReady(function() {
+      Polymer({
+        is: 'x-focusable-in-shadow'
+      });
+    });
+    </script>
+  </dom-module>
+
    <test-fixture id="scoped">
     <template>
       <x-event-scoped></x-event-scoped>
@@ -71,6 +84,12 @@
     </template>
   </test-fixture>
 
+  <test-fixture id="focusableInShadow">
+    <template>
+      <x-focusable-in-shadow></x-focusable-in-shadow>
+    </template>
+  </test-fixture>
+
 <script>
 
   suite('exteded dom api', function() {
@@ -157,6 +176,16 @@
 
   });
 
+  suite('activeElement getter', function() {
+    test('Retrieves `_activeElement` (ShadyDOM) or `activeElement`.', function() {
+      var focusableInShadow = fixture('focusableInShadow');
+      focusableInShadow.$.focusable.focus();
+      var rootNode = focusableInShadow.getRootNode();
+      assert.equal(Polymer.dom(rootNode).activeElement, focusableInShadow);
+      assert.equal(Polymer.dom(focusableInShadow.shadowRoot).activeElement, focusableInShadow.$.focusable);
+    });
+  });
+
 </script>
 
 </body>