@redneckz/wildless-cms-uni-blocks 0.14.846 → 0.14.850

package/lib/hooks/useAspects/useAspects.d.ts

@@ -10,7 +10,7 @@ export interface AspectsAttribute {
     params?: AspectData;
 }
 export interface Aspects {
-    [key: string]: (ev: PreventableEventWithTarget, data?: AspectData) => void;
+    [key: string]: (ev: PreventableEventWithTarget, data?: AspectData) => Promise<void>;
 }
 export declare function useAspects(): Aspects;
 export declare namespace useAspects {

package/lib/retail/utils/renderStep.js

@@ -9,7 +9,9 @@ export const renderStep = ({ sections, field, step, params, }) => sections?.map(
     const cleanElements = [
         !checkCondition({ condition }, getValue(field)) ? renderTitle(title) : null,
         ...renderInputs({ field, inputs, params }),
-    ].filter(Boolean);
+    ]
+        .filter(Boolean)
+        .map((_, j) => ({ ..._, key: _.key ?? `elem-${j}` }));
     return cleanElements.length ? (_jsx("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: cleanElements }, `section-${i}`)) : null;
 });
 const getValue = (field) => (name) => field(name)?.value;

package/lib/retail/utils/renderStep.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderStep.js","sourceRoot":"","sources":["../../../src/retail/utils/renderStep.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAE,cAAc,EAAiB,MAAM,mBAAmB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAS9C,MAAM,CAAC,MAAM,UAAU,GAAG,CAA4C,EACpE,QAAQ,EACR,KAAK,EACL,IAAI,EACJ,MAAM,GACmB,EAAE,EAAE,CAC7B,QAAQ,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;IAC1E,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG;QACpB,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;QAC3E,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;KAC3C,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElB,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAC5B,cAA0B,SAAS,EAAE,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,YACnF,aAAa,IADN,WAAW,CAAC,EAAE,CAElB,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC;AAEL,MAAM,QAAQ,GACZ,CAAC,KAAyC,EAAY,EAAE,CACxD,CAAC,IAAI,EAAE,EAAE,CACP,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC"}
+{"version":3,"file":"renderStep.js","sourceRoot":"","sources":["../../../src/retail/utils/renderStep.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAE,cAAc,EAAiB,MAAM,mBAAmB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAS9C,MAAM,CAAC,MAAM,UAAU,GAAG,CAA4C,EACpE,QAAQ,EACR,KAAK,EACL,IAAI,EACJ,MAAM,GACmB,EAAE,EAAE,CAC7B,QAAQ,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;IAC1E,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG;QACpB,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;QAC3E,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;KAC3C;SACE,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAExD,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAC5B,cAA0B,SAAS,EAAE,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,YACnF,aAAa,IADN,WAAW,CAAC,EAAE,CAElB,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC;AAEL,MAAM,QAAQ,GACZ,CAAC,KAAyC,EAAY,EAAE,CACxD,CAAC,IAAI,EAAE,EAAE,CACP,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC"}

package/mobile/bundle/bundle.umd.js

@@ -1065,9 +1065,12 @@
             : { secondaryPhoneNumber: formatPhone(secondaryPhone) };
     };
 
-    const handleAspects = ({ aspectsAttributes, aspects, ev }) => {
+    const handleAspects = async ({ aspectsAttributes, aspects, ev }) => {
         for (const { aspectName, params } of aspectsAttributes ?? []) {
-            aspects[aspectName ?? '']?.(ev, params);
+            const aspectFn = aspects[aspectName ?? ''];
+            if (aspectFn) {
+                await aspectFn(ev, params);
+            }
         }
     };
 
@@ -1110,7 +1113,7 @@
         return url.toString();
     };
 
-    const forwardQuery = (ev) => {
+    const forwardQuery = async (ev) => {
         const anchor = ev.target?.closest('a');
         const navigator = locationNavigator();
         if (isURL(anchor?.href) && !anchor?.href?.startsWith(navigator.origin)) {
@@ -3518,16 +3521,6 @@
             });
         }
     };
