pb-sxp-ui 1.20.66 → 1.20.68

package/dist/index.cjs

@@ -13107,7 +13107,14 @@ Made in Italy` })));
                         marginTop: '50px',
                         border: 'none'
                     } }))),
-        showAddToCart && (React.createElement(Modal$1, { visible: showAddToCart, padding: 0, isFullScreen: false, onClose: () => setShowAddToCart(false) },
+        showAddToCart && (React.createElement(Modal$1, { visible: showAddToCart, padding: 0, isFullScreen: false, onClose: () => {
+                setShowAddToCart(false);
+                // SKU 场景：关闭加购弹窗时直接回到 feed，不再停留在商品弹窗
+                if (addToCartVariantId && typeof window !== 'undefined' && window.sxpPopup) {
+                    window.sxpPopup('');
+                    setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(null);
+                }
+            } },
             React.createElement(AddToCartPopup$1, { isActive: true, defaultVariantId: addToCartVariantId })))));
 };
 var CommodityDetailDiroNewComponent = React.memo(CommodityDetailDiroNew$1);
@@ -25814,8 +25821,10 @@ const Popup = () => {
     const { setPopupDetailData, popupDetailData, popupCurTimeRef, checkCommodityIndexRef } = useSxpDataSource();
     const { productView } = useEventReport();
     const [visible, setVisible] = React.useState();
-    // 记录商品弹窗的 popup id，用于加购弹窗关闭后恢复（仅 SPU 场景）
+    // 记录上一个非加购弹窗的 popup，用于 SPU 场景：商品弹窗 → 加购弹窗关闭后恢复
     const prevCommodityPopupRef = React.useRef(null);
+    // 记录当前弹窗是否是加购弹窗（用于关闭时判断）
+    const isAddToCartPopupRef = React.useRef(false);
     React.useEffect(() => {
         const initTime = () => {
             popupCurTimeRef.current = new Date();
@@ -25827,17 +25836,24 @@ const Popup = () => {
         };
     }, []);
     React.useEffect(() => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (popup && (popup === null || popup === void 0 ? void 0 : popup.id) && (popup === null || popup === void 0 ? void 0 : popup.id) !== '') {
             popupCurTimeRef.current = new Date();
             setVisible(popup);
-            // 非加购弹窗时，记录当前 popup，供后续加购弹窗关闭后恢复（SPU 场景）
             const currentValue = (_c = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.sxpPageConf) === null || _a === void 0 ? void 0 : _a.globalConfig) === null || _b === void 0 ? void 0 : _b.popupList) === null || _c === void 0 ? void 0 : _c.find((item) => (item === null || item === void 0 ? void 0 : item.id) === (popup === null || popup === void 0 ? void 0 : popup.id));
-            if (((_d = currentValue === null || currentValue === void 0 ? void 0 : currentValue.item) === null || _d === void 0 ? void 0 : _d.type) !== 'AddToCart') {
+            const isAddToCart = ((_d = currentValue === null || currentValue === void 0 ? void 0 : currentValue.item) === null || _d === void 0 ? void 0 : _d.type) === 'AddToCart' || ((_e = currentValue === null || currentValue === void 0 ? void 0 : currentValue.item) === null || _e === void 0 ? void 0 : _e.type) === 'AddToCartPopup';
+            isAddToCartPopupRef.current = isAddToCart;
+            if (!isAddToCart) {
+                // 记录非加购弹窗（商品弹窗等），供加购弹窗关闭后恢复
                 prevCommodityPopupRef.current = popup;
             }
         }
-    }, [popup]);
+        else if ((popup === null || popup === void 0 ? void 0 : popup.id) === '') {
+            // popup 被清空时，同步 visible 状态以便 Modal 正确关闭，避免白屏且关不掉
+            setVisible(Object.assign(Object.assign({}, popup), { id: '' }));
+            isAddToCartPopupRef.current = false;
+        }
+    }, [popup, schema]);
     const isFullScreen = React.useMemo(() => {
         var _a, _b, _c, _d;
         const valueItem = (_c = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.sxpPageConf) === null || _a === void 0 ? void 0 : _a.globalConfig) === null || _b === void 0 ? void 0 : _b.popupList) === null || _c === void 0 ? void 0 : _c.find((value, index) => {
@@ -25854,10 +25870,15 @@ const Popup = () => {
     }, [popup, schema]);
     const handleClose = () => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
-        if (!popup ||
-            (popup === null || popup === void 0 ? void 0 : popup.id) === '' ||
-            !visible ||
-            new Date() - popupCurTimeRef.current < ((_a = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _a !== void 0 ? _a : 0)) {
+        // popup 已被清空时（如 CommodityDetailDiroNew SKU 场景直接调用 sxpPopup('')），确保能关闭 Modal，避免白屏关不掉
+        if ((popup === null || popup === void 0 ? void 0 : popup.id) === '') {
+            setVisible({ id: '' });
+            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(null);
+            checkCommodityIndexRef.current = -1;
+            prevCommodityPopupRef.current = null;
+            return;
+        }
+        if (!popup || !visible || new Date() - popupCurTimeRef.current < ((_a = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _a !== void 0 ? _a : 0)) {
             return;
         }
         setVisible(Object.assign(Object.assign({}, popup), { id: '' }));
@@ -25878,24 +25899,28 @@ const Popup = () => {
             }
         }
         // 加购弹窗关闭时，判断是否需要恢复商品弹窗
-        if (((_u = value === null || value === void 0 ? void 0 : value.item) === null || _u === void 0 ? void 0 : _u.type) === 'AddToCart') {
-            const isFromSku = !!(popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData._defaultVariantId);
-            if (!isFromSku && ((_v = prevCommodityPopupRef.current) === null || _v === void 0 ? void 0 : _v.id)) {
-                // SPU 场景：从商品弹窗跳来的，关闭加购弹窗后恢复商品弹窗
-                const _w = prevCommodityPopupRef.current, { id: commodityId } = _w, commodityAni = __rest(_w, ["id"]);
-                prevCommodityPopupRef.current = null;
+        if (((_u = value === null || value === void 0 ? void 0 : value.item) === null || _u === void 0 ? void 0 : _u.type) === 'AddToCart' || ((_v = value === null || value === void 0 ? void 0 : value.item) === null || _v === void 0 ? void 0 : _v.type) === 'AddToCartPopup') {
+            const prevPopup = prevCommodityPopupRef.current;
+            prevCommodityPopupRef.current = null;
+            isAddToCartPopupRef.current = false;
+            // SKU 场景：加购弹窗带有 _defaultVariantId 表示从 SKU CTA 直接进入（CommodityDetail 注入），关闭后不应恢复商品弹窗
+            const popupData = popupDetailData;
+            const isSkuFlow = !!(popupData === null || popupData === void 0 ? void 0 : popupData._defaultVariantId);
+            if ((prevPopup === null || prevPopup === void 0 ? void 0 : prevPopup.id) && !isSkuFlow) {
+                // SPU 场景：加购弹窗之前有商品弹窗，关闭后恢复商品弹窗
+                const { id: commodityId } = prevPopup, commodityAni = __rest(prevPopup, ["id"]);
                 setTimeout(() => {
                     window === null || window === void 0 ? void 0 : window.sxpPopup(commodityId, commodityAni);
                 }, popup === null || popup === void 0 ? void 0 : popup.duration);
                 return;
             }
-            // SKU 场景：直接从 feed 打开的，关闭后直接回到 feed
-            prevCommodityPopupRef.current = null;
+            // SKU 场景：直接回到 feed，不恢复商品弹窗
         }
         setTimeout(() => {
             window === null || window === void 0 ? void 0 : window.sxpPopup('');
             setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(null);
             checkCommodityIndexRef.current = -1;
+            prevCommodityPopupRef.current = null;
         }, popup === null || popup === void 0 ? void 0 : popup.duration);
     };
     const renderPopupDetail = React.useMemo(() => {