Avoid flash effect on scroll restoration (#25)

* Move nativeFocus execution as close as possible to scroll restoration * Increase package minor version
calvellido · Sep 5, 2020 · 321a392 · 321a392
1 parent 6f32aaf
commit 321a392
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -79,13 +79,15 @@
     var patchedFocus = function(args) {
       if (args && args.preventScroll) {
         var evScrollableElements = calcScrollableElements(this);
-        this.nativeFocus();
         if (typeof setTimeout === 'function') {
+          var thisElem = this;
           setTimeout(function () {
+            thisElem.nativeFocus();
             restoreScrollPosition(evScrollableElements);
           }, 0);
         } else {
-          restoreScrollPosition(evScrollableElements);          
+          this.nativeFocus();
+          restoreScrollPosition(evScrollableElements);
         }
       }
       else {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "focus-options-polyfill",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "JavaScript polyfill for the WHATWG spec of focusOptions, that enables a set of options to be passed to the focus method.",
   "main": "index.js",
   "scripts": {