chore: directly use triggerElement for querySelector instead of children

Author: RylanBot

packages/components/popup/Popup.tsx

@@ -40,6 +40,9 @@ export interface PopupRef {
   setVisible: (visible: boolean) => void;
 }
 
+// 默认动画时长
+const DEFAULT_TRANSITION_TIMEOUT = 180;
+
 const Popup = forwardRef<PopupRef, PopupProps>((originalProps, ref) => {
   const props = useDefaultProps<PopupProps>(originalProps, popupDefaultProps);
   const {
@@ -78,9 +81,6 @@ const Popup = forwardRef<PopupRef, PopupProps>((originalProps, ref) => {
   const contentRef = useRef(null); // 内容部分
   const popperRef = useRef(null); // 保存 popper 实例
 
-  // 默认动画时长
-  const DEFAULT_TRANSITION_TIMEOUT = 180;
-
   // 处理切换 panel 为 null 和正常内容动态切换的情况
   useEffect(() => {
     if (!content && hideEmptyPopup) {
@@ -101,7 +101,6 @@ const Popup = forwardRef<PopupRef, PopupProps>((originalProps, ref) => {
   );
 
   const { triggerElementIsString, getTriggerElement, getTriggerNode } = useTrigger({
-    children,
     triggerElement,
     content,
     disabled,

packages/components/popup/hooks/useTrigger.tsx

@@ -5,16 +5,7 @@ import useConfig from '../../hooks/useConfig';
 
 const ESC_KEY = 'Escape';
 
-export default function useTrigger({
-  children,
-  triggerElement,
-  content,
-  disabled,
-  trigger,
-  visible,
-  onVisibleChange,
-  delay,
-}) {
+export default function useTrigger({ triggerElement, content, disabled, trigger, visible, onVisibleChange, delay }) {
   const { classPrefix } = useConfig();
 
   const triggerElementIsString = typeof triggerElement === 'string';
@@ -47,14 +38,16 @@ export default function useTrigger({
   const getTriggerElement = useCallback(() => {
     let element: HTMLElement | null = null;
     if (triggerElementIsString) {
-      element = document.querySelector(children);
+      element = document.querySelector(triggerElement);
     } else {
       element = getRefDom(triggerRef);
     }
     return element;
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  useEffect(() => clearTimeout(visibleTimer.current), []);
+
   useEffect(() => {
     if (!shouldToggle) return;
 
@@ -205,13 +198,6 @@ export default function useTrigger({
     };
   }, [visible, classPrefix, getTriggerElement]);
 
-  useEffect(
-    () => () => {
-      clearTimeout(visibleTimer.current);
-    },
-    [],
-  );
-
   function getTriggerNode(children: React.ReactNode) {
     if (triggerElementIsString) return;