From 06f12a6475e6332a048c8c0770a36661af3fea20 Mon Sep 17 00:00:00 2001
From: Philipp Fritsche <ph.fritsche@gmail.com>
Date: Thu, 31 Mar 2022 19:30:12 +0200
Subject: [PATCH 1/2] fix(pointer): change selection before dispatching `focus`
 (#895)

---
 src/pointer/pointerPress.ts | 12 +++++-------
 tests/pointer/select.ts     | 14 ++++++++++++++
 tests/utility/type.ts       |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/pointer/pointerPress.ts b/src/pointer/pointerPress.ts
index da101fa4..8730f917 100644
--- a/src/pointer/pointerPress.ts
+++ b/src/pointer/pointerPress.ts
@@ -266,13 +266,6 @@ function mousedownDefaultBehavior({
   node?: Node
   offset?: number
 }) {
-  // The closest focusable element is focused when a `mousedown` would have been fired.
-  // Even if there was no `mousedown` because the element was disabled.
-  // A `mousedown` that preventsDefault cancels this though.
-  focus(target)
-
-  // TODO: What happens if a focus event handler interfers?
-
   // An unprevented mousedown moves the cursor to the closest character.
   // We try to approximate the behavior for a no-layout environment.
   if (!targetIsDisabled) {
@@ -326,6 +319,11 @@ function mousedownDefaultBehavior({
       selection.addRange(range.cloneRange())
     }
   }
+
+  // The closest focusable element is focused when a `mousedown` would have been fired.
+  // Even if there was no `mousedown` because the element was disabled.
+  // A `mousedown` that preventsDefault cancels this though.
+  focus(target)
 }
 
 function getTextRange(
diff --git a/tests/pointer/select.ts b/tests/pointer/select.ts
index 7e2fc45a..83104663 100644
--- a/tests/pointer/select.ts
+++ b/tests/pointer/select.ts
@@ -368,3 +368,17 @@ describe('focus control when clicking label', () => {
     expect(input).not.toHaveFocus()
   })
 })
+
+test('focus event handler can override selection', async () => {
+  const {element, user} = setup(`<input value="hello"/>`, {
+    focus: false,
+  })
+  element.addEventListener('focus', e =>
+    (e.target as HTMLInputElement).select(),
+  )
+
+  await user.click(element)
+
+  expect(element).toHaveProperty('selectionStart', 0)
+  expect(element).toHaveProperty('selectionEnd', 5)
+})
diff --git a/tests/utility/type.ts b/tests/utility/type.ts
index 1e4380c9..26e73131 100644
--- a/tests/utility/type.ts
+++ b/tests/utility/type.ts
@@ -19,9 +19,9 @@ test('type into input', async () => {
     input[value="foo"] - mousemove
     input[value="foo"] - pointerdown
     input[value="foo"] - mousedown: primary
+    input[value="foo"] - select
     input[value="foo"] - focus
     input[value="foo"] - focusin
-    input[value="foo"] - select
     input[value="foo"] - pointerup
     input[value="foo"] - mouseup: primary
     input[value="foo"] - click: primary

From f2e8f8e25f9664feb7db417cc15f16f6fe1d2f21 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 31 Mar 2022 19:32:43 +0200
Subject: [PATCH 2/2] docs: add wKovacs64 as a contributor for bug (#896)

* docs: update CONTRIBUTORS.md

* docs: update .all-contributorsrc

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
---
 .all-contributorsrc | 9 +++++++++
 CONTRIBUTORS.md     | 1 +
 2 files changed, 10 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 1a80539a..a621a1e6 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1189,6 +1189,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "wKovacs64",
+      "name": "Justin Hall",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1288694?v=4",
+      "profile": "https://justinrhall.dev",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "commitConvention": "none",
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 13bdb5c7..2411fb2a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -163,6 +163,7 @@ Thanks goes to these wonderful people ([emoji key][emojis]):
     <td align="center"><a href="https://github.com/joshunger"><img src="https://avatars.githubusercontent.com/u/2301847?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Josh Unger</b></sub></a><br /><a href="https://github.com/testing-library/user-event/issues?q=author%3Ajoshunger" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/robcaldecott"><img src="https://avatars.githubusercontent.com/u/796702?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rob Caldecott</b></sub></a><br /><a href="https://github.com/testing-library/user-event/issues?q=author%3Arobcaldecott" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/user-event/commits?author=robcaldecott" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/tbertrand7"><img src="https://avatars.githubusercontent.com/u/14081248?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Bertrand</b></sub></a><br /><a href="https://github.com/testing-library/user-event/issues?q=author%3Atbertrand7" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://justinrhall.dev"><img src="https://avatars.githubusercontent.com/u/1288694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Justin Hall</b></sub></a><br /><a href="https://github.com/testing-library/user-event/issues?q=author%3AwKovacs64" title="Bug reports">🐛</a></td>
   </tr>
 </table>