Merge pull request #1040 from szhsin/fix/onblur

fix: onblur
szhsin · Aug 13, 2023 · 63fb2ed · 63fb2ed
2 parents 0fa4274 + f547dca
commit 63fb2ed
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 17 deletions.
diff --git a/dist/es/components/MenuContainer.js b/dist/es/components/MenuContainer.js
@@ -28,7 +28,7 @@ const MenuContainer = ({
     }
   };
   const onBlur = e => {
-    if (isOpen && !e.currentTarget.contains(e.relatedTarget || document.activeElement)) {
+    if (isOpen && !e.currentTarget.contains(e.relatedTarget)) {
       safeCall(onClose, {
         reason: CloseReason.BLUR
       });

diff --git a/dist/index.js b/dist/index.js
@@ -556,7 +556,7 @@ const MenuContainer = ({
     }
   };
   const onBlur = e => {
-    if (isOpen && !e.currentTarget.contains(e.relatedTarget || document.activeElement)) {
+    if (isOpen && !e.currentTarget.contains(e.relatedTarget)) {
       safeCall(onClose, {
         reason: CloseReason.BLUR
       });

diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/src/components/Usage.js b/example/src/components/Usage.js
@@ -804,6 +804,8 @@ function ContextMenuExample() {
     <Example
       data={codeExamples.contextMenu}
       onContextMenu={(e) => {
+        if (typeof document.hasFocus === 'function' && !document.hasFocus()) return;
+
         e.preventDefault();
         setAnchorPoint({ x: e.clientX, y: e.clientY });
         setOpen(true);

diff --git a/example/src/data/codeExamples.js b/example/src/data/codeExamples.js
@@ -1099,6 +1099,8 @@ export default function () {
   return (
     <div
       onContextMenu={(e) => {
+        if (typeof document.hasFocus === 'function' && !document.hasFocus()) return;
+        
         e.preventDefault();
         setAnchorPoint({ x: e.clientX, y: e.clientY });
         setOpen(true);

diff --git a/example/src/utils/index.js b/example/src/utils/index.js
@@ -1,8 +1,8 @@
 import { useEffect, useLayoutEffect } from 'react';
 import { useTheme } from '../store';
 
-export const version = '4.0.2';
-export const build = '132';
+export const version = '4.0.3';
+export const build = '133';
 
 export const bem = (block, element, modifiers = {}) => {
   let blockElement = element ? `${block}__${element}` : block;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@szhsin/react-menu",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "React component for building accessible menu, dropdown, submenu, context menu and more.",
   "author": "Zheng Song",
   "license": "MIT",

diff --git a/src/components/MenuContainer.js b/src/components/MenuContainer.js
@@ -30,7 +30,7 @@ export const MenuContainer = ({
   };
 
   const onBlur = (e) => {
-    if (isOpen && !e.currentTarget.contains(e.relatedTarget || document.activeElement)) {
+    if (isOpen && !e.currentTarget.contains(e.relatedTarget)) {
       safeCall(onClose, { reason: CloseReason.BLUR });
     }
   };