treehouse
/
mastodon
19
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix closeModal invocation (#2239) 

Fixes #2238

Some call sites where missed in 382b2a506a
pull/62/head
Claire 2023-06-04 22:05:45 +02:00 committed by GitHub
parent fca2dff2e2
commit ee771f5bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/containers/dropdown_menu_container.js
View File

@ -24,7 +24,10 @@ const mapDispatchToProps = (dispatch, { status, items, scrollKey }) => ({
}, },
onClose(id) { onClose(id) {
dispatch(closeModal('ACTIONS')); dispatch(closeModal({
modalType: 'ACTIONS',
ignoreFocus: false,
}));
dispatch(closeDropdownMenu(id)); dispatch(closeDropdownMenu(id));
}, },
}); });

2
app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js
View File

@ -8,7 +8,7 @@ import Dropdown from '../components/dropdown';
const mapDispatchToProps = dispatch => ({ const mapDispatchToProps = dispatch => ({
isUserTouching, isUserTouching,
onModalOpen: props => dispatch(openModal({ modalType: 'ACTIONS', modalProps: props })), onModalOpen: props => dispatch(openModal({ modalType: 'ACTIONS', modalProps: props })),
onModalClose: () => dispatch(closeModal()), onModalClose: () => dispatch(closeModal({ modalType: undefined, ignoreFocus: false })),
}); });
export default connect(null, mapDispatchToProps)(Dropdown); export default connect(null, mapDispatchToProps)(Dropdown);

5
app/javascript/flavours/glitch/features/local_settings/index.jsx
View File

@ -21,7 +21,10 @@ const mapDispatchToProps = dispatch => ({
dispatch(changeLocalSetting(setting, value)); dispatch(changeLocalSetting(setting, value));
}, },
onClose () { onClose () {
dispatch(closeModal()); dispatch(closeModal({
modalType: undefined,
ignoreFocus: false,
}));
}, },
}); });