FAILING Fork mount impl as well

facebook · Nov 9, 2022 · 168f118 · 168f118
1 parent 68da82a
commit 168f118
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 32 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberHooks.new.js b/packages/react-reconciler/src/ReactFiberHooks.new.js
@@ -1501,13 +1501,13 @@ function updateMutableSource<Source, Snapshot>(
   return useMutableSource(hook, source, getSnapshot, subscribe);
 }
 
-function mountSyncExternalStore<T>(
+function mountSyncExternalStoreImpl<T>(
+  hook: Hook,
   subscribe: (() => void) => () => void,
   getSnapshot: () => T,
   getServerSnapshot?: () => T,
 ): T {
   const fiber = currentlyRenderingFiber;
-  const hook = mountWorkInProgressHook();
 
   let nextSnapshot;
   const isHydrating = getIsHydrating();
@@ -1593,6 +1593,20 @@ function mountSyncExternalStore<T>(
   return nextSnapshot;
 }
 
+function mountSyncExternalStore<T>(
+  subscribe: (() => void) => () => void,
+  getSnapshot: () => T,
+  getServerSnapshot?: () => T,
+): T {
+  const hook = mountWorkInProgressHook();
+  return mountSyncExternalStoreImpl(
+    hook,
+    subscribe,
+    getSnapshot,
+    getServerSnapshot,
+  );
+}
+
 function updateSyncExternalStoreImpl<T>(
   hook: Hook,
   prevSnapshot: T,
@@ -1688,20 +1702,25 @@ function rerenderSyncExternalStore<T>(
   getServerSnapshot?: () => T,
 ): T {
   const hook = updateWorkInProgressHook();
-  const prevSnapshot =
-    currentHook === null
-      ? // This is a rerender during a mount.
-        hook.memoizedState
-      : // This is a rerender during an update.
-        currentHook.memoizedState;
-
-  return updateSyncExternalStoreImpl(
-    hook,
-    prevSnapshot,
-    subscribe,
-    getSnapshot,
-    getServerSnapshot,
-  );
+  if (currentHook === null) {
+    // This is a rerender during a mount.
+    return mountSyncExternalStoreImpl(
+      hook,
+      subscribe,
+      getSnapshot,
+      getServerSnapshot,
+    );
+  } else {
+    // This is a rerender during an update.
+    const prevSnapshot: T = currentHook.memoizedState;
+    return updateSyncExternalStoreImpl(
+      hook,
+      prevSnapshot,
+      subscribe,
+      getSnapshot,
+      getServerSnapshot,
+    );
+  }
 }
 
 function pushStoreConsistencyCheck<T>(

diff --git a/packages/react-reconciler/src/ReactFiberHooks.old.js b/packages/react-reconciler/src/ReactFiberHooks.old.js
@@ -1501,13 +1501,13 @@ function updateMutableSource<Source, Snapshot>(
   return useMutableSource(hook, source, getSnapshot, subscribe);
 }
 
-function mountSyncExternalStore<T>(
+function mountSyncExternalStoreImpl<T>(
+  hook: Hook,
   subscribe: (() => void) => () => void,
   getSnapshot: () => T,
   getServerSnapshot?: () => T,
 ): T {
   const fiber = currentlyRenderingFiber;
-  const hook = mountWorkInProgressHook();
 
   let nextSnapshot;
   const isHydrating = getIsHydrating();
@@ -1593,6 +1593,20 @@ function mountSyncExternalStore<T>(
   return nextSnapshot;
 }
 
+function mountSyncExternalStore<T>(
+  subscribe: (() => void) => () => void,
+  getSnapshot: () => T,
+  getServerSnapshot?: () => T,
+): T {
+  const hook = mountWorkInProgressHook();
+  return mountSyncExternalStoreImpl(
+    hook,
+    subscribe,
+    getSnapshot,
+    getServerSnapshot,
+  );
+}
+
 function updateSyncExternalStoreImpl<T>(
   hook: Hook,
   prevSnapshot: T,
@@ -1688,20 +1702,25 @@ function rerenderSyncExternalStore<T>(
   getServerSnapshot?: () => T,
 ): T {
   const hook = updateWorkInProgressHook();
-  const prevSnapshot =
-    currentHook === null
-      ? // This is a rerender during a mount.
-        hook.memoizedState
-      : // This is a rerender during an update.
-        currentHook.memoizedState;
-
-  return updateSyncExternalStoreImpl(
-    hook,
-    prevSnapshot,
-    subscribe,
-    getSnapshot,
-    getServerSnapshot,
-  );
+  if (currentHook === null) {
+    // This is a rerender during a mount.
+    return mountSyncExternalStoreImpl(
+      hook,
+      subscribe,
+      getSnapshot,
+      getServerSnapshot,
+    );
+  } else {
+    // This is a rerender during an update.
+    const prevSnapshot: T = currentHook.memoizedState;
+    return updateSyncExternalStoreImpl(
+      hook,
+      prevSnapshot,
+      subscribe,
+      getSnapshot,
+      getServerSnapshot,
+    );
+  }
 }
 
 function pushStoreConsistencyCheck<T>(