diff options
author | Starfall <us@starfall.systems> | 2020-07-11 12:31:22 -0500 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2020-07-11 12:31:22 -0500 |
commit | 2f20bc2a8275875033c97249825a2a3305980c3b (patch) | |
tree | 079a021ab1ce792a40555e0718f9861ee8b53f7a /app/javascript/flavours/glitch/reducers/dropdown_menu.js | |
parent | 816d10c7eecd83cb0f115c10328cbb504dabc7e9 (diff) | |
parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) |
Merge branch 'glitch' into main
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/dropdown_menu.js')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/dropdown_menu.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/reducers/dropdown_menu.js b/app/javascript/flavours/glitch/reducers/dropdown_menu.js index 36fd4f132..a78a11acc 100644 --- a/app/javascript/flavours/glitch/reducers/dropdown_menu.js +++ b/app/javascript/flavours/glitch/reducers/dropdown_menu.js @@ -4,14 +4,14 @@ import { DROPDOWN_MENU_CLOSE, } from '../actions/dropdown_menu'; -const initialState = Immutable.Map({ openId: null, placement: null, keyboard: false }); +const initialState = Immutable.Map({ openId: null, placement: null, keyboard: false, scroll_key: null }); export default function dropdownMenu(state = initialState, action) { switch (action.type) { case DROPDOWN_MENU_OPEN: - return state.merge({ openId: action.id, placement: action.placement, keyboard: action.keyboard }); + return state.merge({ openId: action.id, placement: action.placement, keyboard: action.keyboard, scroll_key: action.scroll_key }); case DROPDOWN_MENU_CLOSE: - return state.get('openId') === action.id ? state.set('openId', null) : state; + return state.get('openId') === action.id ? state.set('openId', null).set('scroll_key', null) : state; default: return state; } |