Merge pull request #127 from vizath/fix-scrollRestoration

Make sure scrollRestoration is writable.
taion · Feb 5, 2018 · 4f6f2a5 · 4f6f2a5
2 parents 849937c + 931513f
commit 4f6f2a5
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -35,7 +35,11 @@ export default class ScrollBehavior {
       !isMobileSafari()
     ) {
       this._oldScrollRestoration = window.history.scrollRestoration;
-      window.history.scrollRestoration = 'manual';
+      try {
+        window.history.scrollRestoration = 'manual';
+      } catch (e) {
+        this._oldScrollRestoration = null;
+      }
     } else {
       this._oldScrollRestoration = null;
     }
@@ -126,7 +130,11 @@ export default class ScrollBehavior {
   stop() {
     /* istanbul ignore if: not supported by any browsers on Travis */
     if (this._oldScrollRestoration) {
-      window.history.scrollRestoration = this._oldScrollRestoration;
+      try {
+        window.history.scrollRestoration = this._oldScrollRestoration;
+      } catch (e) {
+        /* silence */
+      }
     }
 
     off(window, 'scroll', this._onWindowScroll);

diff --git a/test/ScrollBehavior.test.js b/test/ScrollBehavior.test.js
@@ -65,6 +65,29 @@ describe('ScrollBehavior', () => {
             },
           ]);
         });
+
+        it('should not crash when history is not available', (done) => {
+          Object.defineProperty(window.history, 'scrollRestoration', {
+            value: 'auto',
+            // See https://github.com/taion/scroll-behavior/issues/126
+            writable: false,
+            enumerable: true,
+            configurable: true,
+          });
+
+          const history = withRoutes(withScroll(createHistory()));
+
+          unlisten = run(history, [
+            () => {
+              expect(scrollTop(window)).to.equal(0);
+
+              delete window.history.scrollRestoration;
+              window.history.scrollRestoration = 'auto';
+
+              done();
+            },
+          ]);
+        });
       });
 
       describe('custom behavior', () => {