From 19d0f1c5ed124cda9cc6051cb43ccc252b3938a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= <changyun.pcy@alibaba-inc.com>
Date: Thu, 12 Aug 2021 22:11:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E8=A7=A3=E5=86=B3=20Rax?=
 =?UTF-8?q?=20=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=8A=A5=E9=94=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/renderer-core/src/renderer/renderer.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/renderer-core/src/renderer/renderer.tsx b/packages/renderer-core/src/renderer/renderer.tsx
index e444e7610..3ca21e46a 100644
--- a/packages/renderer-core/src/renderer/renderer.tsx
+++ b/packages/renderer-core/src/renderer/renderer.tsx
@@ -111,9 +111,17 @@ export default function rendererFactory() {
         return;
       }
       SetComponent.patchedCatch = true;
-      SetComponent.getDerivedStateFromError = (error: Error) => {
-        return { engineRenderError: true, error };
+
+      // Rax 的 getDerivedStateFromError 有 BUG，这里先用 componentDidCatch 来替代
+      // @see https://github.com/alibaba/rax/issues/2211
+      const originalDidCatch = SetComponent.prototype.componentDidCatch;
+      SetComponent.prototype.componentDidCatch = function didCatch(this: any, error: Error, errorInfo: any) {
+        this.setState({ engineRenderError: true, error });
+        if (originalDidCatch && typeof originalDidCatch === 'function') {
+          originalDidCatch.call(this, error, errorInfo);
+        }
       };
+
       const engine = this;
       const originRender = SetComponent.prototype.render;
       SetComponent.prototype.render = function () {