From 240833c023590b6fa442c153fae8c9036559b3f4 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 23 Apr 2018 22:15:38 +0200 Subject: [PATCH] Fix actions modal on mobile (fixes #441) --- .../glitch/containers/dropdown_menu_container.js | 9 +++++++-- .../glitch/features/ui/components/actions_modal.js | 1 - 2 files changed, 7 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 9d490de172..dccd93dab0 100644 --- a/app/javascript/flavours/glitch/containers/dropdown_menu_container.js +++ b/app/javascript/flavours/glitch/containers/dropdown_menu_container.js @@ -14,8 +14,13 @@ const mapDispatchToProps = (dispatch, { status, items }) => ({ onOpen(id, onItemClick, dropdownPlacement) { dispatch(isUserTouching() ? openModal('ACTIONS', { status, - actions: items, - onClick: onItemClick, + actions: items.map( + (item, i) => item ? { + ...item, + name: `${item.text}-${i}`, + onClick: (e) => { return onItemClick(i, e) }, + } : null + ), }) : openDropdownMenu(id, dropdownPlacement)); }, onClose(id) { diff --git a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js index c8b040f95d..9ac6dcf49d 100644 --- a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js @@ -22,7 +22,6 @@ export default class ActionsModal extends ImmutablePureComponent { meta: PropTypes.node, name: PropTypes.string, on: PropTypes.bool, - onClick: PropTypes.func, onPassiveClick: PropTypes.func, text: PropTypes.node, })),