Editing custom selection from autocomplete can clear URL suffix

Fix #9322

app/renderer/components/navigation/urlBar.js

@@ -261,18 +261,21 @@ class UrlBar extends React.Component {
       this.lastSuffix = ''
     }
 
+    const selectionStart = this.urlInput.selectionStart
+    const selectionEnd = this.urlInput.selectionEnd
+
     // if there is no selection then we are not in autocomplete
     // so make sure that this.lastValue is set to urlInput.value
-    if (this.urlInput.selectionStart === this.urlInput.selectionEnd) {
+    if (selectionStart === selectionEnd) {
       this.lastVal = this.urlInput.value
       this.lastSuffix = ''
     }
 
-    const selectionStart = this.urlInput.selectionStart
+    const lastValueWithSuffix = this.getValue()
     const newValue = [
-      this.lastVal.slice(0, selectionStart),
+      lastValueWithSuffix.slice(0, selectionStart),
       String.fromCharCode(e.which),
-      this.lastVal.slice(this.urlInput.selectionEnd)
+      lastValueWithSuffix.slice(selectionEnd)
     ].join('')
 
     if (!this.updateAutocomplete(newValue)) {

test/navbar-components/urlBarTest.js

@@ -752,4 +752,27 @@ describe('urlBar tests', function () {
         .waitForInputText(urlInput, this.page2Url)
     })
   })
+
+  describe('keeps url text separate from suffix text', function () {
+    Brave.beforeAll(this)
+    before(function * () {
+      /*
+      yield setup(this.app.client)
+      yield this.app.client.waitForExist(urlInput)
+      yield this.app.client.waitForElementFocus(urlInput)
+      yield this.app.client
+        .onClearBrowsingData({browserHistory: true})
+        .addSite({ location: 'https://github.com/brave/browser-laptop', title: 'browser-laptop' })
+        .addSite({ location: 'https://github.com/brave/ad-block', title: 'Muon' })
+      */
+    })
+
+    it('changes only the selection', function * () {
+    /*
+      yield this.app.client
+        .setInputText(urlInput, '')
+        .debug()
+        */
+    })
+  })
 })