@momo-kits/foundation 0.103.2-beta.0 → 0.103.2-beta.2

package/Application/BottomSheet.tsx

@@ -19,7 +19,7 @@ import {Icon} from '../Icon';
 
 const BottomSheet: React.FC<BottomSheetParams> = props => {
   const {theme, navigator} = useContext(ApplicationContext);
-  const heightDevice = Dimensions.get('screen').height;
+  const heightDevice = Dimensions.get('screen').height;    // lấy chiều cao thiết bị
   const insets = useSafeAreaInsets();
   const {
     screen: Screen,

package/Application/BottomTab/index.tsx

@@ -18,6 +18,7 @@ const Stack = createStackNavigator();
 
 const TabScreen: React.FC<NavigationScreenProps> = ({route}) => {
   let options = {};
+
   if (route.params?.options) {
     options = getOptions(route.params?.options);
   }

package/Application/Components.tsx

@@ -378,7 +378,7 @@ const HeaderToolkitAction: React.FC<any> = ({
       {runtimeTools},
       (res: {item: {action?: string; key: string}}) => {
         const {item} = res;
-        navigator?.toolkitCallback?.(item?.key);
+        navigator?.toolkitCallback?.(item.key);
         getToolkitConfig();
       }
     );
@@ -430,7 +430,7 @@ const HeaderToolkitAction: React.FC<any> = ({
                 getToolkitConfig();
               }
             );
-            navigator?.toolkitCallback?.(pinTool?.key);
+            navigator?.toolkitCallback?.(pinTool.key);
           }}
         />
       );

package/Application/NavigationContainer.tsx

@@ -1,25 +1,24 @@
+import React, {useEffect, useRef, useState} from 'react';
+import {SafeAreaProvider} from 'react-native-safe-area-context';
 import {
-  NavigationContainerRef,
   NavigationContainer as ReactNavigationContainer,
+  NavigationContainerRef,
 } from '@react-navigation/native';
 import {createStackNavigator} from '@react-navigation/stack';
-import React, {useEffect, useRef, useState} from 'react';
 import {DeviceEventEmitter} from 'react-native';
-import {SafeAreaProvider} from 'react-native-safe-area-context';
-import {defaultTheme} from '../Consts';
-import {ApplicationContext} from './index';
-import Localize from './Localize';
+import StackScreen from './StackScreen';
 import ModalScreen from './ModalScreen';
 import Navigator from './Navigator';
-import StackScreen from './StackScreen';
-import {NavigationContainerProps} from './types';
 import {getDialogOptions, getModalOptions, getStackOptions} from './utils';
+import {NavigationContainerProps} from './types';
+import {ApplicationContext} from './index';
+import Localize from './Localize';
 
 const Stack = createStackNavigator();
 
-const NavigationContainer: React.FC<NavigationContainerProps> = ({
+const NavigationContainer: React.FC<NavigationContainerProps> = ({ // screen: Screen; options?: NavigationOptions; theme: Theme; maxApi: any; initialParams?: any; localize: Localize;
   screen,
-  theme = defaultTheme,
+  theme,
   options,
   maxApi,
   initialParams,

package/Application/Navigator.ts

@@ -73,6 +73,7 @@ class Navigator {
    * @param params
    */
   showBottomSheet = (params: BottomSheetParams) => {
+    // console.log(this);
     if (this.isReady.current) {
       this.ref.current?.dispatch?.(
         StackActions.push('Modal', {

package/Application/StackScreen.tsx

@@ -14,7 +14,7 @@ import {Colors, Radius, Spacing} from '../Consts';
  * @constructor
  */
 const StackScreen: React.FC<ScreenParams> = props => {
-  const {showGrid, navigator} = useContext(ApplicationContext);
+  const {showGrid, navigator} = useContext(ApplicationContext); //showGrid: false, navigator: undefined,
   const tracking = useRef<any>({
     timeoutLoad: undefined,
     timeoutInteraction: undefined,
@@ -31,6 +31,7 @@ const StackScreen: React.FC<ScreenParams> = props => {
 
   const context = useContext<any>(MiniAppContext);
   const {screen: Component, options, initialParams} = props.route.params;
+  console.log(props.route.params);
   const navigation = new Navigation(props.navigation);
   const heightHeader = useHeaderHeight();
 

package/Layout/styles.ts

@@ -42,6 +42,7 @@ export default StyleSheet.create({
     padding: 12,
   },
   item: {
+    overflow: 'hidden',
     margin: undefined,
     marginTop: undefined,
     marginBottom: undefined,

package/Text/index.tsx

@@ -109,19 +109,18 @@ const Text: React.FC<TextProps> = ({
     };
   };
 
-
   const textStyle = getTypoStyle(typography);
 
   if (deprecatedValues.includes(typography)) {
     console.warn(
-      `Warning: The typography value "${typography}" is deprecated.`,
+      `Warning: The typography value "${typography}" is deprecated.`
     );
   }
 
   return (
     <RNText
       {...rest}
-      {...getAccessibilityID((rest.accessibilityLabel))}
+      {...getAccessibilityID(rest.accessibilityLabel)}
       style={[style, textStyle, {color: color ?? theme.colors.text.default}]}>
       {children ?? ''}
     </RNText>

package/Text/utils.ts

@@ -4,7 +4,6 @@ const deviceWidth = Dimensions.get('window').width;
 const DEFAULT_SCREEN_SIZE = 375;
 const scaleSize = (size: number) => {
   const scaleRate = deviceWidth / DEFAULT_SCREEN_SIZE;
-
   if (scaleRate > 1) {
     return Math.min(Math.round(size * scaleRate), size + 3);
   }
@@ -12,11 +11,10 @@ const scaleSize = (size: number) => {
   return size;
 };
 const getAccessibilityID = (accessibilityLabel = '') => {
-  if (Platform.OS ==='ios') {
+  if (Platform.OS === 'ios') {
     return {
       accessible: true,
       testID: accessibilityLabel,
-      accessibilityLabel:undefined
     };
   } else {
     return {
@@ -24,4 +22,4 @@ const getAccessibilityID = (accessibilityLabel = '') => {
     };
   }
 };
-export {scaleSize,getAccessibilityID};
+export {scaleSize, getAccessibilityID};

package/index.ts

@@ -49,10 +49,3 @@ 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.103.2-beta.0",
+    "version": "0.103.2-beta.2",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},
@@ -8,11 +8,9 @@
         "@momo-kits/foundation"
     ],
     "dependencies": {
-        "@gorhom/bottom-sheet": "2.4.1",
         "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": "https://gitlab.mservice.com.vn/momo-platform/react-native-bottom-tabs.git",
         "@react-navigation/core": "5.16.1",