Merge branch 'main' into chore/fix-unnecessary-string-interpolation

This commit is contained in:
Jay Sitter 2023-06-26 08:50:54 -04:00 committed by GitHub
commit 8700f65a7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -79,7 +79,7 @@ export class CommentNodes extends Component<CommentNodesProps, any> {
const maxComments = this.props.maxCommentsShown ?? this.props.nodes.length; const maxComments = this.props.maxCommentsShown ?? this.props.nodes.length;
const borderColor = this.props.depth const borderColor = this.props.depth
? colorList[this.props.depth % colorList.length] ? colorList[(this.props.depth - 1) % colorList.length]
: colorList[0]; : colorList[0];
return ( return (
@ -89,7 +89,11 @@ export class CommentNodes extends Component<CommentNodesProps, any> {
"ms-1": !!this.props.isChild, "ms-1": !!this.props.isChild,
"border-top border-light": !this.props.noBorder, "border-top border-light": !this.props.noBorder,
})} })}
style={`border-left: 2px solid ${borderColor} !important;`} style={
this.props.isChild
? `border-left: 2px solid ${borderColor} !important;`
: undefined
}
> >
{this.props.nodes.slice(0, maxComments).map(node => ( {this.props.nodes.slice(0, maxComments).map(node => (
<CommentNode <CommentNode