pb-sxp-ui 1.20.28 → 1.20.29

package/lib/materials/sxp/popup/AddToCart/index.new.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const hooks_1 = require("../../../../core/hooks");
+const tool_1 = require("../../../../core/utils/tool");
 require("./index.less");
 const AddToCartPopup = ({ isActive = true, onClose }) => {
     var _a, _b, _c, _d, _e, _f, _g;
-    const { popupDetailData, globalConfig } = (0, hooks_1.useSxpDataSource)();
+    const { popupDetailData, globalConfig, bffFbReport } = (0, hooks_1.useSxpDataSource)();
     const [productData, setProductData] = (0, react_1.useState)(null);
     const [selectedOptions, setSelectedOptions] = (0, react_1.useState)({});
     const [selectedVariant, setSelectedVariant] = (0, react_1.useState)(null);
@@ -122,6 +123,17 @@ const AddToCartPopup = ({ isActive = true, onClose }) => {
             alert('Please select all options');
             return;
         }
+        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+            eventName: 'sessionCompleted',
+            product: product ? [product] : undefined,
+            contentType: 'product',
+            rec: data,
+            position: data === null || data === void 0 ? void 0 : data.index,
+            cta_text: 'Add To Cart',
+            cta_action_type: 'add_to_cart',
+            target_content_id: product === null || product === void 0 ? void 0 : product.itemId,
+            target_url: `https://${shopifyDomain}/cart`
+        });
         const variantId = selectedVariant.id.split('/').pop();
         const checkoutUrl = `https://${shopifyDomain}/cart/${variantId}:${quantity}`;
         window.location.href = checkoutUrl;
@@ -129,7 +141,9 @@ const AddToCartPopup = ({ isActive = true, onClose }) => {
     const totalPrice = selectedVariant
         ? (parseFloat(selectedVariant.price.amount) * quantity).toFixed(2)
         : '0.00';
-    const currency = (selectedVariant === null || selectedVariant === void 0 ? void 0 : selectedVariant.price.currencyCode) || 'USD';
+    const displayPrice = selectedVariant
+        ? `${(0, tool_1.getCurrencySymbol)(selectedVariant.price.currencyCode)}${totalPrice}`
+        : totalPrice;
     if (loading) {
         return (react_1.default.createElement("div", { className: "add-to-cart-popup" },
             react_1.default.createElement("div", { className: "loading" }, "Loading...")));
@@ -154,9 +168,7 @@ const AddToCartPopup = ({ isActive = true, onClose }) => {
             react_1.default.createElement("div", { className: "variant-info" },
                 react_1.default.createElement("div", { className: "variant-specs" }, Object.keys(selectedOptions).length > 0 ? (Object.entries(selectedOptions).map(([key, value]) => (react_1.default.createElement("span", { key: key, className: "spec-item" }, value)))) : (react_1.default.createElement("span", { className: "spec-placeholder" }, "Please select options"))),
                 react_1.default.createElement("div", { className: "variant-price-row" },
-                    react_1.default.createElement("div", { className: "price" },
-                        "$",
-                        totalPrice),
+                    react_1.default.createElement("div", { className: "price" }, displayPrice),
                     react_1.default.createElement("div", { className: "quantity-selector" },
                         react_1.default.createElement("button", { className: "qty-btn", onClick: () => setQuantity(Math.max(1, quantity - 1)), disabled: quantity <= 1 }, "\u2212"),
                         react_1.default.createElement("span", { className: "qty-value" }, quantity),
@@ -166,7 +178,16 @@ const AddToCartPopup = ({ isActive = true, onClose }) => {
             react_1.default.createElement("div", { className: "option-values" }, option.values.map(value => {
                 const isAvailable = productData.variants.edges.some(({ node: variant }) => {
                     const hasThisOption = variant.selectedOptions.some(opt => opt.name === option.name && opt.value === value);
-                    return hasThisOption && variant.availableForSale;
+                    if (!hasThisOption)
+                        return false;
+                    const matchesOtherSelections = Object.entries(selectedOptions).every(([key, val]) => {
+                        if (key === option.name)
+                            return true;
+                        return variant.selectedOptions.some(opt => opt.name === key && opt.value === val);
+                    });
+                    if (!matchesOtherSelections)
+                        return false;
+                    return variant.availableForSale;
                 });
                 const isSelected = selectedOptions[option.name] === value;
                 return (react_1.default.createElement("button", { key: value, className: `option-btn ${isSelected ? 'selected' : ''} ${!isAvailable ? 'disabled' : ''}`, onClick: () => isAvailable && handleOptionSelect(option.name, value), disabled: !isAvailable }, value));

package/lib/materials/sxp/popup/AddToCart/index.old.js

@@ -229,6 +229,17 @@ const AddToCartPopup = (_a) => {
                     quantity
                 }]
         });
+        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+            eventName: 'sessionCompleted',
+            product: product ? [product] : undefined,
+            contentType: 'product',
+            rec: data,
+            position,
+            cta_text: 'Add To Cart',
+            cta_action_type: 'add_to_cart',
+            target_content_id: product === null || product === void 0 ? void 0 : product.itemId,
+            target_url: cartUrl
+        });
         window.location.href = cartUrl;
     }, [selectedVariant, quantity, finalShopifyDomain, bffFbReport, product, data, position]);
     const totalPrice = (0, react_1.useMemo)(() => {
@@ -277,7 +288,7 @@ const AddToCartPopup = (_a) => {
                         option.value)))),
                     react_1.default.createElement("div", { className: "price-display" },
                         react_1.default.createElement("span", { className: "price-value", style: variantStyles.price, dangerouslySetInnerHTML: {
-                                __html: (0, tool_1.setFontForText)(`${selectedVariant.price.currencyCode} $${totalPrice}`, variantStyles.price)
+                                __html: (0, tool_1.setFontForText)(selectedVariant ? `${(0, tool_1.getCurrencySymbol)(selectedVariant.price.currencyCode)}${totalPrice}` : totalPrice, variantStyles.price)
                             } })),
                     react_1.default.createElement("div", { className: "quantity-selector-wrapper", style: quantityStyle },
                         react_1.default.createElement("button", { className: "quantity-btn quantity-decrease", onClick: () => handleQuantityChange(-1), disabled: quantity <= 1, "aria-label": "Decrease quantity" }, "-"),

package/lib/materials/sxp/popup/CommodityDetail/index.js

@@ -41,25 +41,30 @@ const CommodityDetail = (_a) => {
     }
     const handleLink = (e) => {
         if (enableAddToCart && addToCartPopupId) {
-            setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, data), { index: position }));
-            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-                eventName: 'ClickCTA',
-                product: product ? [product] : undefined,
-                contentType: 'product',
-                data,
-                position,
-                cta_text: cta === null || cta === void 0 ? void 0 : cta.enTitle,
-                cta_action_type: 'open_internal_popup',
-                target_content_id: product === null || product === void 0 ? void 0 : product.itemId
-            });
-            console.log('[CommodityDetail] 打开加购弹窗:', addToCartPopupId);
-            if (typeof window !== 'undefined' && window.sxpPopup) {
-                window.sxpPopup(addToCartPopupId);
+            if (!(product === null || product === void 0 ? void 0 : product.shopifyId)) {
+                console.warn('[CommodityDetail] 非 Shopify 商品，跳过加购弹窗');
             }
             else {
-                console.warn('[CommodityDetail] sxpPopup 方法不存在');
+                setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(Object.assign(Object.assign({}, data), { index: position }));
+                bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                    eventName: 'ClickCTA',
+                    product: product ? [product] : undefined,
+                    contentType: 'product',
+                    data,
+                    position,
+                    cta_text: cta === null || cta === void 0 ? void 0 : cta.enTitle,
+                    cta_action_type: 'open_internal_popup',
+                    target_content_id: product === null || product === void 0 ? void 0 : product.itemId
+                });
+                console.log('[CommodityDetail] 打开加购弹窗:', addToCartPopupId);
+                if (typeof window !== 'undefined' && window.sxpPopup) {
+                    window.sxpPopup(addToCartPopupId);
+                }
+                else {
+                    console.warn('[CommodityDetail] sxpPopup 方法不存在');
+                }
+                return;
             }
