Fix closeModal invocation (#2239)

Fixes #2238

Some call sites where missed in 382b2a506a
local
Claire 12 months ago committed by GitHub
parent fca2dff2e2
commit ee771f5bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      app/javascript/flavours/glitch/containers/dropdown_menu_container.js
  2. 2
      app/javascript/flavours/glitch/features/compose/containers/dropdown_container.js
  3. 5
      app/javascript/flavours/glitch/features/local_settings/index.jsx

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

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

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

Loading…
Cancel
Save