@momo-kits/foundation 0.92.7-rc.21 → 0.92.7-rc.22

package/Tag/styles.ts

@@ -1,19 +1,20 @@
 import {StyleSheet} from 'react-native';
 import {Radius, Spacing} from '../Consts';
+import {scaleSize} from '../Text';
 
 export default StyleSheet.create({
   container: {
     paddingHorizontal: Spacing.S,
     borderRadius: Radius.S,
     flexDirection: 'row',
-    height: 24,
+    height: scaleSize(24),
     alignItems: 'center',
     justifyContent: 'center',
   },
   mediumContainer: {
     paddingHorizontal: Spacing.S,
     borderRadius: Radius.S,
-    height: 18,
+    height: scaleSize(18),
     alignItems: 'center',
     flexDirection: 'row',
     justifyContent: 'center',

package/Tag/types.ts

@@ -33,4 +33,16 @@ export type TagProps = {
    * that can be applied to the Tag component.
    */
   customColor?: string;
+
+  /**
+   * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the
+   * label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
+   */
+  accessibilityLabelContainer?: string;
+
+  /**
+   * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the
+   * label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
+   */
+  accessibilityLabelText?: string;
 };

package/Title/index.tsx

@@ -1,13 +1,13 @@
 import React, {FC, useContext, useState} 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 {Badge} from '../Badge';
-import {Typography} from '../Text/types';
-import {TitleProps} from './types';
 import {Colors} from '../Consts';
+import styles from './styles';
+import {TitleProps} from './types';
+import {Typography} from '../Text/types';
 
 const Title: FC<TitleProps> = ({
   title = 'Title',
@@ -67,7 +67,9 @@ const Title: FC<TitleProps> = ({
       <View style={styles.contentView}>
         <View
           onLayout={e => {
-            setContentWidth(e.nativeEvent.layout.width);
+            if (e.nativeEvent.layout.width !== contentWidth) {
+              setContentWidth(e.nativeEvent.layout.width);
+            }
           }}
           style={[styles.iconLeftView, flexStyle]}>
           <RNText
@@ -75,14 +77,19 @@ const Title: FC<TitleProps> = ({
             style={[
               styleSheet[typography],
               styles.title,
-              {maxWidth: contentWidth - badgeWidth},
+              {
+                maxWidth:
+                  contentWidth > 0 ? contentWidth - badgeWidth : undefined,
+              },
             ]}>
             {title}
           </RNText>
           {badgeLabel && (
             <View
               onLayout={e => {
-                setBadgeWidth(e.nativeEvent.layout.width);
+                if (e.nativeEvent.layout.width !== badgeWidth) {
+                  setBadgeWidth(e.nativeEvent.layout.width);
+                }
               }}
               style={{
                 alignItems: 'center',
@@ -133,8 +140,14 @@ const Title: FC<TitleProps> = ({
   const renderActionRight = () => {
     if (!showRightAction || showTrailingAction) return false;
 
+    const lineHeight = styleSheet[typography].lineHeight;
+
     return (
-      <View>
+      <View
+        style={{
+          height: lineHeight,
+          justifyContent: 'center',
+        }}>
         {!buttonTitle ? (
           <TouchableOpacity
             onPress={onPressRightAction}

package/Title/styles.ts

@@ -46,16 +46,16 @@ export default StyleSheet.create({
     marginRight: Spacing.S,
   },
   iconRight: {
-    width: scaleSize(22),
-    height: scaleSize(22),
+    width: 22,
+    height: 22,
     borderRadius: Radius.M,
     alignItems: 'center',
     justifyContent: 'center',
     marginLeft: Spacing.S,
   },
   iconLeft: {
-    width: scaleSize(18),
-    height: scaleSize(18),
+    width: 18,
+    height: 18,
     borderRadius: Radius.M,
     alignItems: 'center',
     justifyContent: 'center',

package/code-scanner.js

@@ -2,142 +2,159 @@ const scanner = require('react-scanner');
 const fs = require('fs');
 const path = require('path');
 
-const scan = async (config) => {
-    return await scanner.run(config);
+const scan = async config => {
+  return await scanner.run(config);
 };
 
-const calcSum = (array) => {
-    return array.reduce((a, b) => a + b, 0);
+const calcSum = array => {
+  return array.reduce((a, b) => a + b, 0);
 };
 
-const calculateAdoptionRate = async (branchName , kitJsonPath , miniappJsonPath , reactNativeJsonPath , fsJsonPath ) => {
-    const kitJson = require(kitJsonPath);
-    const miniAppJson = require(miniappJsonPath);
-    const reactNativeJson = require(reactNativeJsonPath);
-    const fsJson = require(fsJsonPath);
-
-    const numOfKitComponents = calcSum(Object.values(kitJson));
-    const numOfMiniAppComponents = calcSum(Object.values(miniAppJson));
-    const numOfReactNativeComponents = calcSum(Object.values(reactNativeJson));
-    const numOfFSComponents = calcSum(Object.values(fsJson));
-
-    const adoptionRate = ((numOfKitComponents + numOfReactNativeComponents + numOfFSComponents) / numOfMiniAppComponents) * 100;
-
-    return {
-        miniAppName: branchName,
-        numOfKitComponents: numOfKitComponents,
-        numOfMiniAppComponents: numOfMiniAppComponents,
-        numOfReactNativeComponents: numOfReactNativeComponents,
-        numOfFSComponents: numOfFSComponents,
-        adoptionRate: adoptionRate.toFixed(2) + '%'
-    }
+const calculateAdoptionRate = async (
+  branchName,
+  kitJsonPath,
+  miniappJsonPath,
+  reactNativeJsonPath,
+  fsJsonPath
+) => {
+  const kitJson = require(kitJsonPath);
+  const miniAppJson = require(miniappJsonPath);
+  const reactNativeJson = require(reactNativeJsonPath);
+  const fsJson = require(fsJsonPath);
+
+  const numOfKitComponents = calcSum(Object.values(kitJson));
+  const numOfMiniAppComponents = calcSum(Object.values(miniAppJson));
+  const numOfReactNativeComponents = calcSum(Object.values(reactNativeJson));
+  const numOfFSComponents = calcSum(Object.values(fsJson));
+
+  const adoptionRate =
+    ((numOfKitComponents + numOfReactNativeComponents + numOfFSComponents) /
+      numOfMiniAppComponents) *
+    100;
+
+  return {
+    miniAppName: branchName,
+    numOfKitComponents: numOfKitComponents,
+    numOfMiniAppComponents: numOfMiniAppComponents,
+    numOfReactNativeComponents: numOfReactNativeComponents,
+    numOfFSComponents: numOfFSComponents,
+    adoptionRate: adoptionRate.toFixed(2) + '%',
+  };
 };
 
-function ensureFileExists(filePath , defaultContent = {}) {
-    if (!fs.existsSync(filePath)) {
-        fs.mkdirSync(path.dirname(filePath), { recursive: true });
-        fs.writeFileSync(filePath, JSON.stringify(defaultContent, null, 2));
-    }
+function ensureFileExists(filePath, defaultContent = {}) {
+  if (!fs.existsSync(filePath)) {
+    fs.mkdirSync(path.dirname(filePath), {recursive: true});
+    fs.writeFileSync(filePath, JSON.stringify(defaultContent, null, 2));
+  }
 }
 
 const sendMessage = ({
-                         numOfKitComponents,
-                         numOfMiniAppComponents,
-                         numOfFSComponents,
-                         numOfReactNativeComponents,
-                         adoptionRate,
-                         miniAppName = ''
-                     }) => {
-    const url = 'https://chat.googleapis.com/v1/spaces/AAAAL9P6G8M/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=fnwfYuH_u0KicBnKTSSm9S0qV6azJH5v6URm8HR7V2g';
-
-    const data = {
-        text: `MiniApp: ${miniAppName}\nNumber of kit's components: ${numOfKitComponents}\nNumber of miniapp's components: ${numOfMiniAppComponents}\nNumber of FS's components: ${numOfFSComponents}\nNumber of React Native's components: ${numOfReactNativeComponents}\nAdoption rate: ${adoptionRate}`
-    };
-
-    fetch(url, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(data)
+  numOfKitComponents,
+  numOfMiniAppComponents,
+  numOfFSComponents,
+  numOfReactNativeComponents,
+  adoptionRate,
+  miniAppName = '',
+}) => {
+  const url =
+    'https://chat.googleapis.com/v1/spaces/AAAAL9P6G8M/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=fnwfYuH_u0KicBnKTSSm9S0qV6azJH5v6URm8HR7V2g';
+
+  const data = {
+    text: `MiniApp: ${miniAppName}\nNumber of kit's components: ${numOfKitComponents}\nNumber of miniapp's components: ${numOfMiniAppComponents}\nNumber of FS's components: ${numOfFSComponents}\nNumber of React Native's components: ${numOfReactNativeComponents}\nAdoption rate: ${adoptionRate}`,
+  };
+
+  fetch(url, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify(data),
+  })
+    .then(response => response.json())
+    .then(data => {
+      console.log('Success:', data);
     })
-        .then(response => response.json())
-        .then(data => {
-            console.log('Success:', data);
-        })
-        .catch((error) => {
-            console.error('Error:', error);
-        });
-}
+    .catch(error => {
+      console.error('Error:', error);
+    });
+};
 
 const main = async () => {
-    const rootPath = `${__dirname}/../../../`
-    const app = path.join(`${__dirname}/../../../`, 'app.json');
-    const appJson = require(app)
-    const branchName = appJson.appId
-
-    if (!branchName || !branchName.includes("vn.momo")){
-        return
-    }
-
-    const scanPath = path.join(rootPath, 'src')
-    const kitJsonPath = path.join(rootPath, './scan/kit.json')
-    const miniappJsonPath = path.join(rootPath, './scan/miniapp.json')
-    const reactNativeJsonPath = path.join(rootPath, './scan/RN.json')
-    const fsJsonPath = path.join(rootPath, './scan/verLib.json')
-
-    const allKitsReg = /@momo-kits/;
-    const fsReg = /^(?:@fs-mobile-platform\/(components|investment|screens)|@miniapp-platform\/(components|foundation))$/;
-    const RNReg = 'react-native'
-
-    const config1 = {
-        crawlFrom: scanPath,
-        includeSubComponents: true,
-        importedFrom: allKitsReg,
-        processors: [['count-components', { outputTo: kitJsonPath }]],
-        rootDir: process.cwd(),
-    };
-
-    const config2 = {
-        crawlFrom: scanPath,
-        includeSubComponents: true,
-        processors: [['count-components', { outputTo: miniappJsonPath }]],
-        rootDir: process.cwd(),
-    };
-
-    const config3 = {
-        crawlFrom: scanPath,
-        includeSubComponents: true,
-        importedFrom: RNReg,
-        processors: [['count-components', { outputTo: reactNativeJsonPath }]],
-        rootDir: process.cwd(),
-    };
-
-    const config4 = {
-        crawlFrom: scanPath,
-        includeSubComponents: true,
-        importedFrom: fsReg,
-        processors: [['count-components', { outputTo: fsJsonPath }]],
-        rootDir: process.cwd(),
-    };
-
-    try {
-        ensureFileExists(kitJsonPath, {});
-        ensureFileExists(miniappJsonPath, {});
-        ensureFileExists(reactNativeJsonPath, {});
-        ensureFileExists(fsJsonPath, {});
-
-        await scan(config1);
-        await scan(config2);
-        await scan(config3);
-        await scan(config4);
-
-        const result = await calculateAdoptionRate(branchName,kitJsonPath, miniappJsonPath, reactNativeJsonPath, fsJsonPath);
-        sendMessage(result)
-        console.log(result)
-    } catch (error) {
-        console.error("Error during scan or calculation:", error);
-    }
+  const rootPath = `${__dirname}/../../../`;
+  const app = path.join(`${__dirname}/../../../`, 'app.json');
+  const appJson = require(app);
+  const branchName = appJson.appId;
+
+  if (!branchName || !branchName.includes('vn.momo')) {
+    return;
+  }
+
+  const scanPath = path.join(rootPath, 'src');
+  const kitJsonPath = path.join(rootPath, './scan/kit.json');
+  const miniappJsonPath = path.join(rootPath, './scan/miniapp.json');
+  const reactNativeJsonPath = path.join(rootPath, './scan/RN.json');
+  const fsJsonPath = path.join(rootPath, './scan/verLib.json');
+
+  const allKitsReg = /@momo-kits/;
+  const fsReg =
+    /^(?:@fs-mobile-platform\/(components(\/.*)?|investment(\/.*)?|screens(\/.*)?|foundation(\/.*)?)|@miniapp-platform\/(components(\/.*)?|foundation(\/.*)?))$/;
+  const RNReg = /react-native|react-native-svg/;
+
+  const config1 = {
+    crawlFrom: scanPath,
+    includeSubComponents: true,
+    importedFrom: allKitsReg,
+    processors: [['count-components', {outputTo: kitJsonPath}]],
+    rootDir: process.cwd(),
+  };
+
+  const config2 = {
+    crawlFrom: scanPath,
+    includeSubComponents: true,
+    processors: [['count-components', {outputTo: miniappJsonPath}]],
+    rootDir: process.cwd(),
+  };
+
+  const config3 = {
+    crawlFrom: scanPath,
+    includeSubComponents: true,
+    importedFrom: RNReg,
+    processors: [['count-components', {outputTo: reactNativeJsonPath}]],
+    rootDir: process.cwd(),
+  };
+
+  const config4 = {
+    crawlFrom: scanPath,
+    includeSubComponents: true,
+    importedFrom: fsReg,
+    processors: [['count-components', {outputTo: fsJsonPath}]],
+    rootDir: process.cwd(),
+  };
+
+  try {
+    ensureFileExists(kitJsonPath, {});
+    ensureFileExists(miniappJsonPath, {});
+    ensureFileExists(reactNativeJsonPath, {});
+    ensureFileExists(fsJsonPath, {});
+
+    await scan(config1);
+    await scan(config2);
+    await scan(config3);
+    await scan(config4);
+
+    const result = await calculateAdoptionRate(
+      branchName,
+      kitJsonPath,
+      miniappJsonPath,
+      reactNativeJsonPath,
+      fsJsonPath
+    );
+    sendMessage(result);
+    console.log(result);
+  } catch (error) {
+    console.error('Error during scan or calculation:', error);
+  }
 };
 
 main();

package/index.ts

@@ -49,3 +49,10 @@ export * from './Title';
 export * from './Title/types';
 export * from './Badge';
 export * from './Badge/types';
+
+/**
+ * export trick for keep old mini app working
+ * @deprecated
+ */
+export * from 'react-native-modalize';
+export * from '@gorhom/bottom-sheet';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.92.7-rc.21",
+    "version": "0.92.7-rc.22",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},
@@ -18,7 +18,7 @@
         "@react-navigation/core": "5.16.1",
         "@react-navigation/native": "5.9.8",
         "@react-navigation/routers": "5.7.4",
-        "lottie-react-native": "3.3.2",
+        "lottie-react-native": "git+https://gitlab.mservice.com.vn/momo-platform/momo-lottie-react-native.git",
         "@react-navigation/stack": "https://gitlab.mservice.com.vn/momo-platform/react-navigation-stack.git"
     },
     "peerDependencies": {
@@ -39,8 +39,9 @@
         "react-test-renderer": "17.0.1",
         "typescript": "^4.0.3",
         "@momo-platform/versions": "4.1.11",
-        "react-scanner": "^1.1.0"
+        "react-scanner": "^1.1.0",
+        "@types/color": "3.0.6"
     },
     "author": "@momo-kits/foundation",
     "license": "ISC"
-}
+}

package/publish.sh

@@ -1,23 +1,18 @@
 #!/bin/bash
-rm -rf dist
-mkdir dist
 
-cp . ./dist
-
-
-# GET VERSION from mck_package.json
-VERSIONSTRING=( v$(jq .version package.json) )
-VERSION=(${VERSIONSTRING//[\"]/})
-echo VERSION: $VERSION
-
-rsync -r --verbose --exclude '*.mdx' --exclude '*Demo.js'  --exclude 'props-type.js' --exclude 'prop-types.js' ./* dist
-
-cd dist
-npm publish --tag latest --access=public
-
-#clear dist and package json
-cd ..
-rm -rf dist
-
-
-#curl -X POST -H 'Content-Type: application/json' 'https://chat.googleapis.com/v1/spaces/AAAAbP8987c/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=UGSFRvk_oYb9uGsAgs31bVvMm6jDkmD8zihGm3eyaQA%3D&threadKey=JoaXTEYaNNkl' -d '{"text": "@momo-kits/core new version release: '*"$VERSION"*' https://www.npmjs.com/package/@momo-kits/foundation"}'
+if [ "$1" == "stable" ]; then
+  npm version $(npm view @momo-kits/foundation@stable version)
+  npm version patch
+  npm publish --tag stable --access=public
+elif [ "$1" == "latest" ]; then
+  npm version $(npm view @momo-kits/foundation@latest version)
+  npm version prerelease --preid=rc
+  npm publish --tag latest --access=public
+else
+  npm version $(npm view @momo-kits/foundation@beta version)
+  npm version prerelease --preid=beta
+  npm publish --tag beta --access=public
+fi
+
+PACKAGE_NAME=$(npm pkg get name)
+NEW_PACKAGE_VERSION=$(npm pkg get version)

package/tsconfig.json

@@ -19,6 +19,6 @@
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "strict": true,
-    "target": "esnext",
+    "target": "esnext"
   }
 }