Skip to content

Commit 05a69b4

Browse files
committed
Address feedback
1 parent da2868d commit 05a69b4

File tree

2 files changed

+23
-38
lines changed

2 files changed

+23
-38
lines changed

packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2220,13 +2220,10 @@ describe('ReactDOMServerPartialHydration', () => {
22202220

22212221
function Button() {
22222222
const ref = React.useRef(null);
2223-
const effect = () => {
2224-
return setClick(ref.current, onEvent);
2225-
};
2226-
if (isServerRendering) {
2227-
React.useEffect(effect);
2228-
} else {
2229-
React.useLayoutEffect(effect);
2223+
if (!isServerRendering) {
2224+
React.useLayoutEffect(() => {
2225+
return setClick(ref.current, onEvent);
2226+
});
22302227
}
22312228
return <a ref={ref}>Click me</a>;
22322229
}
@@ -2379,13 +2376,10 @@ describe('ReactDOMServerPartialHydration', () => {
23792376
function Button() {
23802377
const ref = React.useRef(null);
23812378

2382-
const effect = () => {
2383-
return setClick(ref.current, onEvent);
2384-
};
2385-
if (isServerRendering) {
2386-
React.useEffect(effect);
2387-
} else {
2388-
React.useLayoutEffect(effect);
2379+
if (!isServerRendering) {
2380+
React.useLayoutEffect(() => {
2381+
return setClick(ref.current, onEvent);
2382+
});
23892383
}
23902384

23912385
return <a ref={ref}>Click me</a>;

packages/react-dom/src/__tests__/ReactDOMServerSelectiveHydration-test.internal.js

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -354,15 +354,12 @@ describe('ReactDOMServerSelectiveHydration', () => {
354354
function Child({text}) {
355355
const ref = React.useRef(null);
356356
Scheduler.unstable_yieldValue(text);
357-
const effect = () => {
358-
return setClick(ref.current, () => {
359-
Scheduler.unstable_yieldValue('Clicked ' + text);
357+
if (!isServerRendering) {
358+
React.useLayoutEffect(() => {
359+
return setClick(ref.current, () => {
360+
Scheduler.unstable_yieldValue('Clicked ' + text);
361+
});
360362
});
361-
};
362-
if (isServerRendering) {
363-
React.useEffect(effect);
364-
} else {
365-
React.useLayoutEffect(effect);
366363
}
367364

368365
return <span ref={ref}>{text}</span>;
@@ -433,15 +430,12 @@ describe('ReactDOMServerSelectiveHydration', () => {
433430
}
434431
Scheduler.unstable_yieldValue(text);
435432

436-
const effect = () => {
437-
return setClick(ref.current, () => {
438-
Scheduler.unstable_yieldValue('Clicked ' + text);
433+
if (!isServerRendering) {
434+
React.useLayoutEffect(() => {
435+
return setClick(ref.current, () => {
436+
Scheduler.unstable_yieldValue('Clicked ' + text);
437+
});
439438
});
440-
};
441-
if (isServerRendering) {
442-
React.useEffect(effect);
443-
} else {
444-
React.useLayoutEffect(effect);
445439
}
446440

447441
return <span ref={ref}>{text}</span>;
@@ -524,15 +518,12 @@ describe('ReactDOMServerSelectiveHydration', () => {
524518
}
525519
Scheduler.unstable_yieldValue(text);
526520

527-
const effect = () => {
528-
return setClick(ref.current, () => {
529-
Scheduler.unstable_yieldValue('Clicked ' + text);
521+
if (!isServerRendering) {
522+
React.useLayoutEffect(() => {
523+
return setClick(ref.current, () => {
524+
Scheduler.unstable_yieldValue('Clicked ' + text);
525+
});
530526
});
531-
};
532-
if (isServerRendering) {
533-
React.useEffect(effect);
534-
} else {
535-
React.useLayoutEffect(effect);
536527
}
537528
return <span ref={ref}>{text}</span>;
538529
}

0 commit comments

Comments
 (0)