@redneckz/wildless-cms-uni-blocks 0.14.481 → 0.14.482

package/bin/migration-scripts/0.14.471.js

@@ -1,4 +1,4 @@
-import { deleteProp, renameProp, traversePageBlocks } from '../utils.js';
+import { deleteEmptyProps, deleteProp, renameProp, traversePageBlocks } from '../utils.js';
 
 export const description = 'v0.14.471';
 
@@ -7,14 +7,21 @@ export default traversePageBlocks(adjustTabs, adjustTabsLayout);
 function adjustTabs(block) {
   const isLayout = block?.type === 'VerticalLayout' || block?.type === 'HorizontalLayout';
   const findTab = block?.blocks?.find((_) => _?.type === 'Tabs') ?? [];
+  const tabs = findTab?.content?.tabs;
   const layoutBlocks = block?.blocks;
-  if (!isLayout || !block?.blocks?.length || !findTab?.content?.tabs?.length) {
+
+  if (
+    !isLayout ||
+    !block?.blocks?.length ||
+    !tabs?.length ||
+    tabs?.filter((_) => _?.type === 'group')?.length !== tabs?.length
+  ) {
     return;
   }
+
   const tabContent = findTab.content;
-  const tabs = findTab.content.tabs;
   const slots = tabs.map((tab) => {
-    const slotBlock = layoutBlocks.find((_) => _?.labels?.[0] === tab?.ref);
+    const slotBlock = layoutBlocks.filter((_) => _?.labels?.includes(tab?.ref));
     const title = tab?.title;
     if (slotBlock) {
       block.blocks = block.blocks.filter((_) => _ !== slotBlock);
@@ -24,7 +31,10 @@ function adjustTabs(block) {
     return [title, title && slotBlock];
   });
 
-  findTab.slots = slots.reduce((res, [key, val]) => ({ ...res, [key]: [val] }), {});
+  findTab.slots = slots.reduce((res, [key, val]) => ({ ...res, [key]: val }), {});
+  block.blocks = block.blocks.filter(
+    (_) => !slots?.some(([, slotBlocks]) => slotBlocks?.some((slotBlock) => slotBlock === _)),
+  );
 
   if (!findTab?.labels?.length) {
     deleteProp(findTab, 'labels');
@@ -64,4 +74,7 @@ function adjustTabsLayout(block) {
   if (block?.labels?.length === 0) {
     deleteProp(block, 'labels');
   }
+  if (!Object.keys(block.slots).length) {
+    deleteProp(block, 'slots');
+  }
 }

package/bin/migration-scripts/0.14.478.js

@@ -0,0 +1,86 @@
+import { deleteEmptyProps, deleteProp, renameProp, traversePageBlocks } from '../utils.js';
+
+export const description = 'v0.14.478';
+
+export default traversePageBlocks(adjustTabs, adjustTabsLayout);
+
+function adjustTabs(block, parent) {
+  const parentBlocks = parent?.blocks;
+  const findTab = parentBlocks?.find((_) => _?.type === 'Tabs') ?? [];
+  const tabs = findTab?.content?.tabs;
+
+  if (
+    !parent ||
+    !parentBlocks?.length ||
+    !tabs?.length ||
+    tabs?.filter((_) => _?.type === 'link')?.length !== tabs?.length
+  ) {
+    return;
+  }
+
+  const tabContent = findTab.content;
+  const slots = tabs.map((tab) => {
+    const slotBlocks = parentBlocks.filter((_) => _?.labels?.includes(tab?.ref));
+    const title = tab?.title;
+
+    return [title, title && slotBlocks];
+  });
+
+  findTab.slots = slots.reduce((res, [key, val]) => ({ ...res, [key]: val }), {});
+
+  parent.blocks = parent.blocks.filter(
+    (_) => !slots?.some(([, slotBlocks]) => slotBlocks?.some((slotBlock) => slotBlock === _)),
+  );
+
+  if (!findTab?.labels?.length) {
+    deleteProp(findTab, 'labels');
+  }
+  deleteProp(tabContent, 'showCounter');
+  renameProp(findTab.content, 'tabsMode', 'tabsType');
+  findTab.type = 'TabsLayout';
+  tabContent.tabsType = tabsTypeMap?.[tabContent?.tabsType] ?? 'default';
+  tabContent.version = 'transparent';
+
+  findTab.content.tabs = findTab.content.tabs.map((_) => {
+    renameProp(_, 'title', 'text');
+    deleteProp(_, 'ref');
+    if (_?.type === 'group' && !_?.tabName) {
+      _.tabName = _.text;
+    }
+
+    return _;
+  });
+}
+
+const tabsTypeMap = {
+  wideScreen: 'default',
+  scrollable: 'underlined',
+};
+
+function adjustTabsLayout(block) {
+  if (!block || block?.type !== 'TabsLayout' || !block?.slots) {
+    return;
+  }
+
+  block.slots = Object.fromEntries(
+    Object.entries(block.slots)
+      .filter(([, val]) => val?.length)
+      .map(([key, val]) => [
+        key,
+        val.map((_) => {
+          deleteProp(_, 'labels');
+
+          return _;
+        }),
+      ]),
+  );
+  if (block?.style?.length === 0) {
+    deleteProp(block, 'style');
+  }
+  if (block?.labels?.length === 0) {
+    deleteProp(block, 'labels');
+  }
+  if (!Object.keys(block.slots).length) {
+    deleteProp(block, 'slots');
+  }
+}

package/bundle/bundle.umd.js

@@ -5050,7 +5050,8 @@
     };
     const TabItemInner = JSX(({ tag = 'div', item = {}, isActive = false, type = 'default', onClick }) => {
         const Tag = tag;
-        const { text, description, icon, count, ...link } = item;
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { text, description, icon, count, tabName, ...link } = item;
         return (jsx(Tag, { className: style('h-12', 'block flex-1', 'cursor-pointer', tabPaddingStyleMap[type], isActive ? activeTabBgStyleMap[type] : tabBgStyleMap[type]), role: "tablist", onClick: onClick, ...link, children: jsxs("div", { className: style('h-full', 'flex justify-center items-center', 'text-center whitespace-nowrap', isActive ? activeTabTextStyleMap[type] : tabTextStyle), children: [renderTabItemInner({
                         text,
                         description,
@@ -6057,20 +6058,20 @@
             component: 'm-auto',
         },
     };
-    const renderTabsLayout = ({ tabsType = 'animated', ...props }) => tabsType ? (jsx("div", { className: tabsStyle[tabsType].wrapper, children: jsx(ScrollableTabsControl, { className: tabsStyle[tabsType].component, tabsType: tabsType, ...props }) })) : null;
+    const renderTabsLayout = ({ className = '', tabsType = 'animated', ...props }) => tabsType ? (jsx("div", { className: style(tabsStyle[tabsType].wrapper, className), children: jsx(ScrollableTabsControl, { className: tabsStyle[tabsType].component, tabsType: tabsType, ...props }) })) : null;
 
     const TabsLayout = UniBlock(
     // eslint-disable-next-line max-lines-per-function
     ({ className = '', tabs = [], block, tabsType, showCounter = false, isSticky, ...rest }) => {
         const id = block?.__id ? `tabs-${block.__id}` : 'tabs';
         const router = useRouter();
-        const groupTab = tabs.filter((_) => _.type === 'group');
+        const isEveryLink = tabs.every((_) => _?.type === 'link');
         const tabsCounted = showCounter
-            ? groupTab.map((_) => ({
+            ? tabs.map((_) => ({
                 ..._,
-                count: block?.slots?.[_?.tabName ?? '']?.length ?? 0,
+                count: _?.type === 'group' ? block?.slots?.[_?.tabName ?? '']?.length ?? 0 : 0,
             }))
-            : groupTab;
+            : tabs;
         const { isReady } = router;
         const [activeTabIndex, setActiveTabIndex] = useState(getInitSelectedIndex(tabsCounted, getUrlParams(id)));
         const activeItem = tabsCounted[activeTabIndex];
@@ -6101,8 +6102,9 @@
                 updateUrlSearchTabParam(_, index);
             }
         }, [tabsCounted]);
-        return (jsxs(BlockWrapper, { className: style(isSticky ? 'sticky top-1 z-20' : '', className), defaultPadding: "p-0", block: block, ...rest, children: [renderTabsLayout({
-                    items: tabsCounted,
+        return (jsxs(BlockWrapper, { className: style(isEveryLink ? getStickyStyle(isSticky) : '', className), defaultPadding: "p-0", block: block, ...rest, children: [renderTabsLayout({
+                    className: isEveryLink ? '' : getStickyStyle(isSticky),
+                    items: tabsCounted?.length ? tabsCounted : tabs,
                     activeItem,
                     tabsType,
                     onChange: handleChange,
@@ -6115,6 +6117,7 @@
     }, {
         slots: ({ tabs }) => (tabs?.filter((_) => _.type === 'group')).map(getSlotName) || [],
     });
+    const getStickyStyle = (isSticky = false) => (isSticky ? 'sticky top-1 z-20 pb-1' : '');
     const getSlotName = (tab, index) => tab?.tabName || `Слот №${index}`;
     const getInitSelectedIndex = (tabs, paramsId) => paramsId
         ? Number(paramsId)
@@ -6550,7 +6553,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.480";
+    const packageVersion = "0.14.481";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;