Support null fallback prop

bvaughn · Dec 15, 2023 · 54a2838 · 54a2838
1 parent 23a4d77
commit 54a2838
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-error-boundary",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "description": "Simple reusable React error boundary component",
   "author": "Brian Vaughn <brian.david.vaughn@gmail.com>",
   "license": "MIT",

diff --git a/src/ErrorBoundary.test.tsx b/src/ErrorBoundary.test.tsx
@@ -151,6 +151,18 @@ describe("ErrorBoundary", () => {
       render({ resetKeys: [2] });
       expect(container.textContent).toBe("Content");
     });
+
+    it("should render a null fallback if specified", () => {
+      shouldThrow = true;
+      act(() => {
+        root.render(
+          <ErrorBoundary fallback={null}>
+            <MaybeThrows>Content</MaybeThrows>
+          </ErrorBoundary>
+        );
+      });
+      expect(container.textContent).toBe("");
+    });
   });
 
   describe('"FallbackComponent"', () => {

diff --git a/src/ErrorBoundary.ts b/src/ErrorBoundary.ts
@@ -90,12 +90,12 @@ export class ErrorBoundary extends Component<
         resetErrorBoundary: this.resetErrorBoundary,
       };
 
-      if (isValidElement(fallback)) {
-        childToRender = fallback;
-      } else if (typeof fallbackRender === "function") {
+      if (typeof fallbackRender === "function") {
         childToRender = fallbackRender(props);
       } else if (FallbackComponent) {
         childToRender = createElement(FallbackComponent, props);
+      } else if (fallback === null || isValidElement(fallback)) {
+        childToRender = fallback;
       } else {
         if (isDevelopment) {
           console.error(