Skip to content

fix: Remove duplicate emojis from search #7323

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
MonilBhavsar merged 6 commits into from
Jan 20, 2022
Merged

fix: Remove duplicate emojis from search #7323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7240aea
fix: filter frequently emojis out from the search list
mananjadhav Jan 18, 2022
aa6168b
fix: Changed EMOJI_SPACER references in the app
mananjadhav Jan 18, 2022
9f8e74a
fix: Ignore slice when no frequent used emojis exist
mananjadhav Jan 18, 2022
e82c417
fix: corrected typo
mananjadhav Jan 19, 2022
bf00fb3
fix: Changed comment
mananjadhav Jan 20, 2022
dc965fb
fix: lint fixes
mananjadhav Jan 20, 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
9 changes: 6 additions & 3 deletions src/pages/home/report/EmojiPickerMenu/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class EmojiPickerMenu extends Component {
}

// Move in the prescribed direction until we reach an element that isn't a header
const isHeader = e => e.header || e.code === CONST.EMOJI_SPACER;
const isHeader = e => e.header || e.spacer;
Copy link
Member

@parasharrajat parasharrajat Jan 19, 2022

Choose a reason for hiding this comment

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

Good catch..

do {
newIndex += steps;
} while (isHeader(this.state.filteredEmojis[newIndex]));
Expand Down Expand Up @@ -343,9 +343,12 @@ class EmojiPickerMenu extends Component {
return;
}

const newFilteredEmojiList = _.filter(this.emojis, emoji => (
// Skip "Frequently Used" emojis to avoid duplicate results.
// Frequently used emojis are on the 0th index category. Hence, slice the array from the 1st index category onwards.
const uniqueEmojis = _.isEmpty(this.props.frequentlyUsedEmojis) ? this.emojis : this.emojis.slice(this.unfilteredHeaderIndices[1] * this.numColumns);
const newFilteredEmojiList = _.filter(uniqueEmojis, emoji => (
!emoji.header
&& emoji.code !== CONST.EMOJI_SPACER
&& !emoji.spacer
&& _.find(emoji.keywords, keyword => keyword.includes(normalizedSearchTerm))
));

Expand Down
3 changes: 1 addition & 2 deletions tests/unit/EmojiRegexTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import _ from 'underscore';
import Emoji from '../../assets/emojis';
import CONST from '../../src/CONST';
import * as EmojiUtils from '../../src/libs/EmojiUtils';

describe('EmojiRegexTest', () => {
it('matches all the emojis in the list', () => {
// Given the set of Emojis available in the application
const emojiMatched = _.every(Emoji, (emoji) => {
if (emoji.header === true || emoji.code === CONST.EMOJI_SPACER) {
if (emoji.header === true || emoji.spacer) {
return true;
}

Expand Down