Merge pull request #1566 from ClearlyClaire/glitch-soc/feature/modal-stack
Fix boost/fav confirmation modals closing media modallocal
commit
82bc8e7647
14 changed files with 63 additions and 63 deletions
@ -0,0 +1,18 @@ |
|||||||
|
import { ScrollContainer as OriginalScrollContainer } from 'react-router-scroll-4'; |
||||||
|
|
||||||
|
// ScrollContainer is used to automatically scroll to the top when pushing a
|
||||||
|
// new history state and remembering the scroll position when going back.
|
||||||
|
// There are a few things we need to do differently, though.
|
||||||
|
const defaultShouldUpdateScroll = (prevRouterProps, { location }) => { |
||||||
|
// 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); |
||||||
|
}; |
||||||
|
|
||||||
|
export default |
||||||
|
class ScrollContainer extends OriginalScrollContainer { |
||||||
|
|
||||||
|
static defaultProps = { |
||||||
|
shouldUpdateScroll: defaultShouldUpdateScroll, |
||||||
|
}; |
||||||
|
|
||||||
|
} |
Loading…
Reference in new issue