-    const initializeExternalStylesheet = (url = '') => {
-        const link = globalThis.document.getElementById(url);
-        if (!link) {
-            const newLink = globalThis.document.createElement('link');
-            newLink.href = url;
-            newLink.id = url;
-            newLink.rel = 'stylesheet';
-            globalThis.document.head.appendChild(newLink);
-        }
-    };
     function useExternalNS(namespaceName, url, unmountNS = true) {
         const [externalNS, setExternalNS] = useState(undefined);
         useEffect(() => {
@@ -7799,7 +7792,9 @@
         const cleanElements = [
             !checkCondition({ condition }, getValue(field)) ? renderTitle(title) : null,
             ...renderInputs({ field, inputs, params }),
-        ].filter(Boolean);
+        ]
+            .filter(Boolean)
+            .map((_, j) => ({ ..._, key: _.key ?? `elem-${j}` }));
         return cleanElements.length ? (jsx("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: cleanElements }, `section-${i}`)) : null;
     });
     const getValue = (field) => (name) => field(name)?.value;
@@ -9192,65 +9187,18 @@
     });
     const getDataTestIdAttribute = (dataTestId) => dataTestId ? { 'data-test-id': dataTestId } : null;
 
-    const CHAT_NAMESPACE = 'chatbot';
-    const CHAT_BUTTON_EXTERNAL_NAME = 'text-page__btn-chat';
-    const CHAT_FRAME_ID = 'webchat-js-container:webchat_rshb';
-    const CHAT_STORAGE_NAME = 'webchat-keep-open';
-    const BUSINESS_CHAT_PREFIX = '/webchat-api';
-    const BUSINESS_CHAT_CLASSNAME = '@container fixed right-0 bottom-0 top-0 h-full w-full z-[100] @3xl:w-auto h-fit';
-    const CHATBOT_URL = {
-        personal: '//chat.mes.rshb.ru/assets/js/webchat_rshb',
-        business: '/webchat',
-    };
-    const useChatBot = (chat) => {
-        const [isLoading, setIsLoading] = useState(false);
-        useEffect(() => globalThis.localStorage?.setItem(CHAT_STORAGE_NAME, String(Date.now())), []);
-        const chatUrl = CHATBOT_URL[chat ?? ''];
-        const load = useCallback((ev) => {
-            if (!chatUrl) {
-                return;
-            }
-            setIsLoading(true);
-            if (chat === 'business') {
-                renderBusinessChatBot(chatUrl).finally(() => setIsLoading(false));
-            }
-            else {
-                renderPersonalChatBot(ev, chatUrl).finally(() => setIsLoading(false));
+    const CHAT_BOT_ASPECT_NAME = 'openChatBot';
+    const HeaderChatBotButton = JSX(({ iconVersion, className, ariaLabel = 'Чат', version, buttonSize = 'large' }) => {
+        const [isLoading, { setTrue: startLoad, setFalse: endLoad }] = useBool(false);
+        const aspects = useAspects();
+        const handleClick = useCallback((ev) => {
+            const openChatBot = aspects[CHAT_BOT_ASPECT_NAME];
+            if (openChatBot) {
+                startLoad();
+                openChatBot(ev).finally(endLoad);
             }
-        }, [chatUrl, chat]);
-        return { load, isLoading };
-    };
-    const renderPersonalChatBot = async (ev, chatUrl) => {
-        const target = ev.target;
-        if (!target?.classList.contains(CHAT_BUTTON_EXTERNAL_NAME)) {
-            target?.classList.add(CHAT_BUTTON_EXTERNAL_NAME);
-        }
-        const chatFrame = globalThis.document.getElementById(CHAT_FRAME_ID);
-        if (!chatFrame) {
-            await initializeExternalNS(CHAT_NAMESPACE, chatUrl);
-        }
-    };
-    const renderBusinessChatBot = async (chatUrl) => {
-        const businessChat = (await initializeExternalNS(CHAT_NAMESPACE, `${chatUrl}/bundle.js`, true));
-        initializeExternalStylesheet(`${chatUrl}/bundle.css`);
-        const chatFrame = globalThis.document.getElementById(CHAT_FRAME_ID);
-        if (chatFrame) {
-            businessChat?.chatOpen?.();
-        }
-        else {
-            createChatFrame();
-            businessChat?.render?.(CHAT_FRAME_ID, true, BUSINESS_CHAT_PREFIX, BUSINESS_CHAT_CLASSNAME);
-        }
-    };
-    const createChatFrame = () => {
-        const chatFrame = globalThis.document.createElement('div');
-        chatFrame.id = CHAT_FRAME_ID;
-        globalThis.document.body.appendChild(chatFrame);
-    };
-
-    const HeaderChatBotButton = JSX(({ chat = 'personal', iconVersion, className, ariaLabel = 'Чат', version, buttonSize = 'large', }) => {
-        const { load, isLoading } = useChatBot(chat);
-        return (jsx(HeaderSecondaryMenuButton, { className: className, image: { icon: 'ChatBotIcon', iconVersion }, ariaLabel: ariaLabel, onClick: load, buttonSize: buttonSize, isGrayBg: true, version: version, isLoading: isLoading, dataTestId: "chat icon" }));
+        }, []);
+        return (jsx(HeaderSecondaryMenuButton, { className: className, image: { icon: 'ChatBotIcon', iconVersion }, ariaLabel: ariaLabel, onClick: handleClick, buttonSize: buttonSize, isGrayBg: true, version: version, isLoading: isLoading, disabled: isLoading, dataTestId: "chat icon" }));
     });
 
     const BUTTON_STYLE = {
@@ -9272,7 +9220,7 @@
         const onClick = useCallback(() => {
             router.back();
         }, [router]);
-        return (jsxs("div", { className: "flex items-center justify-between w-full", children: [alwaysShowLogo || isRootLocation ? (jsx("div", { children: jsx(Logo, { className: "my-2xs", bgColor: bgColor, logo: logoProps, data: dataHeader, showTitle: false }) })) : (renderBackButton(onClick, backwardButton)), jsxs("div", { className: "flex gap-lg items-center", children: [projectSettings.CHAT_BOT ? (jsx(HeaderChatBotButton, { version: version, iconVersion: iconVersion, chat: projectSettings.CHAT_BOT, buttonSize: "medium" })) : null, jsx(InternetBankButton, { version: version, ...internetBankButton })] })] }));
+        return (jsxs("div", { className: "flex items-center justify-between w-full", children: [alwaysShowLogo || isRootLocation ? (jsx("div", { children: jsx(Logo, { className: "my-2xs", bgColor: bgColor, logo: logoProps, data: dataHeader, showTitle: false }) })) : (renderBackButton(onClick, backwardButton)), jsxs("div", { className: "flex gap-lg items-center", children: [projectSettings.CHAT_BOT ? (jsx(HeaderChatBotButton, { version: version, iconVersion: iconVersion, buttonSize: "medium" })) : null, jsx(InternetBankButton, { version: version, ...internetBankButton })] })] }));
     });
     const renderBackButton = (onClick, text) => text ? (jsxs("button", { className: "flex items-center text-l my-2xs", onClick: onClick, type: "button", "aria-label": "\u041A\u043D\u043E\u043F\u043A\u0430 \u043D\u0430\u0437\u0430\u0434", children: [jsx(Icon, { name: "ChevronLeftIcon", iconVersion: "black", width: "24", height: "24" }), text] })) : null;
 
@@ -10448,7 +10396,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.845";
+    const packageVersion = "0.14.849";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;