fd33bcb3b2
* Update react-overlays to latest version * Fix breaking changes in dropdown menus * Use react-overlays built-in arrow positioning feature * Re-implemented `.dropdown-menu__arrow` to have a defined width and height to improve positioning * Moved wrapping div (`.dropdown-menu` from `DropdownMenu` to `Dropdown`) * Wrap button in a span to solve issue with ref * Temporarily remove animations * Fix breaking changes in emoji picker * Wrap EmojiPickerMenu in a div where react-overlays’ ref is added * Fix breaking changes in language dropdown * Fix breaking changes in privacy dropdown * Fix breaking changes in search form * Add animations back using `@keyframes` * Fix arrow color in light theme * Fix linting issue * Remove unused `mounted` state * Remove `placement` state from components and redux And remove the placement state from props of the menu components. * Remove abolution position to fix flip issue * Remove z-index to fix modals and overlay positions * Fix lint issues * Set placement in privacy and language components Copy the placement state into the `PrivacyDropdown` and `LanguageDropdown` components, to apply correct styling to the buttons depending on which placement the Overlay has. * Move `placement` state to correct component
32 lines
1 KiB
JavaScript
32 lines
1 KiB
JavaScript
import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu';
|
|
import { fetchRelationships } from 'mastodon/actions/accounts';
|
|
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 => ({
|
|
openDropdownId: state.getIn(['dropdown_menu', 'openId']),
|
|
openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']),
|
|
});
|
|
|
|
const mapDispatchToProps = (dispatch, { status, items, scrollKey }) => ({
|
|
onOpen(id, onItemClick, keyboard) {
|
|
if (status) {
|
|
dispatch(fetchRelationships([status.getIn(['account', 'id'])]));
|
|
}
|
|
|
|
dispatch(isUserTouching() ? openModal('ACTIONS', {
|
|
status,
|
|
actions: items,
|
|
onClick: onItemClick,
|
|
}) : openDropdownMenu(id, keyboard, scrollKey));
|
|
},
|
|
|
|
onClose(id) {
|
|
dispatch(closeModal('ACTIONS'));
|
|
dispatch(closeDropdownMenu(id));
|
|
},
|
|
});
|
|
|
|
export default connect(mapStateToProps, mapDispatchToProps)(DropdownMenu);
|