@momo-kits/foundation 0.81.34 → 0.81.36-beta.1

package/Application/BottomTab.tsx

@@ -1,5 +1,5 @@
 import React, {useContext, useEffect} from 'react';
-import {Platform, StyleSheet, View} from 'react-native';
+import {Platform} from 'react-native';
 import {BottomTabProps, NavigationScreenProps} from './types';
 import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
 import {createStackNavigator} from '@react-navigation/stack';
@@ -8,7 +8,6 @@ import {Text} from '../Text';
 import {ApplicationContext} from './index';
 import {getStackOptions} from './utils';
 import StackScreen from './StackScreen';
-import {Spacing} from '../Consts';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';
 
 const Tab = createBottomTabNavigator();
@@ -49,7 +48,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
       backBehavior={'firstRoute'}
       tabBarOptions={{
         style: {
-          height: 68 + insets.bottom,
+          height: 68 + Math.min(insets.bottom, 21),
         },
         tabStyle: {
           height: 68,

package/Application/Components.tsx

@@ -242,9 +242,8 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   animatedValue,
   useBorder = false,
 }) => {
-  const {theme, config} = useContext(ApplicationContext);
-  let headerImage =
-    config?.navigationBar?.headerBar ?? theme.assets?.headerBackground;
+  const {theme} = useContext(ApplicationContext);
+  let headerImage = theme.assets?.headerBackground;
   if (image === null) {
     headerImage = undefined;
   }

package/Application/NavigationContainer.tsx

@@ -29,7 +29,11 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   const navigator = useRef(new Navigator(navigationRef));
   const [showGrid, setShowGrid] = useState(false);
   const [language, setLanguage] = useState<'vi' | 'en'>('vi');
-  const [config, setConfig] = useState(undefined);
+  const [config, setConfig] = useState<any>(undefined);
+  let assets = theme.assets;
+  if (config) {
+    assets = {...assets, headerBackground: config.navigationBar?.headerBar};
+  }
 
   /**
    * handle mini language & listen change
@@ -83,7 +87,10 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
       <BottomSheetModalProvider>
         <ApplicationContext.Provider
           value={{
-            theme,
+            theme: {
+              ...theme,
+              assets: assets,
+            },
             navigator: navigator.current,
             showGrid,
             language,

package/Layout/Card.tsx

@@ -27,6 +27,7 @@ const Card: React.FC<CardProps> = ({
   style,
   backgroundImage,
   useShadow = false,
+  ...props
 }) => {
   const {showGrid} = useContext(ApplicationContext);
   const {numberOfColumns} = useGridSystem();
@@ -141,6 +142,7 @@ const Card: React.FC<CardProps> = ({
   return (
     <GridContext.Provider value={gridContext}>
       <View
+        {...props}
         accessibilityLabel={`Card`}
         style={[
           style,

package/Layout/Screen.tsx

@@ -101,7 +101,7 @@ const Screen = forwardRef(
     ref,
   ) => {
     const animatedValue = useRef<Animated.Value | undefined>(undefined);
-    const {theme, config} = useContext(ApplicationContext);
+    const {theme} = useContext(ApplicationContext);
     const insets = useSafeAreaInsets();
     const heightHeader = useHeaderHeight();
     const currentTint = useRef(Colors.black_01);
@@ -117,8 +117,7 @@ const Screen = forwardRef(
     }
 
     if (headerType == 'extended') {
-      headerBackground =
-        config?.navigationBar?.headerBar ?? theme.assets?.headerBackground;
+      headerBackground = theme.assets?.headerBackground;
     }
 
     useEffect(() => {

package/Layout/Section.tsx

@@ -33,6 +33,7 @@ const Section: React.FC<SectionProps> = ({
   useMargin = true,
   backgroundImage,
   style,
+  ...props
 }) => {
   const {showGrid} = useContext(ApplicationContext);
   const {numberOfColumns} = useGridSystem();
@@ -148,6 +149,7 @@ const Section: React.FC<SectionProps> = ({
         },
       }}>
       <View
+        {...props}
         accessibilityLabel={`Section`}
         style={[
           style,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.81.34",
+    "version": "0.81.36-beta.1",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {

package/verify.js

@@ -7,7 +7,9 @@ try {
   const packageVersion = parseInt(packageInfo?.version.split('.')?.[1]);
 
   const app = path.join(`${__dirname}/../../../`, 'app.json');
+  const miniJson = path.join(`${__dirname}/../../../`, 'package.json');
   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;
 
@@ -23,6 +25,18 @@ try {
       `Package ${packageInfo.name} version: ${packageInfo.version} require deploymentTarget ${packageVersion}`,
     );
   }
+
+  if (
+    miniInfo?.name !== '@momo-platform/momo-core' &&
+    miniInfo?.resolutions?.['@momo-platform/momo-core'] !== packageInfo?.version
+  ) {
+    console.error(
+      `Package ${packageInfo.name} version: ${packageInfo.version} require install resolutions @momo-platform/momo-core ${packageInfo.version}`,
+    );
+    throw new Error(
+      `Package ${packageInfo.name} version: ${packageInfo.version} require install resolutions @momo-platform/momo-core ${packageInfo.version}`,
+    );
+  }
 } catch (error) {
   console.error(`Installation failed: ${error.message}`);
   process.exit(1);