 -}
 -
  const SimpleButton = React.forwardRef(function SimpleButton(props, ref) {
-   const { isFocusVisible, onBlurVisible, ref: focusVisibleRef } = useIsFocusVisible();
- 
-@@ -79,31 +68,20 @@ describe('focus-visible polyfill', () => {
+   const {
+     isFocusVisibleRef,
+@@ -85,31 +74,20 @@ describe('focus-visible polyfill', () => {
  
      it('should set focus state for shadowRoot children', () => {
        const buttonRef = React.createRef();

     });
   });
 });
diff --git a/packages/material-ui/src/utils/focusVisible.test.js b/packages/material-ui/src/utils/focusVisible.test.js
index 289b048a65..aaec2c066f 100644
--- a/packages/material-ui/src/utils/focusVisible.test.js
+++ b/packages/material-ui/src/utils/focusVisible.test.js
@@ -5,17 +5,6 @@ import { createMount } from 'test/utils';
 import useIsFocusVisible, { teardown as teardownFocusVisible } from './useIsFocusVisible';
 import useForkRef from './useForkRef';

       });
     });
   });
diff --git a/packages/material-ui/src/Tooltip/Tooltip.js b/packages/material-ui/src/Tooltip/Tooltip.js
index 0dfb45f2e6..1eeb34f94b 100644
--- a/packages/material-ui/src/Tooltip/Tooltip.js
+++ b/packages/material-ui/src/Tooltip/Tooltip.js
@@ -347,7 +347,8 @@ const Tooltip = React.forwardRef(function Tooltip(props, ref) {
   const handleLeave = (forward = true) => (event) => {
     const childrenProps = children.props;
 
-    if (event.type === 'blur') {
+    // TODO Should be `blur` once https://github.com/facebook/react/pull/19561 is released
+    if (event.type === 'focusout') {
       if (childrenProps.onBlur && forward) {
         childrenProps.onBlur(event);
       }
diff --git a/packages/material-ui/src/Unstable_TrapFocus/Unstable_TrapFocus.js b/packages/material-ui/src/Unstable_TrapFocus/Unstable_TrapFocus.js
index 5fbc86b1ba..e7b33b024b 100644
--- a/packages/material-ui/src/Unstable_TrapFocus/Unstable_TrapFocus.js
