pb-sxp-ui 1.0.5 → 1.0.6

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

@@ -1,10 +1,10 @@
 import React, { CSSProperties } from 'react';
-import { IPopupAniType } from '../../../../core/context/EditorContext';
+import { IPopupType } from '../../../../core/context/EditorContext';
 interface IModalProps {
     visible?: boolean;
+    popup?: IPopupType;
     padding?: number | string;
     modalStyle?: CSSProperties;
-    popupAniData?: IPopupAniType;
     onClose?: () => void;
 }
 declare const _default: React.NamedExoticComponent<React.PropsWithChildren<IModalProps>>;

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

@@ -1,11 +1,9 @@
 import { debounce } from 'lodash';
-import React, { memo, useEffect, useRef, useState } from 'react';
+import React, { memo, useEffect, useMemo, useRef, useState } from 'react';
 import * as ReactDOM from 'react-dom';
-import { useEditor } from '../../../../core/hooks';
 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, popupAniData }) => {
-    const { popupAni } = useEditor();
-    const cssAni = popupAniData !== null && popupAniData !== void 0 ? popupAniData : popupAni;
+const Modal = ({ visible, onClose, children, modalStyle, padding, popup }) => {
+    var _a;
     const [isShow, setIsShow] = useState(false);
     const modalEleRef = useRef(null);
     useEffect(() => {
@@ -20,28 +18,31 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popupAniData }
             parentNode === null || parentNode === void 0 ? void 0 : parentNode.appendChild(modalEleRef.current);
         }
     }, []);
+    const isOpen = useMemo(() => {
+        return ((popup === null || popup === void 0 ? void 0 : popup.id) && (popup === null || popup === void 0 ? void 0 : popup.id) !== '') || visible;
+    }, [visible, popup]);
     useEffect(() => {
-        if (visible) {
+        if (isOpen) {
             setIsShow(true);
         }
         else {
             setTimeout(() => {
                 setIsShow(false);
-            }, cssAni === null || cssAni === void 0 ? void 0 : cssAni.duration);
+            }, popup === null || popup === void 0 ? void 0 : popup.duration);
         }
-    }, [visible, cssAni]);
+    }, [isOpen, popup]);
     if (!modalEleRef.current)
         return null;
     const handleClose = debounce(() => {
         onClose === null || onClose === void 0 ? void 0 : onClose();
     }, 300);
