@momo-kits/foundation 0.168.1-beta.2 → 0.168.1-beta.21

package/Popup/PopupNotify.tsx

@@ -8,7 +8,7 @@ import { Image } from '../Image';
 import { Text, useScaleSize } from '../Text';
 import { PopupNotifyProps } from './types';
 import { scheduleOnRN } from 'react-native-worklets';
-import { usePopupMaxHeight, usePopupWidth } from './utils';
+import { getPopupRadius, usePopupMaxHeight, usePopupWidth } from './utils';
 
 const PopupNotify: React.FC<PopupNotifyProps> = ({
   image,
@@ -26,6 +26,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   const [scrollContent, setScrollContent] = useState(false);
   const popupWidth = usePopupWidth();
   const maxHeight = usePopupMaxHeight();
+  const radius = getPopupRadius();
   const scaledMaxHeight = useScaleSize(172);
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
@@ -170,7 +171,15 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
 
   const body = (
     <>
-      {!!image && <Image source={{ uri: image }} style={styles.image} />}
+      {!!image && (
+        <Image
+          source={{ uri: image }}
+          style={[
+            styles.image,
+            { borderTopLeftRadius: radius, borderTopRightRadius: radius },
+          ]}
+        />
+      )}
       <View style={styles.content}>
         <Text
           typography={'header_default_bold'}
@@ -218,9 +227,9 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
     <View
       accessibilityLabel={'popup_notify'}
       style={[
-        styles.container,
         {
           backgroundColor: theme.colors.background.surface,
+          borderRadius: radius,
           width: popupWidth,
           maxHeight,
         },
@@ -231,7 +240,13 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
         body
       ) : (
         // scrolls when iPhone Duo landscape is too short; actions stay visible
-        <ScrollView style={styles.body} bounces={false}>
+        <ScrollView
+          style={[
+            styles.body,
+            { borderTopLeftRadius: radius, borderTopRightRadius: radius },
+          ]}
+          bounces={false}
+        >
           {body}
         </ScrollView>
       )}
@@ -242,17 +257,12 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
 };
 
 const styles = StyleSheet.create({
-  container: {
-    borderRadius: Radius.L,
-  },
   debugBaseLine: { borderWidth: 1, borderColor: Colors.green_06 },
   image: {
-    borderTopLeftRadius: Radius.L,
-    borderTopRightRadius: Radius.L,
     aspectRatio: 1.7777,
     overflow: 'hidden',
   },
-  body: { flexShrink: 1 },
+  body: { flexShrink: 1, overflow: 'hidden' },
   content: { padding: Spacing.XL },
   description: {
     marginTop: Spacing.S,

package/Popup/utils.ts

@@ -1,32 +1,26 @@
 import { Dimensions, useWindowDimensions } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import { Spacing } from '../Consts';
-import { getDuoTopInset, isIPhoneDuo } from '../Application/device';
-
-// width of a system alert on the iPhone Duo inner display, in both orientations
-const DUO_POPUP_MAX_WIDTH = 440;
+import { Radius, Spacing } from '../Consts';
+import { getDuoModalBounds, isIPhoneDuo } from '../Application/device';
 
 const usePopupWidth = () => {
-  const windowSize = useWindowDimensions();
+  const insets = useSafeAreaInsets();
+  const { width, height } = useWindowDimensions();
   if (!isIPhoneDuo()) {
     return Dimensions.get('window').width - Spacing.XL * 2;
   }
-  return Math.min(windowSize.width - Spacing.XL * 2, DUO_POPUP_MAX_WIDTH);
+  return getDuoModalBounds(insets, width, height).maxWidth;
 };
 
-// room left for a popup on iPhone Duo, where landscape is too short for it
 const usePopupMaxHeight = () => {
   const insets = useSafeAreaInsets();
   const { width, height } = useWindowDimensions();
   if (!isIPhoneDuo()) {
     return undefined;
   }
-  return (
-    height -
-    getDuoTopInset(insets, width, height) -
-    insets.bottom -
-    Spacing.XL * 2
-  );
+  return getDuoModalBounds(insets, width, height).maxHeight;
 };
 
-export { usePopupWidth, usePopupMaxHeight };
+const getPopupRadius = () => (isIPhoneDuo() ? Radius.XL : Radius.L);
+
+export { usePopupWidth, usePopupMaxHeight, getPopupRadius };

package/package.json

@@ -1,38 +1,38 @@
 {
-    "name": "@momo-kits/foundation",
-    "version": "0.168.1-beta.2",
-    "description": "React Native Component Kits",
-    "main": "index.ts",
-    "scripts": {},
-    "keywords": [
-        "@momo-kits/foundation"
-    ],
-    "dependencies": {
-        "react-native-fast-image": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-fast-image.git#v8.11.0",
-        "@react-navigation/bottom-tabs": "7.4.2",
-        "@react-navigation/core": "7.12.1",
-        "@react-navigation/elements": "2.5.2",
-        "@react-navigation/native": "7.1.14",
-        "@react-navigation/routers": "7.4.1",
-        "@react-navigation/stack": "7.4.2",
-        "react-native-gesture-handler": "2.27.1",
-        "react-native-linear-gradient": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-linear-gradient#v3.0.0",
-        "react-native-reanimated": "4.2.2",
-        "react-native-worklets": "0.6.1",
-        "react-native-safe-area-context": "5.5.2",
-        "react-native-reserved-regions": "0.2.0",
-        "@shopify/flash-list": "2.1.0",
-        "lottie-react-native": "7.2.4"
-    },
-    "peerDependencies": {
-        "react-native": "*",
-        "react-native-worklets": "0.6.1"
-    },
-    "devDependencies": {
-        "@types/color": "3.0.6"
-    },
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org/"
-    },
-    "license": "MoMo"
-}
+  "name": "@momo-kits/foundation",
+  "version": "0.168.1-beta.21",
+  "description": "React Native Component Kits",
+  "main": "index.ts",
+  "scripts": {},
+  "keywords": [
+    "@momo-kits/foundation"
+  ],
+  "dependencies": {
+    "react-native-fast-image": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-fast-image.git#v8.11.0",
+    "@react-navigation/bottom-tabs": "7.4.2",
+    "@react-navigation/core": "7.12.1",
+    "@react-navigation/elements": "2.5.2",
+    "@react-navigation/native": "7.1.14",
+    "@react-navigation/routers": "7.4.1",
+    "@react-navigation/stack": "7.4.2",
+    "react-native-gesture-handler": "2.27.1",
+    "react-native-linear-gradient": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-linear-gradient#v3.0.0",
+    "react-native-reanimated": "4.2.2",
+    "react-native-worklets": "0.6.1",
+    "react-native-safe-area-context": "5.5.2",
+    "react-native-reserved-regions": "0.2.0",
+    "@shopify/flash-list": "2.1.0",
+    "lottie-react-native": "7.2.4"
+  },
+  "peerDependencies": {
+    "react-native": "*",
+    "react-native-worklets": "0.6.1"
+  },
+  "devDependencies": {
+    "@types/color": "3.0.6"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "license": "MoMo"
+}