[PE-6460] Add top of section display and highlighting on linked comments#12501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kyle-Shanks merged 2 commits into from
Jul 10, 2025
Merged

[PE-6460] Add top of section display and highlighting on linked comments #12501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b49b61c
Add top of section display and highlighting on linked comments
Kyle-Shanks Jul 9, 2025
cc71621
Add highlight comment hook
Kyle-Shanks Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/api/tan-query/comments/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './utils'
export * from './useUserComments'
export * from './useTrackComments'
export * from './useComment'
export * from './useHighlightComment'
export * from './useComments'
export * from './useTrackCommentCount'
export * from './useCommentReplies'
Expand Down
8 changes: 4 additions & 4 deletions packages/common/src/api/tan-query/comments/useComment.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { useQueryContext } from '~/api/tan-query/utils'
import { Feature, ID } from '~/models'
import { toast } from '~/store/ui/toast/slice'

import { CommentOrReply, messages } from './types'
import { messages } from './types'
import { getCommentQueryKey } from './utils'

export const useComment = (commentId: ID) => {
Expand All@@ -19,15 +19,15 @@ export const useComment = (commentId: ID) => {
const queryRes = useQuery({
queryKey: getCommentQueryKey(commentId),
enabled: !!commentId,
queryFn: async (): Promise<CommentOrReply | {}> => {
queryFn: async () => {
const sdk = await audiusSdk()
const { data: commentRes } = await sdk.full.comments.getComment({
commentId: Id.parse(commentId)
})

if (!commentRes) return {}
if (!commentRes || commentRes.length === 0) return null

return commentFromSDK(commentRes[0]) ?? {}
return commentFromSDK(commentRes[0]) ?? null
},
staleTime: Infinity
})
Expand Down
12 changes: 12 additions & 0 deletions packages/common/src/api/tan-query/comments/useHighlightComment.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import { HashId } from '@audius/sdk'
import { useSearchParams } from 'react-router-dom-v5-compat'

import { useComment } from './useComment'

export const useHighlightComment = () => {
const [searchParams] = useSearchParams()
const commentIdParam = searchParams.get('commentId')
const { data: highlightComment } = useComment(HashId.parse(commentIdParam))

return highlightComment ?? null
}
1 change: 1 addition & 0 deletions packages/common/src/messages/comments.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ export const commentsMessages = {
menuActions: {
pin: 'Pin',
unpin: 'Unpin',
share: 'Share',
flagAndHide: 'Flag & Hide',
flagAndRemove: 'Flag & Remove',
muteUser: 'Mute User',
Expand Down
21 changes: 18 additions & 3 deletions packages/web/src/components/comments/CommentActionBar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,14 @@ import {
Text,
TextLink
} from '@audius/harmony'
import { Id } from '@audius/sdk'

import { ConfirmationModal } from 'components/confirmation-modal'
import { ToastContext } from 'components/toast/ToastContext'
import { useRequiresAccountCallback } from 'hooks/useRequiresAccount'
import { make, track as trackEvent } from 'services/analytics'
import { env } from 'services/env'
import { copyToClipboard } from 'utils/clipboardUtil'
import { removeNullable } from 'utils/typeUtils'

import { useCommentActionCallback } from './useCommentActionCallback'
Expand DownExpand Up@@ -162,6 +165,12 @@ export const CommentActionBar = ({
)
}, [onClickReply, commentId])

const handleShare = useCallback(() => {

@dylanjeffersdylanjeffersJul 9, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schottra heads up we have comment share now, is this something we want to support in entity manager?

const url = `${env.AUDIUS_URL}${track.permalink}?commentId=${Id.parse(comment.id)}`
copyToClipboard(url)
toast('Copied to clipboard')
}, [comment.id, toast, track.permalink])

// Confirmation Modal state
const confirmationModals: {
[k in ConfirmationAction]: ConfirmationModalState
Expand DownExpand Up@@ -244,6 +253,11 @@ export const CommentActionBar = ({
const popupMenuItems = useMemo(
() =>
[
// TODO: Update this when highlighting replies is implemented
isParentComment && {
onClick: handleShare,
text: messages.menuActions.share
},
isEntityOwner &&
isParentComment && {
onClick: () => setCurrentConfirmationModalType('pin'),
Expand DownExpand Up@@ -286,13 +300,14 @@ export const CommentActionBar = ({
}
].filter(removeNullable),
[
isEntityOwner,
isParentComment,
handleShare,
isEntityOwner,
isPinned,
isCommentOwner,
onClickEdit,
handleMuteNotifs,
isMuted
isMuted,
onClickEdit
]
)

Expand Down
25 changes: 22 additions & 3 deletions packages/web/src/components/comments/CommentBlock.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useContext, useMemo, useState } from 'react'

import { useComment, useUser } from '@audius/common/api'
import { useComment, useHighlightComment, useUser } from '@audius/common/api'
import {
useCurrentCommentSection,
useDeleteComment
Expand All@@ -21,6 +21,7 @@ import { keyframes } from '@emotion/react'
import { Avatar } from 'components/avatar'
import { UserLink } from 'components/link'
import { ToastContext } from 'components/toast/ToastContext'
import { isDarkMode as getIsDarkMode } from 'utils/theme/theme'

import { ArtistPick } from './ArtistPick'
import { CommentActionBar } from './CommentActionBar'
Expand DownExpand Up@@ -52,6 +53,13 @@ const CommentBlockInternal = (
) => {
const { comment, parentCommentId, isPreview } = props
const { track, artistId } = useCurrentCommentSection()
const isDarkMode = getIsDarkMode()

const highlightComment = useHighlightComment()
// TODO: Update this when highlighting replies is implemented
const highlightCommentId = highlightComment?.parentCommentId
? null
: highlightComment?.id

const {
id: commentId,
Expand All@@ -64,7 +72,7 @@ const CommentBlockInternal = (
mentions = []
} = comment

const { motion } = useTheme()
const { color, motion } = useTheme()
const isPinned = track.pinned_comment_id === commentId
const isTombstone = 'isTombstone' in comment ? !!comment.isTombstone : false
const createdAtDate = useMemo(
Expand All@@ -89,7 +97,18 @@ const CommentBlockInternal = (
gap='l'
css={{
opacity: isTombstone ? 0.5 : 1,
animation: `${fadeIn} ${motion.calm}`
animation: `${fadeIn} ${motion.calm}`,
'&::before': {
content: highlightCommentId === commentId ? '""' : 'none',
position: 'absolute',
top: '-12px',
left: '-24px',
right: '-24px',
bottom: '-12px',
backgroundColor: color.focus.default,
opacity: isDarkMode ? 0.1 : 0.05,
zIndex: 0
}
}}
>
<Box>
Expand Down
18 changes: 15 additions & 3 deletions packages/web/src/components/comments/CommentSection.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useEffect, useState, useCallback } from 'react'

import { useHighlightComment } from '@audius/common/api'
import {
CommentSectionProvider,
useCurrentCommentSection
Expand DownExpand Up@@ -63,6 +64,12 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
const [hasScrolledIntoView, setHasScrolledIntoView] = useState(false)
const { history } = useHistoryContext()

const highlightComment = useHighlightComment()
// TODO: Update this when highlighting replies is implemented
const highlightCommentId = highlightComment?.parentCommentId
? null
: highlightComment?.id

const [isFirstLoad, setIsFirstLoad] = useState(true)

useEffect(() => {
Expand DownExpand Up@@ -152,9 +159,14 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
) : (
<>
{commentIds.length === 0 ? <NoComments /> : null}
{commentIds.map((id) => (
<CommentThread commentId={id} key={id} />
))}
{highlightCommentId ? (
<CommentThread commentId={highlightCommentId} />
) : null}
{commentIds
.filter((id) => id !== highlightCommentId)
.map((id) => (
<CommentThread commentId={id} key={id} />
))}
{isLoadingMorePages ? (
<Flex justifyContent='center' mt='l'>
<LoadingSpinner css={{ width: 20, height: 20 }} />
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[PE-6460] Add top of section display and highlighting on linked comments#12501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Kyle-Shanks
merged 2 commits into

from

Jul 10, 2025
 Merged


[PE-6460] Add top of section display and highlighting on linked comments
#12501
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b49b61c

Add top of section display and highlighting on linked comments


Kyle-Shanks Jul 9, 2025
cc71621

Add highlight comment hook


Kyle-Shanks Jul 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/common/src/api/tan-query/comments/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './utils'
export * from './useUserComments'
export * from './useTrackComments'
export * from './useComment'
export * from './useHighlightComment'
export * from './useComments'
export * from './useTrackCommentCount'
export * from './useCommentReplies'
Expand Down

8 changes: 4 additions & 4 deletions
packages/common/src/api/tan-query/comments/useComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { useQueryContext } from '~/api/tan-query/utils'
import { Feature, ID } from '~/models'
import { toast } from '~/store/ui/toast/slice'

import { CommentOrReply, messages } from './types'
import { messages } from './types'
import { getCommentQueryKey } from './utils'

export const useComment = (commentId: ID) => {
Expand All@@ -19,15 +19,15 @@ export const useComment = (commentId: ID) => {
 const queryRes = useQuery({
 queryKey: getCommentQueryKey(commentId),
 enabled: !!commentId,
 queryFn: async (): Promise<CommentOrReply | {}> => {
 queryFn: async () => {
 const sdk = await audiusSdk()
 const { data: commentRes } = await sdk.full.comments.getComment({
 commentId: Id.parse(commentId)
 })

 if (!commentRes) return {}
 if (!commentRes || commentRes.length === 0) return null

 return commentFromSDK(commentRes[0]) ?? {}
 return commentFromSDK(commentRes[0]) ?? null
 },
 staleTime: Infinity
 })
Expand Down

12 changes: 12 additions & 0 deletions
packages/common/src/api/tan-query/comments/useHighlightComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import { HashId } from '@audius/sdk'
import { useSearchParams } from 'react-router-dom-v5-compat'

import { useComment } from './useComment'

export const useHighlightComment = () => {
 const [searchParams] = useSearchParams()
 const commentIdParam = searchParams.get('commentId')
 const { data: highlightComment } = useComment(HashId.parse(commentIdParam))

 return highlightComment ?? null
}

1 change: 1 addition & 0 deletions
packages/common/src/messages/comments.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ export const commentsMessages = {
 menuActions: {
 pin: 'Pin',
 unpin: 'Unpin',
 share: 'Share',
 flagAndHide: 'Flag & Hide',
 flagAndRemove: 'Flag & Remove',
 muteUser: 'Mute User',
Expand Down

21 changes: 18 additions & 3 deletions
packages/web/src/components/comments/CommentActionBar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,14 @@ import {
 Text,
 TextLink
} from '@audius/harmony'
import { Id } from '@audius/sdk'

import { ConfirmationModal } from 'components/confirmation-modal'
import { ToastContext } from 'components/toast/ToastContext'
import { useRequiresAccountCallback } from 'hooks/useRequiresAccount'
import { make, track as trackEvent } from 'services/analytics'
import { env } from 'services/env'
import { copyToClipboard } from 'utils/clipboardUtil'
import { removeNullable } from 'utils/typeUtils'

import { useCommentActionCallback } from './useCommentActionCallback'
Expand DownExpand Up@@ -162,6 +165,12 @@ export const CommentActionBar = ({
 )
 }, [onClickReply, commentId])

 const handleShare = useCallback(() => {
@dylanjeffersdylanjeffersJul 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schottra heads up we have comment share now, is this something we want to support in entity manager?
 const url = `${env.AUDIUS_URL}${track.permalink}?commentId=${Id.parse(comment.id)}`
 copyToClipboard(url)
 toast('Copied to clipboard')
 }, [comment.id, toast, track.permalink])

 // Confirmation Modal state
 const confirmationModals: {
 [k in ConfirmationAction]: ConfirmationModalState
Expand DownExpand Up@@ -244,6 +253,11 @@ export const CommentActionBar = ({
 const popupMenuItems = useMemo(
 () =>
 [
 // TODO: Update this when highlighting replies is implemented
 isParentComment && {
 onClick: handleShare,
 text: messages.menuActions.share
 },
 isEntityOwner &&
 isParentComment && {
 onClick: () => setCurrentConfirmationModalType('pin'),
Expand DownExpand Up@@ -286,13 +300,14 @@ export const CommentActionBar = ({
 }
 ].filter(removeNullable),
 [
 isEntityOwner,
 isParentComment,
 handleShare,
 isEntityOwner,
 isPinned,
 isCommentOwner,
 onClickEdit,
 handleMuteNotifs,
 isMuted
 isMuted,
 onClickEdit
 ]
 )

Expand Down

25 changes: 22 additions & 3 deletions
packages/web/src/components/comments/CommentBlock.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useContext, useMemo, useState } from 'react'

import { useComment, useUser } from '@audius/common/api'
import { useComment, useHighlightComment, useUser } from '@audius/common/api'
import {
 useCurrentCommentSection,
 useDeleteComment
Expand All@@ -21,6 +21,7 @@ import { keyframes } from '@emotion/react'
import { Avatar } from 'components/avatar'
import { UserLink } from 'components/link'
import { ToastContext } from 'components/toast/ToastContext'
import { isDarkMode as getIsDarkMode } from 'utils/theme/theme'

import { ArtistPick } from './ArtistPick'
import { CommentActionBar } from './CommentActionBar'
Expand DownExpand Up@@ -52,6 +53,13 @@ const CommentBlockInternal = (
) => {
 const { comment, parentCommentId, isPreview } = props
 const { track, artistId } = useCurrentCommentSection()
 const isDarkMode = getIsDarkMode()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const {
 id: commentId,
Expand All@@ -64,7 +72,7 @@ const CommentBlockInternal = (
 mentions = []
 } = comment

 const { motion } = useTheme()
 const { color, motion } = useTheme()
 const isPinned = track.pinned_comment_id === commentId
 const isTombstone = 'isTombstone' in comment ? !!comment.isTombstone : false
 const createdAtDate = useMemo(
Expand All@@ -89,7 +97,18 @@ const CommentBlockInternal = (
 gap='l'
 css={{
 opacity: isTombstone ? 0.5 : 1,
 animation: `${fadeIn} ${motion.calm}`
 animation: `${fadeIn} ${motion.calm}`,
 '&::before': {
 content: highlightCommentId === commentId ? '""' : 'none',
 position: 'absolute',
 top: '-12px',
 left: '-24px',
 right: '-24px',
 bottom: '-12px',
 backgroundColor: color.focus.default,
 opacity: isDarkMode ? 0.1 : 0.05,
 zIndex: 0
 }
 }}
 >
 <Box>
Expand Down

18 changes: 15 additions & 3 deletions
packages/web/src/components/comments/CommentSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useEffect, useState, useCallback } from 'react'

import { useHighlightComment } from '@audius/common/api'
import {
 CommentSectionProvider,
 useCurrentCommentSection
Expand DownExpand Up@@ -63,6 +64,12 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 const [hasScrolledIntoView, setHasScrolledIntoView] = useState(false)
 const { history } = useHistoryContext()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const [isFirstLoad, setIsFirstLoad] = useState(true)

 useEffect(() => {
Expand DownExpand Up@@ -152,9 +159,14 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 ) : (
 <>
 {commentIds.length === 0 ? <NoComments /> : null}
 {commentIds.map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {highlightCommentId ? (
 <CommentThread commentId={highlightCommentId} />
 ) : null}
 {commentIds
 .filter((id) => id !== highlightCommentId)
 .map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {isLoadingMorePages ? (
 <Flex justifyContent='center' mt='l'>
 <LoadingSpinner css={{ width: 20, height: 20 }} />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[PE-6460] Add top of section display and highlighting on linked comments#12501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Kyle-Shanks
merged 2 commits into

from

Jul 10, 2025
 Merged


[PE-6460] Add top of section display and highlighting on linked comments
#12501
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b49b61c

Add top of section display and highlighting on linked comments


Kyle-Shanks Jul 9, 2025
cc71621

Add highlight comment hook


Kyle-Shanks Jul 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/common/src/api/tan-query/comments/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './utils'
export * from './useUserComments'
export * from './useTrackComments'
export * from './useComment'
export * from './useHighlightComment'
export * from './useComments'
export * from './useTrackCommentCount'
export * from './useCommentReplies'
Expand Down

8 changes: 4 additions & 4 deletions
packages/common/src/api/tan-query/comments/useComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { useQueryContext } from '~/api/tan-query/utils'
import { Feature, ID } from '~/models'
import { toast } from '~/store/ui/toast/slice'

import { CommentOrReply, messages } from './types'
import { messages } from './types'
import { getCommentQueryKey } from './utils'

export const useComment = (commentId: ID) => {
Expand All@@ -19,15 +19,15 @@ export const useComment = (commentId: ID) => {
 const queryRes = useQuery({
 queryKey: getCommentQueryKey(commentId),
 enabled: !!commentId,
 queryFn: async (): Promise<CommentOrReply | {}> => {
 queryFn: async () => {
 const sdk = await audiusSdk()
 const { data: commentRes } = await sdk.full.comments.getComment({
 commentId: Id.parse(commentId)
 })

 if (!commentRes) return {}
 if (!commentRes || commentRes.length === 0) return null

 return commentFromSDK(commentRes[0]) ?? {}
 return commentFromSDK(commentRes[0]) ?? null
 },
 staleTime: Infinity
 })
Expand Down

12 changes: 12 additions & 0 deletions
packages/common/src/api/tan-query/comments/useHighlightComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import { HashId } from '@audius/sdk'
import { useSearchParams } from 'react-router-dom-v5-compat'

import { useComment } from './useComment'

export const useHighlightComment = () => {
 const [searchParams] = useSearchParams()
 const commentIdParam = searchParams.get('commentId')
 const { data: highlightComment } = useComment(HashId.parse(commentIdParam))

 return highlightComment ?? null
}

1 change: 1 addition & 0 deletions
packages/common/src/messages/comments.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ export const commentsMessages = {
 menuActions: {
 pin: 'Pin',
 unpin: 'Unpin',
 share: 'Share',
 flagAndHide: 'Flag & Hide',
 flagAndRemove: 'Flag & Remove',
 muteUser: 'Mute User',
Expand Down

21 changes: 18 additions & 3 deletions
packages/web/src/components/comments/CommentActionBar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,14 @@ import {
 Text,
 TextLink
} from '@audius/harmony'
import { Id } from '@audius/sdk'

import { ConfirmationModal } from 'components/confirmation-modal'
import { ToastContext } from 'components/toast/ToastContext'
import { useRequiresAccountCallback } from 'hooks/useRequiresAccount'
import { make, track as trackEvent } from 'services/analytics'
import { env } from 'services/env'
import { copyToClipboard } from 'utils/clipboardUtil'
import { removeNullable } from 'utils/typeUtils'

import { useCommentActionCallback } from './useCommentActionCallback'
Expand DownExpand Up@@ -162,6 +165,12 @@ export const CommentActionBar = ({
 )
 }, [onClickReply, commentId])

 const handleShare = useCallback(() => {
@dylanjeffersdylanjeffersJul 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schottra heads up we have comment share now, is this something we want to support in entity manager?
 const url = `${env.AUDIUS_URL}${track.permalink}?commentId=${Id.parse(comment.id)}`
 copyToClipboard(url)
 toast('Copied to clipboard')
 }, [comment.id, toast, track.permalink])

 // Confirmation Modal state
 const confirmationModals: {
 [k in ConfirmationAction]: ConfirmationModalState
Expand DownExpand Up@@ -244,6 +253,11 @@ export const CommentActionBar = ({
 const popupMenuItems = useMemo(
 () =>
 [
 // TODO: Update this when highlighting replies is implemented
 isParentComment && {
 onClick: handleShare,
 text: messages.menuActions.share
 },
 isEntityOwner &&
 isParentComment && {
 onClick: () => setCurrentConfirmationModalType('pin'),
Expand DownExpand Up@@ -286,13 +300,14 @@ export const CommentActionBar = ({
 }
 ].filter(removeNullable),
 [
 isEntityOwner,
 isParentComment,
 handleShare,
 isEntityOwner,
 isPinned,
 isCommentOwner,
 onClickEdit,
 handleMuteNotifs,
 isMuted
 isMuted,
 onClickEdit
 ]
 )

Expand Down

25 changes: 22 additions & 3 deletions
packages/web/src/components/comments/CommentBlock.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useContext, useMemo, useState } from 'react'

import { useComment, useUser } from '@audius/common/api'
import { useComment, useHighlightComment, useUser } from '@audius/common/api'
import {
 useCurrentCommentSection,
 useDeleteComment
Expand All@@ -21,6 +21,7 @@ import { keyframes } from '@emotion/react'
import { Avatar } from 'components/avatar'
import { UserLink } from 'components/link'
import { ToastContext } from 'components/toast/ToastContext'
import { isDarkMode as getIsDarkMode } from 'utils/theme/theme'

import { ArtistPick } from './ArtistPick'
import { CommentActionBar } from './CommentActionBar'
Expand DownExpand Up@@ -52,6 +53,13 @@ const CommentBlockInternal = (
) => {
 const { comment, parentCommentId, isPreview } = props
 const { track, artistId } = useCurrentCommentSection()
 const isDarkMode = getIsDarkMode()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const {
 id: commentId,
Expand All@@ -64,7 +72,7 @@ const CommentBlockInternal = (
 mentions = []
 } = comment

 const { motion } = useTheme()
 const { color, motion } = useTheme()
 const isPinned = track.pinned_comment_id === commentId
 const isTombstone = 'isTombstone' in comment ? !!comment.isTombstone : false
 const createdAtDate = useMemo(
Expand All@@ -89,7 +97,18 @@ const CommentBlockInternal = (
 gap='l'
 css={{
 opacity: isTombstone ? 0.5 : 1,
 animation: `${fadeIn} ${motion.calm}`
 animation: `${fadeIn} ${motion.calm}`,
 '&::before': {
 content: highlightCommentId === commentId ? '""' : 'none',
 position: 'absolute',
 top: '-12px',
 left: '-24px',
 right: '-24px',
 bottom: '-12px',
 backgroundColor: color.focus.default,
 opacity: isDarkMode ? 0.1 : 0.05,
 zIndex: 0
 }
 }}
 >
 <Box>
Expand Down

18 changes: 15 additions & 3 deletions
packages/web/src/components/comments/CommentSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useEffect, useState, useCallback } from 'react'

import { useHighlightComment } from '@audius/common/api'
import {
 CommentSectionProvider,
 useCurrentCommentSection
Expand DownExpand Up@@ -63,6 +64,12 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 const [hasScrolledIntoView, setHasScrolledIntoView] = useState(false)
 const { history } = useHistoryContext()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const [isFirstLoad, setIsFirstLoad] = useState(true)

 useEffect(() => {
Expand DownExpand Up@@ -152,9 +159,14 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 ) : (
 <>
 {commentIds.length === 0 ? <NoComments /> : null}
 {commentIds.map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {highlightCommentId ? (
 <CommentThread commentId={highlightCommentId} />
 ) : null}
 {commentIds
 .filter((id) => id !== highlightCommentId)
 .map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {isLoadingMorePages ? (
 <Flex justifyContent='center' mt='l'>
 <LoadingSpinner css={{ width: 20, height: 20 }} />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[PE-6460] Add top of section display and highlighting on linked comments#12501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Kyle-Shanks
merged 2 commits into

from

Jul 10, 2025
 Merged


[PE-6460] Add top of section display and highlighting on linked comments
#12501
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b49b61c

Add top of section display and highlighting on linked comments


Kyle-Shanks Jul 9, 2025
cc71621

Add highlight comment hook


Kyle-Shanks Jul 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/common/src/api/tan-query/comments/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './utils'
export * from './useUserComments'
export * from './useTrackComments'
export * from './useComment'
export * from './useHighlightComment'
export * from './useComments'
export * from './useTrackCommentCount'
export * from './useCommentReplies'
Expand Down

8 changes: 4 additions & 4 deletions
packages/common/src/api/tan-query/comments/useComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { useQueryContext } from '~/api/tan-query/utils'
import { Feature, ID } from '~/models'
import { toast } from '~/store/ui/toast/slice'

import { CommentOrReply, messages } from './types'
import { messages } from './types'
import { getCommentQueryKey } from './utils'

export const useComment = (commentId: ID) => {
Expand All@@ -19,15 +19,15 @@ export const useComment = (commentId: ID) => {
 const queryRes = useQuery({
 queryKey: getCommentQueryKey(commentId),
 enabled: !!commentId,
 queryFn: async (): Promise<CommentOrReply | {}> => {
 queryFn: async () => {
 const sdk = await audiusSdk()
 const { data: commentRes } = await sdk.full.comments.getComment({
 commentId: Id.parse(commentId)
 })

 if (!commentRes) return {}
 if (!commentRes || commentRes.length === 0) return null

 return commentFromSDK(commentRes[0]) ?? {}
 return commentFromSDK(commentRes[0]) ?? null
 },
 staleTime: Infinity
 })
Expand Down

12 changes: 12 additions & 0 deletions
packages/common/src/api/tan-query/comments/useHighlightComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import { HashId } from '@audius/sdk'
import { useSearchParams } from 'react-router-dom-v5-compat'

import { useComment } from './useComment'

export const useHighlightComment = () => {
 const [searchParams] = useSearchParams()
 const commentIdParam = searchParams.get('commentId')
 const { data: highlightComment } = useComment(HashId.parse(commentIdParam))

 return highlightComment ?? null
}

1 change: 1 addition & 0 deletions
packages/common/src/messages/comments.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ export const commentsMessages = {
 menuActions: {
 pin: 'Pin',
 unpin: 'Unpin',
 share: 'Share',
 flagAndHide: 'Flag & Hide',
 flagAndRemove: 'Flag & Remove',
 muteUser: 'Mute User',
Expand Down

21 changes: 18 additions & 3 deletions
packages/web/src/components/comments/CommentActionBar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,14 @@ import {
 Text,
 TextLink
} from '@audius/harmony'
import { Id } from '@audius/sdk'

import { ConfirmationModal } from 'components/confirmation-modal'
import { ToastContext } from 'components/toast/ToastContext'
import { useRequiresAccountCallback } from 'hooks/useRequiresAccount'
import { make, track as trackEvent } from 'services/analytics'
import { env } from 'services/env'
import { copyToClipboard } from 'utils/clipboardUtil'
import { removeNullable } from 'utils/typeUtils'

import { useCommentActionCallback } from './useCommentActionCallback'
Expand DownExpand Up@@ -162,6 +165,12 @@ export const CommentActionBar = ({
 )
 }, [onClickReply, commentId])

 const handleShare = useCallback(() => {
@dylanjeffersdylanjeffersJul 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schottra heads up we have comment share now, is this something we want to support in entity manager?
 const url = `${env.AUDIUS_URL}${track.permalink}?commentId=${Id.parse(comment.id)}`
 copyToClipboard(url)
 toast('Copied to clipboard')
 }, [comment.id, toast, track.permalink])

 // Confirmation Modal state
 const confirmationModals: {
 [k in ConfirmationAction]: ConfirmationModalState
Expand DownExpand Up@@ -244,6 +253,11 @@ export const CommentActionBar = ({
 const popupMenuItems = useMemo(
 () =>
 [
 // TODO: Update this when highlighting replies is implemented
 isParentComment && {
 onClick: handleShare,
 text: messages.menuActions.share
 },
 isEntityOwner &&
 isParentComment && {
 onClick: () => setCurrentConfirmationModalType('pin'),
Expand DownExpand Up@@ -286,13 +300,14 @@ export const CommentActionBar = ({
 }
 ].filter(removeNullable),
 [
 isEntityOwner,
 isParentComment,
 handleShare,
 isEntityOwner,
 isPinned,
 isCommentOwner,
 onClickEdit,
 handleMuteNotifs,
 isMuted
 isMuted,
 onClickEdit
 ]
 )

Expand Down

25 changes: 22 additions & 3 deletions
packages/web/src/components/comments/CommentBlock.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useContext, useMemo, useState } from 'react'

import { useComment, useUser } from '@audius/common/api'
import { useComment, useHighlightComment, useUser } from '@audius/common/api'
import {
 useCurrentCommentSection,
 useDeleteComment
Expand All@@ -21,6 +21,7 @@ import { keyframes } from '@emotion/react'
import { Avatar } from 'components/avatar'
import { UserLink } from 'components/link'
import { ToastContext } from 'components/toast/ToastContext'
import { isDarkMode as getIsDarkMode } from 'utils/theme/theme'

import { ArtistPick } from './ArtistPick'
import { CommentActionBar } from './CommentActionBar'
Expand DownExpand Up@@ -52,6 +53,13 @@ const CommentBlockInternal = (
) => {
 const { comment, parentCommentId, isPreview } = props
 const { track, artistId } = useCurrentCommentSection()
 const isDarkMode = getIsDarkMode()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const {
 id: commentId,
Expand All@@ -64,7 +72,7 @@ const CommentBlockInternal = (
 mentions = []
 } = comment

 const { motion } = useTheme()
 const { color, motion } = useTheme()
 const isPinned = track.pinned_comment_id === commentId
 const isTombstone = 'isTombstone' in comment ? !!comment.isTombstone : false
 const createdAtDate = useMemo(
Expand All@@ -89,7 +97,18 @@ const CommentBlockInternal = (
 gap='l'
 css={{
 opacity: isTombstone ? 0.5 : 1,
 animation: `${fadeIn} ${motion.calm}`
 animation: `${fadeIn} ${motion.calm}`,
 '&::before': {
 content: highlightCommentId === commentId ? '""' : 'none',
 position: 'absolute',
 top: '-12px',
 left: '-24px',
 right: '-24px',
 bottom: '-12px',
 backgroundColor: color.focus.default,
 opacity: isDarkMode ? 0.1 : 0.05,
 zIndex: 0
 }
 }}
 >
 <Box>
Expand Down

18 changes: 15 additions & 3 deletions
packages/web/src/components/comments/CommentSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useEffect, useState, useCallback } from 'react'

import { useHighlightComment } from '@audius/common/api'
import {
 CommentSectionProvider,
 useCurrentCommentSection
Expand DownExpand Up@@ -63,6 +64,12 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 const [hasScrolledIntoView, setHasScrolledIntoView] = useState(false)
 const { history } = useHistoryContext()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const [isFirstLoad, setIsFirstLoad] = useState(true)

 useEffect(() => {
Expand DownExpand Up@@ -152,9 +159,14 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 ) : (
 <>
 {commentIds.length === 0 ? <NoComments /> : null}
 {commentIds.map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {highlightCommentId ? (
 <CommentThread commentId={highlightCommentId} />
 ) : null}
 {commentIds
 .filter((id) => id !== highlightCommentId)
 .map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {isLoadingMorePages ? (
 <Flex justifyContent='center' mt='l'>
 <LoadingSpinner css={{ width: 20, height: 20 }} />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[PE-6460] Add top of section display and highlighting on linked comments#12501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Kyle-Shanks
merged 2 commits into

from

Jul 10, 2025
 Merged


[PE-6460] Add top of section display and highlighting on linked comments
#12501
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b49b61c

Add top of section display and highlighting on linked comments


Kyle-Shanks Jul 9, 2025
cc71621

Add highlight comment hook


Kyle-Shanks Jul 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/common/src/api/tan-query/comments/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './utils'
export * from './useUserComments'
export * from './useTrackComments'
export * from './useComment'
export * from './useHighlightComment'
export * from './useComments'
export * from './useTrackCommentCount'
export * from './useCommentReplies'
Expand Down

8 changes: 4 additions & 4 deletions
packages/common/src/api/tan-query/comments/useComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { useQueryContext } from '~/api/tan-query/utils'
import { Feature, ID } from '~/models'
import { toast } from '~/store/ui/toast/slice'

import { CommentOrReply, messages } from './types'
import { messages } from './types'
import { getCommentQueryKey } from './utils'

export const useComment = (commentId: ID) => {
Expand All@@ -19,15 +19,15 @@ export const useComment = (commentId: ID) => {
 const queryRes = useQuery({
 queryKey: getCommentQueryKey(commentId),
 enabled: !!commentId,
 queryFn: async (): Promise<CommentOrReply | {}> => {
 queryFn: async () => {
 const sdk = await audiusSdk()
 const { data: commentRes } = await sdk.full.comments.getComment({
 commentId: Id.parse(commentId)
 })

 if (!commentRes) return {}
 if (!commentRes || commentRes.length === 0) return null

 return commentFromSDK(commentRes[0]) ?? {}
 return commentFromSDK(commentRes[0]) ?? null
 },
 staleTime: Infinity
 })
Expand Down

12 changes: 12 additions & 0 deletions
packages/common/src/api/tan-query/comments/useHighlightComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import { HashId } from '@audius/sdk'
import { useSearchParams } from 'react-router-dom-v5-compat'

import { useComment } from './useComment'

export const useHighlightComment = () => {
 const [searchParams] = useSearchParams()
 const commentIdParam = searchParams.get('commentId')
 const { data: highlightComment } = useComment(HashId.parse(commentIdParam))

 return highlightComment ?? null
}

1 change: 1 addition & 0 deletions
packages/common/src/messages/comments.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ export const commentsMessages = {
 menuActions: {
 pin: 'Pin',
 unpin: 'Unpin',
 share: 'Share',
 flagAndHide: 'Flag & Hide',
 flagAndRemove: 'Flag & Remove',
 muteUser: 'Mute User',
Expand Down

21 changes: 18 additions & 3 deletions
packages/web/src/components/comments/CommentActionBar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,14 @@ import {
 Text,
 TextLink
} from '@audius/harmony'
import { Id } from '@audius/sdk'

import { ConfirmationModal } from 'components/confirmation-modal'
import { ToastContext } from 'components/toast/ToastContext'
import { useRequiresAccountCallback } from 'hooks/useRequiresAccount'
import { make, track as trackEvent } from 'services/analytics'
import { env } from 'services/env'
import { copyToClipboard } from 'utils/clipboardUtil'
import { removeNullable } from 'utils/typeUtils'

import { useCommentActionCallback } from './useCommentActionCallback'
Expand DownExpand Up@@ -162,6 +165,12 @@ export const CommentActionBar = ({
 )
 }, [onClickReply, commentId])

 const handleShare = useCallback(() => {
@dylanjeffersdylanjeffersJul 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schottra heads up we have comment share now, is this something we want to support in entity manager?
 const url = `${env.AUDIUS_URL}${track.permalink}?commentId=${Id.parse(comment.id)}`
 copyToClipboard(url)
 toast('Copied to clipboard')
 }, [comment.id, toast, track.permalink])

 // Confirmation Modal state
 const confirmationModals: {
 [k in ConfirmationAction]: ConfirmationModalState
Expand DownExpand Up@@ -244,6 +253,11 @@ export const CommentActionBar = ({
 const popupMenuItems = useMemo(
 () =>
 [
 // TODO: Update this when highlighting replies is implemented
 isParentComment && {
 onClick: handleShare,
 text: messages.menuActions.share
 },
 isEntityOwner &&
 isParentComment && {
 onClick: () => setCurrentConfirmationModalType('pin'),
Expand DownExpand Up@@ -286,13 +300,14 @@ export const CommentActionBar = ({
 }
 ].filter(removeNullable),
 [
 isEntityOwner,
 isParentComment,
 handleShare,
 isEntityOwner,
 isPinned,
 isCommentOwner,
 onClickEdit,
 handleMuteNotifs,
 isMuted
 isMuted,
 onClickEdit
 ]
 )

Expand Down

25 changes: 22 additions & 3 deletions
packages/web/src/components/comments/CommentBlock.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useContext, useMemo, useState } from 'react'

import { useComment, useUser } from '@audius/common/api'
import { useComment, useHighlightComment, useUser } from '@audius/common/api'
import {
 useCurrentCommentSection,
 useDeleteComment
Expand All@@ -21,6 +21,7 @@ import { keyframes } from '@emotion/react'
import { Avatar } from 'components/avatar'
import { UserLink } from 'components/link'
import { ToastContext } from 'components/toast/ToastContext'
import { isDarkMode as getIsDarkMode } from 'utils/theme/theme'

import { ArtistPick } from './ArtistPick'
import { CommentActionBar } from './CommentActionBar'
Expand DownExpand Up@@ -52,6 +53,13 @@ const CommentBlockInternal = (
) => {
 const { comment, parentCommentId, isPreview } = props
 const { track, artistId } = useCurrentCommentSection()
 const isDarkMode = getIsDarkMode()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const {
 id: commentId,
Expand All@@ -64,7 +72,7 @@ const CommentBlockInternal = (
 mentions = []
 } = comment

 const { motion } = useTheme()
 const { color, motion } = useTheme()
 const isPinned = track.pinned_comment_id === commentId
 const isTombstone = 'isTombstone' in comment ? !!comment.isTombstone : false
 const createdAtDate = useMemo(
Expand All@@ -89,7 +97,18 @@ const CommentBlockInternal = (
 gap='l'
 css={{
 opacity: isTombstone ? 0.5 : 1,
 animation: `${fadeIn} ${motion.calm}`
 animation: `${fadeIn} ${motion.calm}`,
 '&::before': {
 content: highlightCommentId === commentId ? '""' : 'none',
 position: 'absolute',
 top: '-12px',
 left: '-24px',
 right: '-24px',
 bottom: '-12px',
 backgroundColor: color.focus.default,
 opacity: isDarkMode ? 0.1 : 0.05,
 zIndex: 0
 }
 }}
 >
 <Box>
Expand Down

18 changes: 15 additions & 3 deletions
packages/web/src/components/comments/CommentSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useEffect, useState, useCallback } from 'react'

import { useHighlightComment } from '@audius/common/api'
import {
 CommentSectionProvider,
 useCurrentCommentSection
Expand DownExpand Up@@ -63,6 +64,12 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 const [hasScrolledIntoView, setHasScrolledIntoView] = useState(false)
 const { history } = useHistoryContext()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const [isFirstLoad, setIsFirstLoad] = useState(true)

 useEffect(() => {
Expand DownExpand Up@@ -152,9 +159,14 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 ) : (
 <>
 {commentIds.length === 0 ? <NoComments /> : null}
 {commentIds.map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {highlightCommentId ? (
 <CommentThread commentId={highlightCommentId} />
 ) : null}
 {commentIds
 .filter((id) => id !== highlightCommentId)
 .map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {isLoadingMorePages ? (
 <Flex justifyContent='center' mt='l'>
 <LoadingSpinner css={{ width: 20, height: 20 }} />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[PE-6460] Add top of section display and highlighting on linked comments#12501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Kyle-Shanks
merged 2 commits into

from

Jul 10, 2025
 Merged


[PE-6460] Add top of section display and highlighting on linked comments
#12501
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b49b61c

Add top of section display and highlighting on linked comments


Kyle-Shanks Jul 9, 2025
cc71621

Add highlight comment hook


Kyle-Shanks Jul 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/common/src/api/tan-query/comments/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './utils'
export * from './useUserComments'
export * from './useTrackComments'
export * from './useComment'
export * from './useHighlightComment'
export * from './useComments'
export * from './useTrackCommentCount'
export * from './useCommentReplies'
Expand Down

8 changes: 4 additions & 4 deletions
packages/common/src/api/tan-query/comments/useComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { useQueryContext } from '~/api/tan-query/utils'
import { Feature, ID } from '~/models'
import { toast } from '~/store/ui/toast/slice'

import { CommentOrReply, messages } from './types'
import { messages } from './types'
import { getCommentQueryKey } from './utils'

export const useComment = (commentId: ID) => {
Expand All@@ -19,15 +19,15 @@ export const useComment = (commentId: ID) => {
 const queryRes = useQuery({
 queryKey: getCommentQueryKey(commentId),
 enabled: !!commentId,
 queryFn: async (): Promise<CommentOrReply | {}> => {
 queryFn: async () => {
 const sdk = await audiusSdk()
 const { data: commentRes } = await sdk.full.comments.getComment({
 commentId: Id.parse(commentId)
 })

 if (!commentRes) return {}
 if (!commentRes || commentRes.length === 0) return null

 return commentFromSDK(commentRes[0]) ?? {}
 return commentFromSDK(commentRes[0]) ?? null
 },
 staleTime: Infinity
 })
Expand Down

12 changes: 12 additions & 0 deletions
packages/common/src/api/tan-query/comments/useHighlightComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import { HashId } from '@audius/sdk'
import { useSearchParams } from 'react-router-dom-v5-compat'

import { useComment } from './useComment'

export const useHighlightComment = () => {
 const [searchParams] = useSearchParams()
 const commentIdParam = searchParams.get('commentId')
 const { data: highlightComment } = useComment(HashId.parse(commentIdParam))

 return highlightComment ?? null
}

1 change: 1 addition & 0 deletions
packages/common/src/messages/comments.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ export const commentsMessages = {
 menuActions: {
 pin: 'Pin',
 unpin: 'Unpin',
 share: 'Share',
 flagAndHide: 'Flag & Hide',
 flagAndRemove: 'Flag & Remove',
 muteUser: 'Mute User',
Expand Down

21 changes: 18 additions & 3 deletions
packages/web/src/components/comments/CommentActionBar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,14 @@ import {
 Text,
 TextLink
} from '@audius/harmony'
import { Id } from '@audius/sdk'

import { ConfirmationModal } from 'components/confirmation-modal'
import { ToastContext } from 'components/toast/ToastContext'
import { useRequiresAccountCallback } from 'hooks/useRequiresAccount'
import { make, track as trackEvent } from 'services/analytics'
import { env } from 'services/env'
import { copyToClipboard } from 'utils/clipboardUtil'
import { removeNullable } from 'utils/typeUtils'

import { useCommentActionCallback } from './useCommentActionCallback'
Expand DownExpand Up@@ -162,6 +165,12 @@ export const CommentActionBar = ({
 )
 }, [onClickReply, commentId])

 const handleShare = useCallback(() => {
@dylanjeffersdylanjeffersJul 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schottra heads up we have comment share now, is this something we want to support in entity manager?
 const url = `${env.AUDIUS_URL}${track.permalink}?commentId=${Id.parse(comment.id)}`
 copyToClipboard(url)
 toast('Copied to clipboard')
 }, [comment.id, toast, track.permalink])

 // Confirmation Modal state
 const confirmationModals: {
 [k in ConfirmationAction]: ConfirmationModalState
Expand DownExpand Up@@ -244,6 +253,11 @@ export const CommentActionBar = ({
 const popupMenuItems = useMemo(
 () =>
 [
 // TODO: Update this when highlighting replies is implemented
 isParentComment && {
 onClick: handleShare,
 text: messages.menuActions.share
 },
 isEntityOwner &&
 isParentComment && {
 onClick: () => setCurrentConfirmationModalType('pin'),
Expand DownExpand Up@@ -286,13 +300,14 @@ export const CommentActionBar = ({
 }
 ].filter(removeNullable),
 [
 isEntityOwner,
 isParentComment,
 handleShare,
 isEntityOwner,
 isPinned,
 isCommentOwner,
 onClickEdit,
 handleMuteNotifs,
 isMuted
 isMuted,
 onClickEdit
 ]
 )

Expand Down

25 changes: 22 additions & 3 deletions
packages/web/src/components/comments/CommentBlock.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useContext, useMemo, useState } from 'react'

import { useComment, useUser } from '@audius/common/api'
import { useComment, useHighlightComment, useUser } from '@audius/common/api'
import {
 useCurrentCommentSection,
 useDeleteComment
Expand All@@ -21,6 +21,7 @@ import { keyframes } from '@emotion/react'
import { Avatar } from 'components/avatar'
import { UserLink } from 'components/link'
import { ToastContext } from 'components/toast/ToastContext'
import { isDarkMode as getIsDarkMode } from 'utils/theme/theme'

import { ArtistPick } from './ArtistPick'
import { CommentActionBar } from './CommentActionBar'
Expand DownExpand Up@@ -52,6 +53,13 @@ const CommentBlockInternal = (
) => {
 const { comment, parentCommentId, isPreview } = props
 const { track, artistId } = useCurrentCommentSection()
 const isDarkMode = getIsDarkMode()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const {
 id: commentId,
Expand All@@ -64,7 +72,7 @@ const CommentBlockInternal = (
 mentions = []
 } = comment

 const { motion } = useTheme()
 const { color, motion } = useTheme()
 const isPinned = track.pinned_comment_id === commentId
 const isTombstone = 'isTombstone' in comment ? !!comment.isTombstone : false
 const createdAtDate = useMemo(
Expand All@@ -89,7 +97,18 @@ const CommentBlockInternal = (
 gap='l'
 css={{
 opacity: isTombstone ? 0.5 : 1,
 animation: `${fadeIn} ${motion.calm}`
 animation: `${fadeIn} ${motion.calm}`,
 '&::before': {
 content: highlightCommentId === commentId ? '""' : 'none',
 position: 'absolute',
 top: '-12px',
 left: '-24px',
 right: '-24px',
 bottom: '-12px',
 backgroundColor: color.focus.default,
 opacity: isDarkMode ? 0.1 : 0.05,
 zIndex: 0
 }
 }}
 >
 <Box>
Expand Down

18 changes: 15 additions & 3 deletions
packages/web/src/components/comments/CommentSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useEffect, useState, useCallback } from 'react'

import { useHighlightComment } from '@audius/common/api'
import {
 CommentSectionProvider,
 useCurrentCommentSection
Expand DownExpand Up@@ -63,6 +64,12 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 const [hasScrolledIntoView, setHasScrolledIntoView] = useState(false)
 const { history } = useHistoryContext()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const [isFirstLoad, setIsFirstLoad] = useState(true)

 useEffect(() => {
Expand DownExpand Up@@ -152,9 +159,14 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 ) : (
 <>
 {commentIds.length === 0 ? <NoComments /> : null}
 {commentIds.map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {highlightCommentId ? (
 <CommentThread commentId={highlightCommentId} />
 ) : null}
 {commentIds
 .filter((id) => id !== highlightCommentId)
 .map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {isLoadingMorePages ? (
 <Flex justifyContent='center' mt='l'>
 <LoadingSpinner css={{ width: 20, height: 20 }} />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[PE-6460] Add top of section display and highlighting on linked comments#12501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Kyle-Shanks
merged 2 commits into

from

Jul 10, 2025
 Merged


[PE-6460] Add top of section display and highlighting on linked comments
#12501
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b49b61c

Add top of section display and highlighting on linked comments


Kyle-Shanks Jul 9, 2025
cc71621

Add highlight comment hook


Kyle-Shanks Jul 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/common/src/api/tan-query/comments/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './utils'
export * from './useUserComments'
export * from './useTrackComments'
export * from './useComment'
export * from './useHighlightComment'
export * from './useComments'
export * from './useTrackCommentCount'
export * from './useCommentReplies'
Expand Down

8 changes: 4 additions & 4 deletions
packages/common/src/api/tan-query/comments/useComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { useQueryContext } from '~/api/tan-query/utils'
import { Feature, ID } from '~/models'
import { toast } from '~/store/ui/toast/slice'

import { CommentOrReply, messages } from './types'
import { messages } from './types'
import { getCommentQueryKey } from './utils'

export const useComment = (commentId: ID) => {
Expand All@@ -19,15 +19,15 @@ export const useComment = (commentId: ID) => {
 const queryRes = useQuery({
 queryKey: getCommentQueryKey(commentId),
 enabled: !!commentId,
 queryFn: async (): Promise<CommentOrReply | {}> => {
 queryFn: async () => {
 const sdk = await audiusSdk()
 const { data: commentRes } = await sdk.full.comments.getComment({
 commentId: Id.parse(commentId)
 })

 if (!commentRes) return {}
 if (!commentRes || commentRes.length === 0) return null

 return commentFromSDK(commentRes[0]) ?? {}
 return commentFromSDK(commentRes[0]) ?? null
 },
 staleTime: Infinity
 })
Expand Down

12 changes: 12 additions & 0 deletions
packages/common/src/api/tan-query/comments/useHighlightComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import { HashId } from '@audius/sdk'
import { useSearchParams } from 'react-router-dom-v5-compat'

import { useComment } from './useComment'

export const useHighlightComment = () => {
 const [searchParams] = useSearchParams()
 const commentIdParam = searchParams.get('commentId')
 const { data: highlightComment } = useComment(HashId.parse(commentIdParam))

 return highlightComment ?? null
}

1 change: 1 addition & 0 deletions
packages/common/src/messages/comments.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ export const commentsMessages = {
 menuActions: {
 pin: 'Pin',
 unpin: 'Unpin',
 share: 'Share',
 flagAndHide: 'Flag & Hide',
 flagAndRemove: 'Flag & Remove',
 muteUser: 'Mute User',
Expand Down

21 changes: 18 additions & 3 deletions
packages/web/src/components/comments/CommentActionBar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,14 @@ import {
 Text,
 TextLink
} from '@audius/harmony'
import { Id } from '@audius/sdk'

import { ConfirmationModal } from 'components/confirmation-modal'
import { ToastContext } from 'components/toast/ToastContext'
import { useRequiresAccountCallback } from 'hooks/useRequiresAccount'
import { make, track as trackEvent } from 'services/analytics'
import { env } from 'services/env'
import { copyToClipboard } from 'utils/clipboardUtil'
import { removeNullable } from 'utils/typeUtils'

import { useCommentActionCallback } from './useCommentActionCallback'
Expand DownExpand Up@@ -162,6 +165,12 @@ export const CommentActionBar = ({
 )
 }, [onClickReply, commentId])

 const handleShare = useCallback(() => {
@dylanjeffersdylanjeffersJul 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schottra heads up we have comment share now, is this something we want to support in entity manager?
 const url = `${env.AUDIUS_URL}${track.permalink}?commentId=${Id.parse(comment.id)}`
 copyToClipboard(url)
 toast('Copied to clipboard')
 }, [comment.id, toast, track.permalink])

 // Confirmation Modal state
 const confirmationModals: {
 [k in ConfirmationAction]: ConfirmationModalState
Expand DownExpand Up@@ -244,6 +253,11 @@ export const CommentActionBar = ({
 const popupMenuItems = useMemo(
 () =>
 [
 // TODO: Update this when highlighting replies is implemented
 isParentComment && {
 onClick: handleShare,
 text: messages.menuActions.share
 },
 isEntityOwner &&
 isParentComment && {
 onClick: () => setCurrentConfirmationModalType('pin'),
Expand DownExpand Up@@ -286,13 +300,14 @@ export const CommentActionBar = ({
 }
 ].filter(removeNullable),
 [
 isEntityOwner,
 isParentComment,
 handleShare,
 isEntityOwner,
 isPinned,
 isCommentOwner,
 onClickEdit,
 handleMuteNotifs,
 isMuted
 isMuted,
 onClickEdit
 ]
 )

Expand Down

25 changes: 22 additions & 3 deletions
packages/web/src/components/comments/CommentBlock.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useContext, useMemo, useState } from 'react'

import { useComment, useUser } from '@audius/common/api'
import { useComment, useHighlightComment, useUser } from '@audius/common/api'
import {
 useCurrentCommentSection,
 useDeleteComment
Expand All@@ -21,6 +21,7 @@ import { keyframes } from '@emotion/react'
import { Avatar } from 'components/avatar'
import { UserLink } from 'components/link'
import { ToastContext } from 'components/toast/ToastContext'
import { isDarkMode as getIsDarkMode } from 'utils/theme/theme'

import { ArtistPick } from './ArtistPick'
import { CommentActionBar } from './CommentActionBar'
Expand DownExpand Up@@ -52,6 +53,13 @@ const CommentBlockInternal = (
) => {
 const { comment, parentCommentId, isPreview } = props
 const { track, artistId } = useCurrentCommentSection()
 const isDarkMode = getIsDarkMode()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const {
 id: commentId,
Expand All@@ -64,7 +72,7 @@ const CommentBlockInternal = (
 mentions = []
 } = comment

 const { motion } = useTheme()
 const { color, motion } = useTheme()
 const isPinned = track.pinned_comment_id === commentId
 const isTombstone = 'isTombstone' in comment ? !!comment.isTombstone : false
 const createdAtDate = useMemo(
Expand All@@ -89,7 +97,18 @@ const CommentBlockInternal = (
 gap='l'
 css={{
 opacity: isTombstone ? 0.5 : 1,
 animation: `${fadeIn} ${motion.calm}`
 animation: `${fadeIn} ${motion.calm}`,
 '&::before': {
 content: highlightCommentId === commentId ? '""' : 'none',
 position: 'absolute',
 top: '-12px',
 left: '-24px',
 right: '-24px',
 bottom: '-12px',
 backgroundColor: color.focus.default,
 opacity: isDarkMode ? 0.1 : 0.05,
 zIndex: 0
 }
 }}
 >
 <Box>
Expand Down

18 changes: 15 additions & 3 deletions
packages/web/src/components/comments/CommentSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useEffect, useState, useCallback } from 'react'

import { useHighlightComment } from '@audius/common/api'
import {
 CommentSectionProvider,
 useCurrentCommentSection
Expand DownExpand Up@@ -63,6 +64,12 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 const [hasScrolledIntoView, setHasScrolledIntoView] = useState(false)
 const { history } = useHistoryContext()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const [isFirstLoad, setIsFirstLoad] = useState(true)

 useEffect(() => {
Expand DownExpand Up@@ -152,9 +159,14 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 ) : (
 <>
 {commentIds.length === 0 ? <NoComments /> : null}
 {commentIds.map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {highlightCommentId ? (
 <CommentThread commentId={highlightCommentId} />
 ) : null}
 {commentIds
 .filter((id) => id !== highlightCommentId)
 .map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {isLoadingMorePages ? (
 <Flex justifyContent='center' mt='l'>
 <LoadingSpinner css={{ width: 20, height: 20 }} />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[PE-6460] Add top of section display and highlighting on linked comments#12501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Kyle-Shanks
merged 2 commits into

from

Jul 10, 2025
 Merged


[PE-6460] Add top of section display and highlighting on linked comments
#12501
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b49b61c

Add top of section display and highlighting on linked comments


Kyle-Shanks Jul 9, 2025
cc71621

Add highlight comment hook


Kyle-Shanks Jul 10, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/common/src/api/tan-query/comments/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './utils'
export * from './useUserComments'
export * from './useTrackComments'
export * from './useComment'
export * from './useHighlightComment'
export * from './useComments'
export * from './useTrackCommentCount'
export * from './useCommentReplies'
Expand Down

8 changes: 4 additions & 4 deletions
packages/common/src/api/tan-query/comments/useComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { useQueryContext } from '~/api/tan-query/utils'
import { Feature, ID } from '~/models'
import { toast } from '~/store/ui/toast/slice'

import { CommentOrReply, messages } from './types'
import { messages } from './types'
import { getCommentQueryKey } from './utils'

export const useComment = (commentId: ID) => {
Expand All@@ -19,15 +19,15 @@ export const useComment = (commentId: ID) => {
 const queryRes = useQuery({
 queryKey: getCommentQueryKey(commentId),
 enabled: !!commentId,
 queryFn: async (): Promise<CommentOrReply | {}> => {
 queryFn: async () => {
 const sdk = await audiusSdk()
 const { data: commentRes } = await sdk.full.comments.getComment({
 commentId: Id.parse(commentId)
 })

 if (!commentRes) return {}
 if (!commentRes || commentRes.length === 0) return null

 return commentFromSDK(commentRes[0]) ?? {}
 return commentFromSDK(commentRes[0]) ?? null
 },
 staleTime: Infinity
 })
Expand Down

12 changes: 12 additions & 0 deletions
packages/common/src/api/tan-query/comments/useHighlightComment.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import { HashId } from '@audius/sdk'
import { useSearchParams } from 'react-router-dom-v5-compat'

import { useComment } from './useComment'

export const useHighlightComment = () => {
 const [searchParams] = useSearchParams()
 const commentIdParam = searchParams.get('commentId')
 const { data: highlightComment } = useComment(HashId.parse(commentIdParam))

 return highlightComment ?? null
}

1 change: 1 addition & 0 deletions
packages/common/src/messages/comments.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ export const commentsMessages = {
 menuActions: {
 pin: 'Pin',
 unpin: 'Unpin',
 share: 'Share',
 flagAndHide: 'Flag & Hide',
 flagAndRemove: 'Flag & Remove',
 muteUser: 'Mute User',
Expand Down

21 changes: 18 additions & 3 deletions
packages/web/src/components/comments/CommentActionBar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,14 @@ import {
 Text,
 TextLink
} from '@audius/harmony'
import { Id } from '@audius/sdk'

import { ConfirmationModal } from 'components/confirmation-modal'
import { ToastContext } from 'components/toast/ToastContext'
import { useRequiresAccountCallback } from 'hooks/useRequiresAccount'
import { make, track as trackEvent } from 'services/analytics'
import { env } from 'services/env'
import { copyToClipboard } from 'utils/clipboardUtil'
import { removeNullable } from 'utils/typeUtils'

import { useCommentActionCallback } from './useCommentActionCallback'
Expand DownExpand Up@@ -162,6 +165,12 @@ export const CommentActionBar = ({
 )
 }, [onClickReply, commentId])

 const handleShare = useCallback(() => {
@dylanjeffersdylanjeffersJul 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schottra heads up we have comment share now, is this something we want to support in entity manager?
 const url = `${env.AUDIUS_URL}${track.permalink}?commentId=${Id.parse(comment.id)}`
 copyToClipboard(url)
 toast('Copied to clipboard')
 }, [comment.id, toast, track.permalink])

 // Confirmation Modal state
 const confirmationModals: {
 [k in ConfirmationAction]: ConfirmationModalState
Expand DownExpand Up@@ -244,6 +253,11 @@ export const CommentActionBar = ({
 const popupMenuItems = useMemo(
 () =>
 [
 // TODO: Update this when highlighting replies is implemented
 isParentComment && {
 onClick: handleShare,
 text: messages.menuActions.share
 },
 isEntityOwner &&
 isParentComment && {
 onClick: () => setCurrentConfirmationModalType('pin'),
Expand DownExpand Up@@ -286,13 +300,14 @@ export const CommentActionBar = ({
 }
 ].filter(removeNullable),
 [
 isEntityOwner,
 isParentComment,
 handleShare,
 isEntityOwner,
 isPinned,
 isCommentOwner,
 onClickEdit,
 handleMuteNotifs,
 isMuted
 isMuted,
 onClickEdit
 ]
 )

Expand Down

25 changes: 22 additions & 3 deletions
packages/web/src/components/comments/CommentBlock.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useContext, useMemo, useState } from 'react'

import { useComment, useUser } from '@audius/common/api'
import { useComment, useHighlightComment, useUser } from '@audius/common/api'
import {
 useCurrentCommentSection,
 useDeleteComment
Expand All@@ -21,6 +21,7 @@ import { keyframes } from '@emotion/react'
import { Avatar } from 'components/avatar'
import { UserLink } from 'components/link'
import { ToastContext } from 'components/toast/ToastContext'
import { isDarkMode as getIsDarkMode } from 'utils/theme/theme'

import { ArtistPick } from './ArtistPick'
import { CommentActionBar } from './CommentActionBar'
Expand DownExpand Up@@ -52,6 +53,13 @@ const CommentBlockInternal = (
) => {
 const { comment, parentCommentId, isPreview } = props
 const { track, artistId } = useCurrentCommentSection()
 const isDarkMode = getIsDarkMode()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const {
 id: commentId,
Expand All@@ -64,7 +72,7 @@ const CommentBlockInternal = (
 mentions = []
 } = comment

 const { motion } = useTheme()
 const { color, motion } = useTheme()
 const isPinned = track.pinned_comment_id === commentId
 const isTombstone = 'isTombstone' in comment ? !!comment.isTombstone : false
 const createdAtDate = useMemo(
Expand All@@ -89,7 +97,18 @@ const CommentBlockInternal = (
 gap='l'
 css={{
 opacity: isTombstone ? 0.5 : 1,
 animation: `${fadeIn} ${motion.calm}`
 animation: `${fadeIn} ${motion.calm}`,
 '&::before': {
 content: highlightCommentId === commentId ? '""' : 'none',
 position: 'absolute',
 top: '-12px',
 left: '-24px',
 right: '-24px',
 bottom: '-12px',
 backgroundColor: color.focus.default,
 opacity: isDarkMode ? 0.1 : 0.05,
 zIndex: 0
 }
 }}
 >
 <Box>
Expand Down

18 changes: 15 additions & 3 deletions
packages/web/src/components/comments/CommentSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { useEffect, useState, useCallback } from 'react'

import { useHighlightComment } from '@audius/common/api'
import {
 CommentSectionProvider,
 useCurrentCommentSection
Expand DownExpand Up@@ -63,6 +64,12 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 const [hasScrolledIntoView, setHasScrolledIntoView] = useState(false)
 const { history } = useHistoryContext()

 const highlightComment = useHighlightComment()
 // TODO: Update this when highlighting replies is implemented
 const highlightCommentId = highlightComment?.parentCommentId
 ? null
 : highlightComment?.id

 const [isFirstLoad, setIsFirstLoad] = useState(true)

 useEffect(() => {
Expand DownExpand Up@@ -152,9 +159,14 @@ const CommentSectionInner = (props: CommentSectionInnerProps) => {
 ) : (
 <>
 {commentIds.length === 0 ? <NoComments /> : null}
 {commentIds.map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {highlightCommentId ? (
 <CommentThread commentId={highlightCommentId} />
 ) : null}
 {commentIds
 .filter((id) => id !== highlightCommentId)
 .map((id) => (
 <CommentThread commentId={id} key={id} />
 ))}
 {isLoadingMorePages ? (
 <Flex justifyContent='center' mt='l'>
 <LoadingSpinner css={{ width: 20, height: 20 }} />
Expand Down