@momo-kits/foundation 0.111.1-beta.2 → 0.111.1-beta.4

package/Application/ModalScreen.tsx

@@ -1,6 +1,7 @@
 import React, {useContext, useEffect, useRef} from 'react';
 import {
   Animated,
+  Easing,
   KeyboardAvoidingView,
   Platform,
   Pressable,
@@ -38,11 +39,13 @@ const Modal: React.FC<ModalParams> = props => {
     Animated.parallel([
       Animated.timing(opacity, {
         toValue: 1,
-        duration: 400,
+        duration: 250,
         useNativeDriver: true,
       }),
-      Animated.spring(scale, {
+      Animated.timing(scale, {
         toValue: 1,
+        duration: 250,
+        easing: Easing.bezier(0.2, 0.0, 0, 1.0),
         useNativeDriver: true,
       }),
     ]).start();
@@ -52,7 +55,7 @@ const Modal: React.FC<ModalParams> = props => {
     };
   }, [opacity, scale]);
 
-  const onDismiss = () => {
+  const onDismiss = (callback = () => {}) => {
     if (barrierDismissible) {
       return;
     }
@@ -65,9 +68,11 @@ const Modal: React.FC<ModalParams> = props => {
       Animated.timing(scale, {
         toValue: 0.8,
         duration: 200,
+        easing: Easing.linear,
         useNativeDriver: true,
       }),
     ]).start(() => {
+      callback();
       navigator?.pop();
     });
   };
@@ -76,7 +81,9 @@ const Modal: React.FC<ModalParams> = props => {
     <KeyboardAvoidingView
       style={Styles.flexCenter}
       behavior={Platform.OS === 'ios' ? 'padding' : 'height'}>
-      <Pressable style={StyleSheet.absoluteFillObject} onPress={onDismiss}>
+      <Pressable
+        style={StyleSheet.absoluteFillObject}
+        onPress={() => onDismiss()}>
         <Animated.View style={[styles.overlayContent, {opacity}]} />
       </Pressable>
       <Animated.View
@@ -87,7 +94,7 @@ const Modal: React.FC<ModalParams> = props => {
           },
           modalStyle,
         ]}>
-        <Component {...params} />
+        <Component {...params} onRequestClose={onDismiss} />
       </Animated.View>
     </KeyboardAvoidingView>
   );

package/Input/Input.tsx

@@ -176,13 +176,6 @@ const Input = forwardRef(
         iconTintColor = disabledColor;
       }
 
-      if (secureTextEntry) {
-        keyboardType = Platform.select({
-          ios: 'ascii-capable',
-          android: 'visible-password',
-        });
-      }
-
       return (
         <View
           style={[

package/Popup/PopupNotify.tsx

@@ -24,6 +24,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   primary,
   buttonDirection = 'row',
   onIconClose,
+  onRequestClose,
 }) => {
   const context = useContext<any>(MiniAppContext);
   const {theme, navigator, translate} = useContext(ApplicationContext);
@@ -73,8 +74,12 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
    * @param callback
    */
   const onAction = (callback?: () => void) => {
-    navigator?.pop();
-    callback?.();
+    if (typeof onRequestClose === 'function') {
+      onRequestClose?.(callback);
+    } else {
+      navigator?.pop();
+      callback?.();
+    }
   };
 
   /**

package/Popup/PopupPromotion.tsx

@@ -10,6 +10,7 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
   id,
   image,
   onIconClose,
+  onRequestClose,
 }) => {
   const context = useContext<any>(MiniAppContext);
   const {theme, navigator} = useContext(ApplicationContext);
@@ -45,6 +46,19 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
     };
   }, []);
 
+  /**
+   * on action popup
+   * @param callback
+   */
+  const onAction = (callback?: () => void) => {
+    if (typeof onRequestClose === 'function') {
+      onRequestClose?.(callback);
+    } else {
+      navigator?.pop();
+      callback?.();
+    }
+  };
+
   /**
    * build close action
    */
@@ -55,8 +69,7 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
           accessibilityLabel={'ic_popup_close'}
           onPress={() => {
             closeAction.current = 'icon_close';
-            navigator?.pop();
-            onIconClose?.();
+            onAction(onIconClose);
           }}
           style={styles.iconButton}>
           <View

package/Popup/types.ts

@@ -47,6 +47,11 @@ export type PopupNotifyProps = {
    * `onIconClose`: Optional. A callback function that is called when the close icon in the PopupNotify component is pressed.
    */
   onIconClose?: () => void;
+
+  /**
+   * onRequestClose on request close for modal
+   */
+  onRequestClose?: (callback?: () => void) => void;
 };
 
 export type PopupPromotionProps = {
@@ -64,6 +69,11 @@ export type PopupPromotionProps = {
    * `onClose`: Optional. A callback function that is called when the PopupPromotion component is closed.
    */
   onIconClose?: () => void;
+
+  /**
+   * onRequestClose on request close for modal
+   */
+  onRequestClose?: (callback?: () => void) => void;
 };
 
 type PopupAction = {

package/package.json

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