refactor: added utility func to check if last element of list

This commit is contained in:
ayeshoali
2023-01-26 13:43:02 +05:00
committed by Mehak Nasir
parent eaa3ce16ea
commit bcde4f5f87
3 changed files with 9 additions and 4 deletions

View File

@@ -25,7 +25,7 @@ import { EmptyPage } from '../empty-posts';
import { Post } from '../posts';
import { selectThread } from '../posts/data/selectors';
import { fetchThread, markThreadAsRead } from '../posts/data/thunks';
import { discussionsPath, filterPosts } from '../utils';
import { discussionsPath, filterPosts, isLastElementOfList } from '../utils';
import { selectThreadComments, selectThreadCurrentPage, selectThreadHasMorePages } from './data/selectors';
import { fetchThreadComments } from './data/thunks';
import { Comment, ResponseEditor } from './comment';
@@ -99,13 +99,13 @@ function DiscussionCommentsView({
const handleComments = (postComments, showLoadMoreResponses = false) => (
<div className="mx-4" role="list">
{postComments.map((comment, index) => (
{postComments.map((comment) => (
<Comment
comment={comment}
key={comment.id}
postType={postType}
isClosedPost={isClosed}
marginBottom={index === (postComments.length - 1)}
marginBottom={isLastElementOfList(postComments, comment)}
/>
))}

View File

@@ -43,6 +43,7 @@ function AuthorLabel({
}
const isRetiredUser = author ? author.startsWith('retired__user') : false;
const showTextPrimary = !authorLabelMessage && !isRetiredUser && !alert;
const className = classNames('d-flex align-items-center', { 'mb-0.5': !postOrComment }, labelColor);
@@ -91,7 +92,7 @@ function AuthorLabel({
{authorLabelMessage && (
<span
className={classNames('mr-1.5 font-size-14 font-style-normal font-family-inter font-weight-500', {
'text-primary-500': !authorLabelMessage && !isRetiredUser && !alert,
'text-primary-500': showTextPrimary,
'text-gray-700': isRetiredUser,
})}
style={{ marginLeft: '2px' }}

View File

@@ -294,3 +294,7 @@ export function handleKeyDown(event) {
selectedOption.focus();
}
}
export function isLastElementOfList(list, element) {
return list[list.length - 1] === element;
}