fix(click/dblClick): prevent blur when clicking the same element (#265)

testing-library · May 13, 2020 · 585f1df · 585f1df
1 parent a0cbe27
commit 585f1df
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/__tests__/react/click.js b/__tests__/react/click.js
@@ -408,6 +408,15 @@ describe("userEvent.click", () => {
     expect(onSubmit).not.toHaveBeenCalled();
   });
 
+  it("should not fire blur on current element if is the same as previous", () => {
+    const onBlur = jest.fn();
+    const { getByText } = render(<button onBlur={onBlur}>Blur</button>);
+    userEvent.click(getByText("Blur"));
+    expect(onBlur).not.toHaveBeenCalled();
+    userEvent.click(getByText("Blur"));
+    expect(onBlur).not.toHaveBeenCalled();
+  });
+
   it.each(["input", "textarea"])(
     "should not give focus for <%s> when mouseDown is prevented",
     (type) => {

diff --git a/__tests__/react/dblclick.js b/__tests__/react/dblclick.js
@@ -105,6 +105,15 @@ describe("userEvent.dblClick", () => {
     ]);
   });
 
+  it("should not fire blur on current element if is the same as previous", () => {
+    const onBlur = jest.fn();
+    const { getByText } = render(<button onBlur={onBlur}>Blur</button>);
+    userEvent.dblClick(getByText("Blur"));
+    expect(onBlur).not.toHaveBeenCalled();
+    userEvent.dblClick(getByText("Blur"));
+    expect(onBlur).not.toHaveBeenCalled();
+  });
+
   it("should not blur when mousedown prevents default", () => {
     let events = [];
     const eventsHandler = jest.fn((evt) => events.push(evt.type));

diff --git a/src/index.js b/src/index.js
@@ -44,10 +44,13 @@ function clickBooleanElement(element) {
 function clickElement(element, previousElement, init) {
   fireEvent.mouseOver(element);
   fireEvent.mouseMove(element);
+  const wasAnotherElementFocused =
+    previousElement !== element.ownerDocument.body &&
+    previousElement !== element;
   const continueDefaultHandling = fireEvent.mouseDown(element);
   if (continueDefaultHandling) {
-    previousElement && previousElement.blur();
-    element.focus();
+    wasAnotherElementFocused && previousElement.blur();
+    previousElement !== element && element.focus();
   }
   fireEvent.mouseUp(element);
   fireEvent.click(element, init);
@@ -59,10 +62,13 @@ function clickElement(element, previousElement, init) {
 function dblClickElement(element, previousElement) {
   fireEvent.mouseOver(element);
   fireEvent.mouseMove(element);
+  const wasAnotherElementFocused =
+    previousElement !== element.ownerDocument.body &&
+    previousElement !== element;
   const continueDefaultHandling = fireEvent.mouseDown(element);
   if (continueDefaultHandling) {
-    previousElement && previousElement.blur();
-    element.focus();
+    wasAnotherElementFocused && previousElement.blur();
+    previousElement !== element && element.focus();
   }
   fireEvent.mouseUp(element);
   fireEvent.click(element);
@@ -106,21 +112,21 @@ function fireChangeEvent(event) {
 }
 
 const Keys = {
-  Backspace: { keyCode: 8, code: "Backspace", key: "Backspace" }
+  Backspace: { keyCode: 8, code: "Backspace", key: "Backspace" },
 };
 
 function backspace(element) {
   const eventOptions = {
     key: Keys.Backspace.key,
     keyCode: Keys.Backspace.keyCode,
-    which: Keys.Backspace.keyCode
+    which: Keys.Backspace.keyCode,
   };
   fireEvent.keyDown(element, eventOptions);
   fireEvent.keyUp(element, eventOptions);
 
   if (!element.readOnly) {
     fireEvent.input(element, {
-      inputType: "deleteContentBackward"
+      inputType: "deleteContentBackward",
     });
     element.value = ""; // when we add special keys to API, will need to respect selected range
   }
@@ -152,7 +158,7 @@ const userEvent = {
           break;
         }
       default:
-        clickElement(element, wasAnotherElementFocused && focusedElement, init);
+        clickElement(element, focusedElement, init);
     }
   },
 
@@ -172,7 +178,7 @@ const userEvent = {
           break;
         }
       default:
-        dblClickElement(element, wasAnotherElementFocused && focusedElement);
+        dblClickElement(element, focusedElement);
     }
   },
 
@@ -185,7 +191,7 @@ const userEvent = {
       fireEvent.mouseLeave(focusedElement);
     }
 
-    clickElement(element, wasAnotherElementFocused && focusedElement);
+    clickElement(element, focusedElement);
 
     const valArray = Array.isArray(values) ? values : [values];
     const selectedOptions = Array.from(