Fix regression for :focus-visible matcher in unit tests (#2827)

sumup-oss · Dec 11, 2024 · dc6aa83 · dc6aa83
1 parent 2c22271
commit dc6aa83
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.changeset/strong-mayflies-kneel.md b/.changeset/strong-mayflies-kneel.md
@@ -0,0 +1,5 @@
+---
+'@sumup-oss/circuit-ui': patch
+---
+
+Fixed a regression that [breaks Jest and Vitest tests](https://github.com/dperini/nwsapi/issues?q=sort%3Aupdated-desc+is%3Aissue+focus-visible+) when [matching elements](https://developer.mozilla.org/en-US/docs/Web/API/Element/matches) using the `:focus-visible` selector.
diff --git a/packages/circuit-ui/components/Tooltip/Tooltip.tsx b/packages/circuit-ui/components/Tooltip/Tooltip.tsx
@@ -137,13 +137,13 @@ export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
     const handleFocus: FocusEventHandler = useCallback(
       (event) => {
         if (
-          event.currentTarget.matches(':focus-visible') ||
           // Vitest and Jest use nwsapi to mock the `Element.matches` API.
           // It has a bug where `:focus-visible` is not matched unless
           // the element has the `autofocus` property set.
           // https://github.com/dperini/nwsapi/issues/122
-          (process.env.NODE_ENV === 'test' &&
-            event.currentTarget.matches(':focus'))
+          process.env.NODE_ENV === 'test'
+            ? event.currentTarget.matches(':focus')
+            : event.currentTarget.matches(':focus-visible')
         ) {
           handleOpen();
         }