pb-sxp-ui 1.0.1 → 1.0.2-alpha.1

package/lib/core/components/SxpPageRender/PictureGroup/index.js

@@ -9,16 +9,20 @@ const hooks_1 = require("../../../../core/hooks");
 const PictureGroup = ({ imgUrls, width, height, rec, index, onReportViewImageEnd, onViewImageStartEvent }) => {
     const { isActive } = (0, react_2.useSwiperSlide)();
     const { sxpParameter, openHashtag } = (0, hooks_1.useSxpDataSource)();
+    const [isLoad, setIsLoad] = (0, react_1.useState)(false);
     (0, react_1.useEffect)(() => {
-        if (!isActive)
-            return;
-        if (openHashtag) {
-            onReportViewImageEnd(rec);
+        if (isLoad && isActive) {
+            if (openHashtag) {
+                onReportViewImageEnd(rec);
+            }
+            else {
+                onViewImageStartEvent(index);
+            }
         }
         else {
-            onViewImageStartEvent(index);
+            setIsLoad(true);
         }
-    }, [rec, isActive, onReportViewImageEnd, openHashtag, index, onViewImageStartEvent]);
+    }, [rec, isActive, onReportViewImageEnd, openHashtag, index, onViewImageStartEvent, isLoad]);
     if (!isActive) {
         return react_1.default.createElement("img", { src: sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.placeholder_image, style: { width, height, objectFit: 'cover' } });
     }

package/lib/core/components/SxpPageRender/Popup/index.js

