monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #442 from ThibG/glitch-soc/fixes/actions-modal-mobile 

Fix actions modal on mobile (fixes #441)
This commit is contained in:
ThibG 2018-04-23 23:42:29 +02:00 committed by GitHub
parent 06fc278e4c 240833c023
commit 65b8880ec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/flavours/glitch/containers/dropdown_menu_container.js
View File

@ -14,8 +14,13 @@ const mapDispatchToProps = (dispatch, { status, items }) => ({
onOpen(id, onItemClick, dropdownPlacement) { onOpen(id, onItemClick, dropdownPlacement) {
dispatch(isUserTouching() ? openModal('ACTIONS', { dispatch(isUserTouching() ? openModal('ACTIONS', {
status, status,
actions: items, actions: items.map(
onClick: onItemClick, (item, i) => item ? {
...item,
name: `${item.text}-${i}`,
onClick: (e) => { return onItemClick(i, e) },
} : null
),
}) : openDropdownMenu(id, dropdownPlacement)); }) : openDropdownMenu(id, dropdownPlacement));
}, },
onClose(id) { onClose(id) {

1
app/javascript/flavours/glitch/features/ui/components/actions_modal.js
View File

@ -22,7 +22,6 @@ export default class ActionsModal extends ImmutablePureComponent {
meta: PropTypes.node, meta: PropTypes.node,
name: PropTypes.string, name: PropTypes.string,
on: PropTypes.bool, on: PropTypes.bool,
onClick: PropTypes.func,
onPassiveClick: PropTypes.func, onPassiveClick: PropTypes.func,
text: PropTypes.node, text: PropTypes.node,
})), })),