From a7f183130822d71e73ea68cd09474dc9c9a6b41a Mon Sep 17 00:00:00 2001
From: Andy Edwards <jedwards@fastmail.com>
Date: Tue, 17 Aug 2021 00:45:55 -0500
Subject: [PATCH] fix: default disableAutoFocus to true for bindHover/bindFocus

---
 README.md                                  |  7 +++----
 demo/examples/CascadingHoverMenus.hooks.js | 11 +++++++----
 demo/examples/FocusPopover.hooks.js        |  1 -
 demo/examples/FocusPopover.js              |  2 +-
 demo/examples/HoverMenu.hooks.js           |  1 -
 demo/examples/HoverMenu.js                 |  2 +-
 demo/examples/HoverPopover.hooks.js        |  1 -
 demo/examples/HoverPopover.js              |  2 +-
 src/core.js                                | 18 +++++++++++++-----
 9 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 9164595..f447f2f 100644
--- a/README.md
+++ b/README.md
@@ -274,8 +274,7 @@ the trigger component may declare the same id in an ARIA prop.
 
 If `true`, will not steal focus when the popup is opened. (And `bindPopover`/`bindMenu`) will inject `disableAutoFocus`, `disableEnforceFocus`, and `disableRestoreFocus`).
 
-You should use this option if you are doing `bindHover`. Otherwise the document may scroll back to the previous focused
-element when you move the pointer out of the hovered menu or popover.
+Defaults to `true` when the popup is opened by the `bindHover` or `bindFocus` element.
 
 ## `usePopupState` return value
 
