@momo-kits/foundation 0.89.6 → 0.92.1-beta.16

package/Popup/PopupNotify.tsx

@@ -4,9 +4,14 @@ import {PopupNotifyProps} from './types';
 import {Radius, Spacing, Styles} from '../Consts';
 import {Image} from '../Image';
 import {Text} from '../Text';
-import {ApplicationContext, MiniAppContext} from '../Application';
+import {ApplicationContext} from '../Application';
 import {Button} from '../Button';
 import {Icon} from '../Icon';
+import {getAccessibilityID} from '../Application/utils';
+
+const {
+  MiniAppContext,
+} = require('react-native/Libraries/Components/ScreenContext');
 
 const PopupNotify: React.FC<PopupNotifyProps> = ({
   id,
@@ -19,7 +24,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   buttonDirection = 'row',
   onIconClose,
 }) => {
-  const context = useContext(MiniAppContext);
+  const context = useContext<any>(MiniAppContext);
   const {theme, navigator, translate} = useContext(ApplicationContext);
   const [scrollContent, setScrollContent] = useState(false);
   const closeAction = useRef('touch_outside');
@@ -89,6 +94,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
                     closeAction.current = 'button_action';
                     onAction(secondary?.onPress);
                   }}
+                  accessibilityLabel={'btn_popup_cancel'}
                 />
               </View>
               <View style={styles.buttonSpace} />
@@ -102,6 +108,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
                 closeAction.current = 'button_action';
                 onAction(primary.onPress);
               }}
+              accessibilityLabel={'btn_popup_allow'}
             />
           </View>
         </View>
