@momo-kits/foundation 0.125.4-beta.2 → 0.125.4-beta.3

package/Application/BottomSheet.tsx

@@ -28,6 +28,7 @@ import {BottomSheetParams} from './types';
 import {Colors, Radius, Spacing, Styles} from '../Consts';
 import {Text} from '../Text';
 import {Icon} from '../Icon';
+import layoutStyles from '../Layout/styles';
 
 const BottomSheet: React.FC<BottomSheetParams> = props => {
   const {theme, navigator} = useContext(ApplicationContext);
@@ -51,6 +52,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     useScrollOverflow = false,
     keyboardVerticalOffset,
     useDivider = true,
+    footerComponent,
   }: BottomSheetParams = props.route.params;
 
   const customEasingOpen = Easing.bezier(0.05, 0.7, 0.1, 1);
@@ -312,10 +314,27 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
               {...props.route.params}
               onRequestClose={onRequestClose}
             />
-            {useBottomInset && (
-              <View style={{height: Math.min(insets.bottom, 21)}} />
-            )}
           </Content>
+          {footerComponent && (
+            <View
+              style={[
+                layoutStyles.shadow,
+                {
+                  paddingBottom: Spacing.S,
+                  backgroundColor: theme.colors.background.surface,
+                },
+              ]}>
+              {footerComponent}
+            </View>
+          )}
+          {useBottomInset && (
+            <View
+              style={{
+                height: Math.min(insets.bottom, 21),
+                backgroundColor: backgroundColor,
+              }}
+            />
+          )}
         </Animated.View>
       </KeyboardAvoidingView>
     </Container>

package/Application/Components/HeaderRight.tsx

@@ -105,7 +105,7 @@ const HeaderToolkitAction: React.FC<any> = ({
   );
 
   const onDismiss = () => {
-    if (useCloseIcon || !isWhiteList) {
+    if (useCloseIcon && !isWhiteList) {
       navigator?.maxApi?.dispatchFunction?.(
         'dismiss',
         navigator?.dismissData,
@@ -300,7 +300,7 @@ const HeaderToolkitAction: React.FC<any> = ({
           <Icon
             color={tintColor}
             source={
-              useCloseIcon || !isWhiteList
+              useCloseIcon && !isWhiteList
                 ? '16_navigation_close_circle'
                 : '16_basic_home'
             }

package/Application/types.ts

@@ -159,6 +159,7 @@ export type BottomSheetParams = {
   keyboardVerticalOffset?: number;
   useScrollOverflow?: boolean;
   useDivider?: boolean;
+  footerComponent?: React.ReactNode;
 };
 
 export interface NavigationButtonProps extends TouchableOpacityProps {

package/Popup/PopupNotify.tsx

@@ -222,7 +222,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
               accessibilityLabel={'description_popup_notify'}
               typography={'body_default_regular'}
               onTextLayout={({nativeEvent: {lines}}) => {
-                const enableScroll = lines.length > 3;
+                const enableScroll = lines.length > 8.5;
                 if (enableScroll !== scrollContent) {
                   setScrollContent(enableScroll);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/foundation",
-  "version": "0.125.4-beta.2",
+  "version": "0.125.4-beta.3",
   "minimumDeployTarget": 32,
   "deploymentTarget": 125,
   "description": "React Native Component Kits",