@pisell/private-materials 6.4.42 → 6.5.2

package/lib/components/checkout/components/PaymentResultToast/PaymentResultToastProvider.js

@@ -30,14 +30,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var PaymentResultToastProvider_exports = {};
 __export(PaymentResultToastProvider_exports, {
   PaymentResultToastProvider: () => PaymentResultToastProvider,
-  clearAllPaymentResultToasts: () => clearAllPaymentResultToasts,
   closePaymentResultToast: () => closePaymentResultToast,
-  getPaymentResultToastCount: () => getPaymentResultToastCount,
-  globalToastManager: () => globalToastManager,
-  setTillButton: () => setTillButton,
   showPaymentResultToast: () => showPaymentResultToast,
   showPaymentResultToastFailed: () => showPaymentResultToastFailed,
-  showPaymentResultToastPartiallyPaid: () => showPaymentResultToastPartiallyPaid,
   showPaymentResultToastSuccess: () => showPaymentResultToastSuccess,
   showPaymentResultToastWalletPassFailed: () => showPaymentResultToastWalletPassFailed,
   usePaymentResultToast: () => usePaymentResultToast
@@ -46,65 +41,66 @@ module.exports = __toCommonJS(PaymentResultToastProvider_exports);
 var import_react = __toESM(require("react"));
 var import_react_dom = require("react-dom");
 var import_index = __toESM(require("./index"));
-var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var PaymentResultToastContext = (0, import_react.createContext)(null);
 var globalPaymentResultToastContext = null;
 var DEFAULT_TOAST_CONFIG = {
   width: 680,
-  mask: false,
-  maskClosable: false,
-  closable: true
-  // 移除强制的zIndex设置，让Toast使用默认层级或由外部控制
+  mask: true,
+  maskClosable: true,
+  closable: true,
+  zIndex: 2e3
 };
 var PaymentResultToastProvider = ({ children }) => {
-  var _a, _b, _c;
-  const [contextToastIds, setContextToastIds] = (0, import_react.useState)([]);
-  const context = (0, import_useEngineContext.default)();
-  const { interaction } = ((_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) || {};
-  (_c = (_b = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _b.asyncDataManager) == null ? void 0 : _c.call(_b, {
-    module: "get",
-    key: "till_button"
-  }).then((res) => {
-    globalToastManager.setTillButton(res);
-  }).catch((err) => {
-    console.error("Failed to get till_button from asyncDataManager:", err);
-  });
+  const [toastProps, setToastProps] = (0, import_react.useState)(null);
+  const customOnCloseRef = (0, import_react.useRef)();
+  const customOnCountdownCompleteRef = (0, import_react.useRef)();
   const closeToast = (0, import_react.useCallback)(() => {
-    contextToastIds.forEach((id) => {
-      globalToastManager.removeToast(id);
-    });
-    setContextToastIds([]);
-  }, [contextToastIds]);
-  const showToast = (0, import_react.useCallback)((config) => {
-    const toastId = globalToastManager.addToast({
-      ...config,
-      onClose: () => {
-        var _a2;
-        (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
-        setContextToastIds((prev) => prev.filter((id) => id !== toastId));
-      }
-    });
-    setContextToastIds((prev) => [...prev, toastId]);
-    return toastId;
+    setToastProps(null);
+  }, []);
+  const handleClose = (0, import_react.useCallback)(() => {
+    var _a;
+    (_a = customOnCloseRef.current) == null ? void 0 : _a.call(customOnCloseRef);
+    closeToast();
+  }, [closeToast]);
+  const handleCountdownComplete = (0, import_react.useCallback)(() => {
+    var _a;
+    (_a = customOnCountdownCompleteRef.current) == null ? void 0 : _a.call(customOnCountdownCompleteRef);
   }, []);
+  const showToast = (0, import_react.useCallback)((config) => {
+    customOnCloseRef.current = config.onClose;
+    customOnCountdownCompleteRef.current = config.onCountdownComplete;
+    const finalConfig = {
+      ...DEFAULT_TOAST_CONFIG,
+      visible: true,
+      statusClassName: config.statusClassName,
+      title: config.title,
+      subtitle: config.subtitle,
+      changeDueText: config.changeDueText,
+      actionButtons: config.actionButtons || [],
+      autoClose: config.autoClose,
+      autoCloseDelay: config.autoCloseDelay || 5,
+      showCountdownProgress: config.showCountdownProgress,
+      onCountdownComplete: handleCountdownComplete,
+      // 使用稳定的handleCountdownComplete函数
+      onClose: handleClose
+      // 使用稳定的handleClose函数
+    };
+    setToastProps(finalConfig);
+  }, [handleClose, handleCountdownComplete]);
   const showSuccess = (0, import_react.useCallback)((config) => {
-    return showToast({ ...config, statusClassName: "success" });
+    showToast({ ...config, statusClassName: "success" });
   }, [showToast]);
   const showFailed = (0, import_react.useCallback)((config) => {
-    return showToast({ ...config, statusClassName: "failed" });
+    showToast({ ...config, statusClassName: "failed" });
   }, [showToast]);
   const showWalletPassFailed = (0, import_react.useCallback)((config) => {
-    return showToast({ ...config, statusClassName: "wallet-pass-failed" });
-  }, [showToast]);
-  const showPartiallyPaid = (0, import_react.useCallback)((config) => {
-    return showToast({ ...config, statusClassName: "partially-paid" });
+    showToast({ ...config, statusClassName: "wallet-pass-failed" });
   }, [showToast]);
-  const isVisible = contextToastIds.length > 0;
+  const isVisible = !!(toastProps == null ? void 0 : toastProps.visible);
   const contextValue = {
     showSuccess,
     showFailed,
     showWalletPassFailed,
-    showPartiallyPaid,
     showToast,
     closeToast,
     isVisible
@@ -115,7 +111,10 @@ var PaymentResultToastProvider = ({ children }) => {
       globalPaymentResultToastContext = null;
     };
   }, [contextValue]);
-  return /* @__PURE__ */ import_react.default.createElement(PaymentResultToastContext.Provider, { value: contextValue }, children);
+  return /* @__PURE__ */ import_react.default.createElement(PaymentResultToastContext.Provider, { value: contextValue }, children, toastProps && (0, import_react_dom.createPortal)(
+    /* @__PURE__ */ import_react.default.createElement(import_index.default, { ...toastProps }),
+    document.body
+  ));
 };
 var usePaymentResultToast = () => {
   const context = (0, import_react.useContext)(PaymentResultToastContext);
@@ -124,252 +123,47 @@ var usePaymentResultToast = () => {
   }
   return context;
 };
-var GlobalToastManager = class {
-  instances = /* @__PURE__ */ new Map();
-  nextId = 1;
-  TOAST_HEIGHT = 160;
-  // 单个Toast的高度（估算：内容约128px + padding 32px）
-  TOAST_MARGIN = 8;
-  // Toast之间的间距
-  BOTTOM_OFFSET = 110;
-  // 距离底部的距离
-  LEFT_OFFSET = 96;
-  // 距离左边的距离
-  cachedBottomOffset = null;
-  // 缓存计算的bottom位置
-  cachedCenterOffset = null;
-  // 缓存计算的center位置
-  tillButton = null;
-  // 缓存的tillButton数据
-  setTillButton(tillButton) {
-    this.tillButton = tillButton;
-  }
-  // 生成唯一ID
-  generateId() {
-    return `toast-${this.nextId++}`;
-  }
-  // 计算并缓存 .ticket-booking-left-panel-content 组件的 bottom 位置
-  calculateAndCacheBottomOffset() {
-    var _a;
-    if (this.cachedBottomOffset !== null) {
-      return this.cachedBottomOffset;
-    }
-    if ((_a = this.tillButton) == null ? void 0 : _a.y) {
-      console.log("使用钱箱按钮位置", this.tillButton);
-      this.cachedBottomOffset = window.innerHeight - this.tillButton.y + 8 + this.tillButton.size;
-      console.log("计算钱箱按钮位置得到的bottom位置", this.cachedBottomOffset);
-      return this.cachedBottomOffset;
-    }
-    const ticketBookingElement = document.querySelector(".ticket-booking-left-panel-content");
-    if (ticketBookingElement) {
-      const rect = ticketBookingElement.getBoundingClientRect();
-      const windowHeight = window.innerHeight;
-      this.cachedBottomOffset = windowHeight - rect.bottom + 16;
-    } else {
-      this.cachedBottomOffset = this.BOTTOM_OFFSET;
-    }
-    return this.cachedBottomOffset;
-  }
-  calculateAndCacheCenterOffset() {
-    if (this.cachedCenterOffset !== null) {
-      return this.cachedCenterOffset;
-    }
-    const ticketBookingElement = document.querySelector(".ticket-booking-left-panel-content");
-    if (ticketBookingElement) {
-      const rect = ticketBookingElement.getBoundingClientRect();
-      this.cachedCenterOffset = {
-        x: rect.width / 2,
-        y: rect.height / 2
-      };
-    } else {
-      this.cachedCenterOffset = { x: 0, y: 0 };
-    }
-    return this.cachedCenterOffset;
-  }
-  // 重置缓存的 bottom 位置（当窗口大小变化或组件位置变化时调用）
-  resetBottomOffsetCache() {
-    this.cachedBottomOffset = null;
-  }
-  // 计算Toast的bottom位置
-  // 新逻辑：最新的Toast在最底部，旧Toast向上位移
-  calculateBottomPosition(offsetIndex, totalCount) {
-    const reversedIndex = totalCount - 1 - offsetIndex;
-    const dynamicBottomOffset = this.calculateAndCacheBottomOffset();
-    return dynamicBottomOffset + (this.TOAST_HEIGHT + this.TOAST_MARGIN) * reversedIndex;
-  }
-  // 更新所有Toast的位置（新Toast在底部，旧Toast平滑向上位移）
-  updatePositions() {
-    const instances = Array.from(this.instances.values());
-    const totalCount = instances.length;
-    instances.forEach((instance, index) => {
-      instance.offsetIndex = index;
-      const bottomPosition = this.calculateBottomPosition(index, totalCount);
-      if (instance.container) {
-        instance.container.classList.add("toast-moving");
-        instance.container.style.position = "fixed";
-        instance.container.style.left = `${this.LEFT_OFFSET}px`;
-        instance.container.style.bottom = `${bottomPosition}px`;
-        instance.container.style.top = "auto";
-        instance.container.style.right = "auto";
-        instance.container.style.transition = "all 0.4s cubic-bezier(0.25, 0.46, 0.45, 0.94)";
-        instance.container.style.pointerEvents = "none";
-        instance.container.style.width = "auto";
-        instance.container.style.height = "auto";
-        instance.container.style.transform = "none";
-        instance.container.style.margin = "0";
-        setTimeout(() => {
-          if (instance.container) {
-            instance.container.classList.remove("toast-moving");
-          }
-        }, 400);
-      }
-    });
-  }
-  // 添加新的Toast实例
-  addToast(config) {
-    const id = this.generateId();
-    this.resetBottomOffsetCache();
-    const finalConfig = {
-      ...DEFAULT_TOAST_CONFIG,
-      visible: true,
-      statusClassName: config.statusClassName,
-      title: config.title,
-      subtitle: config.subtitle,
-      changeDueText: config.changeDueText,
-      actionButtons: config.actionButtons || [],
-      autoClose: config.autoClose,
-      autoCloseDelay: config.autoCloseDelay || 30,
-      showCountdownProgress: config.showCountdownProgress,
-      onCountdownComplete: config.onCountdownComplete,
-      onClose: () => {
-        var _a;
-        (_a = config.onClose) == null ? void 0 : _a.call(config);
-        this.removeToast(id);
-      },
-      closable: config.closable !== void 0 ? config.closable : DEFAULT_TOAST_CONFIG.closable
-    };
-    const container = document.createElement("div");
-    container.setAttribute("data-toast-id", id);
-    const dynamicBottomOffset = this.calculateAndCacheBottomOffset();
-    container.style.position = "fixed";
-    container.style.left = `${this.LEFT_OFFSET}px`;
-    container.style.bottom = `${dynamicBottomOffset}px`;
-    container.style.top = "auto";
-    container.style.right = "auto";
-    container.style.pointerEvents = "none";
-    container.style.width = "auto";
-    container.style.height = "auto";
-    container.style.margin = "0";
-    document.body.appendChild(container);
-    const instance = {
-      id,
-      container,
-      props: finalConfig,
-      offsetIndex: this.instances.size
-    };
-    this.instances.set(id, instance);
-    (0, import_react_dom.render)(/* @__PURE__ */ import_react.default.createElement(import_index.default, { ...finalConfig }), container);
-    return id;
-  }
-  // 移除Toast实例（带动画效果）
-  removeToast(id) {
-    const instance = this.instances.get(id);
-    if (instance) {
-      if (instance.container) {
-        instance.container.classList.add("toast-exiting");
-        setTimeout(() => {
-          if (instance.container) {
-            (0, import_react_dom.unmountComponentAtNode)(instance.container);
-            if (document.body.contains(instance.container)) {
-              document.body.removeChild(instance.container);
-            }
-          }
-          this.instances.delete(id);
-          this.updatePositions();
-        }, 300);
-      } else {
-        this.instances.delete(id);
-        this.updatePositions();
-      }
-    }
-  }
-  // 清理所有Toast
-  clearAll() {
-    this.instances.forEach((instance) => {
-      if (instance.container) {
-        (0, import_react_dom.unmountComponentAtNode)(instance.container);
-        if (document.body.contains(instance.container)) {
-          document.body.removeChild(instance.container);
-        }
-      }
-    });
-    this.instances.clear();
-  }
-  // 获取当前Toast数量
-  getCount() {
-    return this.instances.size;
-  }
-  // 初始化窗口大小变化监听器
-  initializeResizeListener() {
-    const handleResize = () => {
-      this.resetBottomOffsetCache();
-      this.updatePositions();
-    };
-    window.addEventListener("resize", handleResize);
-    return () => {
-      window.removeEventListener("resize", handleResize);
-    };
+var showPaymentResultToastSuccess = (config) => {
+  if (globalPaymentResultToastContext) {
+    globalPaymentResultToastContext.showSuccess(config);
+  } else {
+    console.error("PaymentResultToastProvider not found. Please wrap your app with PaymentResultToastProvider.");
   }
 };
-var globalToastManager = new GlobalToastManager();
-if (typeof window !== "undefined") {
-  globalToastManager.initializeResizeListener();
-}
-var renderGlobalToast = (config) => {
-  return globalToastManager.addToast(config);
-};
-var showPaymentResultToastSuccess = async (config) => {
-  return renderGlobalToast({ ...config, statusClassName: "success" });
-};
-var showPaymentResultToastFailed = async (config) => {
-  return renderGlobalToast({ ...config, statusClassName: "failed" });
-};
-var showPaymentResultToastWalletPassFailed = async (config) => {
-  return renderGlobalToast({ ...config, statusClassName: "wallet-pass-failed" });
-};
-var showPaymentResultToastPartiallyPaid = async (config) => {
-  return renderGlobalToast({ ...config, statusClassName: "partially-paid" });
-};
-var showPaymentResultToast = async (config) => {
-  return renderGlobalToast(config);
-};
-var closePaymentResultToast = (id) => {
-  if (id) {
-    globalToastManager.removeToast(id);
+var showPaymentResultToastFailed = (config) => {
+  if (globalPaymentResultToastContext) {
+    globalPaymentResultToastContext.showFailed(config);
   } else {
-    globalToastManager.clearAll();
+    console.error("PaymentResultToastProvider not found. Please wrap your app with PaymentResultToastProvider.");
   }
 };
-var clearAllPaymentResultToasts = () => {
-  globalToastManager.clearAll();
+var showPaymentResultToastWalletPassFailed = (config) => {
+  if (globalPaymentResultToastContext) {
+    globalPaymentResultToastContext.showWalletPassFailed(config);
+  } else {
+    console.error("PaymentResultToastProvider not found. Please wrap your app with PaymentResultToastProvider.");
+  }
 };
-var getPaymentResultToastCount = () => {
-  return globalToastManager.getCount();
+var showPaymentResultToast = (config) => {
+  if (globalPaymentResultToastContext) {
+    globalPaymentResultToastContext.showToast(config);
+  } else {
+    console.error("PaymentResultToastProvider not found. Please wrap your app with PaymentResultToastProvider.");
+  }
 };
-var setTillButton = (tillButton) => {
-  globalToastManager.setTillButton(tillButton);
+var closePaymentResultToast = () => {
+  if (globalPaymentResultToastContext) {
+    globalPaymentResultToastContext.closeToast();
+  } else {
+    console.error("PaymentResultToastProvider not found.");
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PaymentResultToastProvider,
-  clearAllPaymentResultToasts,
   closePaymentResultToast,
-  getPaymentResultToastCount,
-  globalToastManager,
-  setTillButton,
   showPaymentResultToast,
   showPaymentResultToastFailed,
-  showPaymentResultToastPartiallyPaid,
   showPaymentResultToastSuccess,
   showPaymentResultToastWalletPassFailed,
   usePaymentResultToast

package/lib/components/checkout/components/PaymentResultToast/index.d.ts

@@ -3,7 +3,6 @@ import { PaymentResultToastProps, PaymentResultToastConfig } from './types';
 import './index.less';
 declare const PaymentResultToast: React.FC<PaymentResultToastProps & PaymentResultToastConfig>;
 export default PaymentResultToast;
-export { PaymentResultToastProvider, usePaymentResultToast, showPaymentResultToastSuccess, showPaymentResultToastFailed, showPaymentResultToastWalletPassFailed, showPaymentResultToastPartiallyPaid, showPaymentResultToast, closePaymentResultToast, clearAllPaymentResultToasts, getPaymentResultToastCount, setTillButton, globalToastManager } from './PaymentResultToastProvider';
-export { closeAllPaymentResultToasts, hasActivePaymentResultToasts, getToastCount, debounce, getDefaultModalConfig } from './utils';
+export { PaymentResultToastProvider, usePaymentResultToast, showPaymentResultToastSuccess, showPaymentResultToastFailed, showPaymentResultToastWalletPassFailed, showPaymentResultToast, closePaymentResultToast } from './PaymentResultToastProvider';
 export type { PaymentResultToastProps, PaymentResultToastConfig, ActionButtonProps, ActionButtonGroupList, StatusClassName } from './types';
 export type { ShowPaymentResultToastConfig, PaymentResultToastContextType } from './PaymentResultToastProvider';

package/lib/components/checkout/components/PaymentResultToast/index.js

@@ -30,20 +30,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var PaymentResultToast_exports = {};
 __export(PaymentResultToast_exports, {
   PaymentResultToastProvider: () => import_PaymentResultToastProvider.PaymentResultToastProvider,
-  clearAllPaymentResultToasts: () => import_PaymentResultToastProvider.clearAllPaymentResultToasts,
-  closeAllPaymentResultToasts: () => import_utils2.closeAllPaymentResultToasts,
   closePaymentResultToast: () => import_PaymentResultToastProvider.closePaymentResultToast,
-  debounce: () => import_utils2.debounce,
   default: () => PaymentResultToast_default,
-  getDefaultModalConfig: () => import_utils2.getDefaultModalConfig,
-  getPaymentResultToastCount: () => import_PaymentResultToastProvider.getPaymentResultToastCount,
-  getToastCount: () => import_utils2.getToastCount,
-  globalToastManager: () => import_PaymentResultToastProvider.globalToastManager,
-  hasActivePaymentResultToasts: () => import_utils2.hasActivePaymentResultToasts,
-  setTillButton: () => import_PaymentResultToastProvider.setTillButton,
   showPaymentResultToast: () => import_PaymentResultToastProvider.showPaymentResultToast,
   showPaymentResultToastFailed: () => import_PaymentResultToastProvider.showPaymentResultToastFailed,
-  showPaymentResultToastPartiallyPaid: () => import_PaymentResultToastProvider.showPaymentResultToastPartiallyPaid,
   showPaymentResultToastSuccess: () => import_PaymentResultToastProvider.showPaymentResultToastSuccess,
   showPaymentResultToastWalletPassFailed: () => import_PaymentResultToastProvider.showPaymentResultToastWalletPassFailed,
   usePaymentResultToast: () => import_PaymentResultToastProvider.usePaymentResultToast
@@ -52,11 +42,9 @@ module.exports = __toCommonJS(PaymentResultToast_exports);
 var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
 var import_materials = require("@pisell/materials");
-var import_XClose = __toESM(require("@pisell/icon/es/XClose"));
 var import_utils = require("./utils");
 var import_index = require("./index.less");
 var import_PaymentResultToastProvider = require("./PaymentResultToastProvider");
-var import_utils2 = require("./utils");
 var COMPONENT_PREFIX = "payment-result-toast";
 var getClassName = (...classNames) => {
   return (0, import_classnames.default)(
@@ -83,14 +71,14 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
     actionButtons = [],
     // 倒计时配置
     autoClose = false,
-    autoCloseDelay = 30,
+    autoCloseDelay = 5,
     showCountdownProgress = true,
     onCountdownComplete,
     // Modal 配置
     width,
     height,
-    mask = false,
-    maskClosable = false,
+    mask = true,
+    maskClosable = true,
     closable = true,
     zIndex
   } = props;
@@ -138,28 +126,26 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
     clearCountdown();
     (_a = onCloseRef.current) == null ? void 0 : _a.call(onCloseRef);
   }, [clearCountdown]);
+  const handleContentClick = (0, import_react.useCallback)((e) => {
+    e.stopPropagation();
+    if (autoClose && countdownTimeoutRef.current) {
+      clearCountdown();
+    }
+  }, [autoClose, clearCountdown]);
   const renderTitle = () => {
+    return /* @__PURE__ */ import_react.default.createElement("h2", { className: getClassName(`${statusClassName}-title`) }, title);
+  };
+  const renderSubtitle = () => {
     if (!subtitle) {
       return null;
     }
-    if (closable) {
-      return /* @__PURE__ */ import_react.default.createElement("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", gap: "16px" } }, subtitle, /* @__PURE__ */ import_react.default.createElement(
-        import_materials.Button,
-        {
-          style: { display: "flex", alignItems: "center", justifyContent: "center" },
-          type: "text",
-          icon: /* @__PURE__ */ import_react.default.createElement(import_XClose.default, { style: { fontSize: "40px", color: "white" } }),
-          onClick: handleClose
-        }
-      ));
-    }
     return subtitle;
   };
   const renderChangeDueInfo = () => {
     if (!changeDueText) {
       return null;
     }
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: getClassName("subtitle") }, /* @__PURE__ */ import_react.default.createElement("div", { className: getClassName("subtitle-text change-due") }, changeDueText));
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: getClassName("subtitle") }, /* @__PURE__ */ import_react.default.createElement("h1", { className: getClassName("subtitle-text change-due") }, changeDueText));
   };
   const renderCountdownProgress = () => {
     if (!autoClose || !showCountdownProgress || !visible) {
@@ -180,16 +166,11 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
       }
     )));
   };
-  const handleButtonClick = (0, import_react.useCallback)(() => {
-    if (autoClose && countdownTimeoutRef.current) {
-      clearCountdown();
-    }
-  }, [autoClose, clearCountdown]);
   const renderActionButtons = () => {
     if (!actionButtons || actionButtons.length === 0) {
       return null;
     }
-    return /* @__PURE__ */ import_react.default.createElement("div", { ...{ onClick: handleButtonClick } }, /* @__PURE__ */ import_react.default.createElement(import_materials.ButtonGroupPreview, { buttonGroupList: actionButtons }));
+    return /* @__PURE__ */ import_react.default.createElement(import_materials.ButtonGroupPreview, { buttonGroupList: actionButtons });
   };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
@@ -200,45 +181,27 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
       width: width || modalConfig.width,
       mask,
       maskClosable,
-      closable: false,
+      closable,
       className: getBaseClassName(`${className} ${statusClassName}`),
-      wrapClassName: "toast-modal-wrap",
-      style: {
-        ...height ? { height: `${height}px` } : {},
-        // 确保Modal不会被默认定位影响
-        position: "static",
-        top: "auto",
-        left: "auto",
-        right: "auto",
-        bottom: "auto",
-        transform: "none",
-        margin: 0,
-        padding: 0,
-        width: "100%",
-        maxWidth: "none"
-      },
+      style: height ? { height: `${height}px` } : void 0,
       destroyOnClose: false,
       forceRender: true,
       focusTriggerAfterClose: false,
       transitionName: "",
-      maskTransitionName: "",
-      centered: false,
-      getContainer: false
+      maskTransitionName: ""
     },
     /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: getClassName("content", statusClassName),
-        style: {
-          position: "relative",
-          zIndex: 1
-        }
+        ...{ onClick: handleContentClick }
       },
       renderTitle(),
+      renderSubtitle(),
       renderChangeDueInfo(),
-      renderActionButtons(),
-      renderCountdownProgress()
-    )
+      renderActionButtons()
+    ),
+    renderCountdownProgress()
   );
 });
 PaymentResultToast.displayName = "PaymentResultToast";
@@ -246,19 +209,9 @@ var PaymentResultToast_default = PaymentResultToast;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PaymentResultToastProvider,
-  clearAllPaymentResultToasts,
-  closeAllPaymentResultToasts,
   closePaymentResultToast,
-  debounce,
-  getDefaultModalConfig,
-  getPaymentResultToastCount,
-  getToastCount,
-  globalToastManager,
-  hasActivePaymentResultToasts,
-  setTillButton,
   showPaymentResultToast,
   showPaymentResultToastFailed,
-  showPaymentResultToastPartiallyPaid,
   showPaymentResultToastSuccess,
   showPaymentResultToastWalletPassFailed,
   usePaymentResultToast