diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-05-24 17:28:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 17:28:09 -0400 |
| commit | 7f991eef32475165f819dc8b666c5763f0021696 (patch) | |
| tree | 5e706720c1ed63423f729502dc9dc48b091c550e /src | |
| parent | 3acd1143ccfd36369cab6517d648f025baf511a9 (diff) | |
| parent | a413ca2a7ad004dcfd079b992810e1e63d46660d (diff) | |
Merge pull request #442 from IvanIFChen/tma889-touchable-triangle
[TMA-889] Make Moment Tag Triangle Touchable
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/common/MomentTags.tsx | 3 | ||||
| -rw-r--r-- | src/components/taggs/TaggDraggable.tsx | 37 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/components/common/MomentTags.tsx b/src/components/common/MomentTags.tsx index 04b0558b..defd4b4b 100644 --- a/src/components/common/MomentTags.tsx +++ b/src/components/common/MomentTags.tsx @@ -60,7 +60,8 @@ const MomentTags: React.FC<MomentTagsProps> = ({ minY={offset[1]} maxX={imageDimensions[0] + offset[0]} maxY={imageDimensions[1] + offset[1]} - onDragStart={() => null}> + onDragStart={() => null} + disabled={true}> <TaggDraggable taggedUser={tag.user} editingView={editing} diff --git a/src/components/taggs/TaggDraggable.tsx b/src/components/taggs/TaggDraggable.tsx index e4448642..55f8162b 100644 --- a/src/components/taggs/TaggDraggable.tsx +++ b/src/components/taggs/TaggDraggable.tsx @@ -47,10 +47,11 @@ const TaggDraggable: React.FC<TaggDraggableProps> = ( return ( <TouchableWithoutFeedback> - <View style={styles.container}> - <Image style={styles.imageTip} source={uriTip} /> + <View ref={draggableRef}> <TouchableOpacity - onPressIn={() => + style={styles.container} + disabled={editingView} + onPress={() => navigateToProfile( state, dispatch, @@ -58,22 +59,20 @@ const TaggDraggable: React.FC<TaggDraggableProps> = ( ScreenType.Profile, user, ) - } - disabled={editingView} - style={styles.content} - ref={draggableRef}> - <Avatar style={styles.avatar} uri={taggedUser.thumbnail_url} /> - <Text style={editingView ? styles.buttonTitle : styles.buttonTitleX}> - @{taggedUser.username} - </Text> - {editingView && ( - <TouchableOpacity - disabled={false} - onPressIn={deleteFromList} - style={styles.imageX}> - <Image style={styles.imageX} source={uriX} /> - </TouchableOpacity> - )} + }> + <Image style={styles.imageTip} source={uriTip} /> + <View style={styles.content}> + <Avatar style={styles.avatar} uri={taggedUser.thumbnail_url} /> + <Text + style={editingView ? styles.buttonTitle : styles.buttonTitleX}> + @{taggedUser.username} + </Text> + {editingView && ( + <TouchableOpacity onPress={deleteFromList} style={styles.imageX}> + <Image style={styles.imageX} source={uriX} /> + </TouchableOpacity> + )} + </View> </TouchableOpacity> </View> </TouchableWithoutFeedback> |