fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 07:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing

Browse source 
Revert 245816ab27 (fixes #348)
This commit is contained in:
beatrix 2018-02-10 21:47:27 -05:00 committed by GitHub
parent 20b519f0fc fb6f131fa1
commit 136458eaf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/javascript/flavours/glitch/components/intersection_observer_article.js
View file

@ -1,15 +1,10 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ImmutablePureComponent from 'react-immutable-pure-component';
import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task'; import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task';
import getRectFromEntry from 'flavours/glitch/util/get_rect_from_entry'; import getRectFromEntry from 'flavours/glitch/util/get_rect_from_entry';
import { is } from 'immutable';
// Diff these props in the "rendered" state export default class IntersectionObserverArticle extends ImmutablePureComponent {
const updateOnPropsForRendered = ['id', 'index', 'listLength'];
// Diff these props in the "unrendered" state
const updateOnPropsForUnrendered = ['id', 'index', 'listLength', 'cachedHeight'];
export default class IntersectionObserverArticle extends React.Component {
static propTypes = { static propTypes = {
intersectionObserverWrapper: PropTypes.object.isRequired, intersectionObserverWrapper: PropTypes.object.isRequired,
@ -27,15 +22,18 @@ export default class IntersectionObserverArticle extends React.Component {
} }
shouldComponentUpdate (nextProps, nextState) { shouldComponentUpdate (nextProps, nextState) {
const isUnrendered = !this.state.isIntersecting && (this.state.isHidden || this.props.cachedHeight); if (!nextState.isIntersecting && nextState.isHidden) {
const willBeUnrendered = !nextState.isIntersecting && (nextState.isHidden || nextProps.cachedHeight); // It's only if we're not intersecting (i.e. offscreen) and isHidden is true
if (!!isUnrendered !== !!willBeUnrendered) { // that either "isIntersecting" or "isHidden" matter, and then they're
// If we're going from rendered to unrendered (or vice versa) then update // the only things that matter (and updated ARIA attributes).
return this.state.isIntersecting || !this.state.isHidden || nextProps.listLength !== this.props.listLength;
} else if (nextState.isIntersecting && !this.state.isIntersecting) {
// If we're going from a non-intersecting state to an intersecting state,
// (i.e. offscreen to onscreen), then we definitely need to re-render
return true; return true;
} }
// Otherwise, diff based on props // Otherwise, diff based on "updateOnProps" and "updateOnStates"
const propsToDiff = isUnrendered ? updateOnPropsForUnrendered : updateOnPropsForRendered; return super.shouldComponentUpdate(nextProps, nextState);
return !propsToDiff.every(prop => is(nextProps[prop], this.props[prop]));
} }
componentDidMount () { componentDidMount () {