Skip to content

Теперь последний комментарий под постом выводится с ограниченной длиной #329

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
merged 5 commits into from
Feb 23, 2023
Merged

Теперь последний комментарий под постом выводится с ограниченной длиной #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55a7b35
Теперь последний комментарий под постом выводится с ограниченной длиной
baysarov077 Feb 23, 2023
9a21f11
Вынес код проверки длинны текста в отдельную функцию и исправил услов…
baysarov077 Feb 23, 2023
0b9834a
Провел рефакторинг кода
baysarov077 Feb 23, 2023
aef0bf5
Изменил функцию truncateLongText и добавил условие на проверку послед…
baysarov077 Feb 23, 2023
075acfd
Update src/features/comments/CommentView.jsx
kuduzow Feb 23, 2023
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
2 changes: 2 additions & 0 deletions src/app/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ export const SCROLL_TO_TOP_SHOW = 500;
export const TAG_MAX_LENGTH = 15;

export const MAX_NUMBER_OF_TAGS = 5;

export const MAX_LAST_COMMENT_LENGTH = 140;
12 changes: 12 additions & 0 deletions src/common/utils/truncateLongText.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { MAX_LAST_COMMENT_LENGTH } from 'app/constants';

export const truncateLongText = (value) => {
let str = value;
if (str.length > MAX_LAST_COMMENT_LENGTH) {
str = str.slice(0, MAX_LAST_COMMENT_LENGTH);
const lastSpaceIndex = str.lastIndexOf(' ');
str = str.slice(0, lastSpaceIndex > -1 ? lastSpaceIndex : MAX_LAST_COMMENT_LENGTH);
str += '...';
}
return str;
};
6 changes: 5 additions & 1 deletion src/features/comments/CommentView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { useDispatch, useSelector } from 'react-redux';
import { selectProfile } from 'features/profile/profileSlice';
import FavoritePopoverContent from 'components/FavoritePopoverContent';
import { Popover } from 'antd';
import { truncateLongText } from 'common/utils/truncateLongText';
import { CommentsActions } from './comment-actions/CommentsActions';
import { likeCommentById, unlikeCommentById } from './commentsSlice';

Expand Down Expand Up @@ -121,7 +122,10 @@ export const CommentView = ({ comment, lastComment }) => {
<span>{comment.author?.name}</span>
<StyledTime>{dayjs(comment.createdAt).fromNow()}</StyledTime>
</div>
<Viewer theme="iqa" initialValue={comment.text} />
<Viewer
theme="iqa"
initialValue={lastComment ? truncateLongText(comment.text) : comment.text}
/>
{!lastComment && (
<StyledCommentActions>
<CommentsActions commentId={comment._id} />
Expand Down