From 2408c8ee0d6b2a6b2366fb66dc06c63fa2d0aa2e Mon Sep 17 00:00:00 2001
From: George Rusu <george@tagg.id>
Date: Wed, 26 May 2021 10:48:07 -0700
Subject: Fix view and edit tag jumping

---
 src/components/common/MomentTags.tsx   | 33 ++++++++++++++++++---------------
 src/components/taggs/TaggDraggable.tsx | 10 ----------
 2 files changed, 18 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/components/common/MomentTags.tsx b/src/components/common/MomentTags.tsx
index 2ba16a6b..a75701f0 100644
--- a/src/components/common/MomentTags.tsx
+++ b/src/components/common/MomentTags.tsx
@@ -26,21 +26,24 @@ const MomentTags: React.FC<MomentTagsProps> = ({
   };
 
   useEffect(() => {
-    setTimeout(() => {
-      imageRef.current.measure(
-        (
-          fx: number, // location of ref relative to parent element
-          fy: number,
-          width: number,
-          height: number,
-          _x: number, // location of ref relative to entire screen
-          _y: number,
-        ) => {
-          setOffset([fx, fy]);
-          setImageDimensions([width, height]);
-        },
-      );
-    }, 250);
+    setTimeout(
+      () => {
+        imageRef.current.measure(
+          (
+            fx: number, // location of ref relative to parent element
+            fy: number,
+            width: number,
+            height: number,
+            _x: number, // location of ref relative to entire screen
+            _y: number,
+          ) => {
+            setOffset([fx, fy]);
+            setImageDimensions([width, height]);
+          },
+        );
+      },
+      editing ? 250 : 0,
+    );
   }, []);
 
   if (!tags) {
diff --git a/src/components/taggs/TaggDraggable.tsx b/src/components/taggs/TaggDraggable.tsx
index 7be4a88f..e31be729 100644
--- a/src/components/taggs/TaggDraggable.tsx
+++ b/src/components/taggs/TaggDraggable.tsx
@@ -34,16 +34,6 @@ const TaggDraggable: React.FC<TaggDraggableProps> = (
 
   const draggableRef = useRef(null);
 
-  useEffect(() => {
-    setTimeout(() => {
-      draggableRef.current.measure(
-        (_1: number, _2: number, width: number, height: number, px, py) => {
-          setStart([width, height]);
-        },
-      );
-    }, 250);
-  }, []);
-
   useEffect(() => {
     draggableRef.current.measure(
       (
-- 
cgit v1.2.3-70-g09d2