fix: secure wrapped/uwrapped comparison

gaearon · Dec 17, 2018 · a62bacd · a62bacd
1 parent da7b662
commit a62bacd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/reconciler/componentComparator.js b/src/reconciler/componentComparator.js
@@ -49,7 +49,11 @@ const compareComponents = (oldType, newType, setNewType) => {
     return defaultResult
   }
 
-  if (newType !== oldType && areSwappable(newType, oldType)) {
+  if (
+    newType !== oldType &&
+    areSwappable(newType, oldType) &&
+    !!oldType[PROXY_KEY] == !!newType[PROXY_KEY]
+  ) {
     const unwrapFactory = newType[UNWRAP_PROXY]
     const oldProxy = unwrapFactory && getProxyByType(unwrapFactory())
     if (oldProxy) {