@redneckz/wildless-cms-uni-blocks 0.8.12 → 0.8.13

package/mobile/lib/ui-kit/BlockWrapper.js

@@ -14,17 +14,10 @@ export const blockStyles = {
 export const BlockWrapper = JSX(({ className = '', version = 'primary', block, tag = 'section', role, children }) => {
     const Tag = tag;
     const ref = useBlockIntersectionObserver(block);
-    const [isVisible, setVisible] = useState(true);
+    const [isHidden, setHidden] = useState(false);
     useEffect(() => defaultEventBus.subscribe('tab', (event) => {
-        if (event.type === 'group') {
-            setVisible(!block?.labels?.length ||
-                !event.label ||
-                Boolean(block?.labels?.includes(event.label)));
-        }
-        else {
-            setVisible(true);
-        }
+        setHidden(Boolean(event.type === 'group' && event.label && block?.labels?.includes(event.label)));
     }), [block]);
-    return isVisible ? (_jsx(Tag, { className: style('group', blockStyles[version], className), ...(version ? { 'data-ver': version } : {}), ...(block?.anchor ? { id: block.anchor, ref } : {}), role: role, children: children })) : null;
+    return (_jsx(Tag, { className: style('group', blockStyles[version], isHidden ? 'hidden' : '', className), ...(version ? { 'data-ver': version } : {}), ...(block?.anchor ? { id: block.anchor, ref } : {}), role: role, children: children }));
 });
 //# sourceMappingURL=BlockWrapper.js.map

package/mobile/lib/ui-kit/BlockWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAOvC,MAAM,CAAC,MAAM,WAAW,GAAiC;IACvD,OAAO,EAAE,4BAA4B;IACrC,SAAS,EAAE,4BAA4B;IACvC,IAAI,EAAE,mCAAmC;IACzC,WAAW,EAAE,kCAAkC;IAC/C,EAAE,EAAE,EAAE;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;IAClF,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,GAAG,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/C,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,UAAU,CACR,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM;gBACpB,CAAC,KAAK,CAAC,KAAK;gBACZ,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAChD,CAAC;SACH;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,CAAC;SAClB;IACH,CAAC,CAAC,EACJ,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,KAAC,GAAG,IACF,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KACtD,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACxC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACpD,IAAI,EAAE,IAAI,YAET,QAAQ,GACL,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CACF,CAAC"}
+{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAOvC,MAAM,CAAC,MAAM,WAAW,GAAiC;IACvD,OAAO,EAAE,4BAA4B;IACrC,SAAS,EAAE,4BAA4B;IACvC,IAAI,EAAE,mCAAmC;IACzC,WAAW,EAAE,kCAAkC;IAC/C,EAAE,EAAE,EAAE;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;IAClF,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,GAAG,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,SAAS,CACP,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CACvF,CAAC;IACJ,CAAC,CAAC,EACJ,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,CACL,KAAC,GAAG,IACF,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,KAChF,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACxC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACpD,IAAI,EAAE,IAAI,YAET,QAAQ,GACL,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}

package/mobile/src/components/Tabs/Tabs.tsx

@@ -19,26 +19,11 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
 
   const [currentTab, setCurrentTab] = useState(tabs ? tabs[0] : undefined);
 
-  useEffect(
-    () =>
-      defaultEventBus.subscribe('tab', (event) => {
-        const tab = tabs?.find(checkTab(event));
-        if (event.type === 'link' && tab) {
-          setCurrentTab(tab);
-        }
-
-        return [];
-      }),
-    [tabs],
-  );
-
-  useEffect(
-    () =>
-      currentTab?.type === 'group'
-        ? defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref })
-        : undefined,
-    [currentTab],
-  );
+  useEffect(() => {
+    if (currentTab?.type === 'group') {
+      defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref });
+    }
+  }, [currentTab]);
 
   const handleClick = useCallback((selectedTab: TabData) => {
     if (selectedTab?.type === 'group') {
@@ -76,6 +61,3 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
     </BlockWrapper>
   );
 });
-
-const checkTab = (event: TabActivationEvent) => (_: TabData) =>
-  _.type === 'link' && _.href === `#${event.label}`;

package/mobile/src/ui-kit/BlockWrapper.tsx

@@ -25,32 +25,26 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
 
     const ref = useBlockIntersectionObserver(block);
 
-    const [isVisible, setVisible] = useState(true);
+    const [isHidden, setHidden] = useState(false);
     useEffect(
       () =>
         defaultEventBus.subscribe('tab', (event) => {
-          if (event.type === 'group') {
-            setVisible(
-              !block?.labels?.length ||
-                !event.label ||
-                Boolean(block?.labels?.includes(event.label)),
-            );
-          } else {
-            setVisible(true);
-          }
+          setHidden(
+            Boolean(event.type === 'group' && event.label && block?.labels?.includes(event.label)),
+          );
         }),
       [block],
     );
 
-    return isVisible ? (
+    return (
       <Tag
-        className={style('group', blockStyles[version], className)}
+        className={style('group', blockStyles[version], isHidden ? 'hidden' : '', className)}
         {...(version ? { 'data-ver': version } : {})}
         {...(block?.anchor ? { id: block.anchor, ref } : {})}
         role={role}
       >
         {children}
       </Tag>
-    ) : null;
+    );
   },
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.8.12",
+  "version": "0.8.13",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/Tabs/Tabs.tsx

@@ -19,26 +19,11 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
 
   const [currentTab, setCurrentTab] = useState(tabs ? tabs[0] : undefined);
 
-  useEffect(
-    () =>
-      defaultEventBus.subscribe('tab', (event) => {
-        const tab = tabs?.find(checkTab(event));
-        if (event.type === 'link' && tab) {
-          setCurrentTab(tab);
-        }
-
-        return [];
-      }),
-    [tabs],
-  );
-
-  useEffect(
-    () =>
-      currentTab?.type === 'group'
-        ? defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref })
-        : undefined,
-    [currentTab],
-  );
+  useEffect(() => {
+    if (currentTab?.type === 'group') {
+      defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref });
+    }
+  }, [currentTab]);
 
   const handleClick = useCallback((selectedTab: TabData) => {
     if (selectedTab?.type === 'group') {
@@ -76,6 +61,3 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
     </BlockWrapper>
   );
 });
-
-const checkTab = (event: TabActivationEvent) => (_: TabData) =>
-  _.type === 'link' && _.href === `#${event.label}`;

package/src/ui-kit/BlockWrapper.tsx

@@ -25,32 +25,26 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
 
     const ref = useBlockIntersectionObserver(block);
 
-    const [isVisible, setVisible] = useState(true);
+    const [isHidden, setHidden] = useState(false);
     useEffect(
       () =>
         defaultEventBus.subscribe('tab', (event) => {
-          if (event.type === 'group') {
-            setVisible(
-              !block?.labels?.length ||
-                !event.label ||
-                Boolean(block?.labels?.includes(event.label)),
-            );
-          } else {
-            setVisible(true);
-          }
+          setHidden(
+            Boolean(event.type === 'group' && event.label && block?.labels?.includes(event.label)),
+          );
         }),
       [block],
     );
 
-    return isVisible ? (
+    return (
       <Tag
-        className={style('group', blockStyles[version], className)}
+        className={style('group', blockStyles[version], isHidden ? 'hidden' : '', className)}
         {...(version ? { 'data-ver': version } : {})}
         {...(block?.anchor ? { id: block.anchor, ref } : {})}
         role={role}
       >
         {children}
       </Tag>
-    ) : null;
+    );
   },
 );