npm - @momo-kits/tab-view - Versions diffs - 0.150.2-beta.37 → 0.150.2-beta.40 - Mend

@momo-kits/tab-view 0.150.2-beta.37 → 0.150.2-beta.40

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json CHANGED Viewed

@@ -1,19 +1,19 @@
 {
-    "name": "@momo-kits/tab-view",
-    "version": "0.150.2-beta.37",
-    "private": false,
-    "main": "index.tsx",
-    "peerDependencies": {
-        "@momo-kits/foundation": "latest",
-        "react": "*",
-        "react-native": "*"
-    },
-    "devDependencies": {
-        "@momo-platform/versions": "4.1.11"
-    },
-    "license": "MoMo",
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org/"
-    },
-    "dependencies": {}
-}
+  "name": "@momo-kits/tab-view",
+  "version": "0.150.2-beta.40",
+  "private": false,
+  "main": "index.tsx",
+  "peerDependencies": {
+    "@momo-kits/foundation": "latest",
+    "react": "*",
+    "react-native": "*"
+  },
+  "devDependencies": {
+    "@momo-platform/versions": "4.1.11"
+  },
+  "license": "MoMo",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {}
+}

package/tabBar/CardTabBar.tsx CHANGED Viewed

@@ -1,6 +1,6 @@
-import React, {FC, useContext} from 'react';
-import {Platform, View} from 'react-native';
-import {TabBarProps} from '../types';
+import React, { FC, useContext } from 'react';
+import { Platform, View, Text } from 'react-native';
+import { TabBarProps } from '../types';
 import styles from '../styles';
 import {
   ApplicationContext,
@@ -10,7 +10,6 @@ import {
   Radius,
   Shadow,
   Spacing,
-  Text,
 } from '@momo-kits/foundation';
 import CardTabItem from '../tabItem/CardTabItem';
 import PathSvg from '../assets/Path';
@@ -24,7 +23,7 @@ const CardTabBar: FC<TabBarProps> = ({
   unselectedColor,
   accessibilityLabelForSelectedCard,
 }) => {
-  const {theme} = useContext(ApplicationContext);
+  const { theme } = useContext(ApplicationContext);
   const itemWidth = containerWidth / tabs.length;
   const isFirst = selectedIndex === 0;
   const isLast = selectedIndex === tabs.length - 1;
@@ -40,8 +39,9 @@ const CardTabBar: FC<TabBarProps> = ({
               style={[
                 styles.icon,
                 styles.iconHolder,
-                {marginRight: Spacing.XS},
-              ]}>
+                { marginRight: Spacing.XS },
+              ]}
+            >
               {tabs[selectedIndex]?.renderIcon?.(true)}
             </View>
           )}
@@ -49,7 +49,7 @@ const CardTabBar: FC<TabBarProps> = ({
           <Icon
             color={selectedColor}
             source={tabs[selectedIndex]?.icon as string}
-            style={[styles.icon, {marginRight: Spacing.XS}]}
+            style={[styles.icon, { marginRight: Spacing.XS }]}
           />
         )}
       </>
@@ -81,10 +81,11 @@ const CardTabBar: FC<TabBarProps> = ({
             width: containerWidth / tabs.length,
             left: itemWidth * selectedIndex - backSpace,
           },
-        ]}>
+        ]}
+      >
         {!isFirst && (
           <PathSvg
-            style={{transform: [{rotateY: '180deg'}], left: 8}}
+            style={{ transform: [{ rotateY: '180deg' }], left: 8 }}
             pathWidth={pathWidth}
           />
         )}
@@ -102,13 +103,22 @@ const CardTabBar: FC<TabBarProps> = ({
               borderTopLeftRadius: Radius.M,
               paddingHorizontal: tabs.length === 3 ? Spacing.S : Spacing.M,
             },
-          ]}>
+          ]}
+        >
           {renderIconTabBar()}
           <Text
-            color={selectedColor}
             numberOfLines={1}
