From a6079a42b66a7cfab4b5ef5ba72b020fe98b5d54 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 21 Dec 2018 18:52:41 +0100
Subject: [PATCH] Fix composer not getting focus after reply confirmation
dialog (#9602)
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
---
app/javascript/mastodon/components/modal_root.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/javascript/mastodon/components/modal_root.js b/app/javascript/mastodon/components/modal_root.js
index 114f74937..ef1156571 100644
--- a/app/javascript/mastodon/components/modal_root.js
+++ b/app/javascript/mastodon/components/modal_root.js
@@ -33,13 +33,15 @@ export default class ModalRoot extends React.PureComponent {
} else if (!nextProps.children) {
this.setState({ revealed: false });
}
+ if (!nextProps.children && !!this.props.children) {
+ this.activeElement.focus();
+ this.activeElement = null;
+ }
}
componentDidUpdate (prevProps) {
if (!this.props.children && !!prevProps.children) {
this.getSiblings().forEach(sibling => sibling.removeAttribute('inert'));
- this.activeElement.focus();
- this.activeElement = null;
}
if (this.props.children) {
requestAnimationFrame(() => {