Unverified Commit d257d445 authored by Gerald Monaco's avatar Gerald Monaco Committed by GitHub

Remove dead events (#13156)

parent 91b1548d
...@@ -514,12 +514,6 @@ async function doRender({ App, Component, props, err }) { ...@@ -514,12 +514,6 @@ async function doRender({ App, Component, props, err }) {
// lastAppProps has to be set before ReactDom.render to account for ReactDom throwing an error. // lastAppProps has to be set before ReactDom.render to account for ReactDom throwing an error.
lastAppProps = appProps lastAppProps = appProps
emitter.emit('before-reactdom-render', {
Component,
ErrorComponent,
appProps,
})
const elem = ( const elem = (
<AppContainer> <AppContainer>
<App {...appProps} /> <App {...appProps} />
...@@ -535,6 +529,4 @@ async function doRender({ App, Component, props, err }) { ...@@ -535,6 +529,4 @@ async function doRender({ App, Component, props, err }) {
), ),
appElement appElement
) )
emitter.emit('after-reactdom-render', { Component, ErrorComponent, appProps })
} }
...@@ -43,28 +43,6 @@ initNext({ webpackHMR }) ...@@ -43,28 +43,6 @@ initNext({ webpackHMR })
displayContent(() => { displayContent(() => {
render(renderCtx) render(renderCtx)
}) })
let lastScroll
emitter.on('before-reactdom-render', ({ Component, ErrorComponent }) => {
// Remember scroll when ErrorComponent is being rendered to later restore it
if (!lastScroll && Component === ErrorComponent) {
const { pageXOffset, pageYOffset } = window
lastScroll = {
x: pageXOffset,
y: pageYOffset,
}
}
})
emitter.on('after-reactdom-render', ({ Component, ErrorComponent }) => {
if (lastScroll && Component !== ErrorComponent) {
// Restore scroll after ErrorComponent was replaced with a page component by HMR
const { x, y } = lastScroll
window.scroll(x, y)
lastScroll = null
}
})
}) })
.catch((err) => { .catch((err) => {
console.error('Error was not caught', err) console.error('Error was not caught', err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment