discours.io/webapp
5
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

Merge remote-tracking branch 'hub/main' into feature/sse-connect

Browse Source
This commit is contained in:
Untone 2023-10-17 09:40:03 +03:00
commit f27d1c2d3a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/locales/ru/translation.json
View File

@ -225,7 +225,7 @@
"NotificationNewCommentText2": "от", "NotificationNewCommentText2": "от",
"NotificationNewCommentText3": "{restUsersCount, plural, =0 {} one { и ещё 1 пользователя} few { и ещё {restUsersCount} пользователей} other { и ещё {restUsersCount} пользователей}}", "NotificationNewCommentText3": "{restUsersCount, plural, =0 {} one { и ещё 1 пользователя} few { и ещё {restUsersCount} пользователей} other { и ещё {restUsersCount} пользователей}}",
"NotificationNewReplyText1": "{commentsCount, plural, one {Новый ответ} few {{commentsCount} новых ответа} other {{commentsCount} новых ответов}} к вашему комментарию к публикации", "NotificationNewReplyText1": "{commentsCount, plural, one {Новый ответ} few {{commentsCount} новых ответа} other {{commentsCount} новых ответов}} на ваш комментарий к публикации",
"NotificationNewReplyText2": "от", "NotificationNewReplyText2": "от",
"NotificationNewReplyText3": "{restUsersCount, plural, =0 {} one { и ещё 1 пользователя} few { и ещё {restUsersCount} пользователей} other { и ещё {restUsersCount} пользователей}}", "NotificationNewReplyText3": "{restUsersCount, plural, =0 {} one { и ещё 1 пользователя} few { и ещё {restUsersCount} пользователей} other { и ещё {restUsersCount} пользователей}}",

10
src/components/Article/FullArticle.tsx
View File

@ -39,8 +39,10 @@ export type ArticlePageSearchParams = {
} }
const scrollTo = (el: HTMLElement) => { const scrollTo = (el: HTMLElement) => {
const { top } = el.getBoundingClientRect()
window.scrollTo({ window.scrollTo({
top: el.offsetTop - 96, top: top + window.scrollY - 96,
left: 0, left: 0,
behavior: 'smooth' behavior: 'smooth'
}) })
@ -90,7 +92,9 @@ export const FullArticle = (props: Props) => {
return JSON.parse(props.article.media || '[]') return JSON.parse(props.article.media || '[]')
}) })
const commentsRef: { current: HTMLDivElement } = { current: null } const commentsRef: {
current: HTMLDivElement
} = { current: null }
const scrollToComments = () => { const scrollToComments = () => {
scrollTo(commentsRef.current) scrollTo(commentsRef.current)
@ -118,7 +122,9 @@ export const FullArticle = (props: Props) => {
const commentElement = document.querySelector<HTMLElement>( const commentElement = document.querySelector<HTMLElement>(
`[id='comment_${searchParams().commentId}']` `[id='comment_${searchParams().commentId}']`
) )
changeSearchParam({ commentId: null }) changeSearchParam({ commentId: null })
if (commentElement) { if (commentElement) {
scrollTo(commentElement) scrollTo(commentElement)
} }