Skip to content

use preferred skin tone emoji when add using enter #7292

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.

Sign up for GitHub

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

Merged
luacmartins merged 2 commits into from
Jan 19, 2022
Merged

use preferred skin tone emoji when add using enter #7292

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbd6134
use preferred skin tone emoji when add using enter
thesahindia Jan 18, 2022
440c85f
use lodashGet
thesahindia Jan 19, 2022
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
5 changes: 4 additions & 1 deletion src/pages/home/report/EmojiPickerMenu/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, {Component} from 'react';
import {View, FlatList} from 'react-native';
import PropTypes from 'prop-types';
import _ from 'underscore';
import lodashGet from 'lodash/get';
import CONST from '../../../../CONST';
import styles from '../../../../styles/styles';
import * as StyleUtils from '../../../../styles/StyleUtils';
Expand Down Expand Up @@ -142,7 +143,9 @@ class EmojiPickerMenu extends Component {

// Select the currently highlighted emoji if enter is pressed
if (keyBoardEvent.key === 'Enter' && this.state.highlightedIndex !== -1) {
this.props.onEmojiSelected(this.state.filteredEmojis[this.state.highlightedIndex].code, this.state.filteredEmojis[this.state.highlightedIndex]);
const item = this.state.filteredEmojis[this.state.highlightedIndex];
const emoji = lodashGet(item, ['types', this.props.preferredSkinTone], item.code);
this.props.onEmojiSelected(emoji, item);
return;
}

Expand Down