-            style={[styles.textCenter, {flexShrink: 1}]}
-            typography={'header_s_semibold'}>
+            style={[
+              styles.textCenter,
+              {
+                flexShrink: 1,
+                color: selectedColor,
+                fontSize: 14,
+                lineHeight: 20,
+                fontWeight: '600',
+              },
+            ]}
+          >
             {tabs[selectedIndex]?.title || ''}
           </Text>
           {tabs[selectedIndex]?.showDot && (
@@ -123,12 +133,12 @@ const CardTabBar: FC<TabBarProps> = ({
             <View>
               <Badge
                 label={tabs[selectedIndex]?.badgeValue}
-                style={{marginLeft: Spacing.XS}}
+                style={{ marginLeft: Spacing.XS }}
               />
             </View>
           )}
         </View>
-        {!isLast && <PathSvg style={{right: 8}} pathWidth={pathWidth} />}
+        {!isLast && <PathSvg style={{ right: 8 }} pathWidth={pathWidth} />}
       </View>
     </View>
   );

package/tabItem/CardTabItem.tsx CHANGED Viewed

@@ -1,6 +1,6 @@
-import React, {FC, useContext, useMemo} from 'react';
-import {TouchableOpacity, View} from 'react-native';
-import {TabItemProps} from '../types';
+import React, { FC, useContext, useMemo } from 'react';
+import { TouchableOpacity, View, Text } from 'react-native';
+import { TabItemProps } from '../types';
 import styles from '../styles';
 import {
   Badge,
@@ -9,7 +9,6 @@ import {
   MiniAppContext,
   ScreenContext,
   Spacing,
-  Text,
 } from '@momo-kits/foundation';
 const CardTabItem: FC<TabItemProps> = ({
@@ -49,14 +48,19 @@ const CardTabItem: FC<TabItemProps> = ({
       <>
         {typeof renderIcon === 'function' && (
           <View
-            style={[styles.icon, styles.iconHolder, {marginRight: Spacing.XS}]}>
+            style={[
+              styles.icon,
+              styles.iconHolder,
+              { marginRight: Spacing.XS },
+            ]}
+          >
             {renderIcon(active)}
           </View>
         )}
         {!renderIcon && !!icon && (
           <Icon
             color={color}
-            style={[styles.icon, {marginRight: Spacing.XS}]}
+            style={[styles.icon, { marginRight: Spacing.XS }]}
             source={icon}
           />
         )}
@@ -67,15 +71,19 @@ const CardTabItem: FC<TabItemProps> = ({
   return (
     <TouchableOpacity
       onPress={onPressTabItem}
-      style={[styles.cardTabItem, {width}]}
+      style={[styles.cardTabItem, { width }]}
       accessibilityLabel={componentId}
-      accessibilityState={{checked: active}}>
+      accessibilityState={{ checked: active }}
+    >
       {renderIconTabItem()}
       <Text
         numberOfLines={1}
-        style={[styles.textCenter, {flexShrink: 1}]}
-        typography={'body_default_regular'}
-        accessibilityLabel={`${componentId}|text`}>
+        style={[
+          styles.textCenter,
+          { flexShrink: 1, fontSize: 14, lineHeight: 20 },
+        ]}
+        accessibilityLabel={`${componentId}|text`}
+      >
         {title}
       </Text>
       {showDot && (
@@ -90,7 +98,7 @@ const CardTabItem: FC<TabItemProps> = ({
         <View>
           <Badge
             label={badgeValue}
-            style={{marginLeft: Spacing.XS}}
+            style={{ marginLeft: Spacing.XS }}
             accessibilityLabel={`${componentId}|badge`}
           />
         </View>

package/tabItem/TabItem.tsx CHANGED Viewed

@@ -1,16 +1,14 @@
 import React, { FC, useContext, useMemo } from 'react';
-import { TouchableOpacity, View } from 'react-native';
+import { Text, TouchableOpacity, View } from 'react-native';
 import { TabItemProps } from '../types';
 import {
   Badge,
   BadgeDot,
+  exportFontFamily,
   Icon,
   MiniAppContext,
-  scaleSize,
   ScreenContext,
   Spacing,
-  Text,
-  Typography,
 } from '@momo-kits/foundation';
 import styles from '../styles';
@@ -32,9 +30,6 @@ const TabItem: FC<TabItemProps> = ({
     renderIcon,
     accessibilityLabel,
   } = tab;
-  const typography: Typography = active
-    ? 'header_s_semibold'
-    : 'body_default_regular';
   const color = active ? selectedColor : unselectedColor;
   const dotStyle = dotSize === 'large' ? styles.dot : styles.dotSmall;
   const app = useContext<any>(MiniAppContext);
@@ -54,48 +49,55 @@ const TabItem: FC<TabItemProps> = ({
     return (
       <TouchableOpacity
         accessibilityLabel={componentId}
-        accessibilityState={{checked: active}}
+        accessibilityState={{ checked: active }}
         style={[
           styles.tabItem,
           {
             width,
-            height: scaleSize(48),
+            height: 48,
             flexDirection: 'row',
             overflow: 'hidden',
             paddingVertical: Spacing.M,
             paddingHorizontal: Spacing.M,
           },
         ]}
-        onPress={onPressTabItem}>
+        onPress={onPressTabItem}
+      >
         {renderIcon && typeof renderIcon === 'function' && (
           <View
-            style={[styles.icon, styles.iconHolder, {marginRight: Spacing.S}]}>
+            style={[styles.icon, styles.iconHolder, { marginRight: Spacing.S }]}
+          >
             {renderIcon(active)}
           </View>
         )}
         {!renderIcon && !!icon && (
           <Icon
-            style={[styles.icon, {marginRight: Spacing.S}]}
+            style={[styles.icon, { marginRight: Spacing.S }]}
             source={icon}
             color={color}
           />
         )}
         <Text
           numberOfLines={1}
-          typography={typography}
-          color={color}
-          style={{flexShrink: 1}}
-          accessibilityLabel={`${componentId}|text`}>
+          style={{
+            flexShrink: 1,
+            fontSize: 14,
+            lineHeight: 20,
+            fontWeight: active ? '600' : '400',
+            color,
+          }}
+          accessibilityLabel={`${componentId}|text`}
+        >
           {title}
         </Text>
         {showDot && (
-          <BadgeDot size={dotSize} style={{marginLeft: Spacing.XS}} />
+          <BadgeDot size={dotSize} style={{ marginLeft: Spacing.XS }} />
         )}
         {!showDot && badgeValue && (
           <View>
             <Badge
               label={badgeValue}
-              style={{marginLeft: Spacing.XS}}
+              style={{ marginLeft: Spacing.XS }}
               accessibilityLabel={`${componentId}|badge`}
             />
           </View>
@@ -111,7 +113,7 @@ const TabItem: FC<TabItemProps> = ({
           styles.tabItem,
           {
             width,
-            height: scaleSize(68),
+            height: 68,
             flexDirection: 'column',
             overflow: 'hidden',
             paddingHorizontal: Spacing.M,
@@ -120,15 +122,17 @@ const TabItem: FC<TabItemProps> = ({
         ]}
         onPress={onPressTabItem}
         accessibilityLabel={componentId}
-        accessibilityState={{checked: active}}>
+        accessibilityState={{ checked: active }}
+      >
         <View>
           {renderIcon && typeof renderIcon === 'function' && (
             <View
               style={[
                 styles.icon,
                 styles.iconHolder,
-                {marginBottom: Spacing.XS},
-              ]}>
+                { marginBottom: Spacing.XS },
+              ]}
+            >
               {renderIcon(active)}
             </View>
           )}
@@ -157,9 +161,15 @@ const TabItem: FC<TabItemProps> = ({
         </View>
         <Text
           numberOfLines={1}
-          typography={typography}
-          color={color}
-          accessibilityLabel={`${componentId}|text`}>
+          style={{
+            flexShrink: 1,
+            fontSize: 14,
+            lineHeight: 20,
+            color,
+            fontWeight: active ? '600' : '400',
+          }}
+          accessibilityLabel={`${componentId}|text`}
+        >
           {title}
         </Text>
       </TouchableOpacity>