Optimise

Author: CaitlinKirby

lib/lrud.js

@@ -18,7 +18,7 @@
 const focusableSelector = '[tabindex], a, input, button';
 const containerSelector = 'nav, section, .lrud-container';
 const focusableContainerSelector = '[data-lrud-consider-container-distance]';
-const ignoredClass = 'lrud-ignore';
+const ignoreSelector = '.lrud-ignore, [disabled], [aria-disabled="true"]';
 
 /**
  * Element API .matches() with fallbacks
@@ -75,13 +75,11 @@ const getParentContainer = (elem) => {
 const getFocusables = (scope) => {
   if (!scope) return [];
 
-  const ignoredElements = toArray(scope.querySelectorAll('.' + ignoredClass));
-  if (scope.className.indexOf(ignoredClass) > -1) ignoredElements.push(scope);
+  const ignoredElements = toArray(scope.querySelectorAll(ignoreSelector));
+  if (scope.className.indexOf(ignoreSelector) > -1) ignoredElements.push(scope);
 
   return toArray(scope.querySelectorAll(focusableSelector))
     .filter(node => !ignoredElements.some(ignored => ignored == node || ignored.contains(node)))
-    .filter(node => node.getAttribute('disabled') == null)
-    .filter(node => !(node.getAttribute('aria-disabled') == 'true'))
     .filter(node => parseInt(node.getAttribute('tabindex') || '0', 10) > -1);
 };