mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Refactor intersection observer article code

This commit is contained in:
Thibaut Girka 2019-02-06 20:04:39 +01:00 committed by ThibG
parent e49e54a5ff
commit 68f3d003d6
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/javascript/flavours/glitch/components/intersection_observer_article.js
View File

@ -103,24 +103,23 @@ export default class IntersectionObserverArticle extends ImmutablePureComponent
const { children, id, index, listLength, cachedHeight } = this.props; const { children, id, index, listLength, cachedHeight } = this.props;
const { isIntersecting, isHidden } = this.state; const { isIntersecting, isHidden } = this.state;
const style = {};
if (!isIntersecting && (isHidden || cachedHeight)) { if (!isIntersecting && (isHidden || cachedHeight)) {
return ( style.height = `${this.height || cachedHeight || 150}px`;
<article style.opacity = 0;
ref={this.handleRef} style.overflow = 'hidden';
aria-posinset={index + 1}
aria-setsize={listLength}
style={{ height: `${this.height || cachedHeight || 150}px`, opacity: 0, overflow: 'hidden' }}
data-id={id}
tabIndex='0'
>
{children && React.cloneElement(children, { hidden: true })}
</article>
);
} }
return ( return (
<article ref={this.handleRef} aria-posinset={index + 1} aria-setsize={listLength} data-id={id} tabIndex='0'> <article
{children && React.cloneElement(children, { hidden: false })} ref={this.handleRef}
aria-posinset={index + 1}
aria-setsize={listLength}
data-id={id}
tabIndex='0'
style={style}>
{children && React.cloneElement(children, { hidden: !isIntersecting && (isHidden || cachedHeight) })}
</article> </article>
); );
} }