fix: correct memo fiber updater, fixes #1230

gaearon · May 16, 2019 · a185494 · a185494
1 parent a6ba488
commit a185494
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/internal/getReactStack.js b/src/internal/getReactStack.js
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
 
 import hydrateFiberStack from './stack/hydrateFiberStack';
 import hydrateLegacyStack from './stack/hydrateLegacyStack';
-import { getInternalInstance } from './reactUtils';
+import { getInternalInstance, updateInstance } from './reactUtils';
 
 function getReactStack(instance) {
   const rootNode = getInternalInstance(instance);
@@ -41,6 +41,10 @@ const markUpdate = ({ fiber }) => {
       ...fiber.memoizedProps,
     };
   }
+
+  if (fiber.stateNode) {
+    updateInstance(fiber.stateNode);
+  }
 };
 
 export const cleanupReact = () => {

diff --git a/src/reconciler/componentComparator.js b/src/reconciler/componentComparator.js
@@ -37,7 +37,7 @@ const compareComponents = (oldType, newType, setNewType, baseType) => {
     if (oldType.type === newType.type || areSwappable(oldType.type, newType.type)) {
       if (baseType) {
         // memo form different fibers, why?
-        if (oldType === baseType) {
+        if (baseType.$$typeof === newType.$$typeof) {
           setNewType(newType);
         } else {
           setNewType(newType.type);