|
|
@ -6,11 +6,13 @@ import { ScrollContainer as OriginalScrollContainer } from 'react-router-scroll-
|
|
|
|
const defaultShouldUpdateScroll = (prevRouterProps, { location }) => {
|
|
|
|
const defaultShouldUpdateScroll = (prevRouterProps, { location }) => {
|
|
|
|
// If the change is caused by opening a modal, do not scroll to top
|
|
|
|
// If the change is caused by opening a modal, do not scroll to top
|
|
|
|
return !(location.state?.mastodonModalKey && location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey);
|
|
|
|
return !(location.state?.mastodonModalKey && location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
export default
|
|
|
|
export default
|
|
|
|
class ScrollContainer extends OriginalScrollContainer {
|
|
|
|
class ScrollContainer extends OriginalScrollContainer {
|
|
|
|
|
|
|
|
|
|
|
|
static defaultProps = {
|
|
|
|
static defaultProps = {
|
|
|
|
shouldUpdateScroll: defaultShouldUpdateScroll,
|
|
|
|
shouldUpdateScroll: defaultShouldUpdateScroll,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|