-    return ReactDOM.createPortal(React.createElement("div", { className: 'modal-bg', style: Object.assign({ display: isShow ? 'flex' : 'none', backgroundColor: visible ? 'rgba(0, 0, 0, 0.7)' : 'rgba(0, 0, 0, 0)' }, modalStyle), onClick: handleClose },
-        React.createElement("div", { className: `modal-container ${visible ? 'modal-popIn' : 'modal-popOut'}`, style: { padding, animationDuration: (cssAni === null || cssAni === void 0 ? void 0 : cssAni.duration) / 1000 + 's' }, onClick: (e) => {
+    return ReactDOM.createPortal(React.createElement(React.Fragment, null, isShow && (React.createElement("div", { className: 'modal-bg', style: Object.assign({ display: 'flex', backgroundColor: isOpen ? 'rgba(0, 0, 0, 0.7)' : 'rgba(0, 0, 0, 0)' }, modalStyle), onClick: handleClose },
+        React.createElement("div", { className: `modal-container ${isOpen ? 'modal-popIn' : 'modal-popOut'}`, style: { padding, animationDuration: ((_a = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _a !== void 0 ? _a : 0) / 1000 + 's' }, onClick: (e) => {
                 e.stopPropagation();
                 e.preventDefault();
             } },
             React.createElement("div", { onClick: onClose, className: 'modal-icon-wrapper' },
                 React.createElement("img", { src: closeIcon, alt: 'close', className: 'modal-icon' })),
-            children)), modalEleRef.current);
+            children)))), modalEleRef.current);
 };
 export default memo(Modal);

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

@@ -4,10 +4,10 @@ import { useEditor, useSxpDataSource } from '../../../../core/hooks';
 import withBindDataSource from '../../../../core/hoc/withBindDataSource';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
 const Popup = () => {
-    const { schema, resolver, popup, popupAni } = useEditor();
+    const { schema, resolver, popup } = useEditor();
     const { setPopupDetailData, popupDetailData, bffEventReport } = useSxpDataSource();
     const { productView } = useEventReport();
-    const [visible, setVisible] = useState(false);
+    const [visible, setVisible] = useState();
     const curTimeRef = useRef(null);
     useEffect(() => {
         const initTime = () => {
@@ -20,33 +20,33 @@ const Popup = () => {
         };
     }, []);
     useEffect(() => {
-        if (popup && popup !== '') {
+        if (popup && (popup === null || popup === void 0 ? void 0 : popup.id) && (popup === null || popup === void 0 ? void 0 : popup.id) !== '') {
             curTimeRef.current = new Date();
-            setVisible(true);
+            setVisible(popup);
         }
     }, [popup]);
     const handleClose = () => {
-        var _a, _b, _c;
-        if (!popup || popup === '' || !visible || new Date() - curTimeRef.current < (popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration)) {
+        var _a, _b, _c, _d;
+        if (!popup || (popup === null || popup === void 0 ? void 0 : popup.id) === '' || !visible || new Date() - curTimeRef.current < ((_a = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _a !== void 0 ? _a : 0)) {
             return;
         }
-        setVisible(false);
+        setVisible(Object.assign(Object.assign({}, popup), { id: '' }));
         const data = popupDetailData;
-        const product = (_a = data === null || data === void 0 ? void 0 : data.video) === null || _a === void 0 ? void 0 : _a.bindProduct;
-        const cta = (_c = (_b = data === null || data === void 0 ? void 0 : data.video) === null || _b === void 0 ? void 0 : _b.bindProduct) === null || _c === void 0 ? void 0 : _c.bindCta;
+        const product = (_b = data === null || data === void 0 ? void 0 : data.video) === null || _b === void 0 ? void 0 : _b.bindProduct;
+        const cta = (_d = (_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProduct) === null || _d === void 0 ? void 0 : _d.bindCta;
         if (product && cta) {
             productView(data, product, cta, curTimeRef.current);
         }
         setTimeout(() => {
             window === null || window === void 0 ? void 0 : window.sxpPopup('');
             setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(null);
-        }, popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration);
+        }, popup === null || popup === void 0 ? void 0 : popup.duration);
     };
     const renderPopupDetail = useMemo(() => {
         var _a, _b, _c;
         return (_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.map((value, index) => {
             var _a, _b, _c, _d, _e, _f, _g, _h;
-            if ((value === null || value === void 0 ? void 0 : value.id) === popup) {
+            if ((value === null || value === void 0 ? void 0 : value.id) === (popup === null || popup === void 0 ? void 0 : popup.id)) {
                 const t = resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type];
                 const Component = withBindDataSource(t);
                 const defaulSetting = (_b = t === null || t === void 0 ? void 0 : t.extend) === null || _b === void 0 ? void 0 : _b.defaulSetting;
@@ -57,6 +57,6 @@ const Popup = () => {
             }
         });
     }, [schema, popup, resolver]);
-    return (React.createElement(Modal, { visible: !!visible, onClose: handleClose, padding: 0, modalStyle: { position: 'fixed' } }, renderPopupDetail));
+    return (React.createElement(Modal, { popup: visible, onClose: handleClose, padding: 0, modalStyle: { position: 'fixed' } }, renderPopupDetail));
 };
 export default Popup;

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

@@ -1,6 +1,6 @@
 import { __rest } from "tslib";
 import React, { useState, useEffect, useRef, useMemo, useCallback } from 'react';
-import { useEditor, useSxpDataSource } from '../../../../core/hooks';
+import { useSxpDataSource } from '../../../../core/hooks';
 import './WaterfallList.less';
 const WaterfallFlowItem = (props) => {
     const { rec, style = {}, sizeChange = () => { }, unitWidth, index, showBorder, list, reportTagsView, textStyles, lineClamp } = props;
@@ -145,7 +145,6 @@ const WaterfallFlowItem = (props) => {
 export default function WaterfallList(_a) {
     var _b, _c, _d, _e, _f, _g, _h;
     var { reportTagsView } = _a, props = __rest(_a, ["reportTagsView"]);
-    const { popupAni } = useEditor();
     const { waterFallData, getRecommendVideos, loadingImage } = useSxpDataSource();
     const scrollParent = useRef(null);
     const [scrollTop, setScrollTop] = useState(0);
@@ -163,7 +162,7 @@ export default function WaterfallList(_a) {
     const [frameInfo, setFrameInfoInfo] = useState({ width: 0 });
     const rowsNum = useMemo(() => {
         const width = frameInfo.width || 0;
-        if (width >= (popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration)) {
+        if (width >= 1200) {
             return 6;
         }
         else if (width >= 768 && width <= 1199) {
@@ -172,7 +171,7 @@ export default function WaterfallList(_a) {
         else {
             return 2;
         }
-    }, [frameInfo, popupAni]);
+    }, [frameInfo]);
     const unitWidth = useMemo(() => {
         return frameInfo.width / rowsNum - 2;
     }, [rowsNum, frameInfo]);

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

@@ -66,7 +66,7 @@ const WaterFall = (props) => {
                 relatedContentId: (_d = rec === null || rec === void 0 ? void 0 : rec.video) === null || _d === void 0 ? void 0 : _d.itemId,
                 position: rec === null || rec === void 0 ? void 0 : rec.position,
                 contentTags: JSON.stringify((_e = rec === null || rec === void 0 ? void 0 : rec.video) === null || _e === void 0 ? void 0 : _e.tags),
-                traceInfo: JSON.stringify((_f = rec === null || rec === void 0 ? void 0 : rec.video) === null || _f === void 0 ? void 0 : _f.traceInfo),
+                traceInfo: (_f = rec === null || rec === void 0 ? void 0 : rec.video) === null || _f === void 0 ? void 0 : _f.traceInfo,
                 hashTags: JSON.stringify([recData === null || recData === void 0 ? void 0 : recData.hashTag]),
                 fromKName,
                 fromKPage: location === null || location === void 0 ? void 0 : location.href,

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

@@ -16,9 +16,12 @@ export interface IPageParams {
     mp_rul?: string;
 }
 export type IPopupAniType = {
-    name: string;
-    duration: number;
+    name?: string;
+    duration?: number;
 };
+export type IPopupType = {
+    id: string;
+} & IPopupAniType;
 export interface IEditorContext {
     resolver: Record<string, MaterialComponet>;
     currentNode: any | null;
@@ -57,9 +60,8 @@ export interface IEditorContext {
     setUndoStack?: React.Dispatch<React.SetStateAction<any[]>>;
     setRedoStack?: React.Dispatch<React.SetStateAction<any[]>>;
     getCurPageConf?: any;
-    popup: string;
-    setPopup: React.Dispatch<React.SetStateAction<string>>;
-    popupAni: IPopupAniType;
+    popup: IPopupType;
+    setPopup: React.Dispatch<React.SetStateAction<IPopupType>>;
 }
 export interface IEditorCoreProps {
     resolver: Record<string, MaterialComponet>;

package/es/core/context/EditorContext.js

@@ -25,6 +25,11 @@ const item = {
     pathArr: [0],
     positionY: 0
 };
+const popupInit = {
+    id: '',
+    duration: 0,
+    name: 'none'
+};
 export const EditorContext = React.createContext({
     resolver: {},
     currentNode: null,
@@ -44,12 +49,8 @@ export const EditorContext = React.createContext({
     prePiontData: [],
     undoStack: [item],
     redoStack: [],
-    popup: '',
-    setPopup: () => { },
-    popupAni: {
-        name: 'none',
-        duration: 0
-    }
+    popup: popupInit,
+    setPopup: () => { }
 });
 const EditorCore = forwardRef(({ children, resolver, isSsr, schema, enableDataSource = true, utmVal }, ref) => {
     const [currentNode, setCurrentNode] = useState(null);
@@ -67,25 +68,10 @@ const EditorCore = forwardRef(({ children, resolver, isSsr, schema, enableDataSo
     const [prePiontData, setPrePiontData] = useState([item]);
     const [undoStack, setUndoStack] = useState([[item]]);
     const [redoStack, setRedoStack] = useState([]);
-    const [popup, setPopup] = useState('');
-    const [popupAni, setPopupAni] = useState({
-        name: 'none',
-        duration: 0
-    });
+    const [popup, setPopup] = useState(popupInit);
     typeof window !== 'undefined' &&
         (window.sxpPopup = (type, aniType) => {
-            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
-                });
-            }
-            setTimeout(() => {
-                setPopup(type);
-            });
+            setPopup(Object.assign(Object.assign(Object.assign({}, popupInit), { id: type }), aniType));
         });
     typeof window !== 'undefined' &&
         (window.getJointUtmLink = (url) => {
@@ -154,8 +140,7 @@ const EditorCore = forwardRef(({ children, resolver, isSsr, schema, enableDataSo
             setUndoStack,
             getCurPageConf,
             popup,
-            setPopup,
-            popupAni
+            setPopup
         } },
         React.createElement(DataSourceProvider, { isSsr: isSsr, enable: enableDataSource }, children)));
 });

package/es/core/hooks/useEventReport.js

@@ -20,23 +20,25 @@ export function useEventReport() {
         else if (data === null || data === void 0 ? void 0 : data.product) {
             fromKName = 'productPage';
         }
-        bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
-            eventInfo: {
-                eventSubject: 'jumpToWeb',
-                eventDescription: 'User jumped to website',
-                productId: (_h = product === null || product === void 0 ? void 0 : product.itemId) !== null && _h !== void 0 ? _h : '',
-                productName: (_j = product === null || product === void 0 ? void 0 : product.title) !== null && _j !== void 0 ? _j : '',
-                price: (product === null || product === void 0 ? void 0 : product.price) ? (product === null || product === void 0 ? void 0 : product.price) + '' : '0',
-                productCollection: (_k = product === null || product === void 0 ? void 0 : product.collection) !== null && _k !== void 0 ? _k : '',
-                fromKName,
-                fromKPage: location === null || location === void 0 ? void 0 : location.href,
-                contentTags: (product === null || product === void 0 ? void 0 : product.tags) ? JSON.stringify(product === null || product === void 0 ? void 0 : product.tags) : '',
-                position: (data === null || data === void 0 ? void 0 : data.position) + '',
-                relatedContentId: (_m = (_l = data === null || data === void 0 ? void 0 : data.video) === null || _l === void 0 ? void 0 : _l.itemId) !== null && _m !== void 0 ? _m : '',
-                relatedCtatId: (_o = cta === null || cta === void 0 ? void 0 : cta.itemId) !== null && _o !== void 0 ? _o : '',
-                traceInfo: (_p = product === null || product === void 0 ? void 0 : product.traceInfo) !== null && _p !== void 0 ? _p : ''
-            }
-        });
+        if (product === null || product === void 0 ? void 0 : product.price) {
+            bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
+                eventInfo: {
+                    eventSubject: 'jumpToWeb',
+                    eventDescription: 'User jumped to website',
+                    productId: (_h = product === null || product === void 0 ? void 0 : product.itemId) !== null && _h !== void 0 ? _h : '',
+                    productName: (_j = product === null || product === void 0 ? void 0 : product.title) !== null && _j !== void 0 ? _j : '',
+                    price: (product === null || product === void 0 ? void 0 : product.price) ? (product === null || product === void 0 ? void 0 : product.price) + '' : '0',
+                    productCollection: (_k = product === null || product === void 0 ? void 0 : product.collection) !== null && _k !== void 0 ? _k : '',
+                    fromKName,
+                    fromKPage: location === null || location === void 0 ? void 0 : location.href,
+                    contentTags: (product === null || product === void 0 ? void 0 : product.tags) ? JSON.stringify(product === null || product === void 0 ? void 0 : product.tags) : '',
+                    position: (data === null || data === void 0 ? void 0 : data.position) + '',
+                    relatedContentId: (_m = (_l = data === null || data === void 0 ? void 0 : data.video) === null || _l === void 0 ? void 0 : _l.itemId) !== null && _m !== void 0 ? _m : '',
+                    relatedCtatId: (_o = cta === null || cta === void 0 ? void 0 : cta.itemId) !== null && _o !== void 0 ? _o : '',
+                    traceInfo: (_p = product === null || product === void 0 ? void 0 : product.traceInfo) !== null && _p !== void 0 ? _p : ''
+                }
+            });
+        }
     }, [bffEventReport, popupDetailData, isFromHashtag]);
     const productView = useCallback((data, product, cta, viewTime) => {
         var _a, _b, _c, _d;
@@ -47,24 +49,26 @@ export function useEventReport() {
         else if (data === null || data === void 0 ? void 0 : data.product) {
             fromKName = 'productPage';
         }
-        bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
-            eventInfo: {
-                productId: product === null || product === void 0 ? void 0 : product.itemId,
-                productName: product === null || product === void 0 ? void 0 : product.title,
-                price: (product === null || product === void 0 ? void 0 : product.price) + '',
-                productCollection: product === null || product === void 0 ? void 0 : product.collection,
-                fromKName,
-                fromKPage: location === null || location === void 0 ? void 0 : location.href,
-                contentTags: JSON.stringify(product === null || product === void 0 ? void 0 : product.tags),
-                position: (data === null || data === void 0 ? void 0 : data.position) + '',
-                relatedContentId: (_d = data === null || data === void 0 ? void 0 : data.video) === null || _d === void 0 ? void 0 : _d.itemId,
-                relatedCtatId: cta === null || cta === void 0 ? void 0 : cta.itemId,
-                traceInfo: product === null || product === void 0 ? void 0 : product.traceInfo,
-                timeOnSite: Math.floor((new Date() - viewTime) / 1000) + '',
-                eventSubject: 'productView',
-                eventDescription: 'User browsed the product'
-            }
-        });
+        if (product === null || product === void 0 ? void 0 : product.price) {
+            bffEventReport === null || bffEventReport === void 0 ? void 0 : bffEventReport({
+                eventInfo: {
+                    productId: product === null || product === void 0 ? void 0 : product.itemId,
+                    productName: product === null || product === void 0 ? void 0 : product.title,
+                    price: (product === null || product === void 0 ? void 0 : product.price) + '',
+                    productCollection: product === null || product === void 0 ? void 0 : product.collection,
+                    fromKName,
+                    fromKPage: location === null || location === void 0 ? void 0 : location.href,
+                    contentTags: JSON.stringify(product === null || product === void 0 ? void 0 : product.tags),
+                    position: (data === null || data === void 0 ? void 0 : data.position) + '',
+                    relatedContentId: (_d = data === null || data === void 0 ? void 0 : data.video) === null || _d === void 0 ? void 0 : _d.itemId,
+                    relatedCtatId: cta === null || cta === void 0 ? void 0 : cta.itemId,
+                    traceInfo: product === null || product === void 0 ? void 0 : product.traceInfo,
+                    timeOnSite: Math.floor((new Date() - viewTime) / 1000) + '',
+                    eventSubject: 'productView',
+                    eventDescription: 'User browsed the product'
+                }
+            });
+        }
     }, [bffEventReport, popupDetailData]);
     return {
         jumpToWeb,

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

@@ -3,11 +3,10 @@ import { css } from '@emotion/css';
 import React, { memo, useMemo, useRef, useState } from 'react';
 import { BetaSchemaForm } from '@ant-design/pro-components';
 import { cloneDeep, debounce } from 'lodash';
-import { useEditor, useSxpDataSource } from '../../../../core/hooks';
+import { useSxpDataSource } from '../../../../core/hooks';
 import './index.less';
 const AppointForm = (_a) => {
     var { columns, style, title, textStyle, submitBgColor, submitColor, submitText, layoutType, onClick } = _a, props = __rest(_a, ["columns", "style", "title", "textStyle", "submitBgColor", "submitColor", "submitText", "layoutType", "onClick"]);
-    const { setPopup } = useEditor();
     const { submitForm } = useSxpDataSource();
     const formRef = useRef();
     const [loading, setLoading] = useState(false);

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

@@ -3,11 +3,9 @@ import { css } from '@emotion/css';
 import React, { memo } from 'react';
 import success from './success.png';
 import { getMediaValueByMode } from '../../../../core/utils/materials';
-import { useEditor } from '../../../../core/hooks';
 import './index.less';
 const Prompt = (_a) => {
     var { content, btnText, style, icon, onClick } = _a, props = __rest(_a, ["content", "btnText", "style", "icon", "onClick"]);
-    const { setPopup } = useEditor();
     const iconSrc = typeof icon === 'string' ? icon : getMediaValueByMode(icon);
     const handleOk = () => {
         window === null || window === void 0 ? void 0 : window.sxpPopup('');

package/es/materials/sxp/template/MultiCommodity/index.js

@@ -13,7 +13,7 @@ const MultiCommodity = (_a) => {
     var { content, style, bgImg, recData, onClick, bottom_image, ctaTempStyles, isExternalLink } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "onClick", "bottom_image", "ctaTempStyles", "isExternalLink"]);
     const { sxpParameter } = useSxpDataSource();
     const { ctaEvent, setPopupDetailData } = useSxpDataSource();
-    const { popupAni } = useEditor();
+    const { popup } = useEditor();
     const [products, setProducts] = useState((_c = (_b = recData === null || recData === void 0 ? void 0 : recData.video) === null || _b === void 0 ? void 0 : _b.bindProducts) !== null && _c !== void 0 ? _c : [1, 2]);
     const { jumpToWeb } = useEventReport();
     const handleClick = throttle((item) => {
@@ -31,7 +31,7 @@ const MultiCommodity = (_a) => {
         else {
             onClick === null || onClick === void 0 ? void 0 : onClick();
         }
-    }, popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration);
+    }, popup === null || popup === void 0 ? void 0 : popup.duration);
     return (React.createElement(Scroll, { isPadding: !!recData }, products === null || products === void 0 ? void 0 : products.map((item) => {
         var _a, _b, _c, _d, _e, _f;
         return (React.createElement(SwiperSlide, Object.assign({ hidden: recData && !(item === null || item === void 0 ? void 0 : item.bindCta), key: item.itemId, className: css(Object.assign(Object.assign({}, style), { display: 'flex', flexShrink: 0, marginLeft: 0, marginRight: '8px' })) }, props, { onClick: () => handleClick(item) }),

package/es/materials/sxp/template/MultiCommodityDiro/index.js

@@ -12,7 +12,7 @@ const MultiCommodityDiro = (_a) => {
     var _b, _c;
     var { content, style, bgImg, recData, onClick, bottom_image, ctaTempStyles, isExternalLink } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "onClick", "bottom_image", "ctaTempStyles", "isExternalLink"]);
     const { ctaEvent, setPopupDetailData, sxpParameter } = useSxpDataSource();
-    const { popupAni } = useEditor();
+    const { popup } = useEditor();
     const { jumpToWeb } = useEventReport();
     const [products, setProducts] = useState((_c = (_b = recData === null || recData === void 0 ? void 0 : recData.video) === null || _b === void 0 ? void 0 : _b.bindProducts) !== null && _c !== void 0 ? _c : [1, 2]);
     const handleClick = throttle((item) => {
@@ -30,7 +30,7 @@ const MultiCommodityDiro = (_a) => {
         else {
             onClick === null || onClick === void 0 ? void 0 : onClick();
         }
-    }, popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration);
+    }, popup === null || popup === void 0 ? void 0 : popup.duration);
     return (React.createElement(Scroll, { isPadding: !!recData }, products === null || products === void 0 ? void 0 : products.map((item) => {
         var _a, _b, _c, _d, _e, _f;
         return (React.createElement(SwiperSlide, Object.assign({ hidden: recData && !(item === null || item === void 0 ? void 0 : item.bindCta), key: item === null || item === void 0 ? void 0 : item.itemId, className: css(Object.assign(Object.assign({}, style), { display: 'flex', flexShrink: 0, marginLeft: 0, marginRight: '8px' })) }, props, { onClick: () => handleClick(item) }),

package/es/materials/sxp/template/MultiCommodityDiroNew/index.js

@@ -12,7 +12,7 @@ const MultiCommodityDiroNew = (_a) => {
     var _b, _c;
     var { content, style, bgImg, recData, onClick, bottom_image, ctaTempStyles, isExternalLink } = _a, props = __rest(_a, ["content", "style", "bgImg", "recData", "onClick", "bottom_image", "ctaTempStyles", "isExternalLink"]);
     const { ctaEvent, setPopupDetailData, sxpParameter } = useSxpDataSource();
-    const { popupAni } = useEditor();
+    const { popup } = useEditor();
     const { jumpToWeb } = useEventReport();
     const [products, setProducts] = useState((_c = (_b = recData === null || recData === void 0 ? void 0 : recData.video) === null || _b === void 0 ? void 0 : _b.bindProducts) !== null && _c !== void 0 ? _c : [1, 2]);
     const handleClick = throttle((item) => {
@@ -30,7 +30,7 @@ const MultiCommodityDiroNew = (_a) => {
         else {
             onClick === null || onClick === void 0 ? void 0 : onClick();
         }
-    }, popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration);
+    }, popup === null || popup === void 0 ? void 0 : popup.duration);
     return (React.createElement(Scroll, { isPadding: !!recData }, products === null || products === void 0 ? void 0 : products.map((item) => {
         var _a, _b, _c, _d, _e, _f;
         return (React.createElement(SwiperSlide, Object.assign({ hidden: recData && !(item === null || item === void 0 ? void 0 : item.bindCta), key: item === null || item === void 0 ? void 0 : item.itemId, className: css(Object.assign(Object.assign({}, style), { display: 'flex', flexShrink: 0, marginLeft: 0, marginRight: '8px' })) }, props, { onClick: () => handleClick(item) }),

package/es/materials/sxp/template/components/EventProvider.js

@@ -8,7 +8,7 @@ const EventProvider = (_a) => {
     var { rec, children, className, onClick, style, isExternalLink = false } = _a, props = __rest(_a, ["rec", "children", "className", "onClick", "style", "isExternalLink"]);
     const ref = useRef(null);
     const isOnScreen = useOnScreen(ref);
-    const { popupAni } = useEditor();
+    const { popup } = useEditor();
     const { setPopupDetailData, ctaEvent } = useSxpDataSource();
     const { jumpToWeb } = useEventReport();
     useEffect(() => {
@@ -40,7 +40,7 @@ const EventProvider = (_a) => {
         else {
             onClick === null || onClick === void 0 ? void 0 : onClick();
         }
-    }, popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration);
+    }, popup === null || popup === void 0 ? void 0 : popup.duration);
     return (React.createElement("div", { ref: ref, className: className, style: style, onClick: handleClick }, children));
 };
 export default memo(EventProvider);

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

@@ -1,10 +1,10 @@
 import React, { CSSProperties } from 'react';
-import { IPopupAniType } from '../../../../core/context/EditorContext';
+import { IPopupType } from '../../../../core/context/EditorContext';
 interface IModalProps {
     visible?: boolean;
+    popup?: IPopupType;
     padding?: number | string;
     modalStyle?: CSSProperties;
-    popupAniData?: IPopupAniType;
     onClose?: () => void;
 }
 declare const _default: React.NamedExoticComponent<React.PropsWithChildren<IModalProps>>;

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

@@ -4,11 +4,9 @@ const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
 const react_1 = tslib_1.__importStar(require("react"));
 const ReactDOM = tslib_1.__importStar(require("react-dom"));
-const hooks_1 = require("../../../../core/hooks");
 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, popupAniData }) => {
-    const { popupAni } = (0, hooks_1.useEditor)();
-    const cssAni = popupAniData !== null && popupAniData !== void 0 ? popupAniData : popupAni;
+const Modal = ({ visible, onClose, children, modalStyle, padding, popup }) => {
+    var _a;
     const [isShow, setIsShow] = (0, react_1.useState)(false);
     const modalEleRef = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => {
@@ -23,28 +21,31 @@ const Modal = ({ visible, onClose, children, modalStyle, padding, popupAniData }
             parentNode === null || parentNode === void 0 ? void 0 : parentNode.appendChild(modalEleRef.current);
         }
     }, []);
+    const isOpen = (0, react_1.useMemo)(() => {
+        return ((popup === null || popup === void 0 ? void 0 : popup.id) && (popup === null || popup === void 0 ? void 0 : popup.id) !== '') || visible;
+    }, [visible, popup]);
     (0, react_1.useEffect)(() => {
-        if (visible) {
+        if (isOpen) {
             setIsShow(true);
         }
         else {
             setTimeout(() => {
                 setIsShow(false);
-            }, cssAni === null || cssAni === void 0 ? void 0 : cssAni.duration);
+            }, popup === null || popup === void 0 ? void 0 : popup.duration);
         }
-    }, [visible, cssAni]);
+    }, [isOpen, popup]);
     if (!modalEleRef.current)
         return null;
     const handleClose = (0, lodash_1.debounce)(() => {
         onClose === null || onClose === void 0 ? void 0 : onClose();
     }, 300);
-    return ReactDOM.createPortal(react_1.default.createElement("div", { className: 'modal-bg', style: Object.assign({ display: isShow ? 'flex' : 'none', backgroundColor: visible ? 'rgba(0, 0, 0, 0.7)' : 'rgba(0, 0, 0, 0)' }, modalStyle), onClick: handleClose },
-        react_1.default.createElement("div", { className: `modal-container ${visible ? 'modal-popIn' : 'modal-popOut'}`, style: { padding, animationDuration: (cssAni === null || cssAni === void 0 ? void 0 : cssAni.duration) / 1000 + 's' }, onClick: (e) => {
+    return ReactDOM.createPortal(react_1.default.createElement(react_1.default.Fragment, null, isShow && (react_1.default.createElement("div", { className: 'modal-bg', style: Object.assign({ display: 'flex', backgroundColor: isOpen ? 'rgba(0, 0, 0, 0.7)' : 'rgba(0, 0, 0, 0)' }, modalStyle), onClick: handleClose },
+        react_1.default.createElement("div", { className: `modal-container ${isOpen ? 'modal-popIn' : 'modal-popOut'}`, style: { padding, animationDuration: ((_a = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _a !== void 0 ? _a : 0) / 1000 + 's' }, onClick: (e) => {
                 e.stopPropagation();
                 e.preventDefault();
             } },
             react_1.default.createElement("div", { onClick: onClose, className: 'modal-icon-wrapper' },
                 react_1.default.createElement("img", { src: closeIcon, alt: 'close', className: 'modal-icon' })),
-            children)), modalEleRef.current);
+            children)))), modalEleRef.current);
 };
 exports.default = (0, react_1.memo)(Modal);

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

@@ -7,10 +7,10 @@ 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, popupAni } = (0, hooks_1.useEditor)();
+    const { schema, resolver, popup } = (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);
+    const [visible, setVisible] = (0, react_1.useState)();
     const curTimeRef = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => {
         const initTime = () => {
@@ -23,33 +23,33 @@ const Popup = () => {
         };
     }, []);
     (0, react_1.useEffect)(() => {
-        if (popup && popup !== '') {
+        if (popup && (popup === null || popup === void 0 ? void 0 : popup.id) && (popup === null || popup === void 0 ? void 0 : popup.id) !== '') {
             curTimeRef.current = new Date();
-            setVisible(true);
+            setVisible(popup);
         }
     }, [popup]);
     const handleClose = () => {
-        var _a, _b, _c;
-        if (!popup || popup === '' || !visible || new Date() - curTimeRef.current < (popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration)) {
+        var _a, _b, _c, _d;
+        if (!popup || (popup === null || popup === void 0 ? void 0 : popup.id) === '' || !visible || new Date() - curTimeRef.current < ((_a = popup === null || popup === void 0 ? void 0 : popup.duration) !== null && _a !== void 0 ? _a : 0)) {
             return;
         }
-        setVisible(false);
+        setVisible(Object.assign(Object.assign({}, popup), { id: '' }));
         const data = popupDetailData;
-        const product = (_a = data === null || data === void 0 ? void 0 : data.video) === null || _a === void 0 ? void 0 : _a.bindProduct;
-        const cta = (_c = (_b = data === null || data === void 0 ? void 0 : data.video) === null || _b === void 0 ? void 0 : _b.bindProduct) === null || _c === void 0 ? void 0 : _c.bindCta;
+        const product = (_b = data === null || data === void 0 ? void 0 : data.video) === null || _b === void 0 ? void 0 : _b.bindProduct;
+        const cta = (_d = (_c = data === null || data === void 0 ? void 0 : data.video) === null || _c === void 0 ? void 0 : _c.bindProduct) === null || _d === void 0 ? void 0 : _d.bindCta;
         if (product && cta) {
             productView(data, product, cta, curTimeRef.current);
         }
         setTimeout(() => {
             window === null || window === void 0 ? void 0 : window.sxpPopup('');
             setPopupDetailData === null || setPopupDetailData === void 0 ? void 0 : setPopupDetailData(null);
-        }, popupAni === null || popupAni === void 0 ? void 0 : popupAni.duration);
+        }, popup === null || popup === void 0 ? void 0 : popup.duration);
     };
     const renderPopupDetail = (0, react_1.useMemo)(() => {
         var _a, _b, _c;
         return (_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.map((value, index) => {
             var _a, _b, _c, _d, _e, _f, _g, _h;
-            if ((value === null || value === void 0 ? void 0 : value.id) === popup) {
+            if ((value === null || value === void 0 ? void 0 : value.id) === (popup === null || popup === void 0 ? void 0 : popup.id)) {
                 const t = resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type];
                 const Component = (0, withBindDataSource_1.default)(t);
                 const defaulSetting = (_b = t === null || t === void 0 ? void 0 : t.extend) === null || _b === void 0 ? void 0 : _b.defaulSetting;
@@ -60,6 +60,6 @@ const Popup = () => {
             }
         });
     }, [schema, popup, resolver]);
-    return (react_1.default.createElement(Modal_1.default, { visible: !!visible, onClose: handleClose, padding: 0, modalStyle: { position: 'fixed' } }, renderPopupDetail));
+    return (react_1.default.createElement(Modal_1.default, { popup: visible, onClose: handleClose, padding: 0, modalStyle: { position: 'fixed' } }, renderPopupDetail));
 };
 exports.default = Popup;