Don't add tabindex to interactive elements

Author: rafgraph

src/index.js

@@ -50,16 +50,15 @@ function getElAndScroll() {
     // update focus to where the page is scrolled to
     // unfortunately this doesn't work in safari (desktop and iOS) when blur() is called
     let originalTabIndex = element.getAttribute('tabindex');
-    if (originalTabIndex === null) element.setAttribute('tabindex', -1);
+    if (originalTabIndex === null && !isInteractiveElement(element)) {
+      element.setAttribute('tabindex', -1);
+    }
     element.focus({ preventScroll: true });
-    if (originalTabIndex === null) {
-      if (!isInteractiveElement(element)) {
-        // for some reason calling blur() in safari resets the focus region to where it was previously,
-        // if blur() is not called it works in safari, but then are stuck with default focus styles
-        // on an element that otherwise might never had focus styles applied, so not an option
-        element.blur();
-      }
-
+    if (originalTabIndex === null && !isInteractiveElement(element)) {
+      // for some reason calling blur() in safari resets the focus region to where it was previously,
+      // if blur() is not called it works in safari, but then are stuck with default focus styles
+      // on an element that otherwise might never had focus styles applied, so not an option
+      element.blur();
       element.removeAttribute('tabindex');
     }