@pisell/private-materials 6.5.2 → 6.5.3

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

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

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

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -6,7 +12,8 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { memo, useCallback, useEffect, useState, useRef } from 'react';
 import classnames from 'classnames';
-import { ButtonGroupPreview, PisellModal } from '@pisell/materials';
+import { Button, ButtonGroupPreview, PisellModal } from '@pisell/materials';
+import XClose from '@pisell/icon/es/XClose';
 import { getDefaultModalConfig } from "./utils";
 import "./index.less";
 
@@ -42,16 +49,16 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     _props$autoClose = props.autoClose,
     autoClose = _props$autoClose === void 0 ? false : _props$autoClose,
     _props$autoCloseDelay = props.autoCloseDelay,
-    autoCloseDelay = _props$autoCloseDelay === void 0 ? 5 : _props$autoCloseDelay,
+    autoCloseDelay = _props$autoCloseDelay === void 0 ? 30 : _props$autoCloseDelay,
     _props$showCountdownP = props.showCountdownProgress,
     showCountdownProgress = _props$showCountdownP === void 0 ? true : _props$showCountdownP,
     onCountdownComplete = props.onCountdownComplete,
     width = props.width,
     height = props.height,
     _props$mask = props.mask,
-    mask = _props$mask === void 0 ? true : _props$mask,
+    mask = _props$mask === void 0 ? false : _props$mask,
     _props$maskClosable = props.maskClosable,
-    maskClosable = _props$maskClosable === void 0 ? true : _props$maskClosable,
+    maskClosable = _props$maskClosable === void 0 ? false : _props$maskClosable,
     _props$closable = props.closable,
     closable = _props$closable === void 0 ? true : _props$closable,
     zIndex = props.zIndex;
@@ -123,38 +130,49 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     return clearCountdown;
   }, [clearCountdown]);
 
-  // 处理关闭操作
+  // 处理关闭操作（关闭按钮点击时也取消倒计时）
   var handleClose = useCallback(function () {
     var _onCloseRef$current2;
-    clearCountdown();
+    clearCountdown(); // 取消倒计时
     (_onCloseRef$current2 = onCloseRef.current) === null || _onCloseRef$current2 === void 0 || _onCloseRef$current2.call(onCloseRef);
   }, [clearCountdown]);
 
-  // 处理弹窗内容区域点击，取消倒计时
-  var handleContentClick = useCallback(function (e) {
-    // 阻止事件冒泡，避免触发其他事件
-    e.stopPropagation();
-
-    // 如果存在倒计时，则取消倒计时
-    if (autoClose && countdownTimeoutRef.current) {
-      clearCountdown();
-    }
-  }, [autoClose, clearCountdown]);
+  // 注释掉点击处理，现在完全由CSS的pointer-events控制穿透
+  // const handleContentClick: React.MouseEventHandler<HTMLDivElement> = useCallback((e) => {
+  //   // 由CSS的pointer-events控制点击穿透，不需要JavaScript处理
+  // }, []);
 
-  // 渲染标题
+  // 渲染标题（合并原副标题内容）
   var renderTitle = function renderTitle() {
-    return /*#__PURE__*/React.createElement("h2", {
-      className: getClassName("".concat(statusClassName, "-title"))
-    }, title);
-  };
-
-  // 渲染副标题（金额信息）
-  var renderSubtitle = function renderSubtitle() {
     if (!subtitle) {
       return null;
     }
+    if (closable) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+          gap: '16px'
+        }
+      }, subtitle, /*#__PURE__*/React.createElement(Button, {
+        style: {
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center'
+        },
+        type: "text",
+        icon: /*#__PURE__*/React.createElement(XClose, {
+          style: {
+            fontSize: '40px',
+            color: 'white'
+          }
+        }),
+        onClick: handleClose
+      }));
+    }
 
-    // 直接渲染外部传入的ReactNode，让外部完全控制样式和结构
+    // 直接渲染副标题内容作为标题，保持原有的样式和结构
     return subtitle;
   };
 
