@redneckz/wildless-cms-uni-blocks 0.13.1 → 0.13.3

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

@@ -12,7 +12,7 @@ export interface TabsBlockProps extends TabsContent, UniBlockProps {}
 
 export const Tabs = JSX<TabsBlockProps>(
   ({ className = '', isSticky, tabs = [], tabsMode, ...rest }) => {
-    const normalizedTabs: TabItemBase[] = useMemo(() => tabs.map(normalizeTab), [tabs]);
+    const tabsControlItems: TabItemBase[] = useMemo(() => tabs.map(normalizeTab), [tabs]);
 
     const [activeTabIndex, setActiveTabIndex] = useState(0);
 
@@ -32,12 +32,15 @@ export const Tabs = JSX<TabsBlockProps>(
       }
     }, [tabs, activeTabIndex]);
 
-    const handleChange = useCallback((_: TabItemBase) => {
-      const index = normalizedTabs.indexOf(_);
+    const handleChange = useCallback(
+      (_: TabItemBase) => {
+        const index = tabsControlItems.indexOf(_);
 
-      setActiveTabIndex(index);
-      fireTabEvent(tabs[index]);
-    }, []);
+        setActiveTabIndex(index);
+        fireTabEvent(tabs[index]);
+      },
+      [tabs, tabsControlItems],
+    );
 
     return (
       <BlockWrapper
@@ -46,10 +49,10 @@ export const Tabs = JSX<TabsBlockProps>(
         {...rest}
       >
         {renderTabs({
-          items: normalizedTabs,
-          onChange: handleChange,
-          value: normalizedTabs[activeTabIndex],
+          items: tabsControlItems,
+          value: tabsControlItems[activeTabIndex],
           tabsMode,
+          onChange: handleChange,
         })}
       </BlockWrapper>
     );

package/mobile/src/components/TariffsTable/EmbeddableCellData.tsx

@@ -15,7 +15,7 @@ export type EmbeddableCellDataType =
 
 const renderButtonsCellData = ({ buttons }: ButtonsSectionContent) =>
   renderButtonsSection(buttons, {
-    className: 'mt-3',
+    className: 'mt-s',
     buttonClassName: 'w-12 h-12',
   });
 
@@ -31,7 +31,7 @@ const renderImgCellData = ({ image }: ImageContent) =>
 
 const renderListCellData = ({ isDotted, ...rest }: ListProps) => (
   <List
-    className="flex flex-col justify-between items-start text-m pl-2 text-base"
+    className="flex flex-col justify-between items-start text-m pl-xs text-base"
     isDotted={isDotted ?? true}
     {...rest}
   />

package/mobile/src/components/TariffsTable/TariffsTable.tsx

@@ -34,7 +34,7 @@ export const TariffsTable = JSX<TariffsTableProps>(
           description={description}
           headlineVersion="M"
           align="text-left"
-          isPadding={false}
+          isEmbedded={true}
         />
         {orientation === 'vertical' ? (
           <TariffsTableVertical tiles={tiles} {...rest} />

package/mobile/src/components/TariffsTable/TariffsTableCell.tsx

@@ -30,7 +30,7 @@ export const TariffsTableCell = JSX<TariffsTableCellProps>(
   }) => {
     return (
       <div
-        className="first:pl-0 w-80 flex-grow flex flex-col border-solid border-main-divider border border-t-0 border-x-0"
+        className="w-80 flex-grow flex flex-col border-solid border-main-divider border border-t-0 border-x-0"
         role="cell"
       >
         {cells?.length

package/mobile/src/components/TariffsTable/TariffsTableVertical.tsx

@@ -5,7 +5,7 @@ import { TariffsTableTileCell } from './TariffsTableTileCell';
 
 export const TariffsTableVertical = JSX<TariffsTableProps>(({ tiles, ...rest }) =>
   tiles?.length ? (
-    <div className="flex flex-col gap-3.5">
+    <div className="flex flex-col gap-s">
       {tiles.map((tile, i) => (
         <TariffsTableTileCell key={String(i)} tile={tile} {...rest} />
       ))}

package/mobile/src/components/TariffsTable/constants.ts

@@ -1,4 +1,4 @@
 export const DIVIDER_CLASSES = 'border-main-divider border border-t-0 border-x-0';
-export const FIRST_CELL_CLASSES = 'w-[354px] flex-shrink-0';
+export const FIRST_CELL_CLASSES = 'w-80 flex-shrink-0';
 export const COLS_LENGTH_FOR_SCROLL = 2;
 export const COLUMN_WIDTH = 4 * 80 + 40; // w-80 + pl-10 = 360px

package/mobile/src/components/TextBlock/TextBlock.tsx

@@ -15,14 +15,14 @@ export const TextBlock = JSX<TextBlockProps>(
   ({ className = '', title, description, iconVersion, image, __html, items = [], ...rest }) => (
     <BlockWrapper
       className={style(
-        'flex gap-3 sm:gap-4 bg-white group-data-secondary:bg-primary-main/10',
+        'flex gap-s sm:gap-m bg-white group-data-secondary:bg-primary-main/10',
         className,
       )}
       {...rest}
     >
-      {iconVersion === 'small' ? <div className="mt-1">{renderIcon()}</div> : null}
+      {iconVersion === 'small' ? renderIcon() : null}
       {iconVersion === 'big' ? renderImage(image) : null}
-      <div className="flex flex-col w-fit gap-1 sm:gap-2">
+      <div className="flex flex-col w-fit gap-2xs sm:gap-xs">
         {title ? (
           <Text
             size="text-l"
@@ -62,7 +62,7 @@ const renderDescription = (description: string) => (
 );
 
 const renderList = (items: string[], bullets: boolean) => {
-  const listStyle = bullets ? 'list-disc pl-6' : '';
+  const listStyle = bullets ? 'list-disc pl-xl' : '';
 
   return (
     <ul className={style('text-secondary-text group-data-secondary:text-white/80', listStyle)}>

package/mobile/src/components/Video/getPaddings.ts

@@ -3,4 +3,4 @@ import { getColSpan } from '../../utils/getColSpan';
 const MIN_COL_SPAN = 10;
 
 export const getPaddings = (className?: string) =>
-  getColSpan(className) < MIN_COL_SPAN ? 'py-6 px-11' : 'py-12 px-32';
+  getColSpan(className) < MIN_COL_SPAN ? 'py-xl px-6xl' : 'py-6xl px-32';

package/mobile/src/model/HeadlineType.ts

@@ -1,7 +1,7 @@
 import { TextAlign } from '../ui-kit/Text/TextProps';
 
 /**
- * TODO Hellfire refactoring is needed here
+ * TODO: Hellfire refactoring is needed here
  */
 
 /**

package/mobile/src/ui-kit/BaseFiltration/BaseFiltrationInner.tsx

@@ -13,7 +13,7 @@ import { Text } from '../Text/Text';
 
 const ICONS: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];
 
-const resultsGridStyle = 'grid grid-cols-12 gap-1 border-box';
+const resultsGridStyle = 'grid grid-cols-12 gap-2xs border-box';
 
 interface BaseFiltrationInnerProps extends BaseFiltrationInnerContent, UniBlockProps {
   filtrationState?: Record<string, any>;

package/mobile/src/ui-kit/BaseFiltration/checkShouldRenderBlock.ts

@@ -34,10 +34,8 @@ export const checkShouldRenderBlock = (pattern: Record<string, any>, target: Rec
         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)

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

@@ -45,7 +45,7 @@ export const BaseProductTile = JSX<BaseProductTileProps>(
         description={description}
         headlineVersion={headlineVersion}
         align={align}
-        isPadding={false}
+        isEmbedded={true}
       />
     );
 

package/mobile/src/ui-kit/Button/ButtonInner.tsx

@@ -8,7 +8,7 @@ export const ButtonInner = JSX<ButtonProps>((props) => {
   const { text, aboveText, appendLeft, appendRight, version = 'primary' } = props;
 
   return (
-    <div className={style(getButtonStyle(props), 'flex gap-2')}>
+    <div className={style(getButtonStyle(props), 'flex gap-xs')}>
       {appendLeft ? <div className={iconStyleMap[version]}>{appendLeft}</div> : null}
       {isWithText(props) ? (
         <div>

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

@@ -61,7 +61,7 @@ export const Checkbox = JSX<CheckboxProps>(
           />
           {value ? icon : null}
           {text ? (
-            <div className="ml-3">
+            <div className="ml-s">
               <Text size="text-l" font="font-light">
                 {text}
               </Text>

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

@@ -64,4 +64,4 @@ export const CookiePopup = JSX<CookiePopupProps>(({ termLink, personalDataPolicy
   ) : null;
 });
 
-const linkWrapperStyle = (href?: string) => style('inline mx-1', href ? 'text-green-dark' : '');
+const linkWrapperStyle = (href?: string) => style('inline mx-2xs', href ? 'text-green-dark' : '');

package/mobile/src/ui-kit/DialogManager/CloseButton.tsx

@@ -11,7 +11,7 @@ interface CloseButtonProps {
 export const CloseButton = JSX<CloseButtonProps>(({ className, onClose }) => (
   <button
     className={style(
-      'flex justify-center items-center w-12 h-12 p-1 bg-transparent border-none',
+      'flex justify-center items-center w-12 h-12 p-2xs bg-transparent border-none',
       className,
     )}
     onClick={onClose}

package/mobile/src/ui-kit/Foldable/DefaultFoldButton.tsx

@@ -19,7 +19,7 @@ export const DefaultFoldButton = JSX<DefaultFoldButtonProps>(
     return (
       <button
         className={style(
-          'flex justify-center w-full px-0 py-4 border border-transparent outline-none focus:border-primary-text',
+          'flex justify-center w-full py-4 border border-transparent outline-none focus:border-primary-text',
           disabled
             ? 'bg-main-divider text-main-disabled hover:bg-main-divider'
             : 'bg-primary-main text-white hover:bg-primary-hove',
@@ -29,7 +29,7 @@ export const DefaultFoldButton = JSX<DefaultFoldButtonProps>(
         disabled={disabled}
         data-theme={dataTheme}
       >
-        <span className="text-h4 pr-3">{label}</span>
+        <span className="text-h4 pr-s">{label}</span>
         {icon ? (
           <Img
             image={{

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

@@ -31,7 +31,7 @@ export const InnerTable = JSX<InnerTableProps>(({ dataUrl, pdfUrl, onClick }) =>
       <TableInnerButton onClick={onClick} isOpen />
     </div>
   ) : (
-    <div className="my-5 text-h6 text-center">
+    <div className="my-lg text-h6 text-center">
       <p>{EMPTY_DATA}</p>
       <TableInnerButton onClick={onClick} isOpen />
     </div>

package/mobile/src/ui-kit/InnerTable/InnerTableBody.tsx

@@ -26,7 +26,7 @@ export const InnerTableBody = JSX<InnerTableBodyProps>(({ activeTabIndex, items
         return (
           <div key={key} className="w-full">
             <div
-              className="flex p-4 bg-gray text-center justify-center cursor-pointer relative"
+              className="flex p-m bg-gray text-center justify-center cursor-pointer relative"
               onClick={() => toggleTables(key)}
             >
               <Text size="text-xl" font="font-light">
@@ -34,13 +34,13 @@ export const InnerTableBody = JSX<InnerTableBodyProps>(({ activeTabIndex, items
               </Text>
               <Img
                 image={{ icon: hiddenTables[key] ? 'PlusIcon' : 'MinusIcon' }}
-                className="absolute right-[22px]"
+                className="absolute right-6"
                 width="24"
                 height="24"
               />
             </div>
             <div
-              className={`w-full pl-2 overflow-hidden transition-height duration-500 ease-in-out ${
+              className={`w-full pl-xs overflow-hidden transition-height duration-500 ease-in-out ${
                 hiddenTables[key] ? 'h-0' : ''
               }`}
             >

package/mobile/src/ui-kit/InnerTable/InnerTableBodyItem.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCarouselControls } from '../../hooks/useCarouselControls';
 import { renderArrows } from '../Button/renderArrows';
 import type { RowsData } from './InnerTableProps';
+import { style } from '../../utils/style';
 
 const COLUMN_WIDTH = 140;
 
@@ -52,7 +53,7 @@ const renderRow = (activeColumnIndex: number) => (rowData: RowsData[], rowIdx: n
       className="flex border-main-divider border border-t-0 border-x-0 border-solid"
     >
       {headerColumn?.data ? (
-        <div className={`text-xl font-light w-[214px] py-lg `}>{headerColumn.data}</div>
+        <div className={`text-xl font-light w-52 py-lg `}>{headerColumn.data}</div>
       ) : null}
       <div className="flex flex-grow overflow-hidden">
         <div
@@ -78,9 +79,9 @@ const renderRow = (activeColumnIndex: number) => (rowData: RowsData[], rowIdx: n
 
 const renderCols = (cols: string[], rowIndex: number) =>
   cols?.length > 0 ? (
-    <div className={`flex ${rowIndex} ${rowIndex === 0 ? 'text-secondary-text' : ''} last:mr-3`}>
+    <div className={style('flex', rowIndex === 0 ? 'text-secondary-text' : '')}>
       {cols.map((data, i) => (
-        <div key={String(i)} className={`w-20 text-h6 mr-lg first:ml-3xl`}>
+        <div key={String(i)} className={`w-20 text-h6 mx-lg`}>
           {data}
         </div>
       ))}

package/mobile/src/ui-kit/InnerTable/InnerTableButton.tsx

@@ -16,7 +16,7 @@ export const TableInnerButton = JSX<TableInnerButtonProps>(({ isOpen, onClick })
     <Button
       version="primary"
       onClick={onClick}
-      className="w-full flex items-center justify-center rounded-none py-5"
+      className="w-full flex items-center justify-center rounded-none py-lg"
     >
       <div className="text-h4">{isOpen ? 'Скрыть' : 'Показать'}</div>
       <Icon

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

@@ -29,7 +29,7 @@ export const Input = JSX<InputProps>(
       [onChange],
     );
 
-    const paddingStyle = children ? 'pr-8' : '';
+    const paddingStyle = children ? 'pr-3xl' : '';
     const validStyle = valid
       ? 'border-gray hover:border-primary-hover active:border-primary-text focus:border-primary-text'
       : 'border-error';
@@ -47,7 +47,7 @@ export const Input = JSX<InputProps>(
           <input
             key={key}
             className={style(
-              'w-full border rounded-md text-primary-text outline-none p-4',
+              'w-full border rounded-md text-primary-text outline-none p-m',
               paddingStyle,
               validStyle,
               inputClassName,

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

@@ -53,7 +53,7 @@ export const InputRange = JSX<InputRangeProps>((props) => {
           className={style(
             'm-0 mt-xs font-sans text-h3 w-full h-14',
             'border border-solid border-gray rounded-md outline-none',
-            'p-0 pl-4 box-border',
+            'p-0 pl-m box-border',
             'text-primary-text hover:border-primary-hover focus:border-primary-text',
             DISABLED_INPUT_CLASSES,
           )}
@@ -72,7 +72,7 @@ const closestValue = (list: number[]) => (_: number) =>
   list.reduce((prev, curr) => (Math.abs(curr - _) < Math.abs(prev - _) ? curr : prev));
 
 const renderRangeCaption = (items: string[]) => (
-  <div className="flex justify-between my-2">
+  <div className="flex justify-between my-xs">
     {items.map((item, i) => (
       <Text key={String(i)} size="text-s" font="font-light" color="text-secondary-text">
         {item}

package/mobile/src/ui-kit/InputRange/renderRangeWithTicks.tsx

@@ -27,7 +27,7 @@ export function renderRangeWithTicks({
   return (
     <div>
       {list.length ? (
-        <div className="absolute w-full flex justify-between -bottom-[3px] px-4">
+        <div className="absolute w-full flex justify-between -bottom-[3px] px-m">
           {list.map((_, i) => (
             <div
               key={String(i)}
@@ -38,7 +38,7 @@ export function renderRangeWithTicks({
           ))}
         </div>
       ) : null}
-      <div className="absolute inset-x-0 -bottom-1 px-4 leading-[18px]">
+      <div className="absolute inset-x-0 -bottom-1 px-m leading-[18px]">
         <input
           className="box-border w-full m-0 cursor-pointer slider relative z-10"
           style={inputStyle}

package/mobile/src/ui-kit/LocationDialog/SearchBar.tsx

@@ -9,7 +9,7 @@ export interface SearchBarInnerProps {
 export const SearchBar = JSX<SearchBarInnerProps>(({ className, searchTerm, onSearch }) => {
   return (
     <form className={`font-sans relative ${className}`}>
-      <div className="absolute rounded h-full flex items-center justify-center pl-4 max-w-44 gap-3.5 pointer-events-none">
+      <div className="absolute rounded h-full flex items-center justify-center pl-m max-w-44 gap-s pointer-events-none">
         {searchTerm ? null : (
           <label htmlFor="search-bar-input" className={`text-secondary-text `}>
             Поиск по филиалам
@@ -18,7 +18,7 @@ export const SearchBar = JSX<SearchBarInnerProps>(({ className, searchTerm, onSe
       </div>
       <input
         id="search-bar-input"
-        className={`h-12 pl-4 w-full peer text-l text-black border border-solid rounded-md box-border
+        className={`h-12 pl-m w-full peer text-l text-black border border-solid rounded-md box-border
               outline-none border-gray hover:border-primary-hover active:border-primary-text focus:border-primary-text`}
         value={searchTerm}
         onChange={(e) => onSearch(e.target.value.toLowerCase() as string)}

package/mobile/src/ui-kit/LocationDialog/renderForeignOffices.tsx

@@ -12,7 +12,7 @@ export const renderForeignOffices = (foreignOffices: ForeignOffice[] | undefined
           Представительства за рубежом:
         </Text>
       </div>
-      <div className="flex gap-10">
+      <div className="flex gap-5xl">
         {foreignOffices.map((office, i: number) => (
           <ForeignOffice key={String(i)} {...office} />
         ))}
@@ -25,7 +25,7 @@ const ForeignOffice = JSX<ForeignOffice>(({ icon, ...rest }) => {
   const { text, target, href, onClick } = link(rest);
 
   return (
-    <div className="flex gap-x-3">
+    <div className="flex gap-s">
       {icon ? <Img pathPrefix="/wcms-resources/" image={icon} /> : null}
       {text ? (
         <a className="hover:text-primary-hover" href={href} target={target} onClick={onClick}>

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

@@ -3,7 +3,7 @@ import { RadioProps } from './RadioProps';
 
 export const Radio = JSX<RadioProps>(({ name, text, value, checked, onChange, className }) => (
   <div className={className}>
-    <label className="font-sans flex items-center relative cursor-pointer">
+    <label className="font-sans flex gap-s items-center relative cursor-pointer">
       <input
         className="appearance-none flex justify-center items-center shrink-0 w-5 h-5 border border-gray hover:border-primary-hover
         checked:border-2 checked:!border-primary-main focus:checked:border-primary-main focus:border-primary-text active:border-primary-text
@@ -14,7 +14,7 @@ export const Radio = JSX<RadioProps>(({ name, text, value, checked, onChange, cl
         checked={checked}
         onChange={(_) => onChange(_.target.value)}
       />
-      {text ? <span className="text-primary-text ml-3 cursor-pointer">{text}</span> : null}
+      {text ? <span className="text-primary-text cursor-pointer">{text}</span> : null}
     </label>
   </div>
 ));

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

@@ -17,8 +17,8 @@ interface RadioButtonGroupProps {
 }
 
 const orientationStyleMap: Record<ListOrientation, string> = {
-  horizontal: 'gap-10',
-  vertical: 'flex-col gap-3',
+  horizontal: 'gap-5xl',
+  vertical: 'flex-col gap-s',
 };
 
 export const RadioButtonGroup = JSX<RadioButtonGroupProps>(

package/mobile/src/ui-kit/SearchDialog/SearchInput.tsx

@@ -27,7 +27,7 @@ export const SearchInput = JSX<SearchInputProps>(
         </div>
         <input
           className={style(
-            'h-12 pl-12 w-full text-l text-black outline-none box-border',
+            'h-12 pl-6xl w-full text-l text-black outline-none box-border',
             'border border-solid rounded-md border-gray hover:border-primary-hover active:border-primary-text focus:border-primary-text',
           )}
           value={value}

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

@@ -63,7 +63,7 @@ export const Select = JSX<SelectProps>(
             )}
             onClick={toggle}
           >
-            <p className="p-4 pr-8 h-14 overflow-hidden text-ellipsis whitespace-nowrap">
+            <p className="p-m pr-3xl h-14 overflow-hidden text-ellipsis whitespace-nowrap">
               {formatOption(value) || placeholder}
             </p>
             <Icon
@@ -99,14 +99,14 @@ const renderOption =
         onClick={() => {
           handleChange(option);
         }}
-        className="flex px-4 py-3 cursor-pointer hover:bg-main-divider pr-11 relative"
+        className="flex px-m py-s cursor-pointer hover:bg-main-divider pr-5xl relative"
       >
         <span className="min-h-6">{formatOption(option)}</span>
         <Icon
           name="DoneSimpleIcon"
           width="16"
           height="16"
-          className={style('absolute right-4 pt-0.5', isSelected(option) && isOpen ? '' : 'hidden')}
+          className={style('absolute right-4 pt-3xs', isSelected(option) && isOpen ? '' : 'hidden')}
         />
       </div>
     );

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

@@ -25,7 +25,7 @@ const renderColumn = (menuItem: TopMenuItemProps & { onClick: () => void }, inde
   const { text, items, href, target, onClick } = menuItem;
 
   return (
-    <div key={String(index)} className="flex flex-col gap-3.5 w-1/4">
+    <div key={String(index)} className="flex flex-col gap-s w-1/4">
       <a
         className="leading-5 text-l text-primary-text hover:text-primary-main no-underline"
         href={href}

package/mobile/src/ui-kit/SwipeListControl/SwipeListControlDots.tsx

@@ -4,7 +4,7 @@ import { style } from '../../utils/style';
 import type { SwipeListControlType } from './SwipeListControlContent';
 
 const containerStyles: Record<SwipeListControlType, string> = {
-  'horizontal-list': 'mx-auto mt-5 w-fit',
+  'horizontal-list': 'mx-auto mt-lg w-fit',
   'vertical-list': 'absolute flex-col justify-center h-full top-0 left-4',
 };
 
@@ -39,7 +39,7 @@ export const SwipeListControlDots = JSX<SwipeListControlDotsProps>(
 
     return dotCount ? (
       <div
-        className={style('flex gap-2', containerStyles[listType], version ? 'group' : '')}
+        className={style('flex gap-xs', containerStyles[listType], version ? 'group' : '')}
         {...(version ? { 'data-ver': version } : {})}
       >
         {new Array(dotCount).fill(null).map((_, idx: number) => (

package/mobile/src/ui-kit/TabsControl/TabItem.tsx

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useLink } from '../../hooks/useLink';
 import type { LinkProps } from '../../model/LinkProps';
-import { style } from '../../utils/style';
-import { Text } from '../Text/Text';
+import { TabItemInner } from './TabItemInner';
 import type { TabsControlProps } from './TabsControlProps';
 
 export type TabItemBase = LinkProps;
@@ -16,66 +16,27 @@ export interface TabItemProps {
   type?: TabType;
 }
 
-const tabPaddingStyleMap: Record<TabType, string> = {
-  default: 'px-xs',
-  underlined: 'px-m',
-  rounded: 'px-lg rounded-md',
-};
+export const TabItem = JSX<TabItemProps>((props) =>
+  props?.item?.href ? <LinkTabItem {...props} /> : <ButtonTabItem {...props} />,
+);
 
-const tabTextStyle = 'text-secondary-text hover:text-primary-main';
-
-const activeTabTextStyleMap: Record<TabType, string> = {
-  default: 'text-black sm:text-white',
-  underlined: 'text-primary-main border-b-2',
-  rounded: 'text-white',
-};
+const LinkTabItem = JSX<TabItemProps>((props) => {
+  const link = useLink();
 
-const tabBgStyleMap: Record<TabType, string> = {
-  default: 'bg-white',
-  underlined: 'bg-white',
-  rounded: 'bg-transparent',
-};
+  const handleClick = useCallback(() => {
+    props.onClick && props.onClick(props.item || {});
+  }, [props.onClick, props.item]);
 
-const activeTabBgStyleMap: Record<TabType, string> = {
-  default: 'sm:bg-primary-main',
-  underlined: 'bg-white',
-  rounded: 'bg-primary-main',
-};
+  const { onClick, ...item } = link({ ...props.item, onClick: handleClick });
 
-export const TabItem = JSX<TabItemProps>(({ item = {}, isActive, onClick, type = 'default' }) => {
-  const link = useLink();
+  return <TabItemInner {...props} tag="a" item={item} onClick={onClick} />;
+});
 
-  const handleClick = () => {
+// TODO: Update handlerDecorator (support buttons?)
+const ButtonTabItem = JSX<TabItemProps>(({ item = {}, onClick, ...rest }) => {
+  const handleClick = useCallback(() => {
     onClick && onClick(item);
-  };
-
-  const { text, ...linkProps } = link({ ...item, onClick: handleClick });
-
-  const Tag = item.href ? 'a' : 'div';
+  }, [onClick, item]);
 
-  return (
-    <Tag
-      className={style(
-        'h-12',
-        'block flex-1',
-        'cursor-pointer',
-        tabPaddingStyleMap[type],
-        isActive ? activeTabBgStyleMap[type] : tabBgStyleMap[type],
-      )}
-      role="tab"
-      aria-selected={isActive}
-      {...linkProps}
-    >
-      <div
-        className={style(
-          'h-full',
-          'flex justify-center items-center',
-          'text-center whitespace-nowrap',
-          isActive ? activeTabTextStyleMap[type] : tabTextStyle,
-        )}
-      >
-        <Text size="text-m">{text}</Text>
-      </div>
-    </Tag>
-  );
+  return <TabItemInner item={item} onClick={handleClick} {...rest} />;
 });