@@ -111,6 +118,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
       return (
         <View style={Styles.columnCenter}>
           <Button
+            accessibilityLabel={'btn_popup_allow'}
             title={primary.title}
             size="medium"
             onPress={() => {
@@ -122,6 +130,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
             <>
               <View style={styles.buttonSpace} />
               <Button
+                accessibilityLabel={'btn_popup_cancel'}
                 title={secondary?.title}
                 type="text"
                 size="medium"
@@ -157,6 +166,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   const buildCloseIcon = () => {
     return (
       <TouchableOpacity
+        {...getAccessibilityID?.('ic_popup_close')}
         style={styles.iconCloseContainer}
         onPress={() => {
           closeAction.current = 'icon_close';
@@ -182,6 +192,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
 
   return (
     <View
+      {...getAccessibilityID?.(`pu_${context.code}_notify`)}
       style={[
         styles.container,
         {backgroundColor: theme.colors.background.surface},

package/Popup/PopupPromotion.tsx

@@ -1,17 +1,22 @@
 import React, {useContext, useEffect, useRef} from 'react';
 import {StyleSheet, TouchableOpacity, View} from 'react-native';
 import {PopupPromotionProps} from './types';
-import {ApplicationContext, MiniAppContext} from '../Application';
+import {ApplicationContext} from '../Application';
 import {Image} from '../Image';
 import {Radius, Spacing} from '../Consts';
 import {Icon} from '../Icon';
+import {getAccessibilityID} from '../Application/utils';
+
+const {
+  MiniAppContext,
+} = require('react-native/Libraries/Components/ScreenContext');
 
 const PopupPromotion: React.FC<PopupPromotionProps> = ({
   id,
   image,
   onIconClose,
 }) => {
-  const context = useContext(MiniAppContext);
+  const context = useContext<any>(MiniAppContext);
   const {theme, navigator} = useContext(ApplicationContext);
   const closeAction = useRef('touch_outside');
 
@@ -49,7 +54,9 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
    */
   const buildCloseIcon = () => {
     return (
-      <View style={styles.iconCloseContainer}>
+      <View
+        {...getAccessibilityID?.('ic_popup_close')}
+        style={styles.iconCloseContainer}>
         <TouchableOpacity
           onPress={() => {
             closeAction.current = 'icon_close';
@@ -77,7 +84,7 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
   };
 
   return (
-    <View>
+    <View {...getAccessibilityID?.(`pu_${context.code}_promotion`)}>
       <Image
         source={{
           uri: image,

package/Radio/index.tsx

@@ -6,6 +6,16 @@ import {Text} from '../Text';
 import styles from './styles';
 import {ApplicationContext} from '../Application';
 import {Spacing} from '../Consts';
+import {
+  cleanNameForTracking,
+  formatNameLength,
+  getAccessibilityID,
+} from '../Application/utils';
+
+const {
+  ScreenContext,
+  MiniAppContext,
+} = require('react-native/Libraries/Components/ScreenContext');
 
 const Radio: FC<RadioProps> = ({
   value,
@@ -14,8 +24,12 @@ const Radio: FC<RadioProps> = ({
   onChange,
   label,
   style,
+  params,
+  componentId,
 }) => {
+  const {appId, code} = useContext<any>(MiniAppContext);
   const {theme} = useContext(ApplicationContext);
+  const screenInfo = useContext<any>(ScreenContext);
   const selected = value === groupValue;
   let disabledStyle = {};
   let checkBoxStyle = {
@@ -37,27 +51,46 @@ const Radio: FC<RadioProps> = ({
     };
   }
 
+  const accessibilityID = getAccessibilityID?.(
+    `${appId}/${code}/${screenInfo.screenName}/rdo_${cleanNameForTracking(
+      label,
+    )}_${selected}`,
+  );
+
   return (
-    <TouchableOpacity
-      onPress={onChange}
-      disabled={disabled}
-      style={[
-        style,
-        {
-          flexDirection: 'row',
-          alignItems: 'center',
-        },
-      ]}>
-      <View
+    <ScreenContext.Provider
+      value={{
+        ...screenInfo,
+        componentName: 'Button',
+        params,
+        state: disabled ? 'disabled' : 'enabled',
+        componentId,
+        componentLabel: formatNameLength(label || ''),
+        componentValue: value,
+        action: 'click',
+      }}>
+      <TouchableOpacity
+        {...accessibilityID}
+        onPress={onChange}
+        disabled={disabled}
         style={[
-          styles.radio,
-          checkBoxStyle,
-          disabledStyle,
-          {marginRight: label ? Spacing.XS : 0},
-        ]}
-      />
-      {!!label && <Text typography={'body_default_regular'}>{label}</Text>}
-    </TouchableOpacity>
+          style,
+          {
+            flexDirection: 'row',
+            alignItems: 'center',
+          },
+        ]}>
+        <View
+          style={[
+            styles.radio,
+            checkBoxStyle,
+            disabledStyle,
+            {marginRight: label ? Spacing.XS : 0},
+          ]}
+        />
+        {!!label && <Text typography={'body_default_regular'}>{label}</Text>}
+      </TouchableOpacity>
+    </ScreenContext.Provider>
   );
 };
 

package/Radio/types.ts

@@ -35,4 +35,9 @@ export type RadioProps = {
    * Accepts an object of style properties.
    */
   style?: ViewStyle;
+
+
+  params?: any
+
+  componentId?: string
 };

package/Switch/index.tsx

@@ -1,11 +1,20 @@
-import React, {FC} from 'react';
+import React, {FC, useContext} from 'react';
 import {TouchableOpacity, View} from 'react-native';
 import {SwitchProps} from './types';
 import styles from './styles';
 import {Colors} from '../Consts';
+import {getAccessibilityID} from '../Application/utils';
+
+const {
+  ScreenContext,
+  MiniAppContext,
+} = require('react-native/Libraries/Components/ScreenContext');
 
 const Switch: FC<SwitchProps> = props => {
-  const {value, onChange, disabled, style} = props;
+  const {appId, code} = useContext<any>(MiniAppContext);
+  const {value, onChange, disabled, style, params, componentId} = props;
+  const screenInfo = useContext<any>(ScreenContext);
+
   const circleBackgroundColor = value ? Colors.black_01 : Colors.black_03;
   const circleAlign = value ? 'flex-end' : 'flex-start';
 
@@ -14,19 +23,35 @@ const Switch: FC<SwitchProps> = props => {
     backgroundColor = value ? Colors.green_09 : Colors.black_05;
   }
 
+  const accessibilityID = getAccessibilityID?.(
+    `${appId}/${code}/${screenInfo.screenName}/swt_${value}`,
+  );
+
   return (
-    <TouchableOpacity
-      disabled={disabled}
-      onPress={() => onChange?.(!value)}
-      style={[
-        style,
-        styles.container,
-        {backgroundColor, alignItems: circleAlign},
-      ]}>
-      <View style={[styles.circle, {backgroundColor: circleBackgroundColor}]}>
-        <View style={[styles.circleSmall, {backgroundColor}]} />
-      </View>
-    </TouchableOpacity>
+    <ScreenContext.Provider
+      value={{
+        ...screenInfo,
+        componentName: 'Button',
+        params,
+        state: disabled ? 'disabled' : 'enabled',
+        componentId,
+        componentValue: value,
+        action: 'click',
+      }}>
+      <TouchableOpacity
+        {...accessibilityID}
+        disabled={disabled}
+        onPress={() => onChange?.(!value)}
+        style={[
+          style,
+          styles.container,
+          {backgroundColor, alignItems: circleAlign},
+        ]}>
+        <View style={[styles.circle, {backgroundColor: circleBackgroundColor}]}>
+          <View style={[styles.circleSmall, {backgroundColor}]} />
+        </View>
+      </TouchableOpacity>
+    </ScreenContext.Provider>
   );
 };
 

package/Switch/types.ts

@@ -23,4 +23,8 @@ export type SwitchProps = {
    * Accepts an object of style properties.
    */
   style?: ViewStyle;
+
+  params?: any
+
+  componentId?: string
 };

package/Text/index.tsx

@@ -52,6 +52,21 @@ export interface TextProps extends RNTextProps {
   color?: string;
 }
 
+const deprecatedValues: Typography[] = [
+  'headline_default',
+  'headline_l',
+  'headline_xl',
+  'title_default',
+  'title_xs',
+  'title_s',
+  'header_default',
+  'paragraph_default',
+  'paragraph_bold',
+  'paragraph_italic',
+  'label_xxs',
+  'action_s',
+];
+
 const Text: React.FC<TextProps> = ({
   typography = 'body_default_regular',
   color,
@@ -95,6 +110,13 @@ const Text: React.FC<TextProps> = ({
   };
 
   const textStyle = getTypoStyle(typography);
+
+  if (deprecatedValues.includes(typography)) {
+    console.warn(
+      `Warning: The typography value "${typography}" is deprecated.`,
+    );
+  }
+
   return (
     <RNText
       {...rest}

package/Text/styles.ts

@@ -5,7 +5,7 @@ export default {
   header_s_semibold: {fontSize: 14, lineHeight: 20, fontWeight: '600'},
   header_xs_semibold: {fontSize: 12, lineHeight: 18, fontWeight: '600'},
   body_default_regular: {fontSize: 14, lineHeight: 20, fontWeight: '400'},
-  body_regularstrikethrought: {
+  body_default_regularstrikethrought: {
     fontSize: 14,
     lineHeight: 20,
     fontWeight: '400',

package/Text/types.ts

@@ -14,13 +14,31 @@ export type TypographyWeight = {
 };
 
 export type Typography =
+  /**
+   * @deprecated
+   **/
+  | 'headline_default'
+  | 'headline_l'
+  | 'headline_xl'
+  | 'title_default'
+  | 'title_xs'
+  | 'title_s'
+  | 'header_default'
+  | 'paragraph_default'
+  | 'paragraph_bold'
+  | 'paragraph_italic'
+  | 'label_xxs'
+  | 'action_s'
+  /**
+   * end
+   **/
   | 'headline_default_bold'
   | 'header_m_bold'
   | 'header_default_bold'
   | 'header_s_semibold'
   | 'header_xs_semibold'
   | 'body_default_regular'
-  | 'body_regularstrikethrought'
+  | 'body_default_regularstrikethrought'
   | 'description_default_regular'
   | 'description_default_regularstrikethrought'
   | 'description_xs_regular'

package/Title/index.tsx

@@ -1,129 +1,175 @@
 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 {Text as RNText, TouchableOpacity, View, ViewStyle} from 'react-native';
 import styles from './styles';
-import {ApplicationContext} from '../Application';
-import {Colors, Spacing} from '../Consts';
+import {Icon} from '../Icon';
 import {scaleSize, Text} from '../Text';
+import {ApplicationContext} from '../Application';
+import {Badge} from '../Badge';
+import {Typography} from '../Text/types';
+import {TitleProps} from './types';
+import {Colors} from '../Consts';
 
 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,
+  showTrailingAction = false,
+  badgeLabel,
+  buttonTitle,
+  onPressRightAction = () => {},
+  buttonSize = 'small',
+  textOnly = false,
 }) => {
   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 [badgeWidth, setBadgeWidth] = useState(0);
+  const [contentWidth, setContentWidth] = useState(0);
+  const styleSheet: {
+    [key: string]: any;
+  } = styles;
+  const typography = `${type}_${size}`;
+  const isSection = type === 'section';
+  const numberOfLines = showTrailingAction || !!badgeLabel ? 1 : 2;
+  const buttonTypo: Typography =
+    buttonSize === 'small' ? 'action_xs_bold' : 'action_s_bold';
+  const flexStyle = showTrailingAction && {maxWidth: '70%'};
 
-  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={styles.contentView}>
+        <View
+          onLayout={e => {
+            setContentWidth(e.nativeEvent.layout.width);
+          }}
+          style={[styles.iconLeftView, flexStyle]}>
+          <RNText
+            numberOfLines={numberOfLines}
+            style={[
+              styleSheet[typography],
+              styles.title,
+              {maxWidth: contentWidth - badgeWidth},
+            ]}>
+            {title}
+          </RNText>
+          {badgeLabel && (
+            <View
+              onLayout={e => {
+                setBadgeWidth(e.nativeEvent.layout.width);
+              }}
+              style={{
+                alignItems: 'center',
+              }}>
+              <Badge style={styles.badge} 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}>
+        {showTrailingAction && !showRightAction && (
+          <View
+            style={[
+              styles.iconLeft,
+              {
+                backgroundColor: isSection
+                  ? Colors.black_06 + '99'
+                  : Colors.black_06 + '4D',
+              },
+            ]}>
+            <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 || showTrailingAction) 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>
+    );
+  };
+
+  if (textOnly) {
+    return (
+      <View style={isSection && styles.margin}>
+        <RNText
+          numberOfLines={numberOfLines}
+          style={[styleSheet[typography], styles.title]}>
+          {title}
+        </RNText>
+      </View>
+    );
+  }
+
+  return (
+    <View style={[styles.wrapper, isSection && styles.margin]}>
+      {renderIcon()}
+      {renderContent()}
+      {renderActionRight()}
     </View>
   );
 };