From 42577eab58aa323c07b8efcc3c8c69b9140b9077 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Tue, 3 Jul 2018 21:27:05 +0200 Subject: client/reducer: Use withinRange --- src/client/react/store/reducers.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/client/react/store/reducers.js') diff --git a/src/client/react/store/reducers.js b/src/client/react/store/reducers.js index c5c564c..34c6d99 100644 --- a/src/client/react/store/reducers.js +++ b/src/client/react/store/reducers.js @@ -20,6 +20,7 @@ import getSearchResults from '../lib/getSearchResults'; import users from '../users'; +import withinRange from '../lib/withinRange'; const DEFAULT_STATE = { search: { @@ -91,13 +92,10 @@ function reducer(state = DEFAULT_STATE, action) { const prevSelectedResult = state.search.selected; const prevSelectedResultIndex = state.search.results.indexOf(prevSelectedResult); - let nextSelectedResultIndex = prevSelectedResultIndex + action.relativeChange; - - if (nextSelectedResultIndex < 0) { - nextSelectedResultIndex = state.search.results.length - 1; - } else if (nextSelectedResultIndex > state.search.results.length - 1) { - nextSelectedResultIndex = 0; - } + const nextSelectedResultIndex = withinRange( + prevSelectedResultIndex + action.relativeChange, + state.search.results.length - 1, + ); const nextSelectedResult = state.search.results[nextSelectedResultIndex]; -- cgit v1.1