Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/eager-emus-sort.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@stackflow/react": minor
---

Add an option for customizing error boundary in ErrorHandler of structured activity components
18 changes: 11 additions & 7 deletions integrations/react/src/__internal__/PluginRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,22 @@ function renderStructuredActivityComponent(
) : (
node
),
(node) =>
errorHandler?.component ? (
<StructuredActivityComponentErrorBoundary
(node) => {
if (!errorHandler) return node;

const ErrorBoundary =
errorHandler.boundary ?? StructuredActivityComponentErrorBoundary;

return (
<ErrorBoundary
renderFallback={(err, reset) => (
<errorHandler.component params={params} error={err} reset={reset} />
)}
>
{node}
</StructuredActivityComponentErrorBoundary>
) : (
node
),
</ErrorBoundary>
);
},
(node) =>
layout?.component ? (
<layout.component params={params}>{node}</layout.component>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,23 @@ export function loading<ActivityName extends RegisteredActivityName>(

export interface ErrorHandler<P extends {}> {
component: ComponentType<{ params: P; error: unknown; reset: () => void }>;
boundary?: CustomErrorBoundary;
}

export type CustomErrorBoundary = ComponentType<{
children: ReactNode;
renderFallback: (error: unknown, reset: () => void) => ReactNode;
}>;

export function errorHandler<ActivityName extends RegisteredActivityName>(
component: ComponentType<{
params: InferActivityParams<ActivityName>;
error: unknown;
reset: () => void;
}>,
options?: {
boundary?: CustomErrorBoundary;
},
): ErrorHandler<InferActivityParams<ActivityName>> {
return { component };
return { component, boundary: options?.boundary };
}
Loading