diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-05-21 20:53:37 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-05-21 20:53:37 -0400 |
| commit | 29cfccc7010aee6a5c5f47db4881810fa2b75b9f (patch) | |
| tree | 1370c9e57d2709f65e3e6b891621ab65eab9db07 | |
| parent | e2291c8c09937c75249230efbc680e82c4a72d95 (diff) | |
Fix draggables
| -rw-r--r-- | src/components/common/MomentTags.tsx | 1 | ||||
| -rw-r--r-- | src/screens/moments/TagFriendsScreen.tsx | 34 |
2 files changed, 19 insertions, 16 deletions
diff --git a/src/components/common/MomentTags.tsx b/src/components/common/MomentTags.tsx index fb9ef5be..04b0558b 100644 --- a/src/components/common/MomentTags.tsx +++ b/src/components/common/MomentTags.tsx @@ -30,7 +30,6 @@ const MomentTags: React.FC<MomentTagsProps> = ({ if (!tags) { return null; } - return editing && deleteFromList ? ( <> {tags.map((tag) => ( diff --git a/src/screens/moments/TagFriendsScreen.tsx b/src/screens/moments/TagFriendsScreen.tsx index 9c78a63e..e6a9f5fb 100644 --- a/src/screens/moments/TagFriendsScreen.tsx +++ b/src/screens/moments/TagFriendsScreen.tsx @@ -39,8 +39,10 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => { * Update list of tagged users from route params */ useEffect(() => { - setTaggedUsers(selectedUsers ? selectedUsers : []); - }, [route.params]); + if (selectedUsers !== undefined) { + setTaggedUsers(selectedUsers); + } + }, [selectedUsers]); /* * Navigate back to Tag Users Screen, send selected users @@ -82,19 +84,21 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => { source={{uri: image.path}} resizeMode={'cover'} /> - <MomentTags - editing={true} - tags={taggedUsers.map((user) => ({ - id: '', - x: 0, - y: 0, - user, - }))} - imageRef={imageRef} - deleteFromList={(user) => - setTaggedUsers(taggedUsers.filter((u) => u.id !== user.id)) - } - /> + {taggedUsers.length !== 0 && ( + <MomentTags + editing={true} + tags={taggedUsers.map((user) => ({ + id: '', + x: 0, + y: 0, + user, + }))} + imageRef={imageRef} + deleteFromList={(user) => + setTaggedUsers(taggedUsers.filter((u) => u.id !== user.id)) + } + /> + )} <View style={{marginHorizontal: '5%', marginTop: '3%'}}> <TagFriendsFooter taggedUsers={taggedUsers} |