ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix scroll position (#4821)

rebase/4.0.0rc2
Clworld 2017-09-07 00:29:56 +09:00 committed by Eugen Rochko
parent e0cda4a851
commit 1646f622a5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/components/scrollable_list.js
View File

@ -5,6 +5,7 @@ import IntersectionObserverArticle from './intersection_observer_article';
import LoadMore from './load_more'; import LoadMore from './load_more';
import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper'; import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';
import { throttle } from 'lodash'; import { throttle } from 'lodash';
import { List as ImmutableList } from 'immutable';
export default class ScrollableList extends PureComponent { export default class ScrollableList extends PureComponent {
@ -95,7 +96,12 @@ export default class ScrollableList extends PureComponent {
getFirstChildKey (props) { getFirstChildKey (props) {
const { children } = props; const { children } = props;
const firstChild = Array.isArray(children) ? children[0] : children; let firstChild = children;
if (children instanceof ImmutableList) {
firstChild = children.get(0);
} else if (Array.isArray(children)) {
firstChild = children[0];
}
return firstChild && firstChild.key; return firstChild && firstChild.key;
} }