oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-05 18:48:31 +00:00
Code Wiki Activity

More fixes for the React 16 update.

Browse source
This commit is contained in:
SirStendec 2018-02-22 18:38:13 -05:00
parent 0ae6e5021d
commit eb967e115f
9 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
changelog.html
View file

@ -1,5 +1,11 @@
<div class="list-header">4.0.0-beta1.5<span>@e5095bc624a4d0c6be15</span> <time datetime="2018-02-22">(2018-02-22)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Fixed: Further fixes for the React 16 upgrade. Most features should now be working.</li>
</ul>
<div class="list-header">4.0.0-beta1.5<span>@ef163f5d644217193110</span> <time datetime="2018-02-22">(2018-02-22)</time></div> <div class="list-header">4.0.0-beta1.5<span>@ef163f5d644217193110</span> <time datetime="2018-02-22">(2018-02-22)</time></div>
<ul class="chat-menu-content menu-side-padding"> <ul class="chat-menu-content menu-side-padding">
<li>Added: Integration for the <code>Emote Menu for Twitch</code> extension.</li>
<li>Fixed: React 16 support.</li> <li>Fixed: React 16 support.</li>
<li>Note: Many features are still broken. This is just an initial quick fix.</li> <li>Note: Many features are still broken. This is just an initial quick fix.</li>
</ul> </ul>

6
src/sites/twitch-twilight/modules/channel_bar.js
View file

