Skip to content

Commit

Permalink
💄
Browse files Browse the repository at this point in the history
  • Loading branch information
EtienneLem committed Apr 4, 2017
1 parent bb538ff commit 4926b7b
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 21 deletions.
2 changes: 1 addition & 1 deletion scripts/build-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ emojiData.forEach((datum) => {
}
})

var flags = data.categories[categoriesIndex['Flags']];
var flags = data.categories[categoriesIndex['Flags']]
flags.emojis.sort()

mkdirp('data', (err) => {
Expand Down
30 changes: 17 additions & 13 deletions src/components/picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Anchors, Category, Emoji, Preview, Search } from '.'
const RECENT_CATEGORY = { name: 'Recent', emojis: null }
const SEARCH_CATEGORY = { name: 'Search', emojis: null, anchor: RECENT_CATEGORY }

let CATEGORIES = [];
let CATEGORIES = []

const I18N = {
search: 'Search',
Expand Down Expand Up @@ -40,35 +40,39 @@ export default class Picker extends React.Component {
firstRender: true,
}

let filteredCategories = [];
let filteredCategories = []

for (let hash of data.categories) {
let isIncluded = props.include == undefined ? true : props.include.indexOf(hash.name.toLowerCase()) > -1
let isExcluded = props.exclude == undefined ? false : props.exclude.indexOf(hash.name.toLowerCase()) > -1
if (!isIncluded || isExcluded) { continue; }
if (!isIncluded || isExcluded) { continue }

let newEmojis = []

let new_emojis = [];
for (let emoji of hash.emojis) {
let unified = data.emojis[emoji].unified;
let unified = data.emojis[emoji].unified

if (props.emojisToShowFilter(unified)) {
new_emojis.push(emoji)
newEmojis.push(emoji)
}
}

if (new_emojis.length) {
let new_hash = {
emojis: new_emojis,
name: hash.name
if (newEmojis.length) {
let newHash = {
emojis: newEmojis,
name: hash.name,
}
filteredCategories.push(new_hash);

filteredCategories.push(newHash)
}
}

CATEGORIES = [
SEARCH_CATEGORY,
RECENT_CATEGORY,
].concat(filteredCategories);
].concat(filteredCategories)

this.categories = CATEGORIES;
this.categories = CATEGORIES
}

componentWillReceiveProps(props) {
Expand Down
14 changes: 7 additions & 7 deletions src/utils/emoji-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@ function search(value, emojisToShowFilter = () => true, maxResults = 75) {
}
}

let filtered_results = null;
let filteredResults = null

if (results) {
filtered_results = results.filter(
(result) => emojisToShowFilter(data.emojis[result.id].unified));
if (filtered_results && filtered_results.length) {
filtered_results = filtered_results.slice(0, maxResults)
}
filteredResults = results.filter((result) => emojisToShowFilter(data.emojis[result.id].unified))
if (filteredResults && filteredResults.length) {
filteredResults = filteredResults.slice(0, maxResults)
}
}

return filtered_results
return filteredResults
}

export default { search, emojis: emojisList, emoticons: emoticonsList }

0 comments on commit 4926b7b

Please sign in to comment.