Fix and simplify browser history handling in relation to modals

This simplifies the logic to:
- when the last modal gets closed and we're in our history buffer state, go back
- whenever a modal is open, ensure we're in a history buffer state by
  potentially pushing one
This commit is contained in:
Claire
2021-07-12 17:55:40 +02:00
parent c5b4e6b708
commit 6e3d5cbca2
2 changed files with 24 additions and 18 deletions

View File

@ -59,12 +59,8 @@ export default class ModalRoot extends React.PureComponent {
backgroundColor: null,
};
getSnapshotBeforeUpdate () {
return { visible: !!this.props.type };
}
componentDidUpdate (prevProps, prevState, { visible }) {
if (visible) {
componentDidUpdate () {
if (!!this.props.type) {
document.body.classList.add('with-modals--active');
document.documentElement.style.marginRight = `${getScrollbarWidth()}px`;
} else {