aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/components/taggs/TaggDraggable.tsx17
-rw-r--r--src/screens/profile/CaptionScreen.tsx43
2 files changed, 2 insertions, 58 deletions
diff --git a/src/components/taggs/TaggDraggable.tsx b/src/components/taggs/TaggDraggable.tsx
index 0a0d18d9..a6ffb1ef 100644
--- a/src/components/taggs/TaggDraggable.tsx
+++ b/src/components/taggs/TaggDraggable.tsx
@@ -26,26 +26,13 @@ const TaggDraggable: React.FC<TaggDraggableProps> = (
props: TaggDraggableProps,
) => {
const navigation = useNavigation();
-
- const {taggedUser, editingView, deleteFromList, setStart} = props;
- const state = useSelector((rs: RootState) => rs);
-
const dispatch = useDispatch();
+ const state = useSelector((rs: RootState) => rs);
+ const {taggedUser, editingView, deleteFromList, setStart} = props;
let uriX = require('../../assets/images/draggableX.png');
let uriTip = require('../../assets/images/Tagg-Triangle.png');
const draggableRef = useRef(null);
- // useEffect(() => {
- // draggableRef.current.measure((fx, fy, width, height, px, py) => {
- // // console.log('Drag Component width is: ' + width);
- // // console.log('Drag Component height is: ' + height);
- // // console.log('X offset to frame: ' + fx);
- // // console.log('Y offset to frame: ' + fy);
- // // console.log('X offset to page: ' + px);
- // // console.log('Y offset to page: ' + py);
- // setStart([width, height]);
- // });
- // }, []);
useEffect(() => {
draggableRef.current.measure((width: number, height: number) => {
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 68956407..8e972e07 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -43,12 +43,6 @@ interface CaptionScreenProps {
route: CaptionScreenRouteProp;
navigation: CaptionScreenNavigationProp;
}
-interface momentTag {
- userID: string;
- username: string;
- xLocation: number;
- yLocation: number;
-}
const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
const {title, image, screenType} = route.params;
@@ -60,17 +54,11 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
const [loading, setLoading] = useState(false);
const imageRef = useRef(null);
- // const zIndex = [0, 999];
// state variables used to position draggables
const [offset, setOffset] = useState([0, 0]);
const [curStart, setCurStart] = useState([0, 0]);
const [imageDimensions, setImageDimensions] = useState([0, 0]);
- // state var used to keep track of draggable z ordering
- // const [layerOrder, setLayerOrder] = useState<string[]>([]);
-
- // created a state variable to keep track of every tag
- // idea is that each element in the list
const [taggList, setTaggList] = useState([
{
first_name: 'Ivan',
@@ -105,43 +93,12 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
userXId: undefined,
});
};
- /**
- * Helper function that we use to keep track of which element should be on top most layer
- * @param index
- */
- // const bringToFront = (index: number) => {
- // let currUser = taggList[index].id;
- // if (layerOrder.includes(currUser)) {
- // layerOrder.splice(layerOrder.indexOf(currUser), 1);
- // }
- // layerOrder.push(currUser);
- // setLayerOrder(layerOrder);
- // };
-
- /**
- * Helper function that tells us if the current draggable is the topmost one.
- * @param index
- */
- // const isOnTop = (index: number) => {
- // let currUser = taggList[index].id;
- // return currUser === layerOrder[0];
- // };
- /**
- * function that sets the initial position of each newly created tag
- * @returns
- */
/**
* need a handler to take care of creating a tagged user object, append that object to the taggList state variable.
*/
useEffect(() => {
imageRef.current.measure((fx, fy, width, height, px, py) => {
- // console.log('Component width is: ' + width);
- // console.log('Component height is: ' + height);
- // console.log('X offset to frame: ' + fx);
- // console.log('Y offset to frame: ' + fy);
- // console.log('X offset to page: ' + px);
- // console.log('Y offset to page: ' + py);
setOffset([px, py]);
setImageDimensions([width, height]);
});