@pisell/private-materials 6.11.72 → 6.11.73

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

@@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useState, useEffect, useMemo } from 'react';
+import { useState, useEffect, useMemo, useCallback } from 'react';
 import { useDebounceFn } from 'ahooks';
 import { Button, Dropdown } from 'antd';
 import { CheckCircleOutlined, PieChartOutlined } from '@ant-design/icons';
@@ -248,6 +248,10 @@ function AmountSummary(_ref2) {
       onDepositStatusChange(newPaymentType === 'deposit');
     }
   };
+  var resolveDropdownContainer = useCallback(function (triggerNode) {
+    // 插件模式下将弹层挂到当前弹窗节点，避免渲染到 body 后出现点击穿透
+    return (triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.parentElement) || document.body;
+  }, []);
 
   // 计算钱包应用总金额
   var getWalletTotalAmount = function getWalletTotalAmount() {
@@ -678,8 +682,11 @@ function AmountSummary(_ref2) {
     menu: {
       items: paymentOptions,
       onClick: function onClick(_ref5) {
-        var key = _ref5.key;
-        return handlePaymentTypeChange(key);
+        var key = _ref5.key,
+          domEvent = _ref5.domEvent;
+        domEvent.preventDefault();
+        domEvent.stopPropagation();
+        handlePaymentTypeChange(String(key));
       },
       style: {
         backgroundColor: '#7F56DA',
@@ -690,7 +697,8 @@ function AmountSummary(_ref2) {
     },
     trigger: ['click'],
     placement: "bottomLeft",
-    overlayClassName: "amount-summary-dropdown"
+    overlayClassName: "amount-summary-dropdown",
+    getPopupContainer: resolveDropdownContainer
   }, /*#__PURE__*/React.createElement(Button, {
     className: getPaymentButtonClassName()
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -211,6 +211,9 @@ function AmountSummary({
       onDepositStatusChange(newPaymentType === "deposit");
     }
   };
+  const resolveDropdownContainer = (0, import_react.useCallback)((triggerNode) => {
+    return (triggerNode == null ? void 0 : triggerNode.parentElement) || document.body;
+  }, []);
   const getWalletTotalAmount = () => {
     if (!(walletPassData == null ? void 0 : walletPassData.selectedWallet) || !Array.isArray(walletPassData.selectedWallet)) {
       return 0;
@@ -501,7 +504,11 @@ function AmountSummary({
       {
         menu: {
           items: paymentOptions,
-          onClick: ({ key }) => handlePaymentTypeChange(key),
+          onClick: ({ key, domEvent }) => {
+            domEvent.preventDefault();
+            domEvent.stopPropagation();
+            handlePaymentTypeChange(String(key));
+          },
           style: {
             backgroundColor: "#7F56DA",
             border: "1px solid #C3B2E7",
@@ -511,7 +518,8 @@ function AmountSummary({
         },
         trigger: ["click"],
         placement: "bottomLeft",
-        overlayClassName: "amount-summary-dropdown"
+        overlayClassName: "amount-summary-dropdown",
+        getPopupContainer: resolveDropdownContainer
       },
       /* @__PURE__ */ import_react2.default.createElement(import_antd.Button, { className: getPaymentButtonClassName() }, /* @__PURE__ */ import_react2.default.createElement("div", { className: (0, import_classnames.default)("button-content") }, /* @__PURE__ */ import_react2.default.createElement("span", { className: (0, import_classnames.default)("button-text") }, paymentType === "deposit" ? getText("deposit.payment.short") || "定金\n支付" : getText("regular.payment.short") || "普通\n支付"), /* @__PURE__ */ import_react2.default.createElement(
         ChevronSelectorVertical,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.72",
+  "version": "6.11.73",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -69,8 +69,8 @@
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.11.21",
-    "@pisell/date-picker": "3.0.8",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",