fix(Menu): 修复 Menu 使用 React.StrictMode 报错 (#758)

uiwjs · Apr 11, 2022 · a62e924 · a62e924
1 parent 1d6ea8d
commit a62e924
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/react-menu/src/SubMenu.tsx b/packages/react-menu/src/SubMenu.tsx
@@ -88,21 +88,21 @@ export const SubMenu = React.forwardRef(function <Tag extends TagType = 'a'>(
     }
   }
   function onExit(node: HTMLElement) {
-    node.style.height = `${node.scrollHeight}px`;
+    node && (node.style.height = `${node.scrollHeight}px`);
     setIsOpen(false);
   }
   function onExiting(node: HTMLElement) {
-    node.style.height = '0px';
+    node && (node.style.height = '0px');
   }
   function onEnter(node: HTMLElement) {
-    node.style.height = '1px';
+    node && (node.style.height = '1px');
     setIsOpen(true);
   }
   function onEntering(node: HTMLElement) {
-    node.style.height = `${node.scrollHeight}px`;
+    node && (node.style.height = `${node.scrollHeight}px`);
   }
   function onEntered(node: HTMLElement) {
-    node.style.height = 'initial';
+    node && (node.style.height = 'initial');
   }
 
   if (!collapse) {

diff --git a/packages/react-overlay/src/index.tsx b/packages/react-overlay/src/index.tsx
@@ -65,7 +65,7 @@ export default function Overlay(props: OverlayProps) {
   // const [isOpen, setIsOpen] = useState(props.isOpen || false);
   const [visible, setVisible] = useState(false);
   const container = useRef<HTMLDivElement>(null);
-  const overlay = useRef<HTMLDivElement>(null);
+  const overlay = useRef(null);
   useEffect(() => {
     if (isOpen !== props.isOpen && props.isOpen) {
       setVisible(true);
@@ -138,6 +138,7 @@ export default function Overlay(props: OverlayProps) {
       onEntered={onOpened}
       onExiting={onClosing}
       onExited={handleClosed}
+      nodeRef={overlay}
       {...otherProps}
     >
       {(status) => {