Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when trying to unobserve detached targets in IntersectionObserver (#41454)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/41454

Yet another problem caused by React being too aggressive cleaning up detached fibers. This fixes a problem in `IntersectionObserver` when trying to `unobserve` detached targets. In that case we didn't have access to its shadow node anymore, so we didn't have a way to unobserve in native. This keeps an additional mapping in JS to do the conversion even after detached.

Changelog: [internal]

Reviewed By: rshest

Differential Revision: D51257960

fbshipit-source-id: 25edc9afd2108e141d178dd4939fc2de8286342b
This commit is contained in:
Rubén Norte
2023-11-14 06:11:13 -08:00
committed by Facebook GitHub Bot
parent e8b08813ac
commit 11aadb7287
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/Libraries/IntersectionObserver/IntersectionObserverManager.js
Vendored
+24 -12
View File
@@ -70,6 +70,15 @@ function unsetTargetForInstanceHandle(instanceHandle: mixed): void {
instanceHandleToTargetMap.delete(key);
}
// The mapping between ReactNativeElement and their corresponding shadow node
// also needs to be kept here because React removes the link when unmounting.
// We also keep the instance handle so we don't have to retrieve it again
// from the target to unobserve.
const targetToShadowNodeAndInstanceHandleMap: WeakMap<
ReactNativeElement,
[ReturnType<typeof getShadowNode>, mixed],
> = new WeakMap();
/**
* Registers the given intersection observer and returns a unique ID for it,
* which is required to start observing targets.
@@ -151,6 +160,13 @@ export function observe({
// access it even after the instance handle has been unmounted.
setTargetForInstanceHandle(instanceHandle, target);
// Same for the mapping between the target and its shadow node
// and instance handle.
targetToShadowNodeAndInstanceHandleMap.set(target, [
targetShadowNode,
instanceHandle,
]);
if (!isConnected) {
NativeIntersectionObserver.connect(notifyIntersectionObservers);
isConnected = true;
@@ -182,30 +198,26 @@ export function unobserve(
return;
}
const targetShadowNode = getShadowNode(target);
if (targetShadowNode == null) {
const targetShadowNodeAndInstanceHandle =
targetToShadowNodeAndInstanceHandleMap.get(target);
if (targetShadowNodeAndInstanceHandle == null) {
console.error(
'IntersectionObserverManager: could not find reference to host node from target',
'IntersectionObserverManager: could not find registration data for target',
);
return;
}
const [targetShadowNode, instanceHandle] = targetShadowNodeAndInstanceHandle;
NativeIntersectionObserver.unobserve(
intersectionObserverId,
targetShadowNode,
);
const instanceHandle = getInstanceHandle(target);
if (instanceHandle == null) {
console.error(
'IntersectionObserverManager: could not find reference to instance handle from target',
);
return;
}
// We can guarantee we won't receive any more entries for this target,
// so we don't need to keep the mapping anymore.
// so we don't need to keep the mappings anymore.
unsetTargetForInstanceHandle(instanceHandle);
targetToShadowNodeAndInstanceHandleMap.delete(target);
}
/**