imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorganize reaction sending and show if emoji is selected

Browse source 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
This commit is contained in:
Tulir Asokan 2019-10-15 19:07:04 +03:00
parent 7acae6dc32
commit 318754d31c
9 changed files with 174 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/components/views/emojipicker/EmojiPicker.js
View file

@ -61,7 +61,8 @@ EMOJIBASE.forEach(emoji => {
class EmojiPicker extends React.Component {
static propTypes = {
onChoose: PropTypes.func.isRequired,
closeMenu: PropTypes.func,
selectedEmojis: PropTypes.instanceOf(Set),
showQuickReactions: PropTypes.bool,
};
constructor(props) {
@ -204,10 +205,8 @@ class EmojiPicker extends React.Component {
}
onClickEmoji(emoji) {
recent.add(emoji.unicode);
this.props.onChoose(emoji.unicode);
if (this.props.closeMenu) {
this.props.closeMenu();
if (this.props.onChoose(emoji.unicode) !== false) {
recent.add(emoji.unicode);
}
}
@ -225,14 +224,15 @@ class EmojiPicker extends React.Component {
{this.categories.map(category => (
<Category key={category.id} id={category.id} name={category.name}
emojis={this.memoizedDataByCategory[category.id]} onClick={this.onClickEmoji}
onMouseEnter={this.onHoverEmoji} onMouseLeave={this.onHoverEmojiEnd} />
onMouseEnter={this.onHoverEmoji} onMouseLeave={this.onHoverEmojiEnd}
selectedEmojis={this.props.selectedEmojis} />
))}
</div>
{this.state.previewEmoji
{this.state.previewEmoji || !this.props.showQuickReactions
? <Preview emoji={this.state.previewEmoji} />
: <QuickReactions onClick={this.onClickEmoji} /> }
: <QuickReactions onClick={this.onClickEmoji} selectedEmojis={this.props.selectedEmojis} /> }
</div>
)
);
}
}