[react-interactions] Refine virtual click detection for FF+JAWS/NVDA (#…

…17422)
facebook · Nov 21, 2019 · 3fdfa23 · 3fdfa23
1 parent a7d07ff
commit 3fdfa23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/packages/react-interactions/events/src/dom/PressLegacy.js b/packages/react-interactions/events/src/dom/PressLegacy.js
@@ -489,6 +489,11 @@ function updateIsPressWithinResponderRegion(
 // clicks (NVDA, Jaws, VoiceOver) do not have co-ords associated with the click
 // event and "detail" is always 0 (where normal clicks are > 0)
 function isScreenReaderVirtualClick(nativeEvent): boolean {
+  // JAWS/NVDA with Firefox.
+  if (nativeEvent.mozInputSource === 0 && nativeEvent.isTrusted) {
+    return true;
+  }
+  // Chrome
   return (
     nativeEvent.detail === 0 &&
     nativeEvent.screenX === 0 &&

diff --git a/packages/react-interactions/events/src/dom/shared/index.js b/packages/react-interactions/events/src/dom/shared/index.js
@@ -79,5 +79,9 @@ export function hasModifierKey(event: ReactDOMResponderEvent): boolean {
 // where only the "virtual" click lacks a pointerType field.
 export function isVirtualClick(event: ReactDOMResponderEvent): boolean {
   const nativeEvent: any = event.nativeEvent;
+  // JAWS/NVDA with Firefox.
+  if (nativeEvent.mozInputSource === 0 && nativeEvent.isTrusted) {
+    return true;
+  }
   return nativeEvent.detail === 0 && !nativeEvent.pointerType;
 }