1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-31 23:18:31 +00:00

4.0.0-rc19.4

* Changed: Better DOM scanning performance by giving up faster.
* Fixed: More stupid changes in order to force events to fire on the component we grab badge data from.
This commit is contained in:
SirStendec 2019-05-04 03:36:10 -04:00
parent ebc671ae1e
commit c920b43e01
3 changed files with 46 additions and 14 deletions

View file

@ -560,12 +560,25 @@ export default class ChatHook extends Module {
this.ChatContainer.on('mount', this.containerMounted, this);
this.ChatContainer.on('unmount', this.removeRoom, this);
this.ChatContainer.on('update', this.containerUpdated, this);
this.ChatContainer.on('receive-props', this.containerUpdated, this);
this.ChatContainer.ready((cls, instances) => {
const t = this,
old_render = cls.prototype.render,
old_catch = cls.prototype.componentDidCatch;
// This is so stupid. I hate React. Why won't the events just fire
// like they should.
cls.prototype.render = function() {
try {
t.containerUpdated(this, this.props);
} catch(err) {
t.log.error(err);
}
return old_render.call(this);
}
// Try catching errors. With any luck, maybe we can
// recover from the error when we re-build?
cls.prototype.componentDidCatch = function(err, info) {
@ -580,6 +593,7 @@ export default class ChatHook extends Module {
return old_catch.call(this, err, info);
}
for(const inst of instances)
this.containerMounted(inst);
});
@ -1422,7 +1436,7 @@ export default class ChatHook extends Module {
if ( chat.chatBuffer )
chat.chatBuffer.ffzController = chat;
if ( ! chat._ffz_room || props.channelID !== chat.props.channelID ) {
if ( ! chat._ffz_room || props.channelID != chat._ffz_room.id ) {
this.removeRoom(chat);
if ( chat._ffz_mounted )
this.chatMounted(chat, props);
@ -1526,7 +1540,7 @@ export default class ChatHook extends Module {
containerUpdated(cont, props) {
if ( ! cont._ffz_room || props.channelID !== cont.props.channelID ) {
if ( ! cont._ffz_room || props.channelID != cont._ffz_room.id ) {
this.removeRoom(cont);
if ( cont._ffz_mounted )
this.containerMounted(cont, props);