@momo-kits/foundation 0.89.5 → 0.92.1-rc.1

package/Text/styles.ts

@@ -1,9 +1,9 @@
 export default {
-  headline_default_bold: {fontSize: 24, lineHeight: 32, fontWeight: '700'},
-  header_m_bold: {fontSize: 18, lineHeight: 28, fontWeight: '700'},
+  headline_default_bold: {fontSize: 24, lineHeight: 34, fontWeight: '700'},
+  header_m_bold: {fontSize: 18, lineHeight: 26, fontWeight: '700'},
   header_default_bold: {fontSize: 16, lineHeight: 22, fontWeight: '700'},
   header_s_semibold: {fontSize: 14, lineHeight: 20, fontWeight: '600'},
-  header_xs_semibold: {fontSize: 12, lineHeight: 16, fontWeight: '600'},
+  header_xs_semibold: {fontSize: 12, lineHeight: 18, fontWeight: '600'},
   body_default_regular: {fontSize: 14, lineHeight: 20, fontWeight: '400'},
   body_regularstrikethrought: {
     fontSize: 14,
@@ -13,12 +13,12 @@ export default {
   },
   description_default_regular: {
     fontSize: 12,
-    lineHeight: 16,
+    lineHeight: 18,
     fontWeight: '400',
   },
   description_default_regularstrikethrought: {
     fontSize: 12,
-    lineHeight: 16,
+    lineHeight: 18,
     fontWeight: '400',
     textDecorationLine: 'line-through',
   },
@@ -30,11 +30,11 @@ export default {
     textDecorationLine: 'line-through',
   },
   label_default_medium: {fontSize: 14, lineHeight: 20, fontWeight: '500'},
-  label_s_medium: {fontSize: 12, lineHeight: 16, fontWeight: '500'},
+  label_s_medium: {fontSize: 12, lineHeight: 18, fontWeight: '500'},
   label_xs_medium: {fontSize: 10, lineHeight: 14, fontWeight: '500'},
   action_default_bold: {fontSize: 16, lineHeight: 22, fontWeight: '700'},
   action_s_bold: {fontSize: 14, lineHeight: 20, fontWeight: '700'},
-  action_xs_bold: {fontSize: 12, lineHeight: 16, fontWeight: '700'},
+  action_xs_bold: {fontSize: 12, lineHeight: 18, fontWeight: '700'},
   action_xxs_bold: {fontSize: 10, lineHeight: 14, fontWeight: '700'},
   /**non-support**/
   headline_default: {

package/Title/index.tsx

@@ -1,129 +1,146 @@
-import React, {FC, useContext, useState} from 'react';
-import {
-  LayoutChangeEvent,
-  NativeSyntheticEvent,
-  Text as RNText,
-  TextLayoutEventData,
-  TouchableOpacity,
-  View,
-} from 'react-native';
-import {TitleProps} from './types';
-import {Icon} from '../Icon';
+import React, {FC, useContext} from 'react';
+import {Text as RNText, TouchableOpacity, View, ViewStyle} from 'react-native';
 import styles from './styles';
+import {Icon} from '../Icon';
+import {scaleSize, Text} from '../Text';
 import {ApplicationContext} from '../Application';
 import {Colors, Spacing} from '../Consts';
-import {scaleSize, Text} from '../Text';
+import {Badge} from '../Badge';
+import {Typography} from '../Text/types';
+import {TitleProps} from './types';
 
 const Title: FC<TitleProps> = ({
-  size = 'large',
-  type = 'section',
-  onPressAction,
-  actionTitle,
   title = 'Title',
-  titleFlex = true,
-  showAction = true,
+  type = 'section',
+  size = 'medium',
   icon,
   description,
-  usePadding = true,
+  iconColor = null,
+  iconAlign = 'top',
+  showRightAction = false,
+  showLeftAction = false,
+  badgeLabel,
+  buttonTitle,
+  onPressRightAction = () => {},
+  buttonSize = 'small',
 }) => {
   const {theme} = useContext(ApplicationContext);
-  const [containerWidth, setContainerWidth] = useState(0);
-  const [textLines, setTextLines] = useState(0);
-  const typeStyle =
-    type === 'screen' ? styles.screen : styles[`${type}_${size}`];
-  const titleWeight = type === 'screen' ? 'Semibold' : 'Bold';
-  const marginStyle =
-    type === 'section' && usePadding ? {marginTop: Spacing.S} : {};
-  const numberOfLines = type === 'section' ? 1 : 2;
+  const styleSheet: {
+    [key: string]: any;
+  } = styles;
+  const typography = `${type}_${size}`;
+  const isSection = type === 'section';
+  const numberOfLines = showLeftAction || !!badgeLabel ? 1 : 2;
+  const buttonTypo: Typography =
+    buttonSize === 'small' ? 'action_xs_bold' : 'action_s_bold';
+  const widthStyle =
+    !showLeftAction && !showRightAction && !badgeLabel
+      ? {width: '100%'}
+      : {width: '75%'};
 
-  const renderAction = () => {
-    return !!actionTitle && titleFlex ? (
-      <TouchableOpacity onPress={onPressAction}>
-        <Text typography={'action_s_bold'} color={theme.colors.primary}>
-          {actionTitle}
-        </Text>
-      </TouchableOpacity>
-    ) : (
-      <TouchableOpacity
-        style={[
-          {backgroundColor: theme.colors.primary + '0F'},
-          styles.actionIcon,
-          {width: scaleSize(22), height: scaleSize(22)},
-        ]}
-        onPress={onPressAction}>
-        <Icon
-          size={scaleSize(22)}
-          color={theme.colors.primary}
-          source={'arrow_chevron_right_small'}
-        />
-      </TouchableOpacity>
+  const renderIcon = () => {
+    if (!icon) return null;
+
+    let iconStyle: ViewStyle = {
+      justifyContent: 'flex-start',
+    };
+
+    if (iconAlign === 'middle') {
+      iconStyle = {justifyContent: 'center'};
+    }
+
+    if (iconAlign === 'bottom') {
+      iconStyle = {justifyContent: 'flex-end'};
+    }
+
+    return (
+      <View style={[styles.iconView, iconStyle]}>
+        <Icon color={iconColor} source={icon} />
+      </View>
     );
   };
 
-  const renderSemiAction = () => {
-    if (textLines > 1) return null;
+  const renderContent = () => {
     return (
-      <TouchableOpacity
-        style={[
-          {backgroundColor: Colors.black_06},
-          styles.actionIcon,
-          {width: scaleSize(18), height: scaleSize(18)},
-        ]}
-        onPress={onPressAction}>
-        <Icon
-          size={scaleSize(18)}
-          color={theme.colors.text.default}
-          source={'arrow_chevron_right_small'}
-        />
-      </TouchableOpacity>
+      <View style={{flex: 1}}>
+        <View style={[styles.iconLeftView, widthStyle]}>
+          <RNText
+            numberOfLines={numberOfLines}
+            style={[
+              styleSheet[typography],
+              {
+                fontWeight: 'bold',
+                marginBottom: Spacing.XS,
+              },
+            ]}>
+            {title}
+          </RNText>
+          <View style={{alignItems: 'center'}}>
+            {badgeLabel && (
+              <Badge style={{marginLeft: Spacing.XS}} label={badgeLabel} />
+            )}
+          </View>
+          {renderActionLeft()}
+        </View>
+        <Text
+          color={theme.colors.text.secondary}
+          typography={'description_default_regular'}>
+          {description}
+        </Text>
+      </View>
     );
   };
-  const onLayout = (e: LayoutChangeEvent) => {
-    setContainerWidth(e.nativeEvent.layout.width);
-  };
 
-  const onTextLayout = (e: NativeSyntheticEvent<TextLayoutEventData>) => {
-    setTextLines(e.nativeEvent.lines.length);
+  const renderActionLeft = () => {
+    return (
+      <View style={styles.iconLeftView}>
+        {showLeftAction && !showRightAction && (
+          <View style={[styles.iconLeft, {backgroundColor: Colors.black_06}]}>
+            <Icon
+              source={'arrow_chevron_right_small'}
+              size={scaleSize(18)}
+              color={theme.colors.text.default}
+            />
+          </View>
+        )}
+      </View>
+    );
   };
 
-  return (
-    <View onLayout={onLayout} style={[styles.wrapper, marginStyle]}>
-      {!!icon && type !== 'screen' && (
-        <Icon style={styles.icon} source={icon} />
-      )}
-      <View style={{flex: 1, flexDirection: 'row'}}>
-        <View style={styles.textContent}>
+  const renderActionRight = () => {
+    if (!showRightAction || showLeftAction) return false;
+
+    return (
+      <View>
+        {!buttonTitle ? (
           <View
-            style={{
-              flexDirection: 'row',
-              maxWidth: containerWidth - scaleSize(22),
-            }}>
-            <RNText
-              onTextLayout={onTextLayout}
-              numberOfLines={numberOfLines}
-              style={[
-                typeStyle,
-                {
-                  fontFamily: `${theme.font}-${titleWeight}`,
-                  color: theme.colors.text.default,
-                  marginRight: Spacing.S,
-                },
-              ]}>
-              {title}
-            </RNText>
-            {!titleFlex && renderSemiAction()}
+            style={[
+              styles.iconRight,
+              {
+                backgroundColor: theme.colors.primary + '0F',
+              },
+            ]}>
+            <Icon
+              source={'arrow_chevron_right_small'}
+              size={scaleSize(22)}
+              color={theme.colors.primary}
+            />
           </View>
-          {!!description && type !== 'screen' && (
-            <Text
-              numberOfLines={1}
-              typography={'description_default_regular'}
-              color={theme.colors.text.secondary}>
-              {description}
+        ) : (
+          <TouchableOpacity onPress={onPressRightAction}>
+            <Text color={theme.colors.primary} typography={buttonTypo}>
+              {buttonTitle}
             </Text>
-          )}
-        </View>
-        {showAction && titleFlex && type !== 'screen' && renderAction()}
+          </TouchableOpacity>
+        )}
       </View>
+    );
+  };
+  return (
+    <View style={[styles.wrapper, isSection && styles.margin]}>
+      {renderIcon()}
+      {renderContent()}
+      {renderActionRight()}
     </View>
   );
 };

package/Title/styles.ts

@@ -27,10 +27,6 @@ export default StyleSheet.create({
     fontSize: scaleSize(24),
     lineHeight: scaleSize(34),
   },
-  screen: {
-    fontSize: scaleSize(36),
-    lineHeight: scaleSize(44),
-  },
   actionIcon: {
     borderRadius: Radius.M,
     alignItems: 'center',
@@ -41,12 +37,36 @@ export default StyleSheet.create({
     borderRadius: Radius.XS,
   },
   wrapper: {
-    width: '100%',
     flexDirection: 'row',
-    alignItems: 'center',
   },
   textContent: {
     marginRight: Spacing.S,
     flex: 1,
   },
+  margin: {
+    marginTop: Spacing.S,
+  },
+  iconView: {
+    marginRight: Spacing.S,
+  },
+  iconRight: {
+    width: scaleSize(22),
+    height: scaleSize(22),
+    borderRadius: Radius.M,
+    alignItems: 'center',
+    justifyContent: 'center',
+    marginLeft: Spacing.S,
+  },
+  iconLeft: {
+    width: scaleSize(18),
+    height: scaleSize(18),
+    borderRadius: Radius.M,
+    alignItems: 'center',
+    justifyContent: 'center',
+    marginHorizontal: Spacing.XS,
+  },
+  iconLeftView: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
 });

package/Title/types.ts

@@ -1,52 +1,15 @@
 export type TitleProps = {
-  /**
-   * Optional. Defines the type of Title component.
-   * 'screen' - Used for screen titles.
-   * 'section' - Used for section titles within a screen.
-   * 'card' - Used for titles within a card component.
-   */
-  type?: 'screen' | 'section' | 'card';
-
-  /**
-   * Required. The text of the title.
-   */
+  type?: 'card' | 'section';
+  size?: 'small' | 'medium' | 'large';
   title: string;
-
-  /**
-   * Optional. A description or subtitle that appears below the title.
-   */
-  description?: string;
-
-  /**
-   * Optional. Defines the size of the Title component.
-   * 'large' - A larger, more prominent title.
-   * 'small' - A smaller, less prominent title.
-   */
-  size?: 'large' | 'medium' | 'small';
-
-  /**
-   * Optional. Represents the name or key of the icon to be displayed alongside the title.
-   */
   icon?: string;
-
-  /**
-   * Optional. If `true`, the title will be flexible in its container, adjusting its width dynamically.
-   */
-  titleFlex?: boolean;
-
-  /**
-   * Optional. Text for an action button associated with the title.
-   */
-  actionTitle?: string;
-
-  /**
-   * Optional. Function to be called when the action associated with the title is pressed.
-   */
-  onPressAction?: () => void;
-
-  /**
-   * Optional. If `true`, an action button or icon is displayed alongside the title.
-   */
-  showAction?: boolean;
-  usePadding?: boolean;
+  description?: string;
+  iconColor?: string;
+  iconAlign?: 'top' | 'middle' | 'bottom';
+  showRightAction?: boolean;
+  showLeftAction?: boolean;
+  badgeLabel?: string;
+  buttonTitle?: string;
+  buttonSize?: 'small' | 'large';
+  onPressRightAction?: () => void;
 };

package/index.ts

@@ -4,11 +4,12 @@ import {
   useSafeAreaInsets,
 } from 'react-native-safe-area-context';
 import LinearGradient from 'react-native-linear-gradient';
+import {getAccessibilityID} from "./Application/utils";
 
 /**
  * native export
  */
-export {SafeAreaView, useSafeAreaInsets, SafeAreaProvider, LinearGradient};
+export {SafeAreaView, useSafeAreaInsets, SafeAreaProvider, LinearGradient, getAccessibilityID};
 
 /**
  * foundation component

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.89.5",
+    "version": "0.92.1-rc.1",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {
@@ -14,12 +14,14 @@
         "react-native-safe-area-context": "3.1.4",
         "react-native-linear-gradient": "2.8.3",
         "react-native-gesture-handler": "1.10.3",
+        "react-native-modalize": "2.1.1",
         "react-native-fast-image": "8.1.5",
         "@react-navigation/bottom-tabs": "git+https://gitlab.com/momo-platform/react-navigation-bottom-tabs.git#main",
         "@react-navigation/core": "5.16.1",
         "@react-navigation/native": "5.9.8",
         "@react-navigation/routers": "5.7.4",
         "lottie-react-native": "3.3.2",
+        "d3-shape": "1.3.7",
         "@react-navigation/stack": "git+https://gitlab.com/momo-platform/react-navigation-stack.git#main"
     },
     "peerDependencies": {
@@ -32,6 +34,7 @@
         "@types/jest": "26.0.23",
         "@types/react-native": "0.64.4",
         "@types/react-test-renderer": "16.9.2",
+        "@types/d3-shape": "1.3.7",
         "babel-jest": "^26.6.3",
         "eslint": "^7.14.0",
         "jest": "^26.6.3",

package/verify.js

@@ -2,21 +2,24 @@ const fs = require('fs');
 const path = require('path');
 
 try {
-  const package = path.join(`${__dirname}`, 'package.json');
-  const packageInfo = JSON.parse(fs.readFileSync(package, 'utf8'));
+  const packageInfo = JSON.parse(
+    fs.readFileSync(path.join(`${__dirname}`, 'package.json'), 'utf8'),
+  );
   const packageVersion = parseInt(packageInfo?.version.split('.')?.[1]);
 
   const app = path.join(`${__dirname}/../../../`, 'app.json');
   const miniJson = path.join(`${__dirname}/../../../`, 'package.json');
+
+  if (!fs.existsSync(app) || fs.existsSync(miniJson)) {
+    return;
+  }
+
   const appInfo = JSON.parse(fs.readFileSync(app, 'utf8'));
   const miniInfo = JSON.parse(fs.readFileSync(miniJson, 'utf8'));
+
   const iOSAppTarget = appInfo?.client?.ios.deploymentTarget;
   const androidAppTarget = appInfo?.client?.android.deploymentTarget;
 
-  if (appInfo.name === 'MoMoPlatform') {
-    return;
-  }
-
   if (packageVersion > iOSAppTarget || packageVersion > androidAppTarget) {
     console.error(
       `Package ${packageInfo.name} version: ${packageInfo.version} require deploymentTarget ${packageVersion}`,