backport upstream PR#14019 to fix jumpy timelines when modals are closed

README.md

@@ -10,5 +10,6 @@ Other patches currently included are:
 * (3.1.5_1) hCaptcha support as an antispam measure during signup
 * (3.1.5_2) `lib/mastodon/upgrade_cli.rb` is backported from upstream `master` branch
 * (3.1.5_3) upstream pull request #14247 is backported to resolve display issues with the hashtag timeline (reported by cassolotl, thanks!)
+* (3.1.5_4) upstream pull request #14019 is backported to resolve an issue where the timeline would jump around when closing a modal (eg. media) in Firefox (reported in upstream issue#14018)
 
 queer.party does not use the official docker-compose.yml for orchestration and so it is not included here despite the tagged docker image changing.

deploy/3.1.5_4-backport-timeline-scroll-fix.patch

@@ -0,0 +1,11 @@
+--- untainted/app/javascript/mastodon/components/modal_root.js
+@@ -66,7 +66,7 @@
+       // 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);