@redneckz/wildless-cms-uni-blocks 0.13.0 → 0.13.2

package/bundle/bundle.umd.js

@@ -2802,10 +2802,8 @@
         if (typeof subPattern === 'number') {
             return isNumberFieldMatch(key, pattern);
         }
-        if (typeof subPattern === 'object') {
-            if ('min' in subPattern && 'max' in subPattern) {
-                return isValueInRange(key, pattern);
-            }
+        if (typeof subPattern === 'object' && 'min' in subPattern && 'max' in subPattern) {
+            return isValueInRange(key, pattern);
         }
         return Array.isArray(subPattern)
             ? isMultipleFieldMatch(key, pattern)
@@ -3927,14 +3925,27 @@
         underlined: 'bg-white',
         rounded: 'bg-primary-main',
     };
-    const TabItem = JSX(({ item = {}, isActive, onClick, type = 'default' }) => {
+    const TabItemInner = JSX(({ tag = 'div', item = {}, isActive, type = 'default', onClick }) => {
+        const Tag = tag;
+        const { text, ...link } = item;
+        return (jsx(Tag, { className: style('h-12', 'block flex-1', 'cursor-pointer', tabPaddingStyleMap[type], isActive ? activeTabBgStyleMap[type] : tabBgStyleMap[type]), role: "tab", "aria-selected": isActive, onClick: onClick, ...link, children: jsx("div", { className: style('h-full', 'flex justify-center items-center', 'text-center whitespace-nowrap', isActive ? activeTabTextStyleMap[type] : tabTextStyle), children: jsx(Text, { size: "text-m", children: text }) }) }));
+    });
+
+    const TabItem = JSX((props) => props?.item?.href ? jsx(LinkTabItem, { ...props }) : jsx(ButtonTabItem, { ...props }));
+    const LinkTabItem = JSX((props) => {
         const link = useLink();
-        const handleClick = () => {
+        const handleClick = useCallback(() => {
+            props.onClick && props.onClick(props.item || {});
+        }, [props.onClick, props.item]);
+        const { onClick, ...item } = link({ ...props.item, onClick: handleClick });
+        return jsx(TabItemInner, { ...props, tag: "a", item: item, onClick: onClick });
+    });
+    // TODO: Update handlerDecorator (support buttons?)
+    const ButtonTabItem = JSX(({ item = {}, onClick, ...rest }) => {
+        const handleClick = useCallback(() => {
             onClick && onClick(item);
-        };
-        const { text, ...linkProps } = link({ ...item, onClick: handleClick });
-        const Tag = item.href ? 'a' : 'div';
-        return (jsx(Tag, { className: style('h-12', 'block flex-1', 'cursor-pointer', tabPaddingStyleMap[type], isActive ? activeTabBgStyleMap[type] : tabBgStyleMap[type]), role: "tab", "aria-selected": isActive, ...linkProps, children: jsx("div", { className: style('h-full', 'flex justify-center items-center', 'text-center whitespace-nowrap', isActive ? activeTabTextStyleMap[type] : tabTextStyle), children: jsx(Text, { size: "text-m", children: text }) }) }));
+        }, [onClick, item]);
+        return jsx(TabItemInner, { item: item, onClick: handleClick, ...rest });
     });
 
     const renderTab = (activeTab, onClick, type) => (tab, i) => (jsx(TabItem, { isActive: tab === activeTab, onClick: onClick, type: type, item: tab }, String(i)));
@@ -3962,19 +3973,19 @@
     };
     const MortgageFiltration = JSX(({ className, hotFilters = [], filtrationSchema = {}, resetButton, ...rest }) => {
         const [filtrationState, { field, reset, update: replaceFiltrationState }] = useForm(initialFiltrationState);
-        const normalizedHotFilters = useMemo(() => hotFilters.map(({ text }) => ({
+        const tabsControlItems = useMemo(() => hotFilters.map(({ text }) => ({
             text,
         })), [hotFilters]);
         const [hotFilterIndex, setHotFilterIndex] = useState(0);
         const handleHotFilterSelect = useCallback((_) => {
-            setHotFilterIndex(normalizedHotFilters.indexOf(_));
-            replaceFiltrationState(hotFilters[normalizedHotFilters.indexOf(_)].filter || initialFiltrationState);
-        }, [normalizedHotFilters]);
+            setHotFilterIndex(tabsControlItems.indexOf(_));
+            replaceFiltrationState(hotFilters[tabsControlItems.indexOf(_)].filter || initialFiltrationState);
+        }, [hotFilters, tabsControlItems]);
         useEffect(() => {
             const suggestedHotFilterIndex = hotFilters.findIndex((_) => hotFilterRecordCmp(_.filter, filtrationState));
             setHotFilterIndex(suggestedHotFilterIndex !== -1 ? suggestedHotFilterIndex : 0);
         }, [hotFilters, filtrationState]);
-        return (jsxs(BlockWrapper, { className: style(className), defaultPadding: "p-0", version: "transparent", ...rest, children: [jsx(TabsControl, { className: "mb-2xs", items: normalizedHotFilters, value: normalizedHotFilters[hotFilterIndex], onChange: handleHotFilterSelect }), renderFiltrationForm({ field, reset, filtrationSchema, resetButton }), jsx(BaseFiltrationInner, { filtrationState: filtrationState, ...rest })] }));
+        return (jsxs(BlockWrapper, { className: style(className), defaultPadding: "p-0", version: "transparent", ...rest, children: [jsx(TabsControl, { className: "mb-2xs", items: tabsControlItems, value: tabsControlItems[hotFilterIndex], onChange: handleHotFilterSelect }), renderFiltrationForm({ field, reset, filtrationSchema, resetButton }), jsx(BaseFiltrationInner, { filtrationState: filtrationState, ...rest })] }));
     });
     MortgageFiltration.childrenTypes = ['ProductTile'];
     MortgageFiltration.childSchema = (content) => content?.filtrationSchema || {};
@@ -4665,7 +4676,7 @@
     };
 
     const Tabs = JSX(({ className = '', isSticky, tabs = [], tabsMode, ...rest }) => {
-        const normalizedTabs = useMemo(() => tabs.map(normalizeTab), [tabs]);
+        const tabsControlItems = useMemo(() => tabs.map(normalizeTab), [tabs]);
         const [activeTabIndex, setActiveTabIndex] = useState(0);
         useEffect(() => {
             if (!tabs || !tabs[0]) {
@@ -4680,15 +4691,15 @@
             }
         }, [tabs, activeTabIndex]);
         const handleChange = useCallback((_) => {
-            const index = normalizedTabs.indexOf(_);
+            const index = tabsControlItems.indexOf(_);
             setActiveTabIndex(index);
             fireTabEvent(tabs[index]);
-        }, []);
+        }, [tabs, tabsControlItems]);
         return (jsx(BlockWrapper, { className: style(isSticky ? 'sticky top-1 z-20' : '', className), defaultPadding: "p-0", ...rest, children: renderTabs({
-                items: normalizedTabs,
-                onChange: handleChange,
-                value: normalizedTabs[activeTabIndex],
+                items: tabsControlItems,
+                value: tabsControlItems[activeTabIndex],
                 tabsMode,
+                onChange: handleChange,
             }) }));
     });
     const fireTabEvent = (tab) => {
@@ -5162,7 +5173,7 @@
         return (jsx("div", { className: "flex items-end absolute bottom-0 right-0 h-full pointer-events-none", children: jsx(LikeControl, { className: "rounded-tl-3xl sticky bottom-0 pointer-events-auto" }) }));
     }
 
-    const packageVersion = "0.13.0";
+    const packageVersion = "0.13.2";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;