PLT-3631 Properly update PostViewController when emojis change (#3565)

* Properly remove custom emojis from clientside store

* Properly update PostViewController when emojis change
This commit is contained in:
Harrison Healey
2016-07-12 16:06:03 -04:00
committed by GitHub
parent 34ec30e806
commit caef414abe
2 changed files with 14 additions and 2 deletions
@@ -247,6 +247,10 @@ export default class PostViewController extends React.Component {
return true;
}
if (nextState.emojis !== this.state.emojis) {
return true;
}
return false;
}
+10 -2
View File
@@ -54,12 +54,13 @@ class EmojiStore extends EventEmitter {
this.addCustomEmoji(emoji);
}
// add custom emojis to the map first so that they can't override system ones
this.emojis = new Map([...this.customEmojis, ...this.systemEmojis]);
this.updateEmojiMap();
}
addCustomEmoji(emoji) {
this.customEmojis.set(emoji.name, emoji);
// this doesn't update this.emojis, but it's only called by setCustomEmojis which does that afterwards
}
removeCustomEmoji(id) {
@@ -69,6 +70,13 @@ class EmojiStore extends EventEmitter {
break;
}
}
this.updateEmojiMap();
}
updateEmojiMap() {
// add custom emojis to the map first so that they can't override system ones
this.emojis = new Map([...this.customEmojis, ...this.systemEmojis]);
}
getSystemEmojis() {