logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: b0407ece42dd3057716b58a0db930e79d992b0eb
parent: 9b3d8ee3467e262e50a8e7414d5aadae8e345650
Author: unarist <m.unarist@gmail.com>
Date:   Wed, 11 Oct 2017 18:25:15 +0900

Fix an error when ancestors get loaded before the status itself (#5312)

When ancestors get loaded, we scroll to the target status (i.e. skip
ancestors). However, ancestors may get loaded before the status itself,
then it causes TypeError because `this.node` is undefined yet.

Since we don't show anything until the status gets loaded, we don't need
to scroll to the target status in this time. If we get the status itslef
later, it causes `componentDidUpdate` and scrolling correctly.

Diffstat:

Mapp/javascript/mastodon/features/status/index.js4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js @@ -240,9 +240,9 @@ export default class Status extends ImmutablePureComponent { } componentDidUpdate () { - const { ancestorsIds } = this.props; + const { status, ancestorsIds } = this.props; - if (ancestorsIds && ancestorsIds.size > 0) { + if (status && ancestorsIds && ancestorsIds.size > 0) { const element = this.node.querySelectorAll('.focusable')[ancestorsIds.size]; element.scrollIntoView(); }