Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/EmojiPicker/EmojiSkinToneList.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class EmojiSkinToneList extends Component {
onHoverOut={() => this.setState({highlightedIndex: -1})}
key={skinToneEmoji.code}
emoji={skinToneEmoji.code}
isHighlighted={skinToneEmoji.skinTone === this.state.highlightedIndex}
isHighlighted={skinToneEmoji.skinTone === this.state.highlightedIndex || skinToneEmoji.skinTone === selectedEmoji.skinTone}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, this caused the following issue: #52918
We need to make sure that state.highlightedIndex is updated when the selectedEmoji.skinTone is changed, otherwise, two emoji skin tones will be highlighted at the same time.
More details can be found in this proposal: #52918 (comment)

/>
))
}
Expand Down