Merge pull request #140 from birdwingo/fix/issues

Fix/issues
birdwingo · Feb 1, 2025 · 7c9bbeb · 7c9bbeb
2 parents e9f7c92 + 4b506d4
commit 7c9bbeb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/src/components/Avatar/index.tsx b/src/components/Avatar/index.tsx
@@ -27,6 +27,7 @@ const StoryAvatar: FC<StoryAvatarProps> = ( {
   nameTextStyle,
   nameTextProps,
   renderAvatar,
+  avatarBorderRadius,
 } ) => {
 
   const loaded = useSharedValue( false );
@@ -68,7 +69,7 @@ const StoryAvatar: FC<StoryAvatarProps> = ( {
             style={[
               AvatarStyles.avatar,
               imageAnimatedStyles,
-              { width: size, height: size, borderRadius: size / 2 },
+              { width: size, height: size, borderRadius: avatarBorderRadius ?? ( size / 2 ) },
             ]}
             testID="storyAvatarImage"
             onLoad={onLoad}

diff --git a/src/components/AvatarList/index.tsx b/src/components/AvatarList/index.tsx
@@ -1,8 +1,8 @@
 import React, { FC, memo } from 'react';
 import { ScrollView } from 'react-native';
 import StoryAvatar from '../Avatar';
-import { StoryAvatarListProps } from '~/core/dto/componentsDTO';
-import { InstagramStoryProps } from '~/core/dto/instagramStoriesDTO';
+import { StoryAvatarListProps } from '../../core/dto/componentsDTO';
+import { InstagramStoryProps } from '../../core/dto/instagramStoriesDTO';
 
 let FlashList: any;
 
@@ -20,7 +20,7 @@ try {
 const StoryAvatarList: FC<StoryAvatarListProps> = ( {
   stories, loadingStory, seenStories, colors, seenColors, size,
   showName, nameTextStyle, nameTextProps,
-  avatarListContainerProps, avatarListContainerStyle, onPress,
+  avatarListContainerProps, avatarListContainerStyle, avatarBorderRadius, onPress,
 } ) => {
 
   const renderItem = ( story: InstagramStoryProps ) => (
@@ -35,6 +35,7 @@ const StoryAvatarList: FC<StoryAvatarListProps> = ( {
       showName={showName}
       nameTextStyle={nameTextStyle}
       nameTextProps={nameTextProps}
+      avatarBorderRadius={avatarBorderRadius}
       key={`avatar${story.id}`}
     />
   );

diff --git a/src/components/InstagramStories/index.tsx b/src/components/InstagramStories/index.tsx
@@ -33,6 +33,7 @@ const InstagramStories = forwardRef<InstagramStoriesPublicMethods, InstagramStor
   closeIconColor = CLOSE_COLOR,
   isVisible = false,
   hideAvatarList = false,
+  avatarBorderRadius,
   ...props
 }, ref ) => {
 
@@ -238,6 +239,7 @@ const InstagramStories = forwardRef<InstagramStoriesPublicMethods, InstagramStor
           nameTextProps={nameTextProps}
           avatarListContainerProps={avatarListContainerProps}
           avatarListContainerStyle={avatarListContainerStyle}
+          avatarBorderRadius={avatarBorderRadius}
           onPress={onPress}
         />
       )}

diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx
@@ -34,6 +34,7 @@ const StoryModal = forwardRef<StoryModalPublicMethods, StoryModalProps>( ( {
   const isLongPress = useSharedValue( false );
   const hideElements = useSharedValue( false );
   const lastViewed = useSharedValue<{ [key: string]:number }>( {} );
+  const firstRender = useSharedValue( true );
 
   const userIndex = useDerivedValue( () => Math.round( x.value / WIDTH ) );
   const storyIndex = useDerivedValue( () => stories[userIndex.value]?.stories.findIndex(
@@ -441,12 +442,14 @@ const StoryModal = forwardRef<StoryModalPublicMethods, StoryModalProps>( ( {
 
       y.value = withTiming( 0, { duration: modalAnimationDuration } );
 
-    } else if ( currentStory.value !== undefined ) {
+    } else if ( currentStory.value !== undefined && !firstRender.value ) {
 
       onHide?.( currentStory.value );
 
     }
 
+    firstRender.value = false;
+
   }, [ visible ] );
 
   useAnimatedReaction(

diff --git a/src/core/dto/componentsDTO.ts b/src/core/dto/componentsDTO.ts
@@ -18,6 +18,7 @@ export interface StoryAvatarListProps {
   nameTextProps: InstagramStoriesProps['nameTextProps'];
   avatarListContainerStyle: InstagramStoriesProps['avatarListContainerStyle'];
   avatarListContainerProps: InstagramStoriesProps['avatarListContainerProps'];
+  avatarBorderRadius?: number;
   onPress: ( id: string ) => void;
 }
 
@@ -31,6 +32,7 @@ export interface StoryAvatarProps extends InstagramStoryProps {
   showName?: boolean;
   nameTextStyle?: TextStyle;
   nameTextProps?: TextProps;
+  avatarBorderRadius?: number;
 }
 
 export interface StoryLoaderProps {

diff --git a/src/core/dto/instagramStoriesDTO.ts b/src/core/dto/instagramStoriesDTO.ts
@@ -62,6 +62,7 @@ export interface InstagramStoriesProps {
   loopingStories?: 'none' | 'all' | 'onlyLast';
   statusBarTranslucent?: boolean;
   footerComponent?: ReactNode;
+  avatarBorderRadius?: number;
   onShow?: ( id: string ) => void;
   onHide?: ( id: string ) => void;
   onSwipeUp?: ( userId?: string, storyId?: string ) => void;