Skip to content

Commit 54a9f32

Browse files
committed
Rename hideSuspenseBoundary to hideDehydratedBoundary
Normally we have individual configs for these but the dehydrated fragment is used for both.
1 parent 0400ef7 commit 54a9f32

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,8 +1165,8 @@ export function clearSuspenseBoundaryFromContainer(
11651165
clearHydrationBoundaryFromContainer(container, suspenseInstance);
11661166
}
11671167

1168-
function hideOrUnhideSuspenseBoundary(
1169-
suspenseInstance: SuspenseInstance,
1168+
function hideOrUnhideDehydratedBoundary(
1169+
suspenseInstance: SuspenseInstance | ActivityInstance,
11701170
isHidden: boolean,
11711171
) {
11721172
let node: Node = suspenseInstance;
@@ -1216,8 +1216,10 @@ function hideOrUnhideSuspenseBoundary(
12161216
} while (node);
12171217
}
12181218

1219-
export function hideSuspenseBoundary(suspenseInstance: SuspenseInstance): void {
1220-
hideOrUnhideSuspenseBoundary(suspenseInstance, true);
1219+
export function hideDehydratedBoundary(
1220+
suspenseInstance: SuspenseInstance,
1221+
): void {
1222+
hideOrUnhideDehydratedBoundary(suspenseInstance, true);
12211223
}
12221224

12231225
export function hideInstance(instance: Instance): void {
@@ -1237,10 +1239,10 @@ export function hideTextInstance(textInstance: TextInstance): void {
12371239
textInstance.nodeValue = '';
12381240
}
12391241

1240-
export function unhideSuspenseBoundary(
1241-
suspenseInstance: SuspenseInstance,
1242+
export function unhideDehydratedBoundary(
1243+
dehydratedInstance: SuspenseInstance | ActivityInstance,
12421244
): void {
1243-
hideOrUnhideSuspenseBoundary(suspenseInstance, false);
1245+
hideOrUnhideDehydratedBoundary(dehydratedInstance, false);
12441246
}
12451247

12461248
export function unhideInstance(instance: Instance, props: Props): void {

packages/react-reconciler/src/ReactFiberCommitHostEffects.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ import {
4141
insertBefore,
4242
insertInContainerBefore,
4343
replaceContainerChildren,
44-
hideSuspenseBoundary,
44+
hideDehydratedBoundary,
4545
hideInstance,
4646
hideTextInstance,
47-
unhideSuspenseBoundary,
47+
unhideDehydratedBoundary,
4848
unhideInstance,
4949
unhideTextInstance,
5050
commitHydratedContainer,
@@ -159,15 +159,15 @@ export function commitShowHideSuspenseBoundary(node: Fiber, isHidden: boolean) {
159159
const instance = node.stateNode;
160160
if (isHidden) {
161161
if (__DEV__) {
162-
runWithFiberInDEV(node, hideSuspenseBoundary, instance);
162+
runWithFiberInDEV(node, hideDehydratedBoundary, instance);
163163
} else {
164-
hideSuspenseBoundary(instance);
164+
hideDehydratedBoundary(instance);
165165
}
166166
} else {
167167
if (__DEV__) {
168-
runWithFiberInDEV(node, unhideSuspenseBoundary, node.stateNode);
168+
runWithFiberInDEV(node, unhideDehydratedBoundary, node.stateNode);
169169
} else {
170-
unhideSuspenseBoundary(node.stateNode);
170+
unhideDehydratedBoundary(node.stateNode);
171171
}
172172
}
173173
} catch (error) {

packages/react-reconciler/src/ReactFiberConfigWithNoHydration.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ export const clearActivityBoundary = shim;
5252
export const clearSuspenseBoundary = shim;
5353
export const clearActivityBoundaryFromContainer = shim;
5454
export const clearSuspenseBoundaryFromContainer = shim;
55-
export const hideSuspenseBoundary = shim;
56-
export const unhideSuspenseBoundary = shim;
55+
export const hideDehydratedBoundary = shim;
56+
export const unhideDehydratedBoundary = shim;
5757
export const shouldDeleteUnhydratedTailInstances = shim;
5858
export const diffHydratedPropsForDevWarnings = shim;
5959
export const diffHydratedTextForDevWarnings = shim;

packages/react-reconciler/src/forks/ReactFiberConfig.custom.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ export const clearActivityBoundaryFromContainer =
232232
$$$config.clearActivityBoundaryFromContainer;
233233
export const clearSuspenseBoundaryFromContainer =
234234
$$$config.clearSuspenseBoundaryFromContainer;
235-
export const hideSuspenseBoundary = $$$config.hideSuspenseBoundary;
236-
export const unhideSuspenseBoundary = $$$config.unhideSuspenseBoundary;
235+
export const hideDehydratedBoundary = $$$config.hideDehydratedBoundary;
236+
export const unhideDehydratedBoundary = $$$config.unhideDehydratedBoundary;
237237
export const shouldDeleteUnhydratedTailInstances =
238238
$$$config.shouldDeleteUnhydratedTailInstances;
239239
export const diffHydratedPropsForDevWarnings =

0 commit comments

Comments
 (0)