Merge branch 'main' into glitch-soc/merge-upstream

2022-11-30 10:29:19 +01:00
parent 1a7aa37b60 1122697b37
commit fe111a8bad
2 changed files with 7 additions and 1 deletions
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -222,6 +222,10 @@ class Status extends ImmutablePureComponent {
      this.props.dispatch(fetchStatus(nextProps.params.statusId));
    }

+    if (nextProps.params.statusId && nextProps.ancestorsIds.size > this.props.ancestorsIds.size) {
+      this._scrolledIntoView = false;
+    }
+
    if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) {
      this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') });
    }