From: ThibG <thib@sitedethib.com>
Date: Wed, 10 Jun 2020 11:57:13 +0000 (+0200)
Subject: Fix TL sometimes jumping when closing modals (#14019)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c813789e06e485f8f3d013b55d1d6ecf9a682a02;p=mastodon.git

Fix TL sometimes jumping when closing modals (#14019)

Fixes #14018
---

diff --git a/app/javascript/mastodon/components/modal_root.js b/app/javascript/mastodon/components/modal_root.js
index fa4e59192..6297b5e29 100644
--- a/app/javascript/mastodon/components/modal_root.js
+++ b/app/javascript/mastodon/components/modal_root.js
@@ -66,7 +66,7 @@ export default class ModalRoot extends React.PureComponent {
       // immediately selectable, we have to wait for observers to run, as
       // described in https://github.com/WICG/inert#performance-and-gotchas
       Promise.resolve().then(() => {
-        this.activeElement.focus();
+        this.activeElement.focus({ preventScroll: true });
         this.activeElement = null;
       }).catch((error) => {
         console.error(error);