pb-sxp-ui 1.20.25 → 1.20.27

package/es/core/components/StructurePage/index.d.ts

@@ -61,6 +61,10 @@ export interface IApiResponse {
         productUserId?: string;
         multiCta?: IMultiCtaData;
         position?: number;
+        shopify?: {
+            domain: string;
+            storefrontAccessToken: string;
+        };
     };
 }
 export interface IStructurePageProps {

package/es/core/components/StructurePage/index.js

@@ -2,30 +2,14 @@ import { __rest } from "tslib";
 import React, { useEffect, useState, useRef, useMemo, useCallback } from 'react';
 import { useEditor } from '../../hooks';
 import FormatImage from '../SxpPageRender/FormatImage';
+import * as _materials_ from '../../../materials/sxp';
 const RESOLVER = {};
-try {
-    const materialsModule = require('../../materials/sxp');
-    if (materialsModule && typeof materialsModule === 'object') {
-        Object.values(materialsModule).forEach((v) => {
-            var _a;
-            if ((_a = v === null || v === void 0 ? void 0 : v.extend) === null || _a === void 0 ? void 0 : _a.type) {
-                RESOLVER[v.extend.type] = v;
-            }
-        });
-        if (Object.keys(RESOLVER).length > 0) {
-            console.log('[StructurePage] Successfully loaded materials:', Object.keys(RESOLVER));
-        }
-        else {
-            console.warn('[StructurePage] Materials module loaded but no valid components found');
-        }
-    }
-    else {
-        console.warn('[StructurePage] Materials module is not a valid object:', materialsModule);
+Object.values(_materials_).forEach((v) => {
+    var _a;
+    if ((_a = v === null || v === void 0 ? void 0 : v.extend) === null || _a === void 0 ? void 0 : _a.type) {
+        RESOLVER[v.extend.type] = v;
     }
-}
-catch (error) {
-    console.error('[StructurePage] Failed to load materials for StructurePage:', error);
-}
+});
 const baseStyles = {
     container: {
         backgroundColor: '#000',
@@ -539,7 +523,7 @@ const StructurePage = (_a) => {
             return res.json();
         })
             .then((result) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             if (result.code === '0' || result.code === '00000') {
                 let multiCtaData = null;
                 if (isCmsMode) {
@@ -555,6 +539,13 @@ const StructurePage = (_a) => {
                     console.error('[StructurePage] No multiCta data found in response:', result);
                     setError(result.message || 'No multiCta data found');
                 }
+                if ((_e = result.data) === null || _e === void 0 ? void 0 : _e.shopify) {
+                    window.__SHOPIFY_CONFIG__ = {
+                        domain: result.data.shopify.domain,
+                        storefrontAccessToken: result.data.shopify.storefrontAccessToken
+                    };
+                    console.log('[StructurePage] Shopify config stored:', window.__SHOPIFY_CONFIG__);
+                }
             }
             else {
                 setError(result.message || 'Failed to load data');

package/es/core/components/SxpPageRender/Modal/index.d.ts

@@ -10,6 +10,7 @@ interface IModalProps {
     fullHeight?: number;
     isFullScreen?: boolean;
     openState?: IPopupType;
+    showCloseButton?: boolean;
 }
 declare const _default: React.NamedExoticComponent<React.PropsWithChildren<IModalProps>>;
 export default _default;

package/es/core/components/SxpPageRender/Modal/index.js

@@ -4,7 +4,7 @@ import * as ReactDOM from 'react-dom';
 import { useEditor, useSxpDataSource } from '../../../../core/hooks';
 import { useVisibleHeight } from '../../../../core/hooks/useVisibleHeight';
 const closeIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjhJREFUWEfFlztOw0AQhmeWiJ4CCmpQ5DiRQsIJyAWg5A0lR0AIChDiCJS8ER0cADgBeRSxt4CCDgkaKiq8i+zYeWx2413HEWmiJJv9v535Z2aN8M8vFPT9z3zETD0aAUChUJjwvPFHAJhBhB3Hqd6OAsK2yyucwykAvP38eJX398Z3AJDLlVYR8ToU9Rhj25TWr9KEsKy5dULIGQCMtfZly45TvwsAstm56UwG6wA4FUFwzrdctxZBDcWSy5XWEPG8I84/GcMipdWPtgcsaz5PCHtKG0IuTiqUvjT9U/WYMG2IOPE+AP+LtCB0xKUAAyA2Xbd2o2OG0NQXvTnvhL17D7EPtH9TRCIWwkRcGYGIQgYBABuqPuHXOQBc6pw80lBGwBQiiXhsBHQhkoprA6iM6acjhDQKu5YJZW6XeOI3XJdpvfsdTu52VfXEekD8owQiXGIubpSCbhDbLu8DwKEAd+A41SOdPpE4BS0viFOtvV2iKWqUgn5x/tmS70xR01GuDSCKc86/OCcLgTyyZ0ScDGNhFAktAJV4NFJ9YyaFiAWIE+9uVkkgBgLoig8DMWAa9ro9ynkUdlW5maZDCmB6clmz0k1HH4Cs1Ezbq2p2yEpUuBOKTSZZex00RUWIrltxuuK6EOGDSbGIOPZicpMx6fny650377qNRgBgWeVFQuA+6UjVgREhGIMlSqsPUQqIbZdOOIdZQmCv2axRnU1N1+TzJYsxOEaEV8ep7frPZ7Gd0FTEdP0ft0/kMNdg0eoAAAAASUVORK5CYII=';
-const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema, fullHeight, isFullScreen = false, openState }) => {
+const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema, fullHeight, isFullScreen = false, openState, showCloseButton = true }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
     const { visibleHeight, bottomHeight } = useVisibleHeight();
     const touchRef = useRef(null);
@@ -178,7 +178,7 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popup, schema,
                         setScrollTop(15 - ((_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.scrollTop));
                     }
                 })), child()),
