fix: do not render empty instructions

This commit is contained in:
Ahmad Abdolsaheb
2019-02-15 17:51:43 +03:00
committed by Valeriy
parent 150d655306
commit e727acb281

View File

@ -9,19 +9,22 @@ const propTypes = {
section: PropTypes.string section: PropTypes.string
}; };
function emptyInstruction(instructions) {
return (/^<section\s+id\s*=\s*("|')instructions\1\s*>\s*<\/section>$/)
.test(instructions);
}
function ChallengeDescription({ description, instructions, section }) { function ChallengeDescription({ description, instructions, section }) {
return ( return (
<div className={`challenge-instructions ${section}`}> <div className={`challenge-instructions ${section}`}>
<div dangerouslySetInnerHTML={{ __html: description }} /> <div dangerouslySetInnerHTML={{ __html: description }} />
{instructions ? ( {!emptyInstruction(instructions) && (
<Fragment> <Fragment>
<hr /> <hr />
<div dangerouslySetInnerHTML={{ __html: instructions }} /> <div dangerouslySetInnerHTML={{ __html: instructions }} />
<hr />
</Fragment> </Fragment>
) : (
<hr />
)} )}
<hr />
</div> </div>
); );
} }