From 5781918f84f5e113f13ed58fff53bfe7b7bf8fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Sun, 19 May 2019 21:43:29 +0200 Subject: [PATCH] Fix issue with Tab+alt not being considered as isGlobalFocusVisible candidate on Mac --- packages/react-events/src/Focus.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/react-events/src/Focus.js b/packages/react-events/src/Focus.js index 3d7b9e93dd77a..2e7103d378604 100644 --- a/packages/react-events/src/Focus.js +++ b/packages/react-events/src/Focus.js @@ -39,6 +39,8 @@ type FocusEvent = {| timeStamp: number, |}; +const isMac = /^Mac/.test(navigator.platform); + const targetEventTypes = [ {name: 'focus', passive: true}, {name: 'blur', passive: true}, @@ -304,7 +306,7 @@ const FocusResponder = { const nativeEvent = event.nativeEvent; if ( nativeEvent.key === 'Tab' && - !(nativeEvent.metaKey || nativeEvent.altKey || nativeEvent.ctrlKey) + !(nativeEvent.metaKey || (!isMac && nativeEvent.altKey) || nativeEvent.ctrlKey) ) { state.pointerType = 'keyboard'; isGlobalFocusVisible = true;