Small tweaks to SSR to match #14594 (#14618)

gaearon · web-flow · commit be457ca685b1 · 2019-01-18T00:52:13.000Z
* Small tweaks to SSR to match #14594 * Remove unnecessary comparison
diff --git a/packages/react-dom/src/server/ReactPartialRendererHooks.js b/packages/react-dom/src/server/ReactPartialRendererHooks.js
@@ -286,29 +286,26 @@ export function useReducer<S, A>(
 }
 }
 
-function useMemo<T>(
- nextCreate: () => T,
- inputs: Array<mixed> | void | null,
-): T {
+function useMemo<T>(nextCreate: () => T, deps: Array<mixed> | void | null): T {
 currentlyRenderingComponent = resolveCurrentlyRenderingComponent();
 workInProgressHook = createWorkInProgressHook();
 
- const nextInputs =
- inputs !== undefined && inputs !== null ? inputs : [nextCreate];
+ const nextDeps = deps === undefined ? null : deps;
 
- if (
- workInProgressHook !== null &&
- workInProgressHook.memoizedState !== null
- ) {
+ if (workInProgressHook !== null) {
 const prevState = workInProgressHook.memoizedState;
- const prevInputs = prevState[1];
- if (areHookInputsEqual(nextInputs, prevInputs)) {
- return prevState[0];
+ if (prevState !== null) {
+ if (nextDeps !== null) {
+ const prevDeps = prevState[1];
+ if (areHookInputsEqual(nextDeps, prevDeps)) {
+ return prevState[0];
+ }
+ }
 }
 }
 
 const nextValue = nextCreate();
- workInProgressHook.memoizedState = [nextValue, nextInputs];
+ workInProgressHook.memoizedState = [nextValue, nextDeps];
 return nextValue;
 }
 
@@ -330,7 +327,7 @@ function useRef<T>(initialValue: T): {current: T} {
 
 export function useLayoutEffect(
 create: () => mixed,
- inputs: Array<mixed> | void | null,
+ deps: Array<mixed> | void | null,
 ) {
 if (__DEV__) {
 currentHookNameInDev = 'useLayoutEffect';
@@ -388,7 +385,7 @@ function dispatchAction<A>(
 
 export function useCallback<T>(
 callback: T,
- inputs: Array<mixed> | void | null,
+ deps: Array<mixed> | void | null,
 ): T {
 // Callbacks are passed as they are in the server environment.
 return callback;
diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -303,7 +303,7 @@ class ReactShallowRenderer {
 this._validateCurrentlyRenderingComponent();
 this._createWorkInProgressHook();
 
- const nextDeps = deps !== undefined && deps !== null ? deps : null;
+ const nextDeps = deps !== undefined ? deps : null;
 
 if (
 this._workInProgressHook !== null &&

-Original file line number
+Diff line change
+}
+}
 -functionuseMemo<T>(
 - nextCreate: () =>T,
 -inputs: Array<mixed> | void | null,
 -): T {
 +functionuseMemo<T>(nextCreate: () =>T,deps: Array<mixed> | void | null): T {
 currentlyRenderingComponent=resolveCurrentlyRenderingComponent();
 workInProgressHook=createWorkInProgressHook();
 -constnextInputs=
 -inputs!==undefined&&inputs!==null ? inputs : [nextCreate];
 +constnextDeps=deps===undefined ? null : deps;
 -if(
 -workInProgressHook!==null&&
 -workInProgressHook.memoizedState!==null
 -){
 +if(workInProgressHook!==null){
 const prevState =workInProgressHook.memoizedState;
 -constprevInputs=prevState[1];
 -if(areHookInputsEqual(nextInputs,prevInputs)){
 -returnprevState[0];
 +if(prevState!==null){
 +if(nextDeps!==null){
 +constprevDeps=prevState[1];
 +if(areHookInputsEqual(nextDeps,prevDeps)){
 +returnprevState[0];
 +}
 +}
+}
+}
 constnextValue=nextCreate();
 -workInProgressHook.memoizedState=[nextValue,nextInputs];
 +workInProgressHook.memoizedState=[nextValue,nextDeps];
 returnnextValue;
+}
 exportfunctionuseLayoutEffect(
 create: ()=>mixed,
 -inputs: Array<mixed> | void | null,
 +deps: Array<mixed> | void | null,
 ) {
 if(__DEV__){
 currentHookNameInDev='useLayoutEffect';
 exportfunctionuseCallback<T>(
  callback: T,
 -inputs: Array<mixed> | void | null,
 +deps: Array<mixed> | void | null,
 ): T {
 // Callbacks are passed as they are in the server environment.
 returncallback;