Merge pull request #106 from PolymerLabs/drawer-focus

Default to no drawer focus trapping
PolymerElements · Mar 9, 2016 · 5a9c965 · 5a9c965
2 parents 325d370 + fc86af3
commit 5a9c965
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/app-drawer/app-drawer.html b/app-drawer/app-drawer.html
@@ -221,22 +221,11 @@
         },
 
         /**
-         * The CSS selector for the element that should receive focus when the drawer is open.
-         * By default, when the drawer opens, it focuses the first tabbable element. That is,
-         * the first element that can receive focus.
+         * If specified, the drawer will focus on this CSS selector when opened.
          */
         focusSelector: {
           type: String,
-          value:
-            'a[href]:not([tabindex="-1"]),' +
-            'area[href]:not([tabindex="-1"]),' +
-            'input:not([disabled]):not([tabindex="-1"]),' +
-            'select:not([disabled]):not([tabindex="-1"]),' +
-            'textarea:not([disabled]):not([tabindex="-1"]),' +
-            'button:not([disabled]):not([tabindex="-1"]),' +
-            'iframe:not([tabindex="-1"]),' +
-            '[tabindex]:not([tabindex="-1"]),' +
-            '[contentEditable=true]:not([tabindex="-1"])'
+          value: ''
         }
 
       },
@@ -335,6 +324,10 @@
       },
 
       _focusInsideDrawer: function() {
+        if (!this.focusSelector) {
+          return;
+        }
+
         var child = Polymer.dom(this).querySelector(this.focusSelector);
         if (child) {
           child.focus();

diff --git a/app-drawer/test/app-drawer.html b/app-drawer/test/app-drawer.html
@@ -43,7 +43,7 @@
     <template>
       <div>
         <button id="toggle">Toggle</button>
-        <app-drawer>
+        <app-drawer focus-selector="#foo">
           <button id="foo">Foo</button>
           <button id="bar">Bar</button>
         </app-drawer>