From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 17 Jul 2021 15:06:52 +0000 (+0200)
Subject: Fix replying from modal (#16516)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e54a65013d200cc8407dc4d3cf6631846062f813;p=mastodon.git

Fix replying from modal (#16516)

Fixes #16515

Not using a router object somehow made `this.history` lag behind the real
browser history whenever pushing a new history item in `replyCompose`.

Not using the context-provided router in this case was an oversight made
when porting glitch-soc changes in #16499.
---

diff --git a/app/javascript/mastodon/components/modal_root.js b/app/javascript/mastodon/components/modal_root.js
index 8c9409d01..755c46fd6 100644
--- a/app/javascript/mastodon/components/modal_root.js
+++ b/app/javascript/mastodon/components/modal_root.js
@@ -6,6 +6,10 @@ import { multiply } from 'color-blend';
 
 export default class ModalRoot extends React.PureComponent {
 
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
   static propTypes = {
     children: PropTypes.node,
     onClose: PropTypes.func.isRequired,