fix(Popover): popover ref.current.show() invalid

ant-design · Aug 29, 2024 · 3a6ac62 · 3a6ac62
1 parent 7e6f7e6
commit 3a6ac62
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/components/popover/popover.tsx b/src/components/popover/popover.tsx
@@ -79,13 +79,17 @@ export const Popover = forwardRef<PopoverRef, PopoverProps>((p, ref) => {
   useImperativeHandle(
     ref,
     () => ({
-      show: () => setVisible(true),
+      show: () => {
+        stateRef.current.isClickShow = true
+        setVisible(true)
+      },
       hide: () => setVisible(false),
       visible,
     }),
     [visible]
   )
 
+  const stateRef = useRef({ isClickShow: false })
   const targetRef = useRef<Wrapper>(null)
   const floatingRef = useRef<HTMLDivElement>(null)
   const arrowRef = useRef<HTMLDivElement>(null)
@@ -196,6 +200,10 @@ export const Popover = forwardRef<PopoverRef, PopoverProps>((p, ref) => {
   useClickAway(
     () => {
       if (!props.trigger) return
+      if (stateRef.current.isClickShow) {
+        stateRef.current.isClickShow = false
+        return
+      }
       setVisible(false)
     },
     [() => targetRef.current?.element, floatingRef],