summaryrefslogtreecommitdiffstats
path: root/webapp/components/textbox.jsx
diff options
context:
space:
mode:
authorDavid Meza <dmeza@users.noreply.github.com>2017-07-31 07:24:13 -0500
committerJoram Wilander <jwawilander@gmail.com>2017-07-31 08:24:13 -0400
commitf740698dbe06816921d2a20eea876c9ca7b515ed (patch)
treedf5c9f4f076c6294da8246275a97133f59b5a82f /webapp/components/textbox.jsx
parent22fa48f455f15be7a7528501431841a2c7d84c85 (diff)
downloadchat-f740698dbe06816921d2a20eea876c9ca7b515ed.tar.gz
chat-f740698dbe06816921d2a20eea876c9ca7b515ed.tar.bz2
chat-f740698dbe06816921d2a20eea876c9ca7b515ed.zip
PLT-6486 Add an `@username` button to the profile popover, that puts the username in the post when clicked (#6349)
* PLT-6486 Add an `@username` button to the profile popover, that puts the username in the post when clicked * PLT-6486 Display `@username` mention on the right text area on center or RHS. * Disable @mentions from profile popover on searches, mentions and pinned posts. Fix js errors. * Control undefined post in SearchStore that causes an exception.
Diffstat (limited to 'webapp/components/textbox.jsx')
-rw-r--r--webapp/components/textbox.jsx10
1 files changed, 8 insertions, 2 deletions
diff --git a/webapp/components/textbox.jsx b/webapp/components/textbox.jsx
index 536b1a115..3db87d106 100644
--- a/webapp/components/textbox.jsx
+++ b/webapp/components/textbox.jsx
@@ -36,11 +36,15 @@ export default class Textbox extends React.Component {
supportsCommands: PropTypes.bool.isRequired,
handlePostError: PropTypes.func,
suggestionListStyle: PropTypes.string,
- emojiEnabled: PropTypes.bool
+ emojiEnabled: PropTypes.bool,
+ isRHS: PropTypes.bool,
+ popoverMentionKeyClick: React.PropTypes.bool
};
static defaultProps = {
- supportsCommands: true
+ supportsCommands: true,
+ isRHS: false,
+ popoverMentionKeyClick: false
};
constructor(props) {
@@ -296,6 +300,8 @@ export default class Textbox extends React.Component {
channelId={this.props.channelId}
value={this.props.value}
renderDividers={true}
+ isRHS={this.props.isRHS}
+ popoverMentionKeyClick={this.props.popoverMentionKeyClick}
/>
<div
ref='preview'