fix regression: topLevel comments not showing

Author: Soxasora

components/comments.js

@@ -75,6 +75,7 @@ export default function Comments ({
   // fetch new comments that arrived after the lastCommentAt, and update the item.newComments field in cache
   useLiveComments(parentId, lastCommentAt || parentCreatedAt, router.query.sort, setHasNewComments)
   console.log('hasNewComments', hasNewComments)
+  console.log('sort', router.query.sort)
   const hasNewNotes = useHasNewNotes()
 
   const pins = useMemo(() => comments?.filter(({ position }) => !!position).sort((a, b) => a.position - b.position), [comments])
@@ -101,7 +102,7 @@ export default function Comments ({
           />
         : null}
       {newComments?.length > 0 && (
-        <ShowNewComments comments={comments} newComments={newComments} itemId={parentId} sort={router.query.sort} setHasNewComments={setHasNewComments} />
+        <ShowNewComments topLevel comments={comments} newComments={newComments} itemId={parentId} sort={router.query.sort} setHasNewComments={setHasNewComments} />
       )}
       {pins.map(item => (
         <Fragment key={item.id}>

components/show-new-comments.js

@@ -77,13 +77,12 @@ function collectAllNewComments (item) {
 }
 
 // TODO: Fix bug where new comments out of depth are not shown
-export function ShowNewComments ({ sort, comments, newComments = [], itemId, item, setHasNewComments }) {
+export function ShowNewComments ({ topLevel, sort, comments, itemId, item, setHasNewComments, newComments = [] }) {
   const client = useApolloClient()
 
-  const topLevel = !!sort
   // if item is provided, we're showing all new comments for a thread,
   // otherwise we're showing new comments for a comment
-  const isThread = item.path.split('.').length === 2
+  const isThread = !topLevel && item?.path.split('.').length === 2
   const allNewComments = useMemo(() => {
     if (isThread) {
       return collectAllNewComments(item)