Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/react-art/src/ReactARTHostConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,12 @@ export function commitUpdate(
instance._applyProps(instance, newProps, oldProps);
}

export function commitUnmount(
domElement: Instance,
): void {
// Noop
}

export function hideInstance(instance) {
instance.hide();
}
Expand Down
6 changes: 6 additions & 0 deletions packages/react-dom/src/client/ReactDOMComponentTree.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,12 @@ export function getNodeFromInstance(inst: Fiber): Instance | TextInstance {
invariant(false, 'getNodeFromInstance: Invalid argument.');
}

export function cleanupNode(node) {
node[internalInstanceKey] = null;
node[internalEventHandlersKey] = null;
node[internalContainerInstanceKey] = null;
}

export function getFiberCurrentPropsFromNode(
node: Instance | TextInstance | SuspenseInstance,
): Props {
Expand Down
7 changes: 7 additions & 0 deletions packages/react-dom/src/client/ReactDOMHostConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
getFiberFromScopeInstance,
getInstanceFromNode as getInstanceFromNodeDOMTree,
isContainerMarkedAsRoot,
cleanupNode,
} from './ReactDOMComponentTree';
import {hasRole} from './DOMAccessibilityRoles';
import {
Expand Down Expand Up @@ -428,6 +429,12 @@ export function commitUpdate(
updateProperties(domElement, updatePayload, type, oldProps, newProps);
}

export function commitUnmount(
domElement: Instance,
): void {
cleanupNode(domElement);
}

export function resetTextContent(domElement: Instance): void {
setTextContent(domElement, '');
}
Expand Down
6 changes: 6 additions & 0 deletions packages/react-native-renderer/src/ReactNativeHostConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,12 @@ export function commitUpdate(
}
}

export function commitUnmount(
domElement: Instance,
): void {
// Noop
}

export function insertBefore(
parentInstance: Instance,
child: Instance | TextInstance,
Expand Down
10 changes: 10 additions & 0 deletions packages/react-reconciler/src/ReactFiberCommitWork.new.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ import {
supportsHydration,
commitMount,
commitUpdate,
commitUnmount as commitHostUnmount,
resetTextContent,
commitTextUpdate,
appendChild,
Expand Down Expand Up @@ -1060,6 +1061,15 @@ function commitUnmount(
}
case HostComponent: {
safelyDetachRef(current, nearestMountedAncestor);
if (commitHostUnmount) {
commitHostUnmount(current.stateNode);
}
return;
}
case HostText: {
if (commitHostUnmount) {
commitHostUnmount(current.stateNode);
}
return;
}
case HostPortal: {
Expand Down
10 changes: 10 additions & 0 deletions packages/react-reconciler/src/ReactFiberCommitWork.old.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ import {
supportsHydration,
commitMount,
commitUpdate,
commitUnmount as commitHostUnmount,
resetTextContent,
commitTextUpdate,
appendChild,
Expand Down Expand Up @@ -918,6 +919,15 @@ function commitUnmount(
}
case HostComponent: {
safelyDetachRef(current);
if (commitHostUnmount) {
commitHostUnmount(current.stateNode);
}
return;
}
case HostText: {
if (commitHostUnmount) {
commitHostUnmount(current.stateNode);
}
return;
}
case HostPortal: {
Expand Down
6 changes: 6 additions & 0 deletions packages/react-test-renderer/src/ReactTestHostConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,12 @@ export function commitUpdate(
instance.props = newProps;
}

export function commitUnmount(
domElement: Instance,
): void {
// Noop
}

export function commitMount(
instance: Instance,
type: string,
Expand Down