Merge pull request #11156 from brave/11060

Don't remove url suffix when suggestion is selected
brave · Sep 27, 2017 · 9874f96 · 9874f96 · bsclifton · Sep 28, 2017
1 parent 54915c9
commit 9874f96
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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)
+      })
     })
   })
 })