From 002015e9943ab34d7690babf0fdd24e16b62cf17 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Mon, 24 May 2021 16:30:45 -0400
Subject: Reorganize components in TaggDraggable

---
 src/components/common/MomentTags.tsx   |  3 ++-
 src/components/taggs/TaggDraggable.tsx | 37 +++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'src')

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>
-- 
cgit v1.2.3-70-g09d2