@redneckz/wildless-cms-uni-blocks 0.14.982 → 0.14.984

package/bundle/bundle.umd.js

@@ -977,6 +977,11 @@
         return OutputComponent;
     }
 
+    const getQueryParamValue = (queryParam, queryString) => {
+        const params = new URLSearchParams(queryString);
+        return params.get(queryParam);
+    };
+
     const QUERY_STORAGE_KEY = 'rshb-query-params';
     function saveSessionQuery() {
         const result = globalThis.location?.search || globalThis.sessionStorage?.getItem(QUERY_STORAGE_KEY) || '';
@@ -986,26 +991,23 @@
         return result;
     }
 
+    const getFormatDynamicText = (dynamicQueryParamText = {}, valuesList = [], text = '') => {
+        const { queryParam, value } = dynamicQueryParamText;
+        const sessionQuery = saveSessionQuery();
+        const utmValue = getQueryParamValue(queryParam ?? 'utm_source', sessionQuery);
+        const dynamicValue = valuesList.find((item) => item?.id?.toLowerCase() === utmValue?.toLowerCase())?.value;
+        return dynamicValue ? text?.replace(String(value), dynamicValue) : text;
+    };
+
     const ProductBlock = UniBlock(({ className, padding, defaultPadding, dynamicQueryParamText = {}, dynamicTextSource, description, title, ...rest }) => {
         const { textType } = dynamicQueryParamText;
-        const formatText = getFormatDescription(dynamicQueryParamText, dynamicTextSource?.list, textType === 'title' ? title : description);
+        const formatText = getFormatDynamicText(dynamicQueryParamText, dynamicTextSource?.list, textType === 'title' ? title : description);
         const textProps = {
             title: textType === 'title' ? formatText : title,
             description: textType === 'description' ? formatText : description,
         };
         return (jsx(BlockWrapper, { className: style('overflow-hidden flex flex-col gap-3xl box-border', className), padding: "p-0", ...rest, children: jsx(BaseProductTile, { defaultPadding: defaultPadding || 'p-6xl', padding: padding, className: "grow h-full", ...textProps, ...rest }) }));
     });
-    const getFormatDescription = (dynamicQueryParamText = {}, valuesList = [], text = '') => {
-        const { queryParam, value } = dynamicQueryParamText;
-        const sessionQuery = saveSessionQuery();
-        const utmValue = getQueryParamValue(queryParam ?? 'utm_source', sessionQuery);
-        const dynamicValue = valuesList.find((item) => item?.id?.toLowerCase() === utmValue?.toLowerCase())?.value;
-        return dynamicValue ? text?.replace(String(value), dynamicValue) : text;
-    };
-    const getQueryParamValue = (queryParam, queryString) => {
-        const params = new URLSearchParams(queryString);
-        return params.get(queryParam);
-    };
 
     const AdTile = JSX((props) => {
         const { items } = (props.options?.page?.adSourceBook ?? {});
@@ -5792,12 +5794,12 @@
                 handleChangeRegionHasDelivery?.(checkRegionDeliveryStatus(DEFAULT_BIBLIOLOBUS_VALUES.region));
                 handleChangeMethodObtain?.('office');
             }
-            if (isSalaryCard) {
+            else if (isSalaryCard) {
                 handleChangeRegion?.(DEFAULT_SALARY_CARD_VALUES.region);
                 handleChangeOffice?.(DEFAULT_SALARY_CARD_VALUES.office);
                 handleChangeMethodObtain?.('office');
             }
-            if (regionRetail) {
+            else if (regionRetail) {
                 const regionHasDelivery = checkRegionDeliveryStatus(regionRetail);
                 handleChangeRegionHasDelivery?.(regionHasDelivery);
                 handleChangeMethodObtain?.(regionHasDelivery ? 'courier' : 'office');
@@ -12524,9 +12526,10 @@
         return (jsx(BlockWrapper, { version: "transparent", className: style(className), defaultPadding: "p-0", ...rest, children: dataType === 'offices' ? jsx(OfficesMap, {}) : jsx(AtmsMap, { descriptionData: data }) }));
     });
 
-    const RichTextBlock = JSX((props) => {
-        const { __html, richVersion = '', ...rest } = props;
-        return (jsx(BlockWrapper, { defaultPadding: "p-0", ...rest, children: jsx(RichText, { __html: __html, richVersion: richVersion }) }));
+    const RichTextBlock = UniBlock((props) => {
+        const { __html, dynamicQueryParamText = {}, dynamicTextSource, richVersion = '', ...rest } = props;
+        const formatText = getFormatDynamicText(dynamicQueryParamText, dynamicTextSource?.list, __html);
+        return (jsx(BlockWrapper, { defaultPadding: "p-0", ...rest, children: jsx(RichText, { __html: formatText, richVersion: richVersion }) }));
     });
 
     const getFoldableStyles = (isMobile = false) => isMobile ? 'flex flex-wrap group-last:last:pb-0' : 'grid grid-cols-12 [&>*]:pb-m';
@@ -13137,7 +13140,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.981";
+    const packageVersion = "0.14.983";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;