@@ -165,7 +183,7 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     }
     return /*#__PURE__*/React.createElement("div", {
       className: getClassName('subtitle')
-    }, /*#__PURE__*/React.createElement("h1", {
+    }, /*#__PURE__*/React.createElement("div", {
       className: getClassName('subtitle-text change-due')
     }, changeDueText));
   };
@@ -195,14 +213,24 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     })));
   };
 
+  // 处理按钮点击，取消倒计时
+  var handleButtonClick = useCallback(function () {
+    // 如果存在倒计时，则取消倒计时
+    if (autoClose && countdownTimeoutRef.current) {
+      clearCountdown();
+    }
+  }, [autoClose, clearCountdown]);
+
   // 渲染操作按钮
   var renderActionButtons = function renderActionButtons() {
     if (!actionButtons || actionButtons.length === 0) {
       return null;
     }
-    return /*#__PURE__*/React.createElement(ButtonGroupPreview, {
+    return /*#__PURE__*/React.createElement("div", {
+      onClick: handleButtonClick
+    }, /*#__PURE__*/React.createElement(ButtonGroupPreview, {
       buttonGroupList: actionButtons
-    });
+    }));
   };
   return /*#__PURE__*/React.createElement(PisellModal, {
     open: visible,
@@ -211,11 +239,24 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     width: width || modalConfig.width,
     mask: mask,
     maskClosable: maskClosable,
-    closable: closable,
+    closable: false,
     className: getBaseClassName("".concat(className, " ").concat(statusClassName)),
-    style: height ? {
+    wrapClassName: "toast-modal-wrap",
+    style: _objectSpread(_objectSpread({}, height ? {
       height: "".concat(height, "px")
-    } : undefined,
+    } : {}), {}, {
+      // 确保Modal不会被默认定位影响
+      position: 'static',
+      top: 'auto',
+      left: 'auto',
+      right: 'auto',
+      bottom: 'auto',
+      transform: 'none',
+      margin: 0,
+      padding: 0,
+      width: '100%',
+      maxWidth: 'none'
+    }),
     destroyOnClose: false
     // 优化Modal渲染性能
     ,
@@ -223,19 +264,33 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     // 禁用Modal的默认focus逻辑，减少渲染延迟
     ,
     focusTriggerAfterClose: false
-    // 优化动画性能
+    // 禁用默认动画，使用自定义CSS动画
     ,
     transitionName: "",
     maskTransitionName: ""
+    // 禁用居中定位
+    ,
+    centered: false
+    // 使用自定义getContainer确保渲染到正确的位置
+    ,
+    getContainer: false
   }, /*#__PURE__*/React.createElement("div", {
     className: getClassName('content', statusClassName),
-    onClick: handleContentClick
-  }, renderTitle(), renderSubtitle(), renderChangeDueInfo(), renderActionButtons()), renderCountdownProgress());
+    style: {
+      position: 'relative',
+      zIndex: 1
+    }
+  }, renderTitle(), renderChangeDueInfo(), renderActionButtons(), renderCountdownProgress()));
 });
 PaymentResultToast.displayName = 'PaymentResultToast';
 export default PaymentResultToast;
 
 // 导出Provider相关
-export { PaymentResultToastProvider, usePaymentResultToast, showPaymentResultToastSuccess, showPaymentResultToastFailed, showPaymentResultToastWalletPassFailed, showPaymentResultToast, closePaymentResultToast } from "./PaymentResultToastProvider";
+export { PaymentResultToastProvider, usePaymentResultToast, showPaymentResultToastSuccess, showPaymentResultToastFailed, showPaymentResultToastWalletPassFailed, showPaymentResultToastPartiallyPaid, showPaymentResultToast, closePaymentResultToast, clearAllPaymentResultToasts, getPaymentResultToastCount, setTillButton, globalToastManager } from "./PaymentResultToastProvider";
+
+// 导出工具函数
+export { closeAllPaymentResultToasts, hasActivePaymentResultToasts, getToastCount, debounce, getDefaultModalConfig } from "./utils";
+
+// 全局Provider功能已集成到PaymentResultToastProvider中，无需额外导出
 
 // 导出类型