Skip to content

Commit 10ff979

Browse files
committed
Add Flow type to new host config method
1 parent 100239e commit 10ff979

9 files changed

Lines changed: 13 additions & 18 deletions

File tree

packages/react-art/src/ReactARTHostConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,6 @@ export function preparePortalMount(portalInstance: any): void {
472472
// noop
473473
}
474474

475-
export function unmountNode(node: any): void {
475+
export function detachDeletedInstance(node: Instance): void {
476476
// noop
477477
}

packages/react-dom/src/client/ReactDOMComponentTree.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,11 @@ const internalEventHandlersKey = '__reactEvents$' + randomKey;
4343
const internalEventHandlerListenersKey = '__reactListeners$' + randomKey;
4444
const internalEventHandlesSetKey = '__reactHandles$' + randomKey;
4545

46-
export function unmountNode(
47-
node: Instance | TextInstance | SuspenseInstance | ReactScopeInstance,
48-
): void {
46+
export function detachDeletedInstance(node: Instance): void {
47+
// TODO: This function is only called on host components. I don't think all of
48+
// these fields are relevant.
4949
delete (node: any)[internalInstanceKey];
5050
delete (node: any)[internalPropsKey];
51-
delete (node: any)[internalContainerInstanceKey];
5251
delete (node: any)[internalEventHandlersKey];
5352
delete (node: any)[internalEventHandlerListenersKey];
5453
delete (node: any)[internalEventHandlesSetKey];

packages/react-dom/src/client/ReactDOMHostConfig.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import {
2424
getFiberFromScopeInstance,
2525
getInstanceFromNode as getInstanceFromNodeDOMTree,
2626
isContainerMarkedAsRoot,
27-
unmountNode as unmountNodeFromDOMTree,
2827
} from './ReactDOMComponentTree';
28+
export {detachDeletedInstance} from './ReactDOMComponentTree';
2929
import {hasRole} from './DOMAccessibilityRoles';
3030
import {
3131
createElement,
@@ -1210,7 +1210,3 @@ export function setupIntersectionObserver(
12101210
},
12111211
};
12121212
}
1213-
1214-
export function unmountNode(node: any): void {
1215-
unmountNodeFromDOMTree(node);
1216-
}

packages/react-native-renderer/src/ReactFabricHostConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,6 @@ export function preparePortalMount(portalInstance: Instance): void {
482482
// noop
483483
}
484484

485-
export function unmountNode(node: any): void {
485+
export function detachDeletedInstance(node: Instance): void {
486486
// noop
487487
}

packages/react-native-renderer/src/ReactNativeHostConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,6 @@ export function preparePortalMount(portalInstance: Instance): void {
539539
// noop
540540
}
541541

542-
export function unmountNode(node: any): void {
542+
export function detachDeletedInstance(node: Instance): void {
543543
// noop
544544
}

packages/react-noop-renderer/src/createReactNoop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
421421
throw new Error('Not yet implemented.');
422422
},
423423

424-
unmountNode() {},
424+
detachDeletedInstance() {},
425425
};
426426

427427
const hostConfig = useMutation

packages/react-reconciler/src/ReactFiberCommitWork.new.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import {
6161
hasCaughtError,
6262
clearCaughtError,
6363
} from 'shared/ReactErrorUtils';
64-
import {unmountNode} from './ReactFiberHostConfig';
64+
import {detachDeletedInstance} from './ReactFiberHostConfig';
6565
import {
6666
NoFlags,
6767
ContentReset,
@@ -1285,7 +1285,7 @@ function detachFiberAfterEffects(fiber: Fiber) {
12851285
if (fiber.tag === HostComponent) {
12861286
const hostInstance: Instance = fiber.stateNode;
12871287
if (hostInstance !== null) {
1288-
unmountNode(hostInstance);
1288+
detachDeletedInstance(hostInstance);
12891289
}
12901290
}
12911291

packages/react-reconciler/src/ReactFiberCommitWork.old.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import {
6161
hasCaughtError,
6262
clearCaughtError,
6363
} from 'shared/ReactErrorUtils';
64-
import {unmountNode} from './ReactFiberHostConfig';
64+
import {detachDeletedInstance} from './ReactFiberHostConfig';
6565
import {
6666
NoFlags,
6767
ContentReset,
@@ -1285,7 +1285,7 @@ function detachFiberAfterEffects(fiber: Fiber) {
12851285
if (fiber.tag === HostComponent) {
12861286
const hostInstance: Instance = fiber.stateNode;
12871287
if (hostInstance !== null) {
1288-
unmountNode(hostInstance);
1288+
detachDeletedInstance(hostInstance);
12891289
}
12901290
}
12911291

packages/react-test-renderer/src/ReactTestHostConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,6 @@ export function getInstanceFromScope(scopeInstance: Object): null | Object {
361361
return nodeToInstanceMap.get(scopeInstance) || null;
362362
}
363363

364-
export function unmountNode(node: any): void {
364+
export function detachDeletedInstance(node: Instance): void {
365365
// noop
366366
}

0 commit comments

Comments
 (0)