specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode (#26633)

Browse source 
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
This commit is contained in:
Claire 2023-08-24 14:10:48 +02:00 committed by GitHub
parent b2ac93dd73
commit e90649b064
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/javascript/mastodon/components/column.jsx
View file

@ -16,7 +16,19 @@ export default class Column extends PureComponent {
}; };
scrollTop () { scrollTop () {
const scrollable = this.props.bindToDocument ? document.scrollingElement : this.node.querySelector('.scrollable'); let scrollable = null;
if (this.props.bindToDocument) {
scrollable = document.scrollingElement;
} else {
scrollable = this.node.querySelector('.scrollable');
// Some columns have nested `.scrollable` containers, with the outer one
// being a wrapper while the actual scrollable content is deeper.
if (scrollable.classList.contains('scrollable--flex')) {
scrollable = scrollable?.querySelector('.scrollable') || scrollable;
}
}
if (!scrollable) { if (!scrollable) {
return; return;