diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-01-13 12:26:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-13 12:26:34 +0100 |
commit | afd0d424da4928b9e20a3c7a943f970252ed3a29 (patch) | |
tree | 98641aa5df145b1a025ff29940c2d8814f6b7b2f /app/javascript/flavours/glitch/containers | |
parent | 932a22219ae99a285bdd0b69f02627f029327db3 (diff) | |
parent | b52dc5f69d27ce2fcc84b3929840f2d8704ae48a (diff) |
Merge pull request #2080 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/containers')
-rw-r--r-- | app/javascript/flavours/glitch/containers/dropdown_menu_container.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/containers/dropdown_menu_container.js b/app/javascript/flavours/glitch/containers/dropdown_menu_container.js index b2dff63db..43ce8ca63 100644 --- a/app/javascript/flavours/glitch/containers/dropdown_menu_container.js +++ b/app/javascript/flavours/glitch/containers/dropdown_menu_container.js @@ -5,18 +5,17 @@ import DropdownMenu from 'flavours/glitch/components/dropdown_menu'; import { isUserTouching } from '../is_mobile'; const mapStateToProps = state => ({ - dropdownPlacement: state.getIn(['dropdown_menu', 'placement']), openDropdownId: state.getIn(['dropdown_menu', 'openId']), openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']), }); const mapDispatchToProps = (dispatch, { status, items, scrollKey }) => ({ - onOpen(id, onItemClick, dropdownPlacement, keyboard) { + onOpen(id, onItemClick, keyboard) { dispatch(isUserTouching() ? openModal('ACTIONS', { status, actions: items, onClick: onItemClick, - }) : openDropdownMenu(id, dropdownPlacement, keyboard, scrollKey)); + }) : openDropdownMenu(id, keyboard, scrollKey)); }, onClose(id) { |