Skip to content
Closed
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
Binary file added core
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/react/src/errorboundary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,11 @@ function withErrorBoundary<P extends Record<string, any>>(
): React.FC<P> {
const componentDisplayName = WrappedComponent.displayName || WrappedComponent.name || UNKNOWN_COMPONENT;

const Wrapped: React.FC<P> = (props: P) => (
const Wrapped = React.memo<P>((props: P) => (
<ErrorBoundary {...errorBoundaryOptions}>
<WrappedComponent {...props} />
</ErrorBoundary>
);
));

Wrapped.displayName = `errorBoundary(${componentDisplayName})`;

Expand Down
21 changes: 21 additions & 0 deletions packages/react/test/errorboundary.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,27 @@ describe('withErrorBoundary', () => {
const Component = withErrorBoundary(() => <h1>Hello World</h1>, { fallback: <h1>fallback</h1> });
expect(Component.displayName).toBe(`errorBoundary(${UNKNOWN_COMPONENT})`);
});

it('prevents unnecessary rerenders with React.memo', () => {
let renderCount = 0;
const TestComponent = ({ value }: { value: string }) => {
renderCount++;
return <div>{value}</div>;
};

const WrappedComponent = withErrorBoundary(TestComponent, { fallback: <h1>fallback</h1> });

const { rerender } = render(<WrappedComponent value="test" />);
expect(renderCount).toBe(1);

// Rerender with same props - should not cause wrapped component to rerender
rerender(<WrappedComponent value="test" />);
expect(renderCount).toBe(1);

// Rerender with different props - should cause wrapped component to rerender
rerender(<WrappedComponent value="different" />);
expect(renderCount).toBe(2);
});
});

describe('ErrorBoundary', () => {
Expand Down
Loading