pb-sxp-ui 1.15.9 → 1.15.11

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

@@ -10,7 +10,7 @@ import { useEventReport } from '../../../../core/hooks/useEventReport';
 import { getPriceText } from '../../../../core/utils/materials';
 const WaterfallFlowItem = (props) => {
     var _a;
-    const { rec, index, list, reportTagsView, textStyles, space, openFixedSize } = props;
+    const { rec, index, list, reportTagsView, textStyles, space, openFixedSize, fixedSizeRatio } = props;
     const { swiperRef, setRtcList, setOpenHashtag, sxpParameter, globalConfig } = useSxpDataSource();
     const [showVideo, setShowVideo] = useState(false);
     const imgDom = useRef(null);
@@ -104,11 +104,11 @@ const WaterfallFlowItem = (props) => {
         }, 0);
     };
     return (React.createElement("div", { ref: ref, className: 'list-content-listItem', key: index, onClick: handleClickToDetail, style: { marginBottom: space } },
-        React.createElement("div", { className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture' : 'list-content-listItem-picture1609' },
+        React.createElement("div", { className: fixedSizeRatio === '1' ? 'list-content-listItem-picture' : 'list-content-listItem-picture1609' },
             showVideo && (React.createElement("div", { style: { display: 'none' } },
                 React.createElement("video", { ref: videoDom, crossOrigin: 'anonymous', className: 'list-content-listItem-picture-img' }),
                 React.createElement("canvas", { ref: canvasRef }))),
-            React.createElement(FormatImage, { loading: 'lazy', className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture-img' : 'list-content-listItem-picture1609-img', ref: imgDom })),
+            React.createElement(FormatImage, { loading: 'lazy', className: fixedSizeRatio === '1' ? 'list-content-listItem-picture-img' : 'list-content-listItem-picture1609-img', ref: imgDom })),
         React.createElement("div", { className: 'list-content-listItem-info' },
             React.createElement("div", { className: `${'list-content-listItem-info-title'} ${priceText ? 'list-content-listItem-info-nowrap' : ''}`, style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.title, dangerouslySetInnerHTML: {
                     __html: setFontForText(title, textStyles === null || textStyles === void 0 ? void 0 : textStyles.title)

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

@@ -8,7 +8,7 @@ import List from './List';
 import { useSxpDataSource } from '../../../../core/hooks';
 import { useEventReport } from '../../../../core/hooks/useEventReport';
 const WaterFall = (props) => {
-    var _a, _b;
+    var _a;
     const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = useSxpDataSource();
     const { backMainFeed } = useEventReport();
     const modalEleRef = useRef(null);
@@ -97,6 +97,6 @@ const WaterFall = (props) => {
             display: openHashtag ? 'block' : 'none'
         } },
         React.createElement(Navbar, { icon: left, styles: { top: '32px' }, textStyle: (_a = props === null || props === void 0 ? void 0 : props.textStyles) === null || _a === void 0 ? void 0 : _a.hashTagTitle, onClose: handleClose }),
-        ((_b = props === null || props === void 0 ? void 0 : props.openFixedSize) === null || _b === void 0 ? void 0 : _b.open) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (React.createElement(List, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
+        (props === null || props === void 0 ? void 0 : props.openFixedSize) || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (React.createElement(List, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (React.createElement(WaterfallList, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
 };
 export default memo(WaterFall);

package/es/materials/sxp/HashTag/index.d.ts

@@ -14,10 +14,8 @@ export interface IHashTagProps {
     };
     buttonBgStyle: CSSProperties;
     showBanner?: boolean;
-    openFixedSize?: {
-        open: true;
-        ratio: string;
-    };
+    openFixedSize?: boolean;
+    fixedSizeRatio?: '1' | '2';
 }
 declare const _default: React.NamedExoticComponent<IHashTagProps>;
 export default _default;

package/es/materials/sxp/HashTag/material.js

@@ -57,7 +57,8 @@ const HashTag = createMaterial(HashTagComponent, {
                 paddingRight: 20,
                 paddingBottom: 20
             },
-            openFixedSize: { open: true, ratio: '1' }
+            openFixedSize: true,
+            fixedSizeRatio: '1'
         }
     },
     w: 100,

package/es/materials/sxp/HashTag/settingRender.js

@@ -21,7 +21,7 @@ export default [
             {
                 type: 'HashTagFixedSize',
                 label: '固定宽高',
-                name: ['props', 'openFixedSize']
+                name: ['props']
             }
         ]
     },

package/es/materials/sxp/consentPopup/Click/index.js

@@ -6,9 +6,11 @@ import tel from './tel.png';
 import { setFontForText } from '../../../../core/utils/tool';
 import { useSxpDataSource } from '../../../../core/hooks';
 import { getUserConsentResult, setUserConsentResult } from '../../../../core/utils/localStore';
+import { useEditorDataProvider } from '../../../../core/context/EditorDataProvider';
 const Click = (_a) => {
     var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton, showRejectButton } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton", "showRejectButton"]);
     const { getAccount, accountSonsent } = useSxpDataSource();
+    const { setConsentPopupCate } = useEditorDataProvider();
     const [consentResult, setConsentResult] = useState(true);
     const handleGetAccount = () => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
@@ -21,14 +23,24 @@ const Click = (_a) => {
         !consentPopupCate && open && style && !getUserConsentResult() && handleGetAccount();
     }, []);
     const handleClickAccept = () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
-        if (res) {
+        if (consentPopupCate) {
+            setConsentPopupCate === null || setConsentPopupCate === void 0 ? void 0 : setConsentPopupCate('');
+        }
+        else {
+            const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
+            if (!res)
+                return;
             setConsentResult(true);
             setUserConsentResult();
         }
     });
     const handleClickReject = () => {
-        history === null || history === void 0 ? void 0 : history.back();
+        if (consentPopupCate) {
+            setConsentPopupCate === null || setConsentPopupCate === void 0 ? void 0 : setConsentPopupCate('');
+        }
+        else {
+            history === null || history === void 0 ? void 0 : history.back();
+        }
     };
     return (React.createElement(React.Fragment, null, isTel ? (React.createElement("img", { src: tel, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (React.createElement(React.Fragment, null, visivle && (React.createElement("div", { className: 'consentPopupClick' },
         React.createElement("div", { className: 'consentPopupClick-container', style: style },

package/es/materials/sxp/consentPopup/Swipe/index.js

@@ -5,11 +5,13 @@ import ConsentDetail from '../../popup/ConsentDetail';
 import tel from './tel.png';
 import { useSxpDataSource } from '../../../../core/hooks';
 import { getUserConsentResult, setUserConsentResult } from '../../../../core/utils/localStore';
+import { useEditorDataProvider } from '../../../../core/context/EditorDataProvider';
 const Swipe = (_a) => {
     var { isTel, open, content, style, consentPopupCate, swipeIcon } = _a, props = __rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon"]);
     const touchInfo = useRef();
     const threshold = 50;
     const { getAccount, accountSonsent } = useSxpDataSource();
+    const { setConsentPopupCate } = useEditorDataProvider();
     const [consentResult, setConsentResult] = useState(true);
     const handleGetAccount = () => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
@@ -22,8 +24,13 @@ const Swipe = (_a) => {
         !consentPopupCate && open && style && !getUserConsentResult() && handleGetAccount();
     }, []);
     const handleClickAccept = () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
-        if (res) {
+        if (consentPopupCate) {
+            setConsentPopupCate === null || setConsentPopupCate === void 0 ? void 0 : setConsentPopupCate('');
+        }
+        else {
+            const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
+            if (!res)
+                return;
             setConsentResult(true);
             setUserConsentResult();
         }
@@ -50,7 +57,12 @@ const Swipe = (_a) => {
         }
         touchInfo.current = {};
     };
-    return (React.createElement(React.Fragment, null, isTel ? (React.createElement("img", { src: tel, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (React.createElement(React.Fragment, null, visivle && (React.createElement("div", { className: 'consentPopupSwipe', onTouchStart: handleTouchStart, onTouchMove: handleTouchMove, onTouchEnd: handleTouchEnd },
+    const handleClick = () => {
+        if (consentPopupCate) {
+            setConsentPopupCate === null || setConsentPopupCate === void 0 ? void 0 : setConsentPopupCate('');
+        }
+    };
+    return (React.createElement(React.Fragment, null, isTel ? (React.createElement("img", { src: tel, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (React.createElement(React.Fragment, null, visivle && (React.createElement("div", { className: 'consentPopupSwipe', onTouchStart: handleTouchStart, onTouchMove: handleTouchMove, onTouchEnd: handleTouchEnd, onClick: handleClick },
         React.createElement("div", { className: 'consentPopupSwipe-container', style: style },
             React.createElement("div", { className: 'consentPopupSwipe-container-content' },
                 React.createElement(ConsentDetail, { content: content, style: { padding: 0 } })),

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

@@ -12,7 +12,7 @@ const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const materials_1 = require("../../../../core/utils/materials");
 const WaterfallFlowItem = (props) => {
     var _a;
-    const { rec, index, list, reportTagsView, textStyles, space, openFixedSize } = props;
+    const { rec, index, list, reportTagsView, textStyles, space, openFixedSize, fixedSizeRatio } = props;
     const { swiperRef, setRtcList, setOpenHashtag, sxpParameter, globalConfig } = (0, hooks_1.useSxpDataSource)();
     const [showVideo, setShowVideo] = (0, react_1.useState)(false);
     const imgDom = (0, react_1.useRef)(null);
@@ -106,11 +106,11 @@ const WaterfallFlowItem = (props) => {
         }, 0);
     };
     return (react_1.default.createElement("div", { ref: ref, className: 'list-content-listItem', key: index, onClick: handleClickToDetail, style: { marginBottom: space } },
-        react_1.default.createElement("div", { className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture' : 'list-content-listItem-picture1609' },
+        react_1.default.createElement("div", { className: fixedSizeRatio === '1' ? 'list-content-listItem-picture' : 'list-content-listItem-picture1609' },
             showVideo && (react_1.default.createElement("div", { style: { display: 'none' } },
                 react_1.default.createElement("video", { ref: videoDom, crossOrigin: 'anonymous', className: 'list-content-listItem-picture-img' }),
                 react_1.default.createElement("canvas", { ref: canvasRef }))),
-            react_1.default.createElement(FormatImage_1.default, { loading: 'lazy', className: (openFixedSize === null || openFixedSize === void 0 ? void 0 : openFixedSize.ratio) === '1' ? 'list-content-listItem-picture-img' : 'list-content-listItem-picture1609-img', ref: imgDom })),
+            react_1.default.createElement(FormatImage_1.default, { loading: 'lazy', className: fixedSizeRatio === '1' ? 'list-content-listItem-picture-img' : 'list-content-listItem-picture1609-img', ref: imgDom })),
         react_1.default.createElement("div", { className: 'list-content-listItem-info' },
             react_1.default.createElement("div", { className: `${'list-content-listItem-info-title'} ${priceText ? 'list-content-listItem-info-nowrap' : ''}`, style: textStyles === null || textStyles === void 0 ? void 0 : textStyles.title, dangerouslySetInnerHTML: {
                     __html: (0, tool_1.setFontForText)(title, textStyles === null || textStyles === void 0 ? void 0 : textStyles.title)

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

@@ -11,7 +11,7 @@ const List_1 = tslib_1.__importDefault(require("./List"));
 const hooks_1 = require("../../../../core/hooks");
 const useEventReport_1 = require("../../../../core/hooks/useEventReport");
 const WaterFall = (props) => {
-    var _a, _b;
+    var _a;
     const { waterFallData, setOpenHashtag, openHashtag, swiperRef, setWaterFallData, cacheRtcList, setRtcList, cacheActiveIndex, rtcList, setCacheRtcList, setIsFromHashtag, isFromHashtag, bffEventReport, themeTag, selectTag, bffFbReport } = (0, hooks_1.useSxpDataSource)();
     const { backMainFeed } = (0, useEventReport_1.useEventReport)();
     const modalEleRef = (0, react_1.useRef)(null);
@@ -100,6 +100,6 @@ const WaterFall = (props) => {
             display: openHashtag ? 'block' : 'none'
         } },
         react_1.default.createElement(Navbar_1.default, { icon: left_png_1.default, styles: { top: '32px' }, textStyle: (_a = props === null || props === void 0 ? void 0 : props.textStyles) === null || _a === void 0 ? void 0 : _a.hashTagTitle, onClose: handleClose }),
-        ((_b = props === null || props === void 0 ? void 0 : props.openFixedSize) === null || _b === void 0 ? void 0 : _b.open) === true || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (react_1.default.createElement(List_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (react_1.default.createElement(WaterfallList_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
+        (props === null || props === void 0 ? void 0 : props.openFixedSize) || (props === null || props === void 0 ? void 0 : props.openFixedSize) === undefined ? (react_1.default.createElement(List_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props))) : (react_1.default.createElement(WaterfallList_1.default, Object.assign({ key: waterFallData, reportTagsView: reportTagsView }, props)))), modalEleRef.current);
 };
 exports.default = (0, react_1.memo)(WaterFall);

package/lib/materials/sxp/HashTag/index.d.ts

@@ -14,10 +14,8 @@ export interface IHashTagProps {
     };
     buttonBgStyle: CSSProperties;
     showBanner?: boolean;
-    openFixedSize?: {
-        open: true;
-        ratio: string;
-    };
+    openFixedSize?: boolean;
+    fixedSizeRatio?: '1' | '2';
 }
 declare const _default: React.NamedExoticComponent<IHashTagProps>;
 export default _default;

package/lib/materials/sxp/HashTag/material.js

@@ -61,7 +61,8 @@ const HashTag = (0, create_1.createMaterial)(_1.default, {
                 paddingRight: 20,
                 paddingBottom: 20
             },
-            openFixedSize: { open: true, ratio: '1' }
+            openFixedSize: true,
+            fixedSizeRatio: '1'
         }
     },
     w: 100,

package/lib/materials/sxp/HashTag/settingRender.js

@@ -23,7 +23,7 @@ exports.default = [
             {
                 type: 'HashTagFixedSize',
                 label: '固定宽高',
-                name: ['props', 'openFixedSize']
+                name: ['props']
             }
         ]
     },

package/lib/materials/sxp/consentPopup/Click/index.js

@@ -8,9 +8,11 @@ const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const tool_1 = require("../../../../core/utils/tool");
 const hooks_1 = require("../../../../core/hooks");
 const localStore_1 = require("../../../../core/utils/localStore");
+const EditorDataProvider_1 = require("../../../../core/context/EditorDataProvider");
 const Click = (_a) => {
     var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton, showRejectButton } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton", "showRejectButton"]);
     const { getAccount, accountSonsent } = (0, hooks_1.useSxpDataSource)();
+    const { setConsentPopupCate } = (0, EditorDataProvider_1.useEditorDataProvider)();
     const [consentResult, setConsentResult] = (0, react_1.useState)(true);
     const handleGetAccount = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
@@ -23,14 +25,24 @@ const Click = (_a) => {
         !consentPopupCate && open && style && !(0, localStore_1.getUserConsentResult)() && handleGetAccount();
     }, []);
     const handleClickAccept = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
-        if (res) {
+        if (consentPopupCate) {
+            setConsentPopupCate === null || setConsentPopupCate === void 0 ? void 0 : setConsentPopupCate('');
+        }
+        else {
+            const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
+            if (!res)
+                return;
             setConsentResult(true);
             (0, localStore_1.setUserConsentResult)();
         }
     });
     const handleClickReject = () => {
-        history === null || history === void 0 ? void 0 : history.back();
+        if (consentPopupCate) {
+            setConsentPopupCate === null || setConsentPopupCate === void 0 ? void 0 : setConsentPopupCate('');
+        }
+        else {
+            history === null || history === void 0 ? void 0 : history.back();
+        }
     };
     return (react_1.default.createElement(react_1.default.Fragment, null, isTel ? (react_1.default.createElement("img", { src: tel_png_1.default, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (react_1.default.createElement(react_1.default.Fragment, null, visivle && (react_1.default.createElement("div", { className: 'consentPopupClick' },
         react_1.default.createElement("div", { className: 'consentPopupClick-container', style: style },

package/lib/materials/sxp/consentPopup/Swipe/index.js

@@ -7,11 +7,13 @@ const ConsentDetail_1 = tslib_1.__importDefault(require("../../popup/ConsentDeta
 const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const hooks_1 = require("../../../../core/hooks");
 const localStore_1 = require("../../../../core/utils/localStore");
+const EditorDataProvider_1 = require("../../../../core/context/EditorDataProvider");
 const Swipe = (_a) => {
     var { isTel, open, content, style, consentPopupCate, swipeIcon } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon"]);
     const touchInfo = (0, react_1.useRef)();
     const threshold = 50;
     const { getAccount, accountSonsent } = (0, hooks_1.useSxpDataSource)();
+    const { setConsentPopupCate } = (0, EditorDataProvider_1.useEditorDataProvider)();
     const [consentResult, setConsentResult] = (0, react_1.useState)(true);
     const handleGetAccount = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
@@ -24,8 +26,13 @@ const Swipe = (_a) => {
         !consentPopupCate && open && style && !(0, localStore_1.getUserConsentResult)() && handleGetAccount();
     }, []);
     const handleClickAccept = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
-        if (res) {
+        if (consentPopupCate) {
+            setConsentPopupCate === null || setConsentPopupCate === void 0 ? void 0 : setConsentPopupCate('');
+        }
+        else {
+            const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
+            if (!res)
+                return;
             setConsentResult(true);
             (0, localStore_1.setUserConsentResult)();
         }
@@ -52,7 +59,12 @@ const Swipe = (_a) => {
         }
         touchInfo.current = {};
     };
-    return (react_1.default.createElement(react_1.default.Fragment, null, isTel ? (react_1.default.createElement("img", { src: tel_png_1.default, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (react_1.default.createElement(react_1.default.Fragment, null, visivle && (react_1.default.createElement("div", { className: 'consentPopupSwipe', onTouchStart: handleTouchStart, onTouchMove: handleTouchMove, onTouchEnd: handleTouchEnd },
+    const handleClick = () => {
+        if (consentPopupCate) {
+            setConsentPopupCate === null || setConsentPopupCate === void 0 ? void 0 : setConsentPopupCate('');
+        }
+    };
+    return (react_1.default.createElement(react_1.default.Fragment, null, isTel ? (react_1.default.createElement("img", { src: tel_png_1.default, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (react_1.default.createElement(react_1.default.Fragment, null, visivle && (react_1.default.createElement("div", { className: 'consentPopupSwipe', onTouchStart: handleTouchStart, onTouchMove: handleTouchMove, onTouchEnd: handleTouchEnd, onClick: handleClick },
         react_1.default.createElement("div", { className: 'consentPopupSwipe-container', style: style },
             react_1.default.createElement("div", { className: 'consentPopupSwipe-container-content' },
                 react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } })),

package/package.json

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