@redneckz/wildless-cms-uni-blocks 0.14.861 → 0.14.862

package/bundle/bundle.umd.js

@@ -10383,11 +10383,6 @@
 
     const StickyBottomMenu = JSX(() => (jsx("div", { className: "hidden", role: "none" })));
 
-    const getUrlParams = (params = '') => {
-        const href = globalThis?.location?.href;
-        return href ? new URL(href).searchParams.get(params) : null;
-    };
-
     const badgeBgStyleMap = {
         primary: 'bg-white/30',
         secondary: 'bg-main-divider',
@@ -10532,24 +10527,19 @@
         const id = getId(block || {});
         const router = useRouter();
         const isEveryLink = tabs.every((_) => _?.type === 'link');
-        const query = new URLSearchParams(globalThis?.location?.search || '');
-        const currentQueryParam = query.get[id];
+        const query = new URLSearchParams(decodeURIComponent(globalThis?.location?.search || ''));
+        const tabId = getTabId(id);
         const tabsCounted = showCounter
             ? tabs.map((_) => ({
                 ..._,
                 count: _?.type === 'group' ? block?.slots?.[_?.tabName ?? '']?.length ?? 0 : 0,
             }))
             : tabs;
-        const [activeTabIndex, setActiveTabIndex] = useState(getInitSelectedIndex(tabsCounted, getUrlParams(id)));
+        const defaultSelectedTabIndex = tabsCounted.findIndex((_) => Boolean(_?.selected));
+        const defaultQueryTabIndex = tabsCounted.findIndex((_, i) => _.type === 'group' && (_?.tabName ?? String(i)) === tabId);
+        const defaultTabIndex = tabId ? defaultQueryTabIndex : defaultSelectedTabIndex;
+        const [activeTabIndex, setActiveTabIndex] = useState(getDefaultIndex(defaultTabIndex));
         const activeItem = tabsCounted[activeTabIndex];
-        const defaultSelectedTab = tabsCounted.findIndex((_) => Boolean(_.selected));
-        //TODO: Вынести в отдельный хук
-        useEffect(() => {
-            const defaultTabIndex = currentQueryParam
-                ? tabsCounted.findIndex((_, i) => _.type === 'group' && (_?.tabName ?? String(i)) === currentQueryParam)
-                : defaultSelectedTab;
-            setActiveTabIndex(defaultTabIndex === -1 ? 0 : defaultTabIndex);
-        }, [defaultSelectedTab, currentQueryParam]);
         const slotName = getSlotName(tabsCounted[activeTabIndex], activeTabIndex);
         const updateUrlSearchTabParam = (_, i) => {
             if (_.text) {
@@ -10586,12 +10576,16 @@
     }, {
         slots: ({ tabs }) => tabs?.map(getSlotName)?.filter(Boolean) || [],
     });
+    const getDefaultIndex = (index) => (index && index !== -1 ? index : 0);
     const getId = ({ __id, anchor }) => anchor ?? __id ?? 'tabs';
     const getItems = (tabs, tabsCounted) => (tabsCounted?.length ? tabsCounted : tabs);
     const getSlotName = (tab, index) => tab?.type === 'group' ? tab?.tabName || `Слот №${index + 1}` : '';
-    const getInitSelectedIndex = (tabs, paramsId) => paramsId
-        ? Number(paramsId)
-        : tabs.reduce((selectedIndex, tab, i) => (tab.selected ? i : selectedIndex), 0);
+    const getTabId = (id) => decodeURIComponent(globalThis?.location?.search
+        .replace('?', '')
+        .replace('+', ' ')
+        .split('&')
+        .find((_) => _.split('=').find((param) => param === id))
+        ?.split('=')?.[1] ?? '');
 
     const FIRST_CELL_STYLES = 'w-80 flex-shrink-0 sticky left-0 bg-white';
     const renderHeader = ({ title, icon }) => (jsxs("div", { className: style('flex gap-m items-center', FIRST_CELL_STYLES), role: "cell", children: [icon ? (jsx(Img, { className: "hidden lg:block max-w-6 shrink-0", image: icon, width: "24", height: "24" })) : null, title ? (jsx(Text, { size: "text-m", font: "font-light", color: "text-primary-text", children: title })) : null] }));
@@ -10941,7 +10935,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.860";
+    const packageVersion = "0.14.861";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;