From 9874f96728dd9bf274c6d5134a1ec023fe5190e0 Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Tue, 26 Sep 2017 16:03:58 -0700 Subject: [PATCH] Merge pull request #11156 from brave/11060 Don't remove url suffix when suggestion is selected --- app/renderer/reducers/urlBarReducer.js | 9 ++++++--- test/unit/app/renderer/reducers/urlBarReducerTest.js | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/renderer/reducers/urlBarReducer.js b/app/renderer/reducers/urlBarReducer.js index 29bb66e2ffa..ee8ebfa6437 100644 --- a/app/renderer/reducers/urlBarReducer.js +++ b/app/renderer/reducers/urlBarReducer.js @@ -269,9 +269,11 @@ const urlBarReducer = (state, action) => { case windowConstants.WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS: state = setRenderUrlBarSuggestions(state, action.enabled) break - case windowConstants.WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED: - const selectedIndex = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])) || 0 - const suggestionList = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList'])) + case windowConstants.WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED: { + const activeFramePath = activeFrameStatePath(state) + const selectedIndex = state.getIn(activeFramePath.concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])) || 0 + const suggestionList = state.getIn(activeFramePath.concat(['navbar', 'urlbar', 'suggestions', 'suggestionList'])) + state = state.setIn(activeFramePath.concat(['navbar', 'urlbar', 'suggestions', 'autocompleteEnabled']), false) if (suggestionList.size > 0) { // It's important this doesn't run sync or else the returned state below will overwrite anything done in the click handler setImmediate(() => { @@ -280,6 +282,7 @@ const urlBarReducer = (state, action) => { }) } break + } case windowConstants.WINDOW_ON_STOP: if (action.isFocused) { state = setActive(state, false) diff --git a/test/unit/app/renderer/reducers/urlBarReducerTest.js b/test/unit/app/renderer/reducers/urlBarReducerTest.js index 545ae92c550..8ae3ad4c016 100644 --- a/test/unit/app/renderer/reducers/urlBarReducerTest.js +++ b/test/unit/app/renderer/reducers/urlBarReducerTest.js @@ -319,6 +319,11 @@ describe('urlBarReducer', function () { urlBarReducer(inputState, {actionType: windowConstants.WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED}) assert.equal(this.suggestionClickHandlers.navigateSiteClickHandler.callCount, 0) }) + it('sets the urlbar to disabled', function () { + const inputState = windowState.setIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'suggestionList', Immutable.fromJS([{location: 'https://www.brave.com'}])]) + const newState = urlBarReducer(inputState, {actionType: windowConstants.WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED}) + assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'autocompleteEnabled']), false) + }) }) }) })