Findbar focus twice should select text

This was introduced with #5289 Fix #5289 Auditors: @diracdeltas
brave · Nov 1, 2016 · 649630f · 649630f · diracdeltas · Nov 1, 2016
1 parent c9afb91
commit 649630f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/js/components/findbar.js b/js/components/findbar.js
@@ -79,6 +79,9 @@ class FindBar extends ImmutableComponent {
   componentDidUpdate (prevProps) {
     if (this.props.selected) {
       this.focus()
+      // Findbar might already be focused, so make sure select happens even if no
+      // onFocus event happens.
+      this.select()
       windowActions.setFindbarSelected(false)
     }
     if (!this.props.findDetail || !prevProps.findDetail ||

diff --git a/test/components/frameTest.js b/test/components/frameTest.js
@@ -124,6 +124,22 @@ describe('findbar', function () {
       })
   })
 
+  it('focus twice without hide selects text', function * () {
+    yield this.app.client
+      .showFindbar()
+      .waitForElementFocus(findBarInput)
+      .setValue(findBarInput, 'test')
+      .waitUntil(function () {
+        return this.getValue(findBarInput).then((val) => val === 'test')
+      })
+      .showFindbar()
+      .waitForElementFocus(findBarInput)
+      .keys('x')
+      .waitUntil(function () {
+        return this.getValue(findBarInput).then((val) => val === 'x')
+      })
+  })
+
   it('should remember the position across findbar showing', function * () {
     yield this.app.client
       .showFindbar()