Merge pull request #166 from IWSR/fix/commit-area-need-to-hide

fix: The bottom sheet do not close when the page navigate to other route
Crossbell-Box · Jul 2, 2023 · 9af0127 · 9af0127
2 parents e0e057f + 4773322
commit 9af0127
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/env.d.ts b/env.d.ts
@@ -7,6 +7,12 @@ declare global {
       OWNER: string
       UPDATES_URL: string
       INFURA_ID: string
+      CSB_SCAN: string
+      CSB_XCHAR: string
+      SENTRY_DSN: string
+      SENTRY_ORG: string
+      SENTRY_PROJECT: string
+      SENTRY_AUTH_TOKEN: string
     }
   }
 }

diff --git a/src/components/Avatar/index.tsx b/src/components/Avatar/index.tsx
@@ -17,6 +17,7 @@ interface Props {
   size?: number
   useDefault?: boolean
   isNavigateToUserInfo?: boolean
+  handleBeforeNavigate?: () => void
 }
 
 const isValidUrl = (url) => {
@@ -31,7 +32,7 @@ const isValidUrl = (url) => {
 };
 
 export const Avatar: FC<Props> = (props) => {
-  const { character, size = 45, useDefault = false, isNavigateToUserInfo = true } = props;
+  const { character, size = 45, useDefault = false, isNavigateToUserInfo = true, handleBeforeNavigate } = props;
   const navigation = useRootNavigation();
   const uri = character?.metadata?.content?.avatars?.[0];
   const name = character?.metadata?.content?.name;
@@ -45,6 +46,7 @@ export const Avatar: FC<Props> = (props) => {
     if (!character?.characterId) {
       return;
     }
+    handleBeforeNavigate && handleBeforeNavigate();
     navigation.navigate("UserInfo", { characterId: character?.characterId });
   };
 

diff --git a/src/components/CommentButton/index.tsx b/src/components/CommentButton/index.tsx
@@ -231,6 +231,9 @@ export const CommentButton: React.FC<Props> = ({ characterId, noteId, iconSize =
                       }}
                       onComment={comments.refetch}
                       onEdit={comments.refetch}
+                      onNavigateToUserProfile={() => {
+                        bottomSheetRef.current.close();
+                      }}
                     />
                   );
                 }}

diff --git a/src/components/CommentItem/index.tsx b/src/components/CommentItem/index.tsx
@@ -36,6 +36,7 @@ export interface CommentItemProps extends ListItemProps {
   onPressEdit?: (comment: Comment) => void
   onComment?: () => Promise<any>
   onEdit?: () => Promise<any>
+  onNavigateToUserProfile?: () => void
 }
 
 export type Comment = NoteEntity & {
@@ -55,6 +56,7 @@ export const CommentItem: React.FC<CommentItemProps> = (props) => {
     onPressEdit: _onPressEdit,
     onComment,
     onEdit,
+    onNavigateToUserProfile,
     ...restProps
   } = props;
   const date = useDate();
@@ -133,7 +135,7 @@ export const CommentItem: React.FC<CommentItemProps> = (props) => {
   return (
     <>
       <XStack marginBottom="$2" gap="$3" {...restProps}>
-        <Avatar useDefault size={isSubComment ? 36 : 40} character={comment?.character} />
+        <Avatar useDefault size={isSubComment ? 36 : 40} character={comment?.character} handleBeforeNavigate={onNavigateToUserProfile} />
         <YStack flex={1}>
           <YStack flex={1}>
             <XStack alignItems="center" marginBottom="$1">