Merge branch 'develop' of https://github.com/weareteamturing/bombe in…

…to develop
weareteamturing · Aug 29, 2024 · 3d06706 · 3d06706
2 parents fb20439 + 1921d50
commit 3d06706
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/react-native-kit/src/component/ProfilePhoto/LightProfilePhoto.tsx b/packages/react-native-kit/src/component/ProfilePhoto/LightProfilePhoto.tsx
@@ -1,10 +1,10 @@
-import type { StyleProp, ViewStyle } from 'react-native';
+import type { StyleProp, ViewStyle, ImageSourcePropType } from 'react-native';
 import { View } from 'react-native';
 
 import { is, appendImageSizeQueryParams } from '../../util';
 import { Img } from '../Img';
 
-import defaultImage from './profile_outline_gray_90.png';
+import DEFAULT_PROFILE_IMAGE from './profile_outline_gray_90.png';
 
 // this is used for just rendering character image in light component like list item(shouldn't be heavy)
 const LightProfilePhoto = ({
@@ -14,13 +14,15 @@ const LightProfilePhoto = ({
   borderColor,
   borderWidth = 0,
   optimize = true,
+  defaultImage = DEFAULT_PROFILE_IMAGE,
 }: {
   profileImageUrl: string;
   style?: StyleProp<Omit<ViewStyle, 'borderWidth' | 'borderColor'>>;
   size?: number;
   borderWidth?: number;
   borderColor?: string;
   optimize?: boolean;
+  defaultImage?: ImageSourcePropType;
 }) => {
   const size = _size || 56;
   return (

diff --git a/packages/react-native-kit/src/component/ProfilePhoto/ProfilePhoto.tsx b/packages/react-native-kit/src/component/ProfilePhoto/ProfilePhoto.tsx
@@ -1,5 +1,5 @@
 import type { ReactElement } from 'react';
-import { type StyleProp, type ViewStyle, View } from 'react-native';
+import { type StyleProp, type ViewStyle, View, type ImageSourcePropType } from 'react-native';
 
 import { palette } from '../../theme';
 import { is } from '../../util';
@@ -18,6 +18,7 @@ type Props = {
   length?: number;
   testID?: string;
   profileImageUrl?: string;
+  defaultImage?: ImageSourcePropType;
 };
 const ProfilePhoto = ({
   style,
@@ -27,6 +28,7 @@ const ProfilePhoto = ({
   length: _length,
   testID,
   profileImageUrl,
+  defaultImage,
 }: Props): ReactElement => {
   const length = is.number(_length) ? _length : defaultLength;
 
@@ -52,7 +54,7 @@ const ProfilePhoto = ({
         onPress={onPress}
         disabled={!pressable}
       >
-        <LightProfilePhoto profileImageUrl={profileImageUrl || ''} size={length} />
+        <LightProfilePhoto profileImageUrl={profileImageUrl || ''} size={length} defaultImage={defaultImage} />
         {showIcon ? (
           <View
             style={{