fix: correct ts type

Author: RylanBot

packages/components/_util/dom.ts

@@ -1,6 +1,6 @@
 import { isString } from 'lodash-es';
 import { getCssVarsValue } from './style';
-import type { AttachNode, AttachNodeReturnValue } from '../common';
+import type { AttachNode } from '../common';
 
 // 用于判断是否可使用 dom
 export const canUseDocument = !!(typeof window !== 'undefined' && window.document && window.document.createElement);
@@ -14,7 +14,7 @@ export const canUseDocument = !!(typeof window !== 'undefined' && window.documen
  */
 export const isWindow = (val: unknown): val is Window => val === window;
 
-export const getAttach = (node: AttachNode): AttachNodeReturnValue => {
+export const getAttach = (node: AttachNode): HTMLElement => {
   const attachNode = typeof node === 'function' ? node() : node;
   if (!attachNode) {
     return document.body;

packages/components/message/Message.tsx

@@ -10,7 +10,6 @@ import { PlacementOffset } from './const';
 import MessageComponent from './MessageComponent';
 import { useMessageClass } from './useMessageClass';
 
-import type { AttachNodeReturnValue } from '../common';
 import type {
   MessageCloseAllMethod,
   MessageConfigMethod,
@@ -56,7 +55,7 @@ interface ContainerInstance {
 let messageKey = 1;
 
 // 不同 attach 和 placement 对应的消息容器
-const MessageContainerMaps: Map<AttachNodeReturnValue, Map<MessagePlacementList, ContainerInstance>> = new Map();
+const MessageContainerMaps: Map<HTMLElement, Map<MessagePlacementList, ContainerInstance>> = new Map();
 
 const MessageContainer: React.FC<MessageContainerProps> = (props) => {
   const { placement, children, zIndex, renderCallback } = props;
@@ -93,15 +92,15 @@ const MessageContainer: React.FC<MessageContainerProps> = (props) => {
   );
 };
 
-function getAttachNodeMap(attachNode: AttachNodeReturnValue) {
+function getAttachNodeMap(attachNode: HTMLElement) {
   if (!MessageContainerMaps.has(attachNode)) {
     MessageContainerMaps.set(attachNode, new Map());
   }
   return MessageContainerMaps.get(attachNode);
 }
 
 async function findExistingContainer(
-  attachNode: AttachNodeReturnValue,
+  attachNode: HTMLElement,
   placement: MessagePlacementList,
   zIndex?: number,
 ) {
@@ -162,15 +161,6 @@ async function renderElement(theme, config: MessageOptions): Promise<MessageInst
       const index = containerInstance.messages.indexOf(message);
       if (index === -1) return;
       containerInstance.messages.splice(index, 1);
-      // 如果容器内没有消息，整个移除
-      if (containerInstance.messages.length === 0) {
-        containerInstance.container.remove();
-        const attachNodeMap = getAttachNodeMap(attachNode);
-        attachNodeMap.delete(placement);
-        if (attachNodeMap.size === 0) {
-          MessageContainerMaps.delete(attachNode);
-        }
-      }
     },
   };
 
@@ -259,13 +249,11 @@ MessagePlugin.close = (messageInstance) => {
  * @desc 关闭所有的 message
  */
 MessagePlugin.closeAll = (): MessageCloseAllMethod => {
-  // 收集所有需要关闭的消息实例
   const allMessages: MessageInstance[] = [];
-
   MessageContainerMaps.forEach((placementMap) => {
-    placementMap.forEach((containerInfo) => {
-      // 复制消息数组，避免在关闭过程中数组被修改
-      allMessages.push(...containerInfo.messages.slice());
+    placementMap.forEach((instance) => {
+      // 收集需要关闭的消息实例，避免同时遍历与删除导致的索引错乱问题
+      allMessages.push(...instance.messages.slice());
     });
   });
 
@@ -275,8 +263,6 @@ MessagePlugin.closeAll = (): MessageCloseAllMethod => {
       message.close();
     }
   });
-
-  MessageContainerMaps.clear();
   return;
 };
 

packages/components/popup/PopupPlugin.tsx

@@ -1,26 +1,25 @@
+import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { CSSTransition } from 'react-transition-group';
 import { createPopper, Instance, Placement, type Options } from '@popperjs/core';
 import classNames from 'classnames';
 import { isString } from 'lodash-es';
-import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { CSSTransition } from 'react-transition-group';
 import { getAttach } from '../_util/dom';
 import { off, on } from '../_util/listener';
 import { render, unmount } from '../_util/react-render';
-import type { TNode } from '../common';
 import PluginContainer from '../common/PluginContainer';
 import ConfigProvider from '../config-provider';
 import useDefaultProps from '../hooks/useDefaultProps';
 import { popupDefaultProps } from './defaultProps';
+
+import type { AttachNode, TNode } from '../common';
 import type { TdPopupProps } from './type';
 
 export interface PopupPluginApi {
   config: TdPopupProps;
 }
 
-type TriggerEl = string | HTMLElement;
-
 export interface OverlayProps extends TdPopupProps {
-  triggerEl: TriggerEl;
+  triggerEl: AttachNode;
   renderCallback: (instance: HTMLElement) => void;
 }
 
@@ -172,7 +171,7 @@ function removeOverlayInstance() {
   }
 }
 
-export type PluginMethod = (triggerEl: TriggerEl, content: TNode, popupProps?: TdPopupProps) => Promise<Instance>;
+export type PluginMethod = (triggerEl: AttachNode, content: TNode, popupProps?: TdPopupProps) => Promise<Instance>;
 
 const renderInstance = (props, attach: HTMLElement): Promise<HTMLElement> =>
   new Promise((resolve) => {