Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-10-05 10:56:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(composer-emoji): Return if no search results are found

Browse source
This commit is contained in:
Jackie Luo 2016-03-24 11:57:49 -07:00
parent 3544ccf979
commit cff427d710
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal_packages/composer-emoji/lib/emoji-button-popover.jsx
View file

@ -128,6 +128,8 @@ class EmojiButtonPopover extends React.Component {
} }
categoryNames = ["Frequently Used"].concat(categoryNames); categoryNames = ["Frequently Used"].concat(categoryNames);
} }
// Calculates where each category should be (variable because Frequently
// Used may or may not be present)
for (const name of categoryNames) { for (const name of categoryNames) {
categoryPositions[name] = {top: 0, bottom: 0}; categoryPositions[name] = {top: 0, bottom: 0};
} }
@ -165,6 +167,7 @@ class EmojiButtonPopover extends React.Component {
} }
findSearchMatches(searchValue) { findSearchMatches(searchValue) {
// TODO: Find matches for aliases, too.
const searchMatches = []; const searchMatches = [];
for (const category of Object.keys(categorizedEmojiList)) { for (const category of Object.keys(categorizedEmojiList)) {
categorizedEmojiList[category].forEach((emojiName) => { categorizedEmojiList[category].forEach((emojiName) => {
@ -188,13 +191,13 @@ class EmojiButtonPopover extends React.Component {
calcEmojiByPosition = (position) => { calcEmojiByPosition = (position) => {
for (const category in this.state.categoryPositions) { for (const category in this.state.categoryPositions) {
if (this.state.categoryPositions.hasOwnProperty(category)) { if (this.state.categoryPositions.hasOwnProperty(category)) {
const LEFT_PADDING = 8; const LEFT_BOUNDARY = 8;
const RIGHT_PADDING = 204; const RIGHT_BOUNDARY = 204;
const EMOJI_WIDTH = 24.5; const EMOJI_WIDTH = 24.5;
const EMOJI_HEIGHT = 24; const EMOJI_HEIGHT = 24;
const EMOJI_PER_ROW = 8; const EMOJI_PER_ROW = 8;
if (position.x >= LEFT_PADDING && if (position.x >= LEFT_BOUNDARY &&
position.x <= RIGHT_PADDING && position.x <= RIGHT_BOUNDARY &&
position.y >= this.state.categoryPositions[category].top && position.y >= this.state.categoryPositions[category].top &&
position.y <= this.state.categoryPositions[category].bottom) { position.y <= this.state.categoryPositions[category].bottom) {
const x = Math.round((position.x + 5) / EMOJI_WIDTH); const x = Math.round((position.x + 5) / EMOJI_WIDTH);
@ -264,6 +267,7 @@ class EmojiButtonPopover extends React.Component {
position.y += 48; position.y += 48;
ctx.font = "32px Arial"; ctx.font = "32px Arial";
ctx.fillStyle = 'black'; ctx.fillStyle = 'black';
if (this.state.categorizedEmoji[category].length === 0) return;
this.state.categorizedEmoji[category].forEach((emojiName, j) => { this.state.categorizedEmoji[category].forEach((emojiName, j) => {
if (missingEmojiList.indexOf(emojiName) === -1) { if (missingEmojiList.indexOf(emojiName) === -1) {
const emojiChar = emoji.get(emojiName); const emojiChar = emoji.get(emojiName);

1
internal_packages/composer-emoji/lib/missing-emoji.js
View file

@ -15,6 +15,7 @@ export default missingEmojiList = [
'baseball', 'baseball',
'airplane', 'airplane',
'envelope', 'envelope',
'email',
'scissors', 'scissors',
'black_nib', 'black_nib',
'pencil2', 'pencil2',