ad6fcb2d9c
* Allow selecting menu items with the space bar in status dropdown menus * Fix modals opened by keyboard navigation being immediately closed * Fix menu items triggering modal actions * Add Tab trapping inside dropdown menu * Give focus back to last focused element when status dropdown menu closes
28 lines
1 KiB
JavaScript
28 lines
1 KiB
JavaScript
import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu';
|
|
import { openModal, closeModal } from '../actions/modal';
|
|
import { connect } from 'react-redux';
|
|
import DropdownMenu from '../components/dropdown_menu';
|
|
import { isUserTouching } from '../is_mobile';
|
|
|
|
const mapStateToProps = state => ({
|
|
isModalOpen: state.get('modal').modalType === 'ACTIONS',
|
|
dropdownPlacement: state.getIn(['dropdown_menu', 'placement']),
|
|
openDropdownId: state.getIn(['dropdown_menu', 'openId']),
|
|
openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']),
|
|
});
|
|
|
|
const mapDispatchToProps = (dispatch, { status, items }) => ({
|
|
onOpen(id, onItemClick, dropdownPlacement, keyboard) {
|
|
dispatch(isUserTouching() ? openModal('ACTIONS', {
|
|
status,
|
|
actions: items,
|
|
onClick: onItemClick,
|
|
}) : openDropdownMenu(id, dropdownPlacement, keyboard));
|
|
},
|
|
onClose(id) {
|
|
dispatch(closeModal('ACTIONS'));
|
|
dispatch(closeDropdownMenu(id));
|
|
},
|
|
});
|
|
|
|
export default connect(mapStateToProps, mapDispatchToProps)(DropdownMenu);
|