@@ -394,7 +393,7 @@ const styles = (theme) => ({
 })
 
 const HoverPopoverPopupState = ({ classes }) => (
-  <PopupState variant="popover" popupId="demoPopover" disableAutoFocus>
+  <PopupState variant="popover" popupId="demoPopover">
     {(popupState) => (
       <div>
         <Typography {...bindHover(popupState)}>
@@ -547,7 +546,7 @@ the trigger component may declare the same id in an ARIA prop.
 
 If `true`, will not steal focus when the popup is opened. (And `bindPopover`/`bindMenu`) will inject `disableAutoFocus`, `disableEnforceFocus`, and `disableRestoreFocus`).
 
-You should use this option if you are doing `bindHover`. Otherwise the document may scroll back to the previous focused
+Defaults to `true` when the popup is opened by the `bindHover` or `bindFocus` element.
 
 ### `children` (`(popupState: InjectedProps) => ?React.Node`, **required**)
 
diff --git a/demo/examples/CascadingHoverMenus.hooks.js b/demo/examples/CascadingHoverMenus.hooks.js
index 3e92fb8..5e9cb98 100644
--- a/demo/examples/CascadingHoverMenus.hooks.js
+++ b/demo/examples/CascadingHoverMenus.hooks.js
@@ -7,6 +7,7 @@ import Button from '@material-ui/core/Button'
 import {
   usePopupState,
   bindHover,
+  bindFocus,
   bindMenu,
 } from 'material-ui-popup-state/hooks'
 
@@ -48,11 +49,10 @@ function CascadingSubmenu({ title, popupId, ...props }) {
     popupId,
     variant: 'popover',
     parentPopupState,
-    disableAutoFocus: true,
   })
   return (
     <React.Fragment>
-      <MenuItem {...bindHover(popupState)}>
+      <MenuItem {...bindHover(popupState)} {...bindFocus(popupState)}>
         <span className={classes.title}>{title}</span>
         <ChevronRight className={classes.moreArrow} />
       </MenuItem>
@@ -88,11 +88,14 @@ const CascadingHoverMenus = () => {
   const popupState = usePopupState({
     popupId: 'demoMenu',
     variant: 'popover',
-    disableAutoFocus: true,
   })
   return (
     <div style={{ height: 600 }}>
-      <Button variant="contained" {...bindHover(popupState)}>
+      <Button
+        variant="contained"
+        {...bindHover(popupState)}
+        {...bindFocus(popupState)}
+      >
         Hover to open Menu
       </Button>
       <CascadingMenu
diff --git a/demo/examples/FocusPopover.hooks.js b/demo/examples/FocusPopover.hooks.js
index 2953210..f1c23c9 100644
--- a/demo/examples/FocusPopover.hooks.js
+++ b/demo/examples/FocusPopover.hooks.js
@@ -12,7 +12,6 @@ const FocusPopoverPopupState = ({ classes }) => {
   const popupState = usePopupState({
     variant: 'popover',
     popupId: 'demoPopover',
-    disableAutoFocus: true,
   })
   return (
     <div>
diff --git a/demo/examples/FocusPopover.js b/demo/examples/FocusPopover.js
index b07ccbf..4ae2183 100644
--- a/demo/examples/FocusPopover.js
+++ b/demo/examples/FocusPopover.js
@@ -5,7 +5,7 @@ import Input from '@material-ui/core/Input'
 import PopupState, { bindFocus, bindPopover } from 'material-ui-popup-state'
 
 const FocusPopoverPopupState = ({ classes }) => (
-  <PopupState variant="popover" popupId="demoPopover" disableAutoFocus>
+  <PopupState variant="popover" popupId="demoPopover">
     {(popupState) => (
       <div>
         <Input {...bindFocus(popupState)} placeholder="Focus to open Popover" />
diff --git a/demo/examples/HoverMenu.hooks.js b/demo/examples/HoverMenu.hooks.js
index f65fe91..555bf14 100644
--- a/demo/examples/HoverMenu.hooks.js
+++ b/demo/examples/HoverMenu.hooks.js
@@ -12,7 +12,6 @@ const MenuPopupState = () => {
   const popupState = usePopupState({
     variant: 'popover',
     popupId: 'demoMenu',
-    disableAutoFocus: true,
   })
   return (
     <React.Fragment>
diff --git a/demo/examples/HoverMenu.js b/demo/examples/HoverMenu.js
index 6332552..34ec9ad 100644
--- a/demo/examples/HoverMenu.js
+++ b/demo/examples/HoverMenu.js
@@ -5,7 +5,7 @@ import Button from '@material-ui/core/Button'
 import PopupState, { bindHover, bindMenu } from 'material-ui-popup-state'
 
 const MenuPopupState = () => (
-  <PopupState variant="popover" popupId="demoMenu" disableAutoFocus>
+  <PopupState variant="popover" popupId="demoMenu">
     {(popupState) => (
       <React.Fragment>
         <Button variant="contained" {...bindHover(popupState)}>
diff --git a/demo/examples/HoverPopover.hooks.js b/demo/examples/HoverPopover.hooks.js
index 981f200..7ec70dc 100644
--- a/demo/examples/HoverPopover.hooks.js
+++ b/demo/examples/HoverPopover.hooks.js
@@ -12,7 +12,6 @@ const HoverPopoverPopupState = ({ classes }) => {
   const popupState = usePopupState({
     variant: 'popover',
     popupId: 'demoPopover',
-    disableAutoFocus: true,
   })
   return (
     <div>
diff --git a/demo/examples/HoverPopover.js b/demo/examples/HoverPopover.js
index 18f41d5..14d8b49 100644
--- a/demo/examples/HoverPopover.js
+++ b/demo/examples/HoverPopover.js
@@ -5,7 +5,7 @@ import Button from '@material-ui/core/Button'
 import PopupState, { bindHover, bindPopover } from 'material-ui-popup-state'
 
 const HoverPopoverPopupState = ({ classes }) => (
-  <PopupState variant="popover" popupId="demoPopover" disableAutoFocus>
+  <PopupState variant="popover" popupId="demoPopover">
     {(popupState) => (
       <div>
         <Button variant="contained" {...bindHover(popupState)}>
diff --git a/src/core.js b/src/core.js
index 83d80ef..9410f73 100644
--- a/src/core.js
+++ b/src/core.js
@@ -38,6 +38,7 @@ export type CoreState = {
   setAnchorElUsed: boolean,
   anchorEl: ?HTMLElement,
   hovered: boolean,
+  focused: boolean,
   _childPopupState: ?PopupState,
   _deferNextOpen: boolean,
   _deferNextClose: boolean,
@@ -48,6 +49,7 @@ export const initCoreState: CoreState = {
   setAnchorElUsed: false,
   anchorEl: null,
   hovered: false,
+  focused: false,
   _childPopupState: null,
   _deferNextOpen: false,
   _deferNextClose: false,
@@ -73,6 +75,7 @@ export function createPopupState({
     setAnchorElUsed,
     anchorEl,
     hovered,
+    focused,
     _childPopupState,
     _deferNextOpen,
     _deferNextClose,
@@ -122,6 +125,7 @@ export function createPopupState({
       const newState: $Shape<CoreState> = {
         isOpen: true,
         hovered: eventType === 'mouseover',
+        focused: eventType === 'focus',
       }
 
       if (currentTarget) {
@@ -144,14 +148,18 @@ export function createPopupState({
 
   const close = (arg?: SyntheticEvent<any> | HTMLElement) => {
     const eventType = arg && (arg: any).type
-    if (eventType === 'touchstart') {
-      setState({ _deferNextClose: true })
-      return
+    switch (eventType) {
+      case 'touchstart':
+        setState({ _deferNextClose: true })
+        return
+      case 'blur':
+        if (isElementInPopup((arg: any)?.relatedTarget, popupState)) return
+        break
     }
     const doClose = () => {
       if (_childPopupState) _childPopupState.close()
       if (parentPopupState) parentPopupState._setChildPopupState(null)
-      setState({ isOpen: false, hovered: false })
+      setState({ isOpen: false, hovered: false, focused: false })
     }
     if (_deferNextClose) {
       setState({ _deferNextClose: false })
@@ -192,7 +200,7 @@ export function createPopupState({
     toggle,
     setOpen,
     onMouseLeave,
-    disableAutoFocus: Boolean(disableAutoFocus),
+    disableAutoFocus: disableAutoFocus ?? Boolean(hovered || focused),
     _childPopupState,
     _setChildPopupState,
   }