tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Fix reply button on media modal not giving focus to compose form

Browse Source 
Port 2cd31b3177 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Claire
2022-02-25 00:51:01 +01:00
parent 2e2b8a9a40
commit 8e04ba87b7
7 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/flavours/glitch/features/ui/containers/modal_container.js
View File

@@ -3,22 +3,23 @@ import { openModal, closeModal } from 'flavours/glitch/actions/modal';
import ModalRoot from '../components/modal_root';
const mapStateToProps = state => ({
type: state.getIn(['modal', 0, 'modalType'], null),
props: state.getIn(['modal', 0, 'modalProps'], {}),
ignoreFocus: state.getIn(['modal', 'ignoreFocus']),
type: state.getIn(['modal', 'stack', 0, 'modalType'], null),
props: state.getIn(['modal', 'stack', 0, 'modalProps'], {}),
});
const mapDispatchToProps = dispatch => ({
onClose (confirmationMessage) {
onClose (confirmationMessage, ignoreFocus = false) {
if (confirmationMessage) {
dispatch(
openModal('CONFIRM', {
message: confirmationMessage.message,
confirm: confirmationMessage.confirm,
onConfirm: () => dispatch(closeModal()),
onConfirm: () => dispatch(closeModal(undefined, { ignoreFocus })),
}),
);
} else {
dispatch(closeModal());
dispatch(closeModal(undefined, { ignoreFocus }));
}
},
});