@@ -7,7 +7,7 @@ const hooks_1 = require("../../../../core/hooks");
 const withBindDataSource_1 = tslib_1.__importDefault(require("../../../../core/hoc/withBindDataSource"));
 const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const Popup = () => {
-    const { schema, resolver, popup } = (0, hooks_1.useEditor)();
+    const { schema, resolver, popup, popupAni } = (0, hooks_1.useEditor)();
     const { setPopupDetailData, popupDetailData, bffEventReport } = (0, hooks_1.useSxpDataSource)();
     const { productView } = (0, useEventReport_1.useEventReport)();
     const [visible, setVisible] = (0, react_1.useState)(false);
@@ -30,7 +30,7 @@ const Popup = () => {
     }, [popup]);
     const handleClose = () => {
         var _a, _b, _c;
-        if (!popup || popup === '' || !visible || new Date() - curTimeRef.current < 1200) {
+        if (!popup || popup === '' || !visible || new Date() - curTimeRef.current < (popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration)) {
             return;
         }
         setVisible(false);
@@ -43,7 +43,7 @@ const Popup = () => {
         setTimeout(() => {
             window === null || window === void 0 ? void 0 : window.sxpPopup('');
             setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(null);
-        }, 1200);
+        }, popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration);
     };
     const renderPopupDetail = (0, react_1.useMemo)(() => {
         var _a, _b, _c;

package/lib/core/components/SxpPageRender/VideoWidget/index.js

@@ -19,8 +19,10 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex }) => {
         videoRef.current.muted = muted;
     }, [muted]);
     const handleVideoStart = (0, react_1.useCallback)(() => {
-        var _a;
-        (_a = videoRef.current) === null || _a === void 0 ? void 0 : _a.play();
+        var _a, _b;
+        if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || ((_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.readyState) < 2)
+            return;
+        (_b = videoRef.current) === null || _b === void 0 ? void 0 : _b.play();
     }, []);
     const PAUSE_ICON = (0, useIconLink_1.useIconLink)('/pb_static/06f28a2025c74c1cb49be6767316d827.png');
     const handlePlaying = (0, react_1.useCallback)(() => {
@@ -77,37 +79,38 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex }) => {
             });
         }
         setTimeout(() => {
-            var _a;
-            (_a = videoRef.current) === null || _a === void 0 ? void 0 : _a.play();
+            var _a, _b;
+            if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || ((_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.readyState) < 2)
+                return;
+            (_b = videoRef.current) === null || _b === void 0 ? void 0 : _b.play();
         }, 0);
     }, [index, bffEventReport, data, isLoad]);
     const handleClickVideo = (0, react_1.useCallback)((type) => () => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f;
+        if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || ((_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.readyState) < 2)
+            return;
         if (!isLoad)
             return;
-        const item = data[index];
-        const videoDuration = ((_b = (_a = videoRef.current) === null || _a === void 0 ? void 0 : _a.duration) !== null && _b !== void 0 ? _b : 0).toFixed(2);
-        const videoCurrentTime = ((_d = (_c = videoRef.current) === null || _c === void 0 ? void 0 : _c.currentTime) !== null && _d !== void 0 ? _d : 0).toFixed(2);
-        const isPause = (_e = videoRef.current) === null || _e === void 0 ? void 0 : _e.paused;
+        const isPause = (_b = videoRef.current) === null || _b === void 0 ? void 0 : _b.paused;
         switch (type) {
             case 'start':
                 if (!isPause)
                     return;
-                (_f = videoRef.current) === null || _f === void 0 ? void 0 : _f.play();
+                (_c = videoRef.current) === null || _c === void 0 ? void 0 : _c.play();
                 setIsPauseVideo(false);
                 break;
             case 'pause':
                 if (isPause)
                     return;
-                (_g = videoRef.current) === null || _g === void 0 ? void 0 : _g.pause();
+                (_d = videoRef.current) === null || _d === void 0 ? void 0 : _d.pause();
                 setIsPauseVideo(true);
                 break;
             default:
                 if (isPause) {
-                    (_h = videoRef.current) === null || _h === void 0 ? void 0 : _h.play();
+                    (_e = videoRef.current) === null || _e === void 0 ? void 0 : _e.play();
                 }
                 else {
-                    (_j = videoRef.current) === null || _j === void 0 ? void 0 : _j.pause();
+                    (_f = videoRef.current) === null || _f === void 0 ? void 0 : _f.pause();
                 }
                 setIsPauseVideo(!isPause);
                 break;
@@ -138,14 +141,16 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex }) => {
         }
     }, [data, index, bffEventReport]);
     (0, react_1.useEffect)(() => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         if (data.length <= 0)
             return;
         if (!videoRef.current)
             return;
+        const isPause = (_a = videoRef.current) === null || _a === void 0 ? void 0 : _a.paused;
         setIsPauseVideo(false);
         if (!isActive) {
-            (_a = videoRef.current) === null || _a === void 0 ? void 0 : _a.pause();
+            if (!isPause && ((_b = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _b === void 0 ? void 0 : _b.readyState) >= 2)
+                (_c = videoRef.current) === null || _c === void 0 ? void 0 : _c.pause();
             return;
         }
         if (!videoRef.current.src) {
@@ -155,10 +160,12 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex }) => {
             videoRef.current.setAttribute('webkit-playsinline', 'true');
         }
         else {
+            if (((_d = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _d === void 0 ? void 0 : _d.readyState) < 2)
+                return;
             videoRef.current.play();
         }
-        (_b = videoRef.current) === null || _b === void 0 ? void 0 : _b.addEventListener('canplay', handleLoadedMetadata);
-        (_c = videoRef.current) === null || _c === void 0 ? void 0 : _c.addEventListener('playing', handlePlaying);
+        (_e = videoRef.current) === null || _e === void 0 ? void 0 : _e.addEventListener('canplay', handleLoadedMetadata);
+        (_f = videoRef.current) === null || _f === void 0 ? void 0 : _f.addEventListener('playing', handlePlaying);
         return () => {
             var _a, _b;
             (_a = videoRef.current) === null || _a === void 0 ? void 0 : _a.removeEventListener('canplay', handleLoadedMetadata);
@@ -166,15 +173,17 @@ const VideoWidget = ({ rec, index, height, data, muted, activeIndex }) => {
         };
     }, [data, handleLoadedMetadata, handlePlaying, isActive, isLoad, rec.video]);
     (0, react_1.useEffect)(() => {
-        var _a, _b, _c;
-        const isPause = (_a = videoRef.current) === null || _a === void 0 ? void 0 : _a.paused;
+        var _a, _b, _c, _d;
+        if (!(videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) || ((_a = videoRef === null || videoRef === void 0 ? void 0 : videoRef.current) === null || _a === void 0 ? void 0 : _a.readyState) < 2)
+            return;
+        const isPause = (_b = videoRef.current) === null || _b === void 0 ? void 0 : _b.paused;
         if (!isActive)
             return;
         if (!isPause && openHashtag) {
-            (_b = videoRef.current) === null || _b === void 0 ? void 0 : _b.pause();
+            (_c = videoRef.current) === null || _c === void 0 ? void 0 : _c.pause();
         }
         else if (!openHashtag) {
-            (_c = videoRef.current) === null || _c === void 0 ? void 0 : _c.play();
+            (_d = videoRef.current) === null || _d === void 0 ? void 0 : _d.play();
         }
     }, [openHashtag, isActive]);
     (0, react_1.useEffect)(() => {

package/lib/core/components/SxpPageRender/WaterFall/WaterfallList.js

@@ -146,6 +146,7 @@ const WaterfallFlowItem = (props) => {
 };
 function WaterfallList({ reportTagsView }) {
     var _a, _b, _c, _d, _e, _f;
+    const { popupAni } = (0, hooks_1.useEditor)();
     const { waterFallData, getRecommendVideos, loadingImage } = (0, hooks_1.useSxpDataSource)();
     const scrollParent = (0, react_1.useRef)(null);
     const [scrollTop, setScrollTop] = (0, react_1.useState)(0);
@@ -163,7 +164,7 @@ function WaterfallList({ reportTagsView }) {
     const [frameInfo, setFrameInfoInfo] = (0, react_1.useState)({ width: 0 });
     const rowsNum = (0, react_1.useMemo)(() => {
         const width = frameInfo.width || 0;
-        if (width >= 1200) {
+        if (width >= (popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration)) {
             return 6;
         }
         else if (width >= 768 && width <= 1199) {
@@ -172,7 +173,7 @@ function WaterfallList({ reportTagsView }) {
         else {
             return 2;
         }
-    }, [frameInfo]);
+    }, [frameInfo, popupAni]);
     const unitWidth = (0, react_1.useMemo)(() => {
         return frameInfo.width / rowsNum - 2;
     }, [rowsNum, frameInfo]);

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

@@ -10,7 +10,7 @@ interface ISxpPageRenderProps {
         likeIcon?: string;
         unlikeIcon?: string;
         color?: string;
-        productPost?: string;
+        productPost?: any[];
         muteIconX?: number;
         muteIconY?: number;
         likeIconX?: number;
@@ -23,6 +23,25 @@ interface ISxpPageRenderProps {
         foldText: string;
         unfoldText: string;
     };
+    nudge?: {
+        isOpen: boolean;
+        icon?: string;
+        backgroundColor: string;
+        content?: string;
+        marginBottom: number;
+        borderRadius: number;
+        size: {
+            height: number;
+            width: number;
+        };
+        textStyle: {
+            color: string;
+            fontFamily: string;
+            fontSize: number;
+            fontStyle: string;
+            textAlign: string;
+        };
+    };
     containerHeight?: number;
     containerWidth?: number;
     tempMap?: Record<string, any>;

package/lib/core/components/SxpPageRender/index.js

@@ -10,20 +10,20 @@ const VideoWidget_1 = tslib_1.__importDefault(require("./VideoWidget"));
 const ToggleButton_1 = tslib_1.__importDefault(require("./ToggleButton"));
 const FingerSwipeTip_1 = tslib_1.__importDefault(require("./FingerSwipeTip"));
 const PictureGroup_1 = tslib_1.__importDefault(require("./PictureGroup"));
-const ProductInfo_1 = tslib_1.__importDefault(require("./ProductInfo"));
 const Hashtag_1 = tslib_1.__importDefault(require("./Hashtag"));
 const Navbar_1 = tslib_1.__importDefault(require("./Navbar"));
 const left_png_1 = tslib_1.__importDefault(require("./left.png"));
 const RenderCard_1 = tslib_1.__importDefault(require("./RenderCard"));
 const useIconLink_1 = require("./useIconLink");
 const WaterFall_1 = tslib_1.__importDefault(require("./WaterFall"));
-const CommodityDetailDiroNew_1 = tslib_1.__importDefault(require("../../../materials/sxp/popup/CommodityDetailDiroNew"));
+const Nudge_1 = tslib_1.__importDefault(require("./Nudge"));
 const event_1 = tslib_1.__importStar(require("../../../core/utils/event"));
 const hooks_1 = require("../../../core/hooks");
 const sessionStore_1 = require("../../../core/utils/sessionStore");
 require("./index.less");
 const useEventReport_1 = require("../../../core/hooks/useEventReport");
-const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, _schema }) => {
+const withBindDataSource_1 = tslib_1.__importDefault(require("../../../core/hoc/withBindDataSource"));
+const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.innerHeight, containerWidth = window.innerWidth, tempMap, resolver, data = [], ctaType, tipText, nudge, _schema }) => {
     var _a, _b, _c, _d;
     const { schema } = (0, hooks_1.useEditor)();
     const [activeIndex, setActiveIndex] = (0, react_1.useState)(0);
@@ -152,39 +152,37 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
         return null;
     }, [globalConfig]);
     const renderContent = (0, react_1.useCallback)((rec, index) => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if ((_a = rec.video) === null || _a === void 0 ? void 0 : _a.url) {
             return (react_1.default.createElement(VideoWidget_1.default, { rec: rec, index: index, muted: isMuted, data: data, height: height, activeIndex: activeIndex }));
         }
         if ((_b = rec.video) === null || _b === void 0 ? void 0 : _b.imgUrls) {
             return (react_1.default.createElement(PictureGroup_1.default, { key: rec.video.itemId, imgUrls: rec.video.imgUrls, width: containerWidth, height: height, rec: rec, index: index, onReportViewImageEnd: handleReportViewImageEnd, onViewImageStartEvent: handleViewImageStartEvent }));
         }
-        if (rec.product) {
-            switch (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) {
-                case 'CommodityDetailDiroNew':
-                    return (react_1.default.createElement(CommodityDetailDiroNew_1.default, { key: rec.product.itemId, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: { height: '100%', overflow: 'auto' } }));
-                case 'CommodityDetail':
-                    return (react_1.default.createElement(ProductInfo_1.default, { key: rec.product.itemId, viewTime: viewTime.current, data: rec, height: height, tipText: tipText, width: containerWidth }));
-                default:
-                    return (react_1.default.createElement(ProductInfo_1.default, { key: rec.product.itemId, viewTime: viewTime.current, data: rec, height: height, tipText: tipText, width: containerWidth }));
-            }
+        if (rec.product && Array.isArray(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) && ((_c = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+            return (_d = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost) === null || _d === void 0 ? void 0 : _d.map((value, index) => {
+                var _a, _b, _c, _d, _e, _f;
+                const Component = (0, withBindDataSource_1.default)(resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type]);
+                return (react_1.default.createElement(Component, Object.assign({ key: index, textStyle: (_b = value === null || value === void 0 ? void 0 : value.item) === null || _b === void 0 ? void 0 : _b.textStyle, bindDatas: (_d = (_c = value === null || value === void 0 ? void 0 : value.item) === null || _c === void 0 ? void 0 : _c.bindDatas) !== null && _d !== void 0 ? _d : [] }, (_e = value === null || value === void 0 ? void 0 : value.item) === null || _e === void 0 ? void 0 : _e.props, { event: ((_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, viewTime: viewTime.current, rec: rec, isPost: true, tipText: tipText, style: { height: '100%', overflow: 'auto' }, data: rec, height: height, width: containerWidth })));
+            });
         }
         return null;
-    }, [containerWidth, data, height, isMuted, activeIndex, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost, viewTime, tipText]);
+    }, [containerWidth, data, height, isMuted, activeIndex, globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.productPost, viewTime, tipText, resolver, schema]);
     const renderBottom = (0, react_1.useCallback)((rec, index) => {
         var _a, _b, _c, _d, _e, _f, _g;
         if (rec.video) {
             return (react_1.default.createElement(react_1.default.Fragment, null,
                 ((_a = rec.video) === null || _a === void 0 ? void 0 : _a.title) && react_1.default.createElement("div", { className: 'clc-sxp-bottom-shadow' }),
                 react_1.default.createElement("div", { className: 'clc-sxp-bottom' },
+                    react_1.default.createElement(Nudge_1.default, { nudge: nudge }),
                     react_1.default.createElement("div", { className: 'clc-sxp-bottom-card' },
                         react_1.default.createElement(RenderCard_1.default, { rec: rec, index: index, tempMap: tempMap, resolver: resolver })),
                     react_1.default.createElement("div", { className: 'clc-sxp-bottom-text' },
-                        react_1.default.createElement(ExpandableText_1.default, { foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, text: (_c = (_b = rec.video) === null || _b === void 0 ? void 0 : _b.title) !== null && _c !== void 0 ? _c : '', style: descStyle })),
+                        react_1.default.createElement(ExpandableText_1.default, { isPost: true, foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, text: (_c = (_b = rec.video) === null || _b === void 0 ? void 0 : _b.title) !== null && _c !== void 0 ? _c : '', style: descStyle })),
                     react_1.default.createElement(Hashtag_1.default, { index: activeIndex, tags: (_e = (_d = rec === null || rec === void 0 ? void 0 : rec.video) === null || _d === void 0 ? void 0 : _d.hashTags) !== null && _e !== void 0 ? _e : [], itemId: (_f = rec === null || rec === void 0 ? void 0 : rec.video) === null || _f === void 0 ? void 0 : _f.itemId, itemType: ((_g = rec.video) === null || _g === void 0 ? void 0 : _g.url) ? 'VIDEO' : null, rec: rec }))));
         }
         return null;
-    }, [descStyle, activeIndex, tempMap, resolver, tipText]);
+    }, [descStyle, activeIndex, tempMap, resolver, tipText, nudge]);
     const renderLikeButton = (0, react_1.useCallback)((rec) => {
         var _a, _b;
         if (!(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.isShowLike))
@@ -260,6 +258,11 @@ const SxpPageRender = ({ globalConfig, descStyle, containerHeight = window.inner
             productView(item, item.product, (_c = item === null || item === void 0 ? void 0 : item.product) === null || _c === void 0 ? void 0 : _c.bindCta, viewTime.current);
         }
     };
+    (0, react_1.useEffect)(() => {
+        const item = data[activeIndex];
+        if (openHashtag)
+            handleReportProductView(item);
+    }, [openHashtag, data, activeIndex]);
     const handleViewImageStartEvent = (activeIndex) => {
         var _a, _b, _c, _d, _e, _f;
         const item = data[activeIndex];

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

@@ -39,6 +39,7 @@ export type ProductInfoType = {
     info: string;
     currency: string;
     bindCta?: CTAInfoType;
+    taxInfo?: string;
 };
 export type VideoInfoType = {
     bindCtaId: string;

package/lib/core/components/SxpPageRender/useIconLink.d.ts

@@ -1 +1 @@
-export declare function useIconLink(path: string): string;
+export declare function useIconLink(path: string, domain?: string): string;

package/lib/core/components/SxpPageRender/useIconLink.js

@@ -3,10 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useIconLink = void 0;
 const react_1 = require("react");
 const hooks_1 = require("../../../core/hooks");
-function useIconLink(path) {
+function useIconLink(path, domain) {
     const { appDomain } = (0, hooks_1.useSxpDataSource)();
     return (0, react_1.useMemo)(() => {
-        return appDomain ? `https://${appDomain}${path}` : `${window.location.origin}${path}`;
-    }, [appDomain, path]);
+        if (domain) {
+            return `https://${domain}${path}`;
+        }
+        else {
+            return appDomain ? `https://${appDomain}${path}` : `${window.location.origin}${path}`;
+        }
+    }, [appDomain, path, domain]);
 }
 exports.useIconLink = useIconLink;

package/lib/core/context/EditorContext.d.ts

@@ -15,6 +15,10 @@ export interface IPageParams {
     h5_url?: string;
     mp_rul?: string;
 }
+export type IPopupAniType = {
+    name: string;
+    duration: number;
+};
 export interface IEditorContext {
     resolver: Record<string, MaterialComponet>;
     currentNode: any | null;
@@ -55,6 +59,7 @@ export interface IEditorContext {
     getCurPageConf?: any;
     popup: string;
     setPopup: React.Dispatch<React.SetStateAction<string>>;
+    popupAni: IPopupAniType;
 }
 export interface IEditorCoreProps {
     resolver: Record<string, MaterialComponet>;

package/lib/core/context/EditorContext.js

@@ -49,7 +49,11 @@ exports.EditorContext = react_1.default.createContext({
     undoStack: [item],
     redoStack: [],
     popup: '',
-    setPopup: () => { }
+    setPopup: () => { },
+    popupAni: {
+        name: 'none',
+        duration: 0
+    }
 });
 const EditorCore = (0, react_1.forwardRef)(({ children, resolver, isSsr, schema, enableDataSource = true, utmVal }, ref) => {
     const [currentNode, setCurrentNode] = (0, react_1.useState)(null);
@@ -68,9 +72,22 @@ const EditorCore = (0, react_1.forwardRef)(({ children, resolver, isSsr, schema,
     const [undoStack, setUndoStack] = (0, react_1.useState)([[item]]);
     const [redoStack, setRedoStack] = (0, react_1.useState)([]);
     const [popup, setPopup] = (0, react_1.useState)('');
+    const [popupAni, setPopupAni] = (0, react_1.useState)({
+        name: 'none',
+        duration: 0
+    });
     typeof window !== 'undefined' &&
-        (window.sxpPopup = (type) => {
+        (window.sxpPopup = (type, aniType) => {
             setPopup(type);
+            if (aniType && (aniType === null || aniType === void 0 ? void 0 : aniType.name) !== 'none') {
+                setPopupAni(Object.assign(Object.assign({}, popupAni), aniType));
+            }
+            else {
+                setPopupAni({
+                    name: 'none',
+                    duration: 0
+                });
+            }
         });
     typeof window !== 'undefined' &&
         (window.getJointUtmLink = (url) => {
@@ -139,7 +156,8 @@ const EditorCore = (0, react_1.forwardRef)(({ children, resolver, isSsr, schema,
             setUndoStack,
             getCurPageConf,
             popup,
-            setPopup
+            setPopup,
+            popupAni
         } },
         react_1.default.createElement(DataSourceProvider_1.default, { isSsr: isSsr, enable: enableDataSource }, children)));
 });

package/lib/core/context/SxpDataSourceProvider.js

@@ -171,7 +171,7 @@ const SxpDataSourceProvider = ({ render, dataSources, utmVal, enableReportEvent
             setLoading(false);
         });
     }, [getRecommendVideos]);
-    const defaultLoadingImage = (0, useIconLink_1.useIconLink)('/pb_static/a65d23c5893c49d7aaaa81681d3179e2.gif');
+    const defaultLoadingImage = (0, useIconLink_1.useIconLink)('/pb_static/a65d23c5893c49d7aaaa81681d3179e2.gif', appDomain);
     return (react_1.default.createElement(exports.SxpDataSourceContext.Provider, { value: {
             rtcList,
             setRtcList,

package/lib/core/create.d.ts

@@ -7,7 +7,7 @@ export interface IMaterialOptions<T> {
     type: string;
     related?: {
         settingRender?: Record<string, any>;
-        bindableProps: Array<{
+        bindableProps?: Array<{
             label: string;
             value: keyof T;
             dataType: Array<DATA_TYPE>;

package/lib/materials/sxp/popup/CommodityDetailDiroNew/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { CSSProperties } from 'react';
 import { IEditorContext } from '../../../../core/context/EditorContext';
 import { RecItemType } from '../../../../core/components/SxpPageRender/typing';
 import './index.less';
@@ -17,6 +17,18 @@ export interface ICommodityDetailDiroNewProps {
         foldText?: string;
         unfoldText?: string;
     };
+    swiper: {
+        dotsAlign: 'left' | 'center';
+        delay: number;
+    };
+    commodityStyles?: {
+        title: CSSProperties;
+        collection: CSSProperties;
+        price: CSSProperties;
+        taxInfo: CSSProperties;
+        info: CSSProperties;
+    };
+    buttonStyle?: CSSProperties;
 }
 declare const _default: React.NamedExoticComponent<ICommodityDetailDiroNewProps>;
 export default _default;

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

@@ -11,8 +11,8 @@ const Modal_1 = tslib_1.__importDefault(require("../../../../core/components/Sxp
 const ExpandableText_1 = tslib_1.__importDefault(require("../../../../core/components/SxpPageRender/ExpandableText"));
 const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const CommodityDetailDiroNew = (_a) => {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText"]);
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var { style, isDefault, rec, viewTime, isPost, bottom_image, tipText, swiper, commodityStyles, buttonStyle } = _a, props = tslib_1.__rest(_a, ["style", "isDefault", "rec", "viewTime", "isPost", "bottom_image", "tipText", "swiper", "commodityStyles", "buttonStyle"]);
     const [spread, setSpread] = (0, react_1.useState)(true);
     const { sxpParameter } = (0, hooks_1.useSxpDataSource)();
     const { popupDetailData, bffEventReport, isPreview, swiperRef, waterFallData } = (0, hooks_1.useSxpDataSource)();
@@ -81,14 +81,22 @@ const CommodityDetailDiroNew = (_a) => {
             }
         }
     };
+    const productInfoText = () => {
+        return (react_1.default.createElement("div", { hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.info) || (product === null || product === void 0 ? void 0 : product.info) === '') },
+            react_1.default.createElement(ExpandableText_1.default, { isPost: isPost, onClick: () => setShowModal(true), className: 'pb-commondityDiroNew-info', style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.info, foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, text: (product === null || product === void 0 ? void 0 : product.info) ||
+                    `Unveiled at the Spring-Summer 2023 fashion show, the Dior Toujours bag is distinguished by a casual and practical design. Crafted in black calfskin with Macrocannage topstitching, it showcases a spacious interior compartment with a matching pouch to organize essentials. Its leather strap closure keeps items secure while the D of the CD Lock closure twists to adjust the sides and enhance the bag's silhouette. The leather handles can be adjusted using the small notches in order to be able to carry the large bag by hand or wear it over the shoulder. CD Lock and strap closures D.I.O.R. charms Removable interior pouch Adjustable leather handles Dust bag included
+Made in Italy` })));
+    };
     return (react_1.default.createElement("div", { className: 'pb-commondityDiroNew' },
         react_1.default.createElement("div", Object.assign({ ref: scrollRef, className: (0, css_1.css)(Object.assign({}, style)) }, props),
             product && ((_f = product === null || product === void 0 ? void 0 : product.homePage) === null || _f === void 0 ? void 0 : _f.length) > 0 && (react_1.default.createElement(react_2.Swiper, { height: width, modules: [modules_1.Pagination, modules_1.Autoplay], pagination: {
                     clickable: true,
                     bulletActiveClass: 'commondityDiroNew-swipe-item-active-bullet',
-                    clickableClass: 'commondityDiroNew-swiper-clickable'
+                    clickableClass: (swiper === null || swiper === void 0 ? void 0 : swiper.dotsAlign) === 'left'
+                        ? 'commondityDiroNew-swiper-clickable-left'
+                        : 'commondityDiroNew-swiper-clickable-center'
                 }, loop: true, autoplay: {
-                    delay: 3000
+                    delay: (swiper === null || swiper === void 0 ? void 0 : swiper.delay) * 1000
                 } }, (_g = product === null || product === void 0 ? void 0 : product.homePage) === null || _g === void 0 ? void 0 : _g.map((src) => {
                 return (react_1.default.createElement(react_2.SwiperSlide, { key: src },
                     react_1.default.createElement("div", { style: {
@@ -114,18 +122,13 @@ const CommodityDetailDiroNew = (_a) => {
                     }), src: (_j = sxpParameter === null || sxpParameter === void 0 ? void 0 : sxpParameter.bottom_image) !== null && _j !== void 0 ? _j : bottom_image, alt: '' }))),
             react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content' },
                 react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top' },
-                    react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top-title' }, (_k = product === null || product === void 0 ? void 0 : product.title) !== null && _k !== void 0 ? _k : 'Large Dior Toujours Bag'),
-                    react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.price) }, priceText)),
-                react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-collection', hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.collection) || (product === null || product === void 0 ? void 0 : product.collection) === '') }, (product === null || product === void 0 ? void 0 : product.collection) || 'Black Macrocannage Calfskin'),
-                (!product || (product === null || product === void 0 ? void 0 : product.link)) && (react_1.default.createElement("button", { onClick: handleLink, className: 'pb-commondityDiroNew-btn' }, (_l = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _l !== void 0 ? _l : 'Shop now')),
-                react_1.default.createElement("div", { hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.info) || (product === null || product === void 0 ? void 0 : product.info) === '') }, isPost ? (react_1.default.createElement(ExpandableText_1.default, { onClick: () => setShowModal(true), className: 'pb-commondityDiroNew-info', foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, text: (product === null || product === void 0 ? void 0 : product.info) ||
-                        `Unveiled at the Spring-Summer 2023 fashion show, the Dior Toujours bag is distinguished by a casual and practical design. Crafted in black calfskin with Macrocannage topstitching, it showcases a spacious interior compartment with a matching pouch to organize essentials. Its leather strap closure keeps items secure while the D of the CD Lock closure twists to adjust the sides and enhance the bag's silhouette. The leather handles can be adjusted using the small notches in order to be able to carry the large bag by hand or wear it over the shoulder. CD Lock and strap closures D.I.O.R. charms Removable interior pouch Adjustable leather handles Dust bag included
-Made in Italy` })) : (react_1.default.createElement("div", { className: 'pb-commondityDiroNew-info' }, (product === null || product === void 0 ? void 0 : product.info) ||
-                    `Unveiled at the Spring-Summer 2023 fashion show, the Dior Toujours bag is distinguished by a casual and practical design. Crafted in black calfskin with Macrocannage topstitching, it showcases a spacious interior compartment with a matching pouch to organize essentials. Its leather strap closure keeps items secure while the D of the CD Lock closure twists to adjust the sides and enhance the bag's silhouette. The leather handles can be adjusted using the small notches in order to be able to carry the large bag by hand or wear it over the shoulder. CD Lock and strap closures D.I.O.R. charms Removable interior pouch Adjustable leather handles Dust bag included
-Made in Italy`))))),
-        react_1.default.createElement(Modal_1.default, { visible: showModal, onClose: () => setShowModal(false) },
-            react_1.default.createElement("div", { className: 'pb-commondityDiroNew-info', hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.info) || (product === null || product === void 0 ? void 0 : product.info) === '') }, (product === null || product === void 0 ? void 0 : product.info) ||
-                `Unveiled at the Spring-Summer 2023 fashion show, the Dior Toujours bag is distinguished by a casual and practical design. Crafted in black calfskin with Macrocannage topstitching, it showcases a spacious interior compartment with a matching pouch to organize essentials. Its leather strap closure keeps items secure while the D of the CD Lock closure twists to adjust the sides and enhance the bag's silhouette. The leather handles can be adjusted using the small notches in order to be able to carry the large bag by hand or wear it over the shoulder. CD Lock and strap closures D.I.O.R. charms Removable interior pouch Adjustable leather handles Dust bag included
-Made in Italy`))));
+                    react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top-title', style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title }, (_k = product === null || product === void 0 ? void 0 : product.title) !== null && _k !== void 0 ? _k : 'Large Dior Toujours Bag'),
+                    react_1.default.createElement("div", { className: '' },
+                        react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.price), style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price }, priceText),
+                        react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-top-price', hidden: !!product && !(product === null || product === void 0 ? void 0 : product.taxInfo), style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.taxInfo }, (_l = product === null || product === void 0 ? void 0 : product.taxInfo) !== null && _l !== void 0 ? _l : '税费'))),
+                react_1.default.createElement("div", { className: 'pb-commondityDiroNew-content-collection', hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.collection) || (product === null || product === void 0 ? void 0 : product.collection) === ''), style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.collection }, (product === null || product === void 0 ? void 0 : product.collection) || 'Black Macrocannage Calfskin'),
+                (!product || (product === null || product === void 0 ? void 0 : product.link)) && (react_1.default.createElement("button", { onClick: handleLink, className: 'pb-commondityDiroNew-btn', style: buttonStyle }, (_m = cta === null || cta === void 0 ? void 0 : cta.enTitle) !== null && _m !== void 0 ? _m : 'Shop now')),
+                productInfoText())),
+        react_1.default.createElement(Modal_1.default, { visible: showModal, onClose: () => setShowModal(false) }, productInfoText())));
 };
 exports.default = (0, react_1.memo)(CommodityDetailDiroNew);

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommodityDetailDiroNew = void 0;
 const tslib_1 = require("tslib");
+const settingRender_1 = tslib_1.__importDefault(require("./settingRender"));
 const _1 = tslib_1.__importDefault(require("."));
 const create_1 = require("../../../../core/create");
 const CommodityDetailDiroNew = (0, create_1.createMaterial)(_1.default, {
@@ -9,8 +10,41 @@ const CommodityDetailDiroNew = (0, create_1.createMaterial)(_1.default, {
     icon: '',
     category: 'popup',
     type: 'CommodityDetailDiroNew',
+    related: {
+        settingRender: settingRender_1.default
+    },
     defaulSetting: {
-        props: {},
+        props: {
+            swiper: {
+                dotsAlign: 'left',
+                delay: 3
+            },
+            commodityStyles: {
+                price: {
+                    color: '#000',
+                    fontWeight: 'bold',
+                    fontSize: 18
+                },
+                title: {
+                    color: '#000',
+                    fontSize: 13
+                },
+                collection: {
+                    color: '#757575',
+                    fontSize: 13
+                },
+                info: {
+                    color: '#757575',
+                    fontSize: 13
+                },
+                taxInfo: {
+                    color: '#000',
+                    fontWeight: 'bold',
+                    fontSize: 13,
+                    textAlign: 'right'
+                }
+            }
+        },
         style: {}
     },
     w: 100,