@momo-kits/foundation 0.81.1-optimize.18 → 0.81.1-optimize.19

package/Application/BottomSheet.tsx

@@ -28,6 +28,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     barrierDismissible = false,
     draggable = true,
     useBottomInset = true,
+    keyboardVerticalOffset,
   }: BottomSheetParams = props.route.params;
   const pan = useRef(
     new Animated.ValueXY({
@@ -83,7 +84,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   /**
    * handler dismiss
    */
-  const onDismiss = (force = false) => {
+  const onDismiss = (force = false, callback?: () => void) => {
     if (barrierDismissible && !force) {
       return;
     }
@@ -93,9 +94,20 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
       duration: 100,
     }).start(() => {
       navigator?.pop();
+      callback?.();
     });
   };
 
+  /**
+   * manual close
+   */
+  const requestClose = useCallback((callback?: () => void) => {
+    onDismiss(true, callback);
+  }, []);
+
+  /**
+   * render header
+   */
   const renderHeader = useCallback(() => {
     return (
       <View
@@ -137,7 +149,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     <Modal transparent visible={true} onRequestClose={() => onDismiss()}>
       <KeyboardAvoidingView
         behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-        keyboardVerticalOffset={-20}
+        keyboardVerticalOffset={keyboardVerticalOffset ?? -20}
         style={[Styles.flex, {justifyContent: 'flex-end'}]}>
         <TouchableOpacity
           style={Styles.flex}
@@ -147,7 +159,11 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
         <Animated.View style={{transform: pan.getTranslateTransform()}}>
           {renderHeader()}
           <View style={{backgroundColor: backgroundColor}}>
-            <Screen {...props} {...props.route.params} />
+            <Screen
+              {...props}
+              {...props.route.params}
+              requestClose={requestClose}
+            />
             {useBottomInset && (
               <View style={{height: Math.min(insets.bottom, 21)}} />
             )}
@@ -157,6 +173,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     </Modal>
   );
 };
+
 export default BottomSheet;
 
 const styles = StyleSheet.create({

package/Application/StackScreen.tsx

@@ -50,10 +50,11 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen
    */
   useEffect(() => {
-    Alert.alert(screenName);
+    if (__DEV__ && (!screenName || screenName == 'Invalid')) {
+      Alert.alert('Design system', `Unvalidated screen name "${screenName}" !`);
+    }
 
     navigator?.maxApi?.of?.({screenName});
-
     tracked.current.timeoutLoad = setTimeout(() => {
       onScreenLoad();
     }, 5000);

package/Application/types.ts

@@ -119,6 +119,7 @@ export type BottomSheetParams = {
   barrierDismissible?: boolean;
   draggable?: boolean;
   useBottomInset?: boolean;
+  keyboardVerticalOffset?: number;
 };
 
 export type NavigationButtonProps = {

package/Layout/Screen.tsx

@@ -33,6 +33,9 @@ import styles from './styles';
 import {HeaderType} from './types';
 
 export interface ScreenProps extends ViewProps {
+  /**
+   * ReactNode representing the content of the screen.
+   */
   children: React.ReactNode;
   /**
    * Optional. Navigation object for handling navigation actions.
@@ -90,9 +93,10 @@ export interface ScreenProps extends ViewProps {
   floatingButtonProps?: Omit<FloatingButtonProps, 'animatedValue' | 'bottom'>;
 
   /**
-   * optional animated value
+   * Optional. Keyboard vertical offset.
    */
-  animatedValue?: Animated.Value;
+  keyboardVerticalOffset?: number;
+
   /**
    * Optional. If `true`, the screen content is using grid layout by span.
    */
@@ -115,13 +119,11 @@ const Screen = forwardRef(
       headerType = 'default',
       floatingButtonProps,
       useGridLayout = true,
-      animatedValue: animated,
+      keyboardVerticalOffset,
     }: ScreenProps,
     ref,
   ) => {
-    const animatedValue = useRef<Animated.Value>(
-      animated ?? new Animated.Value(0),
-    );
+    const animatedValue = useRef<Animated.Value>(new Animated.Value(0));
     const {theme} = useContext(ApplicationContext);
     const insets = useSafeAreaInsets();
     const heightHeader = useHeaderHeight();
@@ -132,10 +134,9 @@ const Screen = forwardRef(
     let handleScroll;
     let headerBackground: string | undefined = undefined;
     let Component: any = View;
-    let keyboardVerticalOffset = heightHeader - 20;
-
+    let keyboardOffset = heightHeader - 20;
     if (headerType == 'extended' || animatedHeader) {
-      keyboardVerticalOffset = -20;
+      keyboardOffset = -20;
     }
 
     if (headerType == 'extended') {
@@ -339,7 +340,7 @@ const Screen = forwardRef(
         <KeyboardAvoidingView
           style={Styles.flex}
           enabled={enableKeyboardAvoidingView}
-          keyboardVerticalOffset={keyboardVerticalOffset}
+          keyboardVerticalOffset={keyboardVerticalOffset ?? keyboardOffset}
           behavior={Platform.select({
             ios: 'padding',
             android: undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.81.1-optimize.18",
+    "version": "0.81.1-optimize.19",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},