@ -54,12 +54,12 @@ export default class ChannelBar extends Module {
this.ChannelBar.on('update', this.updateChannelBar, this); this.ChannelBar.on('update', this.updateChannelBar, this);
/*this.HostBar.on('mount', inst => { /*this.HostBar.on('mount', inst => {
this.log.info('host-mount', inst, this.fine.getHostNode(inst)); this.log.info('host-mount', inst, this.fine.getChildNode(inst));
}); });
this.HostBar.ready((cls, instances) => { this.HostBar.ready((cls, instances) => {
for(const inst of instances) for(const inst of instances)
this.log.info('host-found', inst, this.fine.getHostNode(inst)); this.log.info('host-found', inst, this.fine.getChildNode(inst));
})*/ })*/
} }
@ -82,7 +82,7 @@ export default class ChannelBar extends Module {
updateMetadata(inst, keys) { updateMetadata(inst, keys) {
const container = this.fine.getHostNode(inst), const container = this.fine.getChildNode(inst),
metabar = container && container.querySelector && container.querySelector('.channel-info-bar__action-container > .tw-flex'); metabar = container && container.querySelector && container.querySelector('.channel-info-bar__action-container > .tw-flex');
if ( ! inst._ffz_mounted || ! metabar ) if ( ! inst._ffz_mounted || ! metabar )

2
src/sites/twitch-twilight/modules/chat/index.js
View file

@ -526,7 +526,7 @@ export default class ChatHook extends Module {
// ======================================================================== // ========================================================================
fixPinnedCheer(inst) { fixPinnedCheer(inst) {
const el = this.fine.getHostNode(inst), const el = this.fine.getChildNode(inst),
container = el && el.querySelector && el.querySelector('.pinned-cheer__headline'), container = el && el.querySelector && el.querySelector('.pinned-cheer__headline'),
tc = inst.props.topCheer; tc = inst.props.topCheer;

6
src/sites/twitch-twilight/modules/chat/scroller.js
View file

@ -113,7 +113,7 @@ export default class Scroller extends Module {
this._ffz_freeze_visible = true; this._ffz_freeze_visible = true;
let el = this._ffz_freeze_indicator; let el = this._ffz_freeze_indicator;
if ( ! el ) { if ( ! el ) {
const node = t.fine.getHostNode(this); const node = t.fine.getChildNode(this);
if ( ! node ) if ( ! node )
return; return;
@ -204,7 +204,7 @@ export default class Scroller extends Module {
cls.prototype.ffzEnableFreeze = function() { cls.prototype.ffzEnableFreeze = function() {
const node = t.fine.getHostNode(this); const node = t.fine.getChildNode(this);
if ( ! node || this.ffz_freeze_enabled ) if ( ! node || this.ffz_freeze_enabled )
return; return;
@ -236,7 +236,7 @@ export default class Scroller extends Module {
this._ffz_outside = null; this._ffz_outside = null;
} }
const node = t.fine.getHostNode(this); const node = t.fine.getChildNode(this);
if ( ! node ) if ( ! node )
return; return;

2
src/sites/twitch-twilight/modules/directory/browse_popular.js
View file

@ -68,7 +68,7 @@ export default class BrowsePopular extends SiteModule {
} }
updateChannelCard(inst) { updateChannelCard(inst) {
const container = this.fine.getHostNode(inst); const container = this.fine.getChildNode(inst);
if (!container) return; if (!container) return;
if (container.classList.contains('ffz-modified-channel-card')) return; if (container.classList.contains('ffz-modified-channel-card')) return;

2
src/sites/twitch-twilight/modules/directory/following.js
View file

@ -332,7 +332,7 @@ export default class Following extends SiteModule {
} }
updateChannelCard(inst) { updateChannelCard(inst) {
const container = this.fine.getHostNode(inst), const container = this.fine.getChildNode(inst),
card = container && container.querySelector && container.querySelector('.tw-card'); card = container && container.querySelector && container.querySelector('.tw-card');
if ( ! card ) if ( ! card )

2
src/sites/twitch-twilight/modules/directory/game.js
View file

@ -36,7 +36,7 @@ export default class Game extends SiteModule {
} }
updateButtons(inst, update = false) { updateButtons(inst, update = false) {
const container = this.fine.getHostNode(inst); const container = this.fine.getChildNode(inst);
if ( inst.props.directoryType !== 'GAMES' || ! container || ! container.querySelector ) if ( inst.props.directoryType !== 'GAMES' || ! container || ! container.querySelector )
return; return;

6
src/sites/twitch-twilight/modules/directory/index.js
View file

@ -162,7 +162,7 @@ export default class Directory extends SiteModule {
updateChannelCard(inst) { updateChannelCard(inst) {
const container = this.fine.getHostNode(inst); const container = this.fine.getChildNode(inst);
if (!container) return; if (!container) return;
this.updateUptime(inst, 'props.streamNode.viewersCount.createdAt', '.tw-card-img'); this.updateUptime(inst, 'props.streamNode.viewersCount.createdAt', '.tw-card-img');
@ -230,7 +230,7 @@ export default class Directory extends SiteModule {
updateUptime(inst, created_path, selector) { updateUptime(inst, created_path, selector) {
const container = this.fine.getHostNode(inst), const container = this.fine.getChildNode(inst),
card = container && container.querySelector && container.querySelector(selector), card = container && container.querySelector && container.querySelector(selector),
setting = this.settings.get('directory.uptime'), setting = this.settings.get('directory.uptime'),
created_at = get(created_path, inst), created_at = get(created_path, inst),
@ -275,7 +275,7 @@ export default class Directory extends SiteModule {
addCardAvatar(inst, created_path, selector, data) { addCardAvatar(inst, created_path, selector, data) {
const container = this.fine.getHostNode(inst), const container = this.fine.getChildNode(inst),
card = container && container.querySelector && container.querySelector(selector), card = container && container.querySelector && container.querySelector(selector),
setting = this.settings.get('directory.show-channel-avatars'); setting = this.settings.get('directory.show-channel-avatars');

24
src/utilities/compat/fine.js
View file

@ -74,7 +74,7 @@ export default class Fine extends Module {
return instance.return; return instance.return;
} }
getHostNode(instance) { getParentNode(instance) {
if ( instance._reactInternalFiber ) if ( instance._reactInternalFiber )
instance = instance._reactInternalFiber; instance = instance._reactInternalFiber;
else if ( instance instanceof Node ) else if ( instance instanceof Node )
@ -87,6 +87,23 @@ export default class Fine extends Module {
instance = instance.parent; instance = instance.parent;
} }
getChildNode(instance) {
if ( instance._reactInternalFiber )
instance = instance._reactInternalFiber;
else if ( instance instanceof Node )
instance = this.getReactInstance(instance);
while( instance )
if ( instance.stateNode instanceof Node )
return instance.stateNode
else
instance = instance.child;
}
getHostNode(instance) {
return this.getChildNode(instance);
}
getParent(instance) { getParent(instance) {
return this.getOwner(instance); return this.getOwner(instance);
} }
@ -424,8 +441,9 @@ export class FineWrapper extends EventEmitter {
if ( instances ) if ( instances )
for(const inst of instances) { for(const inst of instances) {
// How do we check mounted state for fibers? // How do we check mounted state for fibers?
//if ( inst._reactInternalInstance && inst._reactInternalInstance._renderedComponent ) if ( this.fine.getChildNode(inst) )
// inst._ffz_mounted = true; inst._ffz_mounted = true;
_instances.add(inst); _instances.add(inst);
} }