-
Notifications
You must be signed in to change notification settings - Fork 382
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.
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
chore: bump major versions of client dependencies #529
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
bde133a
chore: bump major versions of client dependencies
KhaledEmaraDev 8ad4cab
Refactor js code to pass the lint test
Yassa-hue d160ee8
Add x86_64-linux platform
ahangarha 37bcfca
Upgrade to Shakapacker 7.0.2
ahangarha 6f2fe92
Use generateWebpackConfig instead of webpackConfig
ahangarha 1e30e07
Remove deprecated option
Yassa-hue 4223647
Solve the marked warnings
Yassa-hue 907295a
Move the comment component ref to CommentList
Yassa-hue 8c13893
Fix add comment ref error
Yassa-hue e849ebf
Apply review requests
Yassa-hue File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
client/app/bundles/comments/components/CommentBox/CommentBox.module.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 25 additions & 19 deletions
44
client/app/bundles/comments/components/CommentBox/CommentList/Comment/Comment.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,34 @@ | ||
import BaseComponent from 'libs/components/BaseComponent'; | ||
import React from 'react'; | ||
import PropTypes from 'prop-types'; | ||
|
||
import { marked } from 'marked'; | ||
import { gfmHeadingId } from 'marked-gfm-heading-id'; | ||
import { mangle } from 'marked-mangle'; | ||
import sanitizeHtml from 'sanitize-html'; | ||
import css from './Comment.module.scss'; | ||
|
||
export default class Comment extends BaseComponent { | ||
static propTypes = { | ||
author: PropTypes.string.isRequired, | ||
text: PropTypes.string.isRequired, | ||
}; | ||
marked.use(gfmHeadingId()); | ||
marked.use(mangle()); | ||
|
||
render() { | ||
const { author, text } = this.props; | ||
const rawMarkup = marked(text, { gfm: true }); | ||
const sanitizedRawMarkup = sanitizeHtml(rawMarkup); | ||
const Comment = React.forwardRef((props, ref) => { | ||
const { author, text } = props; | ||
const rawMarkup = marked(text, { gfm: true }); | ||
const sanitizedRawMarkup = sanitizeHtml(rawMarkup); | ||
|
||
/* eslint-disable react/no-danger */ | ||
return ( | ||
<div className={css.comment}> | ||
<h2 className={`${css.commentAuthor} js-comment-author`}>{author}</h2> | ||
<span dangerouslySetInnerHTML={{ __html: sanitizedRawMarkup }} className="js-comment-text" /> | ||
</div> | ||
); | ||
} | ||
} | ||
/* eslint-disable react/no-danger */ | ||
return ( | ||
<div ref={ref} className={css.comment}> | ||
<h2 className={`${css.commentAuthor} js-comment-author`}>{author}</h2> | ||
<span dangerouslySetInnerHTML={{ __html: sanitizedRawMarkup }} className="js-comment-text" /> | ||
</div> | ||
); | ||
}); | ||
|
||
Comment.displayName = 'Comment'; | ||
|
||
Comment.propTypes = { | ||
author: PropTypes.string.isRequired, | ||
text: PropTypes.string.isRequired, | ||
}; | ||
|
||
export default React.memo(Comment); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ import Alert from 'react-bootstrap/lib/Alert'; | |
import Immutable from 'immutable'; | ||
import React from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import ReactCSSTransitionGroup from 'react-transition-group/CSSTransitionGroup'; | ||
import { CSSTransition, TransitionGroup } from 'react-transition-group'; | ||
import _ from 'lodash'; | ||
import BaseComponent from '../../../../../libs/components/BaseComponent.jsx'; | ||
|
||
|
@@ -20,57 +20,65 @@ export default class CommentList extends BaseComponent { | |
|
||
constructor(props, context) { | ||
super(props, context); | ||
this.state = {}; | ||
|
||
_.bindAll(this, 'errorWarning'); | ||
} | ||
|
||
errorWarning() { | ||
const { error, cssTransitionGroupClassNames } = this.props; | ||
|
||
// If there is no error, there is nothing to add to the DOM | ||
if (!this.props.error) return null; | ||
if (!error) return null; | ||
|
||
const nodeRef = React.createRef(null); | ||
|
||
return ( | ||
<Alert bsStyle="danger" key="commentFetchError"> | ||
<strong>Comments could not be retrieved. </strong>A server error prevented loading comments. Please | ||
try again. | ||
</Alert> | ||
<CSSTransition | ||
key="commentFetchError" | ||
nodeRef={nodeRef} | ||
timeout={500} | ||
classNames={cssTransitionGroupClassNames} | ||
> | ||
<Alert ref={nodeRef} bsStyle="danger"> | ||
<strong>Comments could not be retrieved. </strong>A server error prevented loading comments. Please | ||
try again. | ||
</Alert> | ||
</CSSTransition> | ||
); | ||
} | ||
|
||
render() { | ||
const { $$comments, cssTransitionGroupClassNames } = this.props; | ||
const commentNodes = $$comments.map(($$comment, index) => ( | ||
// `key` is a React-specific concept and is not mandatory for the | ||
// purpose of this tutorial. if you're curious, see more here: | ||
// http://facebook.github.io/react/docs/multiple-components.html#dynamic-children | ||
<Comment | ||
key={$$comment.get('id') || index} | ||
author={$$comment.get('author')} | ||
text={$$comment.get('text')} | ||
/> | ||
)); | ||
const commentNodes = $$comments.map(($$comment, index) => { | ||
const nodeRef = React.createRef(null); | ||
return ( | ||
<CSSTransition | ||
key={$$comment.get('id') || index} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am concerned that this is a good key. Though it works in our case I think it is better to make ids like |
||
nodeRef={nodeRef} | ||
timeout={500} | ||
classNames={cssTransitionGroupClassNames} | ||
> | ||
<Comment | ||
key={$$comment.get('id') || index} | ||
author={$$comment.get('author')} | ||
text={$$comment.get('text')} | ||
ref={nodeRef} | ||
/> | ||
</CSSTransition> | ||
); | ||
}); | ||
|
||
// For animation with ReactCSSTransitionGroup | ||
// https://facebook.github.io/react/docs/animation.html | ||
// For animation with TransitionGroup | ||
// https://reactcommunity.org/react-transition-group/transition-group | ||
// The 500 must correspond to the 0.5s in: | ||
// client/app/bundles/comments/components/CommentBox/CommentBox.module.scss:6 | ||
// client/app/bundles/comments/components/CommentBox/CommentBox.module.scss:8 | ||
return ( | ||
<div> | ||
<ReactCSSTransitionGroup | ||
transitionName={cssTransitionGroupClassNames} | ||
transitionEnterTimeout={500} | ||
transitionLeaveTimeout={500} | ||
> | ||
{this.errorWarning()} | ||
</ReactCSSTransitionGroup> | ||
{this.errorWarning()} | ||
|
||
<ReactCSSTransitionGroup | ||
transitionName={cssTransitionGroupClassNames} | ||
transitionEnterTimeout={500} | ||
transitionLeaveTimeout={500} | ||
className="commentList" | ||
component="div" | ||
> | ||
<TransitionGroup className="commentList" component="div"> | ||
{commentNodes} | ||
</ReactCSSTransitionGroup> | ||
</TransitionGroup> | ||
</div> | ||
); | ||
} | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's just a linting issue.