-                React.createElement("button", { className: 'modal-icon-wrapper', role: 'button', "aria-label": 'close button', onClick: onClose, style: { top: scrollTop } },
-                    React.createElement("img", { src: (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.popupCloseIcon) || closeIcon, alt: 'close button', className: 'modal-icon' }))))))), modalEleRef.current);
+                showCloseButton && (React.createElement("button", { className: 'modal-icon-wrapper', role: 'button', "aria-label": 'close button', onClick: onClose, style: { top: scrollTop } },
+                    React.createElement("img", { src: (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.popupCloseIcon) || closeIcon, alt: 'close button', className: 'modal-icon' })))))))), modalEleRef.current);
 };
 export default memo(Modal);

package/es/core/components/SxpPageRender/index.d.ts

@@ -81,6 +81,7 @@ export interface ISxpPageRenderProps {
         };
         shopifyDomain?: string;
         storefrontAccessToken?: string;
+        popupList?: any[];
     };
     descStyle?: CSSProperties;
     tipText?: {

package/es/core/components/SxpPageRender/typing.d.ts

@@ -46,6 +46,7 @@ export type ProductInfoType = {
     taxInfo?: string;
     cover?: string;
     remark?: string;
+    shopifyId?: string;
 };
 export interface IScene {
     blueprintStep: number;

package/es/materials/sxp/popup/AddToCart/index.d.ts

@@ -1,33 +1,7 @@
-import { FC, CSSProperties } from 'react';
+import { FC } from 'react';
 import './index.less';
 export interface IAddToCartPopupProps {
-    style?: CSSProperties;
     isActive?: boolean;
-    index?: number;
-    shopifyDomain?: string;
-    storefrontAccessToken?: string;
-    variantStyles?: {
-        title?: CSSProperties;
-        price?: CSSProperties;
-        option?: CSSProperties;
-        selectedOption?: CSSProperties;
-    };
-    buttonStyle?: CSSProperties;
-    quantityStyle?: CSSProperties;
-    texts?: {
-        addToCart?: string;
-        selectOptions?: string;
-        loading?: string;
-        error?: string;
-        color?: string;
-        size?: string;
-        material?: string;
-        style?: string;
-    };
-    popupBg?: {
-        horizontalMargin?: number;
-        bottomMargin?: number;
-    };
 }
 declare const AddToCartPopup: FC<IAddToCartPopupProps>;
 export default AddToCartPopup;

package/es/materials/sxp/popup/AddToCart/index.js

@@ -1,53 +1,31 @@
-import { __awaiter, __rest } from "tslib";
-import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
+import { __awaiter } from "tslib";
+import React, { useState, useEffect, useCallback } from 'react';
 import { useSxpDataSource } from '../../../../core/hooks';
-import { useEventReport } from '../../../../core/hooks/useEventReport';
-import { setFontForText } from '../../../../core/utils/tool';
+import Modal from '../../../../core/components/SxpPageRender/Modal';
 import './index.less';
-const AddToCartPopup = (_a) => {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    var { style, isActive = true, index, shopifyDomain = '', storefrontAccessToken = '', variantStyles = {}, buttonStyle = {}, quantityStyle = {}, texts = {}, popupBg = {} } = _a, props = __rest(_a, ["style", "isActive", "index", "shopifyDomain", "storefrontAccessToken", "variantStyles", "buttonStyle", "quantityStyle", "texts", "popupBg"]);
-    const { sxpParameter, popupDetailData, isPreview, bffFbReport, globalConfig } = useSxpDataSource();
-    const { jumpToWeb } = useEventReport();
-    const curTimeRef = useRef(null);
+const AddToCartPopup = ({ isActive = true }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    const { popupDetailData, globalConfig } = useSxpDataSource();
     const [productData, setProductData] = useState(null);
     const [selectedOptions, setSelectedOptions] = useState({});
     const [selectedVariant, setSelectedVariant] = useState(null);
     const [quantity, setQuantity] = useState(1);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
+    const [showImagePreview, setShowImagePreview] = useState(false);
+    const [previewImageUrl, setPreviewImageUrl] = useState('');
     const data = popupDetailData;
-    const product = (_c = (_b = data === null || data === void 0 ? void 0 : data.video) === null || _b === void 0 ? void 0 : _b.bindProduct) !== null && _c !== void 0 ? _c : (_e = (_d = data === null || data === void 0 ? void 0 : data.video) === null || _d === void 0 ? void 0 : _d.bindProducts) === null || _e === void 0 ? void 0 : _e[0];
-    const cta = product === null || product === void 0 ? void 0 : product.bindCta;
-    const position = (_g = (_f = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.index) !== null && _f !== void 0 ? _f : index) !== null && _g !== void 0 ? _g : 0;
-    const finalShopifyDomain = shopifyDomain || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.shopifyDomain) || 'dev-store-749237498237498636.myshopify.com';
-    const finalStorefrontToken = storefrontAccessToken || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.storefrontAccessToken) || '77d894c490f79430ce7bd0a7efdff6b7';
-    const productId = (product === null || product === void 0 ? void 0 : product.itemId) || '';
-    const finalTexts = {
-        addToCart: texts.addToCart || 'Add to Cart',
-        selectOptions: texts.selectOptions || 'Please select options',
-        loading: texts.loading || 'Loading...',
-        error: texts.error || 'Failed to load product',
-        color: texts.color || 'Color',
-        size: texts.size || 'Size',
-        material: texts.material || 'Material',
-        style: texts.style || 'Style'
-    };
+    const product = (_e = (_b = (_a = data === null || data === void 0 ? void 0 : data.video) === null || _a === void 0 ? void 0 : _a.bindProduct) !== null && _b !== void 0 ? _b : (_d = (_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProducts) === null || _d === void 0 ? void 0 : _d[0]) !== null && _e !== void 0 ? _e : data === null || data === void 0 ? void 0 : data.product;
+    const shopifyConfig = window.__SHOPIFY_CONFIG__;
+    const shopifyDomain = ((_f = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.shopify) === null || _f === void 0 ? void 0 : _f.domain) || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.shopifyDomain) || (shopifyConfig === null || shopifyConfig === void 0 ? void 0 : shopifyConfig.domain) || 'dev-store-749237498237498636.myshopify.com';
+    const storefrontToken = ((_g = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.shopify) === null || _g === void 0 ? void 0 : _g.storefrontAccessToken) || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.storefrontAccessToken) || (shopifyConfig === null || shopifyConfig === void 0 ? void 0 : shopifyConfig.storefrontAccessToken) || '77d894c490f79430ce7bd0a7efdff6b7';
+    const productId = (product === null || product === void 0 ? void 0 : product.shopifyId) || (product === null || product === void 0 ? void 0 : product.itemId) || '';
     const fetchProductData = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _m;
-        if (!productId || !finalShopifyDomain || !finalStorefrontToken) {
-            console.log('[AddToCartPopup] 缺少必要配置:', {
-                productId,
-                shopifyDomain: finalShopifyDomain,
-                hasToken: !!finalStorefrontToken
-            });
+        var _k;
+        if (!productId || !shopifyDomain || !storefrontToken) {
             setLoading(false);
             return;
         }
-        console.log('[AddToCartPopup] 开始加载商品数据:', {
-            productId,
-            shopifyDomain: finalShopifyDomain
-        });
         setLoading(true);
         setError(null);
         try {
@@ -91,45 +69,34 @@ const AddToCartPopup = (_a) => {
           }
         }
       `;
-            const formattedProductId = productId.startsWith('gid://')
-                ? productId
-                : `gid://shopify/Product/${productId}`;
-            console.log('[AddToCartPopup] 使用的 Product ID:', formattedProductId);
-            const response = yield fetch(`https://${finalShopifyDomain}/api/2024-01/graphql.json`, {
+            const fullProductId = productId.startsWith('gid://') ? productId : `gid://shopify/Product/${productId}`;
+            const response = yield fetch(`https://${shopifyDomain}/api/2024-01/graphql.json`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
-                    'X-Shopify-Storefront-Access-Token': finalStorefrontToken
+                    'X-Shopify-Storefront-Access-Token': storefrontToken
                 },
                 body: JSON.stringify({
                     query,
-                    variables: { id: formattedProductId }
+                    variables: { id: fullProductId }
                 })
             });
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}`);
-            }
             const result = yield response.json();
             if (result.errors) {
-                console.error('[AddToCartPopup] GraphQL 错误:', result.errors);
                 throw new Error(result.errors[0].message);
             }
-            if (!((_m = result.data) === null || _m === void 0 ? void 0 : _m.product)) {
-                console.error('[AddToCartPopup] 未找到商品');
-                throw new Error('Product not found');
-            }
-            console.log('[AddToCartPopup] 商品数据加载成功:', result.data.product.title);
+            console.log('[AddToCart] Shopify Product Data:', result.data.product);
+            console.log('[AddToCart] Options:', (_k = result.data.product) === null || _k === void 0 ? void 0 : _k.options);
             setProductData(result.data.product);
         }
         catch (err) {
-            const errorMessage = err instanceof Error ? err.message : finalTexts.error;
-            setError(errorMessage);
+            setError(err instanceof Error ? err.message : 'Failed to load product');
             console.error('[AddToCartPopup] 加载失败:', err);
         }
         finally {
             setLoading(false);
         }
-    }), [productId, finalShopifyDomain, finalStorefrontToken, finalTexts.error]);
+    }), [productId, shopifyDomain, storefrontToken]);
     useEffect(() => {
         if (isActive) {
             fetchProductData();
@@ -146,134 +113,111 @@ const AddToCartPopup = (_a) => {
             return;
         }
         const matchedVariant = variants.find(variant => {
-            return variant.selectedOptions.every(option => selectedOptions[option.name] === option.value);
+            return variant.selectedOptions.every(option => {
+                return selectedOptions[option.name] === option.value;
+            });
         });
         setSelectedVariant(matchedVariant || null);
-        setQuantity(1);
+        if ((matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.quantityAvailable) !== undefined && matchedVariant.quantityAvailable > 0) {
+            setQuantity(prev => Math.min(prev, matchedVariant.quantityAvailable));
+        }
     }, [selectedOptions, productData]);
-    const handleOptionSelect = useCallback((optionName, value) => {
-        setSelectedOptions(prev => {
-            const newOptions = Object.assign({}, prev);
-            if (newOptions[optionName] === value) {
-                delete newOptions[optionName];
-            }
-            else {
-                newOptions[optionName] = value;
-            }
-            return newOptions;
-        });
-    }, []);
-    const handleQuantityChange = useCallback((delta) => {
-        setQuantity(prev => {
-            var _a;
-            const newQuantity = prev + delta;
-            const maxQuantity = (_a = selectedVariant === null || selectedVariant === void 0 ? void 0 : selectedVariant.quantityAvailable) !== null && _a !== void 0 ? _a : 999;
-            return Math.max(1, Math.min(newQuantity, maxQuantity));
-        });
-    }, [selectedVariant]);
-    const isOptionValueAvailable = useCallback((optionName, value) => {
-        if (!productData)
-            return false;
-        const variants = productData.variants.edges.map(edge => edge.node);
-        const tempOptions = Object.assign(Object.assign({}, selectedOptions), { [optionName]: value });
-        return variants.some(variant => {
-            const matches = variant.selectedOptions.every(option => !tempOptions[option.name] || tempOptions[option.name] === option.value);
-            const hasStock = variant.quantityAvailable === null || variant.quantityAvailable > 0;
-            return matches && variant.availableForSale && hasStock;
-        });
-    }, [productData, selectedOptions]);
-    const handleAddToCart = useCallback(() => {
-        var _a;
-        if (!selectedVariant || quantity === 0)
+    const handleOptionSelect = (optionName, value) => {
+        setSelectedOptions(prev => (Object.assign(Object.assign({}, prev), { [optionName]: value })));
+    };
+    const handleAddToCart = () => {
+        if (!selectedVariant) {
+            alert('Please select all options');
             return;
-        const variantId = selectedVariant.id.split('/').pop();
-        const cartUrl = `https://${finalShopifyDomain}/cart/add?id=${variantId}&quantity=${quantity}`;
-        console.log('[AddToCartPopup] 加购:', {
+        }
+        const variantId = selectedVariant.id.replace('gid://shopify/ProductVariant/', '');
+        console.log('[AddToCart] 添加到购物车:', {
             variantId,
             quantity,
-            cartUrl
+            shopifyDomain,
+            selectedVariant
         });
-        bffFbReport === null || bffFbReport === void 0 ? void 0 : bffFbReport({
-            eventName: 'AddToCart',
-            product: product ? [product] : undefined,
-            contentType: 'product',
-            data,
-            position,
-            content_id: (_a = product === null || product === void 0 ? void 0 : product.itemId) !== null && _a !== void 0 ? _a : '',
-            value: parseFloat(selectedVariant.price.amount) * quantity,
-            currency: selectedVariant.price.currencyCode,
-            contents: [{
-                    id: variantId,
-                    quantity
-                }]
+        const params = new URLSearchParams({
+            id: variantId,
+            quantity: quantity.toString()
         });
+        const cartUrl = `https://${shopifyDomain}/cart/add?${params.toString()}`;
+        console.log('[AddToCart] 跳转到购物车 URL:', cartUrl);
         window.location.href = cartUrl;
-    }, [selectedVariant, quantity, finalShopifyDomain, bffFbReport, product, data, position]);
-    const totalPrice = useMemo(() => {
-        if (!selectedVariant)
-            return null;
-        const price = parseFloat(selectedVariant.price.amount);
-        const total = price * quantity;
-        return total.toFixed(2);
-    }, [selectedVariant, quantity]);
-    useEffect(() => {
-        const initTime = () => {
-            curTimeRef.current = new Date();
-        };
-        initTime();
-        window.addEventListener('pageshow', initTime);
-        return () => {
-            window.removeEventListener('pageshow', initTime);
-        };
-    }, []);
+    };
+    const totalPrice = selectedVariant
+        ? (parseFloat(selectedVariant.price.amount) * quantity).toFixed(2)
+        : '0.00';
     if (loading) {
-        return (React.createElement("div", { className: "add-to-cart-popup-loading", style: style },
-            React.createElement("div", null, finalTexts.loading)));
+        return (React.createElement("div", { className: 'add-to-cart-popup' },
+            React.createElement("div", { className: 'loading' }, "Loading...")));
+    }
+    if (error) {
+        return (React.createElement("div", { className: 'add-to-cart-popup' },
+            React.createElement("div", { className: 'error' }, error)));
     }
-    if (error || !productData) {
-        return (React.createElement("div", { className: "add-to-cart-popup-error", style: style },
-            React.createElement("div", null,
-                finalTexts.error,
-                ": ",
-                error || 'Product not found')));
+    if (!productData) {
+        return null;
     }
-    const mainImage = ((_h = selectedVariant === null || selectedVariant === void 0 ? void 0 : selectedVariant.image) === null || _h === void 0 ? void 0 : _h.url) || ((_j = productData.images.edges[0]) === null || _j === void 0 ? void 0 : _j.node.url) || ((_k = product === null || product === void 0 ? void 0 : product.homePage) === null || _k === void 0 ? void 0 : _k[0]) || '';
-    const hasAllOptionsSelected = productData.options.length === Object.keys(selectedOptions).length;
-    const isAddToCartDisabled = !selectedVariant || quantity === 0;
-    return (React.createElement("div", Object.assign({ className: "add-to-cart-popup-container", style: style }, props),
-        React.createElement("div", { className: "variant-detail-section" },
-            React.createElement("div", { className: "variant-image-wrapper" },
-                React.createElement("img", { src: mainImage, alt: productData.title, className: "variant-image" })),
-            React.createElement("div", { className: "variant-info-wrapper" },
-                React.createElement("h2", { className: "product-title-text", style: variantStyles.title, dangerouslySetInnerHTML: {
-                        __html: setFontForText(productData.title, variantStyles.title)
-                    } }),
-                selectedVariant && (React.createElement(React.Fragment, null,
-                    React.createElement("div", { className: "selected-options-tags" }, selectedVariant.selectedOptions.map(option => (React.createElement("span", { key: option.name, className: "option-tag", style: variantStyles.selectedOption },
-                        option.name,
-                        ": ",
-                        option.value)))),
-                    React.createElement("div", { className: "price-display" },
-                        React.createElement("span", { className: "price-value", style: variantStyles.price, dangerouslySetInnerHTML: {
-                                __html: setFontForText(`${selectedVariant.price.currencyCode} $${totalPrice}`, variantStyles.price)
-                            } })),
-                    React.createElement("div", { className: "quantity-selector-wrapper", style: quantityStyle },
-                        React.createElement("button", { className: "quantity-btn quantity-decrease", onClick: () => handleQuantityChange(-1), disabled: quantity <= 1, "aria-label": "Decrease quantity" }, "-"),
-                        React.createElement("input", { type: "number", value: quantity, readOnly: true, className: "quantity-input-field", "aria-label": "Quantity" }),
-                        React.createElement("button", { className: "quantity-btn quantity-increase", onClick: () => handleQuantityChange(1), disabled: quantity >= ((_l = selectedVariant.quantityAvailable) !== null && _l !== void 0 ? _l : 999), "aria-label": "Increase quantity" }, "+")))),
-                !hasAllOptionsSelected && (React.createElement("div", { className: "no-selection-hint", style: variantStyles.option }, finalTexts.selectOptions)))),
-        React.createElement("div", { className: "variant-options-section" }, productData.options.map(option => (React.createElement("div", { key: option.name, className: "option-group-wrapper" },
-            React.createElement("h3", { className: "option-group-name", style: variantStyles.option, dangerouslySetInnerHTML: {
-                    __html: setFontForText(option.name, variantStyles.option)
-                } }),
-            React.createElement("div", { className: "option-values-grid" }, option.values.map(value => {
-                const isSelected = selectedOptions[option.name] === value;
-                const isAvailable = isOptionValueAvailable(option.name, value);
-                return (React.createElement("button", { key: value, className: `option-value-button ${isSelected ? 'selected' : ''} ${!isAvailable ? 'disabled' : ''}`, onClick: () => isAvailable && handleOptionSelect(option.name, value), disabled: !isAvailable, "aria-label": `${option.name}: ${value}`, "aria-pressed": isSelected }, value));
-            })))))),
-        React.createElement("button", { className: `add-to-cart-button ${isAddToCartDisabled ? 'disabled' : ''}`, style: buttonStyle, onClick: handleAddToCart, disabled: isAddToCartDisabled, "aria-label": finalTexts.addToCart },
-            React.createElement("span", { dangerouslySetInnerHTML: {
-                    __html: setFontForText(finalTexts.addToCart, buttonStyle)
-                } }))));
+    const mainImage = ((_h = productData.images.edges[0]) === null || _h === void 0 ? void 0 : _h.node.url) || '';
+    const variantImage = ((_j = selectedVariant === null || selectedVariant === void 0 ? void 0 : selectedVariant.image) === null || _j === void 0 ? void 0 : _j.url) || mainImage;
+    const maxQuantity = (selectedVariant === null || selectedVariant === void 0 ? void 0 : selectedVariant.quantityAvailable) || 999;
+    return (React.createElement("div", { className: 'add-to-cart-popup' },
+        React.createElement("div", { className: 'popup-content' },
+            React.createElement("div", { className: 'product-header' },
+                React.createElement("div", { className: 'product-title' }, productData.title)),
+            React.createElement("div", { className: 'variant-detail' },
+                React.createElement("div", { className: 'variant-image-container', onClick: () => {
+                        if (variantImage) {
+                            setPreviewImageUrl(variantImage);
+                            setShowImagePreview(true);
+                        }
+                    }, style: { cursor: 'pointer' } },
+                    React.createElement("img", { src: variantImage, alt: 'Selected variant', className: 'variant-image' })),
+                React.createElement("div", { className: 'variant-info' },
+                    React.createElement("div", { className: 'variant-specs-row' },
+                        React.createElement("div", { className: 'variant-specs' }, Object.keys(selectedOptions).length > 0 ? (Object.entries(selectedOptions).map(([key, value]) => (React.createElement("span", { key: key, className: 'spec-item' }, value)))) : (React.createElement("span", { className: 'spec-placeholder' }, "Please select options"))),
+                        selectedVariant && selectedVariant.quantityAvailable !== undefined && (React.createElement("div", { className: 'stock-info' },
+                            "Available: ",
+                            selectedVariant.quantityAvailable))),
+                    React.createElement("div", { className: 'variant-price-row' },
+                        React.createElement("div", { className: 'price' },
+                            "$",
+                            totalPrice),
+                        React.createElement("div", { className: 'quantity-selector' },
+                            React.createElement("button", { className: 'qty-btn', onClick: () => setQuantity(Math.max(1, quantity - 1)), disabled: quantity <= 1 }, "\u2212"),
+                            React.createElement("span", { className: 'qty-value' }, quantity),
+                            React.createElement("button", { className: 'qty-btn', onClick: () => setQuantity(quantity + 1), disabled: !selectedVariant || quantity >= maxQuantity }, "+"))))),
+            React.createElement("div", { className: 'variant-options' }, productData.options.map(option => (React.createElement("div", { key: option.name, className: 'option-group' },
+                React.createElement("div", { className: 'option-label' }, option.name),
+                React.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);
+                        if (!hasThisOption || !variant.availableForSale)
+                            return false;
+                        if (variant.quantityAvailable !== undefined) {
+                            return variant.quantityAvailable > 0;
+                        }
+                        return true;
+                    });
+                    const isSelected = selectedOptions[option.name] === value;
+                    return (React.createElement("button", { key: value, className: `option-btn ${isSelected ? 'selected' : ''} ${!isAvailable ? 'disabled' : ''}`, onClick: () => isAvailable && handleOptionSelect(option.name, value), disabled: !isAvailable }, value));
+                }))))))),
+        React.createElement("div", { className: 'popup-footer' },
+            React.createElement("button", { className: 'add-to-cart-btn', onClick: handleAddToCart, disabled: !selectedVariant }, "Add To Cart")),
+        showImagePreview && previewImageUrl && (React.createElement(Modal, { visible: showImagePreview, padding: 0, isFullScreen: true, onClose: () => setShowImagePreview(false) },
+            React.createElement("div", { style: {
+                    width: '100%',
+                    height: '100%',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    backgroundColor: 'rgba(0, 0, 0, 0.9)'
+                }, onClick: () => setShowImagePreview(false) },
+                React.createElement("img", { src: previewImageUrl, alt: 'Preview', style: {
+                        maxWidth: '100%',
+                        maxHeight: '100%',
+                        objectFit: 'contain'
+                    } }))))));
 };
 export default AddToCartPopup;

package/es/materials/sxp/popup/AddToCart/index.new.d.ts

@@ -0,0 +1,8 @@
+import { FC } from 'react';
+import './index.less';
+export interface IAddToCartPopupProps {
+    isActive?: boolean;
+    onClose?: () => void;
+}
+declare const AddToCartPopup: FC<IAddToCartPopupProps>;
+export default AddToCartPopup;