-            return;
         }
         if (product === null || product === void 0 ? void 0 : product.link) {
             jumpToWeb(e, data, product, cta, position);

package/lib/materials/sxp/popup/CommodityDetailDiroNew/index.js

@@ -43,6 +43,31 @@ const CommodityDetailDiroNew = (_a) => {
     }
     const handleLink = (e) => {
         e.preventDefault();
+        if (!(product === null || product === void 0 ? void 0 : product.shopifyId)) {
+            console.warn('[CommodityDetailDiroNew] 非 Shopify 商品，跳转到外链');
+            ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({
+                eventSubject: 'clickCta',
+                eventDescription: 'User clicked the CTA'
+            }, data, product, position);
+            bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
+                eventName: 'ClickCTA',
+                product: product ? [product] : undefined,
+                contentType: 'product',
+                data,
+                position,
+                cta_text: cta === null || cta === void 0 ? void 0 : cta.enTitle,
+                cta_action_type: 'open_external_link',
+                target_content_id: product === null || product === void 0 ? void 0 : product.itemId,
+                target_url: product === null || product === void 0 ? void 0 : product.link
+            });
+            if (!isPost) {
+                productView(data, product, cta, viewTime || curTimeRef.current, position);
+            }
+            if (product === null || product === void 0 ? void 0 : product.link) {
+                window.location.href = window.getJointUtmLink(product.link);
+            }
+            return;
+        }
         ctaEvent === null || ctaEvent === void 0 ? void 0 : ctaEvent({
             eventSubject: 'clickCta',
             eventDescription: 'User clicked the CTA'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pb-sxp-ui",
-  "version": "1.20.28",
+  "version": "1.20.29",
   "description": "React enterprise-class UI components",
   "main": "dist/index.cjs",
   "module": "dist/index.js",