unwind panics into error boundaries

This commit is contained in:
Evan Almloff committed 2024-03-13 18:55:57 -05:00
1 parent 34956cdb31
commit 2e7b8cb178
4 files changed
+69 -23

No files matched your search

+6 -1
View File
@@ -1,4 +1,8 @@
use crate::{nodes::RenderReturn, ComponentFunction};
use crate::{
innerlude::{throw_error, CapturedPanic},
nodes::RenderReturn,
ComponentFunction,
};
use std::{any::Any, panic::AssertUnwindSafe};
pub(crate) type BoxedAnyProps = Box<dyn AnyProps>;
@@ -79,6 +83,7 @@ impl<F: ComponentFunction<P, M> + Clone, P: Clone + 'static, M: 'static> AnyProp
Err(err) => {
let component_name = self.name;
tracing::error!("Error while rendering component `{component_name}`: {err:?}");
throw_error::<()>(CapturedPanic { error: err });
RenderReturn::default()
}
}
+15 -1
View File
@@ -13,6 +13,20 @@ use std::{
rc::Rc,
};
/// A panic in a component that was caught by an error boundary.
///
/// NOTE: WASM currently does not support caching unwinds, so this struct will not be created in WASM.
pub struct CapturedPanic {
/// The error that was caught
pub error: Box<dyn Any + 'static>,
}
impl Debug for CapturedPanic {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("CapturedPanic").finish()
}
}
/// Provide an error boundary to catch errors from child components
pub fn use_error_boundary() -> ErrorBoundary {
use_hook(|| provide_context(ErrorBoundary::new()))
@@ -201,7 +215,7 @@ pub trait Throw<S = ()>: Sized {
}
}
fn throw_error<T>(e: impl Debug + 'static) -> Option<T> {
pub(crate) fn throw_error<T>(e: impl Debug + 'static) -> Option<T> {
if let Some(cx) = try_consume_context::<ErrorBoundary>() {
match current_scope_id() {
Some(id) => cx.insert_error(id, Box::new(e), Backtrace::capture()),