Introduce error boundaries around all screens
parent
4eabc2d65a
commit
d262393992
|
@ -0,0 +1,40 @@
|
||||||
|
import React, {Component, ErrorInfo, ReactNode} from 'react'
|
||||||
|
import {ErrorScreen} from './error/ErrorScreen'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
children?: ReactNode
|
||||||
|
}
|
||||||
|
|
||||||
|
interface State {
|
||||||
|
hasError: boolean
|
||||||
|
error: any
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ErrorBoundary extends Component<Props, State> {
|
||||||
|
public state: State = {
|
||||||
|
hasError: false,
|
||||||
|
error: undefined,
|
||||||
|
}
|
||||||
|
|
||||||
|
public static getDerivedStateFromError(error: Error): State {
|
||||||
|
return {hasError: true, error}
|
||||||
|
}
|
||||||
|
|
||||||
|
public componentDidCatch(error: Error, errorInfo: ErrorInfo) {
|
||||||
|
console.error('Uncaught error:', error, errorInfo)
|
||||||
|
}
|
||||||
|
|
||||||
|
public render() {
|
||||||
|
if (this.state.hasError) {
|
||||||
|
return (
|
||||||
|
<ErrorScreen
|
||||||
|
title="Oh no!"
|
||||||
|
message="There was an unexpected issue in the application. Please let us know if this happened to you!"
|
||||||
|
details={this.state.error.toString()}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.props.children
|
||||||
|
}
|
||||||
|
}
|
|
@ -31,6 +31,7 @@ import {HorzSwipe} from '../../com/util/gestures/HorzSwipe'
|
||||||
import {Modal} from '../../com/modals/Modal'
|
import {Modal} from '../../com/modals/Modal'
|
||||||
import {Lightbox} from '../../com/lightbox/Lightbox'
|
import {Lightbox} from '../../com/lightbox/Lightbox'
|
||||||
import {Text} from '../../com/util/text/Text'
|
import {Text} from '../../com/util/text/Text'
|
||||||
|
import {ErrorBoundary} from '../../com/util/ErrorBoundary'
|
||||||
import {TabsSelector} from './TabsSelector'
|
import {TabsSelector} from './TabsSelector'
|
||||||
import {Composer} from './Composer'
|
import {Composer} from './Composer'
|
||||||
import {s, colors} from '../../lib/styles'
|
import {s, colors} from '../../lib/styles'
|
||||||
|
@ -327,7 +328,9 @@ export const MobileShell: React.FC = observer(() => {
|
||||||
end={{x: 0, y: 1}}
|
end={{x: 0, y: 1}}
|
||||||
style={styles.outerContainer}>
|
style={styles.outerContainer}>
|
||||||
<SafeAreaView style={styles.innerContainer}>
|
<SafeAreaView style={styles.innerContainer}>
|
||||||
|
<ErrorBoundary>
|
||||||
<Login />
|
<Login />
|
||||||
|
</ErrorBoundary>
|
||||||
</SafeAreaView>
|
</SafeAreaView>
|
||||||
<Modal />
|
<Modal />
|
||||||
</LinearGradient>
|
</LinearGradient>
|
||||||
|
@ -337,7 +340,9 @@ export const MobileShell: React.FC = observer(() => {
|
||||||
return (
|
return (
|
||||||
<View style={styles.outerContainer}>
|
<View style={styles.outerContainer}>
|
||||||
<View style={styles.innerContainer}>
|
<View style={styles.innerContainer}>
|
||||||
|
<ErrorBoundary>
|
||||||
<Onboard />
|
<Onboard />
|
||||||
|
</ErrorBoundary>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
|
@ -400,12 +405,14 @@ export const MobileShell: React.FC = observer(() => {
|
||||||
]
|
]
|
||||||
: undefined,
|
: undefined,
|
||||||
]}>
|
]}>
|
||||||
|
<ErrorBoundary>
|
||||||
<Com
|
<Com
|
||||||
params={params}
|
params={params}
|
||||||
navIdx={navIdx}
|
navIdx={navIdx}
|
||||||
visible={current}
|
visible={current}
|
||||||
scrollElRef={current ? scrollElRef : undefined}
|
scrollElRef={current ? scrollElRef : undefined}
|
||||||
/>
|
/>
|
||||||
|
</ErrorBoundary>
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
</Screen>
|
</Screen>
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue