Merge branch 'master' into query-composition

Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-embed-stream/src/Stream.js

client/coral-embed-stream/src/components/Comment.js

@@ -64,6 +64,8 @@ class Comment extends React.Component {
     currentUser: PropTypes.shape({
       id: PropTypes.string.isRequired
     }),
+    charCountEnable: PropTypes.bool.isRequired,
+    maxCharCount: PropTypes.number,
     comment: PropTypes.shape({
       depth: PropTypes.number,
       action_summaries: PropTypes.array.isRequired,
@@ -121,6 +123,8 @@ class Comment extends React.Component {
       ignoreUser,
       disableReply,
       commentIsIgnored,
+      maxCharCount,
+      charCountEnable,
     } = this.props;
 
     const likeSummary = getActionSummary('LikeActionSummary', comment);
@@ -256,6 +260,8 @@ class Comment extends React.Component {
               commentPostedHandler={() => {
                 setActiveReplyBox('');
               }}
+              charCountEnable={charCountEnable}
+              maxCharCount={maxCharCount}
               setActiveReplyBox={setActiveReplyBox}
               parentId={parentId || comment.id}
               addNotification={addNotification}
@@ -288,6 +294,8 @@ class Comment extends React.Component {
                   addCommentTag={addCommentTag}
                   removeCommentTag={removeCommentTag}
                   ignoreUser={ignoreUser}
+                  charCountEnable={charCountEnable}
+                  maxCharCount={maxCharCount}
                   showSignInDialog={showSignInDialog}
                   reactKey={reply.id}
                   key={reply.id}

client/coral-embed-stream/src/components/Stream.js

@@ -91,7 +91,8 @@ class Stream extends React.Component {
                     premod={asset.settings.moderation}
                     isReply={false}
                     authorId={user.id}
-                    charCount={asset.settings.charCountEnable && asset.settings.charCount} />
+                    charCountEnable={asset.settings.charCountEnable}
+                    maxCharCount={asset.settings.charCount} />
                  : null
                }
              </RestrictedContent>
@@ -125,7 +126,10 @@ class Stream extends React.Component {
             key={highlightedComment.id}
             commentIsIgnored={commentIsIgnored}
             reactKey={highlightedComment.id}
-            comment={highlightedComment} />
+            comment={highlightedComment}
+            charCountEnable={asset.settings.charCountEnable}
+            maxCharCount={asset.settings.charCount}
+          />
           : <div>
             <NewCount
               commentCount={asset.commentCount}
@@ -167,6 +171,8 @@ class Stream extends React.Component {
                         reactKey={comment.id}
                         comment={comment}
                         pluginProps={pluginProps}
+                        charCountEnable={asset.settings.charCountEnable}
+                        maxCharCount={asset.settings.charCount}
                       />
                 )
               }