diff options
| -rw-r--r-- | frontend/src/errorboundary-hook.tsx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/frontend/src/errorboundary-hook.tsx b/frontend/src/errorboundary-hook.tsx index 95be77ab..2c69a267 100644 --- a/frontend/src/errorboundary-hook.tsx +++ b/frontend/src/errorboundary-hook.tsx @@ -79,9 +79,17 @@ class ErrorBoundaryHook extends Logger { this.setState(stateClone); return null; } - if (this.state.error) { + // yoinked from valve error boundary + if (this.state.error && this.props.errorKey == this.state.lastErrorKey) { const store = Object.getPrototypeOf(this)?.constructor?.sm_ErrorReportingStore || errorReportingStore; - return ( + + return void 0 !== this.props.fallback ? ( + 'function' == typeof this.props.fallback ? ( + this.props.fallback(this.state.error.error) + ) : ( + this.props.fallback + ) + ) : ( <DeckyErrorBoundary error={this.state.error} errorKey={this.props.errorKey} |