@momo-kits/foundation 0.161.2-beta.18 → 0.161.2-beta.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/Application/BottomSheet.tsx +2 -3
  2. package/Application/BottomTab/index.tsx +1 -1
  3. package/Application/Components/HeaderLeft.tsx +1 -1
  4. package/Application/NavigationContainer.tsx +15 -18
  5. package/Layout/Screen.tsx +2 -2
  6. package/package.json +34 -35
package/Application/BottomSheet.tsx CHANGED
@@ -37,8 +37,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
37
37
  const action = useRef<undefined | string>(undefined);
38
38
  const insets = useSafeAreaInsets();
39
39
  const heightHeader = useHeaderHeight();
40
- const bottomInset = Platform.OS === 'ios' ? Math.min(insets.bottom, 21) : insets.bottom;
41
- const keyboardOffset = heightHeader - bottomInset;
40
+ const keyboardOffset = heightHeader - Math.min(insets.bottom, 21);
42
41
 
43
42
  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
44
43
 
@@ -312,7 +311,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
312
311
  {useBottomInset && (
313
312
  <View
314
313
  style={{
315
- height: bottomInset,
314
+ height: Math.min(insets.bottom, 21),
316
315
  backgroundColor: backgroundColor,
317
316
  }}
318
317
  />
package/Application/BottomTab/index.tsx CHANGED
@@ -320,7 +320,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
320
320
  activeTintColor={theme.colors.primary}
321
321
  style={[
322
322
  {
323
- height: 64 + (Platform.OS === 'ios' ? Math.min(insets.bottom, 21) : insets.bottom),
323
+ height: 64 + Math.min(insets.bottom, 21),
324
324
  },
325
325
  ]}
326
326
  />
package/Application/Components/HeaderLeft.tsx CHANGED
@@ -86,7 +86,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
86
86
 
87
87
  const styles = StyleSheet.create({
88
88
  headerLeft: {
89
- marginLeft: 12,
89
+ marginLeft: 8,
90
90
  },
91
91
  });
92
92
 
package/Application/NavigationContainer.tsx CHANGED
@@ -26,7 +26,6 @@ import { HeaderLeft } from './Components/HeaderLeft';
26
26
  import { HeaderRight } from './Components/HeaderRight';
27
27
  import { HeaderTitle } from './Components/HeaderTitle';
28
28
  import { HeaderBackground } from './Components/HeaderBackground';
29
- import { KeyboardProvider } from 'react-native-keyboard-controller';
30
29
 
31
30
  const Stack = createStackNavigator();
32
31
 
@@ -57,23 +56,21 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
57
56
  };
58
57
 
59
58
  return (
60
- <KeyboardProvider>
61
- <SafeAreaProvider>
62
- <MiniAppContext.Provider value={mergedContext}>
63
- <ScaleSizeProvider scaleSizeMaxRate={mergedContext?.scaleSizeMaxRate}>
64
- <Navigation
65
- screen={screen}
66
- theme={theme}
67
- options={options}
68
- maxApi={maxApi}
69
- setCurrentContext={setCurrentContext}
70
- initialParams={initialParams}
71
- localize={localize}
72
- />
73
- </ScaleSizeProvider>
74
- </MiniAppContext.Provider>
75
- </SafeAreaProvider>
76
- </KeyboardProvider>
59
+ <SafeAreaProvider>
60
+ <MiniAppContext.Provider value={mergedContext}>
61
+ <ScaleSizeProvider scaleSizeMaxRate={mergedContext?.scaleSizeMaxRate}>
62
+ <Navigation
63
+ screen={screen}
64
+ theme={theme}
65
+ options={options}
66
+ maxApi={maxApi}
67
+ setCurrentContext={setCurrentContext}
68
+ initialParams={initialParams}
69
+ localize={localize}
70
+ />
71
+ </ScaleSizeProvider>
72
+ </MiniAppContext.Provider>
73
+ </SafeAreaProvider>
77
74
  );
78
75
  };
79
76
 
package/Layout/Screen.tsx CHANGED
@@ -13,6 +13,7 @@ import React, {
13
13
  } from 'react';
14
14
  import {
15
15
  Animated,
16
+ KeyboardAvoidingView,
16
17
  NativeScrollEvent,
17
18
  NativeSyntheticEvent,
18
19
  Platform,
@@ -24,7 +25,6 @@ import {
24
25
  View,
25
26
  ViewProps,
26
27
  } from 'react-native';
27
- import { KeyboardAvoidingView } from "react-native-keyboard-controller";
28
28
  import { useSafeAreaInsets } from 'react-native-safe-area-context';
29
29
  import { ApplicationContext, ScreenContext } from '../Context';
30
30
  import Navigation from '../Application/Navigation';
@@ -591,7 +591,7 @@ const Screen = forwardRef(
591
591
  keyboardVerticalOffset={keyboardVerticalOffset ?? keyboardOffset}
592
592
  behavior={Platform.select({
593
593
  ios: 'padding',
594
- android: 'padding',
594
+ android: undefined,
595
595
  })}
596
596
  >
597
597
  {Header}
package/package.json CHANGED
@@ -1,36 +1,35 @@
1
1
  {
2
- "name": "@momo-kits/foundation",
3
- "version": "0.161.2-beta.18",
4
- "description": "React Native Component Kits",
5
- "main": "index.ts",
6
- "scripts": {},
7
- "keywords": [
8
- "@momo-kits/foundation"
9
- ],
10
- "dependencies": {
11
- "react-native-fast-image": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-fast-image.git#v8.11.0",
12
- "@react-navigation/bottom-tabs": "7.4.2",
13
- "@react-navigation/core": "7.12.1",
14
- "@react-navigation/elements": "2.5.2",
15
- "@react-navigation/native": "7.1.14",
16
- "@react-navigation/routers": "7.4.1",
17
- "@react-navigation/stack": "7.4.2",
18
- "react-native-gesture-handler": "2.27.1",
19
- "react-native-keyboard-controller": "1.21.11",
20
- "react-native-linear-gradient": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-linear-gradient#v3.0.0",
21
- "react-native-reanimated": "4.2.2",
22
- "react-native-safe-area-context": "5.5.2",
23
- "@shopify/flash-list": "2.1.0",
24
- "lottie-react-native": "7.2.4"
25
- },
26
- "peerDependencies": {
27
- "react-native": "*"
28
- },
29
- "devDependencies": {
30
- "@types/color": "3.0.6"
31
- },
32
- "publishConfig": {
33
- "registry": "https://registry.npmjs.org/"
34
- },
35
- "license": "MoMo"
36
- }
2
+ "name": "@momo-kits/foundation",
3
+ "version": "0.161.2-beta.20",
4
+ "description": "React Native Component Kits",
5
+ "main": "index.ts",
6
+ "scripts": {},
7
+ "keywords": [
8
+ "@momo-kits/foundation"
9
+ ],
10
+ "dependencies": {
11
+ "react-native-fast-image": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-fast-image.git#v8.11.0",
12
+ "@react-navigation/bottom-tabs": "7.4.2",
13
+ "@react-navigation/core": "7.12.1",
14
+ "@react-navigation/elements": "2.5.2",
15
+ "@react-navigation/native": "7.1.14",
16
+ "@react-navigation/routers": "7.4.1",
17
+ "@react-navigation/stack": "7.4.2",
18
+ "react-native-gesture-handler": "2.27.1",
19
+ "react-native-linear-gradient": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-linear-gradient#v3.0.0",
20
+ "react-native-reanimated": "4.2.2",
21
+ "react-native-safe-area-context": "5.5.2",
22
+ "@shopify/flash-list": "2.1.0",
23
+ "lottie-react-native": "7.2.4"
24
+ },
25
+ "peerDependencies": {
26
+ "react-native": "*"
27
+ },
28
+ "devDependencies": {
29
+ "@types/color": "3.0.6"
30
+ },
31
+ "publishConfig": {
32
+ "registry": "https://registry.npmjs.org/"
33
+ },
34
+ "license": "MoMo"
35
+ }