about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/containers
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-07-10 17:29:43 +0200
committerGitHub <noreply@github.com>2020-07-10 17:29:43 +0200
commitddf7cc1ab56b888fdf61ee8cb1456c71cd9c33c9 (patch)
treeb2e64f065128f5df5d910d7ea393ebc2575be54b /app/javascript/flavours/glitch/containers
parentd42a23fdbe59f5a8f2beed4201ccd6d797fbd5f4 (diff)
parent66c0953c33d6d872e720eb8dedc5ab94bb3cd69a (diff)
Merge pull request #1380 from ThibG/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.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/containers/dropdown_menu_container.js b/app/javascript/flavours/glitch/containers/dropdown_menu_container.js
index 1378e75fe..e60ee814d 100644
--- a/app/javascript/flavours/glitch/containers/dropdown_menu_container.js
+++ b/app/javascript/flavours/glitch/containers/dropdown_menu_container.js
@@ -11,7 +11,7 @@ const mapStateToProps = state => ({
   openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']),
 });
 
-const mapDispatchToProps = (dispatch, { status, items }) => ({
+const mapDispatchToProps = (dispatch, { status, items, scrollKey }) => ({
   onOpen(id, onItemClick, dropdownPlacement, keyboard) {
     dispatch(isUserTouching() ? openModal('ACTIONS', {
       status,
@@ -22,7 +22,7 @@ const mapDispatchToProps = (dispatch, { status, items }) => ({
           onClick: item.action ? ((e) => { return onItemClick(i, e) }) : null,
         } : null
       ),
-    }) : openDropdownMenu(id, dropdownPlacement, keyboard));
+    }) : openDropdownMenu(id, dropdownPlacement, keyboard, scrollKey));
   },
   onClose(id) {
     dispatch(closeModal('ACTIONS'));