1 files changed, 22 insertions, 24 deletions

diff --git a/vnext/src/ui/Thread.js b/vnext/src/ui/Thread.js
index f965e80c..ae5e4f3c 100644
--- a/vnext/src/ui/Thread.js
+++ b/vnext/src/ui/Thread.js
@@ -1,8 +1,4 @@
 import React, { useEffect, useState, useRef, useCallback } from 'react';
-import PropTypes from 'prop-types';
-
-import ReactRouterPropTypes from 'react-router-prop-types';
-import { UserType, MessageType } from './Types';
 
 import Message from './Message';
 import MessageInput from './MessageInput';
@@ -101,7 +97,7 @@ function Comment({ msg, draft, visitor, active, setActive, onStartEditing, postC
     </div>
   );
 }
-
+/*
 Comment.propTypes = {
   msg: MessageType.isRequired,
   draft: PropTypes.string.isRequired,
@@ -110,7 +106,7 @@ Comment.propTypes = {
   setActive: PropTypes.func.isRequired,
   onStartEditing: PropTypes.func.isRequired,
   postComment: PropTypes.func.isRequired
-};
+};*/
 
 export default function Thread(props) {
   const [message, setMessage] = useState((props.location.state || {}).msg || {});
@@ -118,22 +114,8 @@ export default function Thread(props) {
   const [loading, setLoading] = useState(false);
   const [active, setActive] = useState(0);
   const [editing, setEditing] = useState({});
-  useEffect(() => {
-    setActive(0);
-    loadReplies();
-  }, [loadReplies]);
-  useEffect(() => {
-    if (props.connection.addEventListener && message.mid) {
-      props.connection.addEventListener('msg', onReply);
-    }
-    return () => {
-      if (props.connection.removeEventListener && message.mid) {
-        props.connection.removeEventListener('msg', onReply);
-      }
-    };
-  }, [props.connection, message.mid, onReply]);
 
-  let loadReplies = useCallback(() => {
+  let loadReplies = () => {
     document.body.scrollTop = 0;
     document.documentElement.scrollTop = 0;
 
@@ -156,7 +138,7 @@ export default function Thread(props) {
       ).catch(ex => {
         console.log(ex);
       });
-  }, [props.visitor, props.match.params]);
+  };
   let onReply = useCallback((json) => {
     const msg = JSON.parse(json.data);
     if (msg.mid == message.mid) {
@@ -165,6 +147,7 @@ export default function Thread(props) {
       });
     }
   }, [message]);
+
   let postComment = (template) => {
     const { mid, rid, body, attach } = template;
     let commentAction = editing.rid ? update(mid, editing.rid, body) : comment(mid, rid, body, attach);
@@ -180,6 +163,21 @@ export default function Thread(props) {
     setEditing(reply);
   };
 
+  useEffect(() => {
+    setActive(0);
+    loadReplies();
+  }, []);
+  useEffect(() => {
+    if (props.connection.addEventListener && message.mid) {
+      props.connection.addEventListener('msg', onReply);
+    }
+    return () => {
+      if (props.connection.removeEventListener && message.mid) {
+        props.connection.removeEventListener('msg', onReply);
+      }
+    };
+  }, [props.connection, message.mid, onReply]);
+
   const loaders = Math.min(message.replies || 0, 10);
   return (
     <>
@@ -214,11 +212,11 @@ export default function Thread(props) {
 const linkStyle = {
   cursor: 'pointer'
 };
-
+/*
 Thread.propTypes = {
   location: ReactRouterPropTypes.location,
   history: ReactRouterPropTypes.history,
   match: ReactRouterPropTypes.match,
   visitor: UserType.isRequired,
   connection: PropTypes.object.isRequired,
-};
+};*/