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: Make RCTSurfacePresenter weakly retain its observers

Browse Source 
Summary:
Changelog: [Fabric][iOS] Fix: Make RCTSurfacePresenter weakly retain its observers

There is retain cycle because RCTSurfacePresenter is keeping an array of  RCTSurfacePresenterObserver, which is strongly retaining the class that owns this RCTSurfacePresenter.

This diff makes RCTSurfacePresenter weakly retain observers instead.

Reviewed By: RSNara

Differential Revision: D35439589

fbshipit-source-id: ddc7813976b543de12af6173b2f1b31c69b043a8
This commit is contained in:
Paige Sun
2022-04-06 20:29:30 -07:00
committed by Facebook GitHub Bot
parent 17ecd2fb5b
commit 88814d52dd
1 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
React/Fabric/RCTSurfacePresenter.mm
+33 -9
View File
@@ -80,7 +80,7 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
RuntimeExecutor _runtimeExecutor; // Protected by `_schedulerLifeCycleMutex`.
butter::shared_mutex _observerListMutex;
NSMutableArray<id<RCTSurfacePresenterObserver>> *_observers;
std::vector<__weak id<RCTSurfacePresenterObserver>> _observers; // Protected by `_observerListMutex`.
}
- (instancetype)initWithContextContainer:(ContextContainer::Shared)contextContainer
@@ -96,8 +96,6 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
_mountingManager.contextContainer = contextContainer;
_mountingManager.delegate = self;
_observers = [NSMutableArray array];
_scheduler = [self _createScheduler];
auto reactNativeConfig = _contextContainer->at<std::shared_ptr<ReactNativeConfig const>>("ReactNativeConfig");
@@ -386,13 +384,17 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
- (void)addObserver:(id<RCTSurfacePresenterObserver>)observer
{
std::unique_lock<butter::shared_mutex> lock(_observerListMutex);
[self->_observers addObject:observer];
_observers.push_back(observer);
}
- (void)removeObserver:(id<RCTSurfacePresenterObserver>)observer
{
std::unique_lock<butter::shared_mutex> lock(_observerListMutex);
[self->_observers removeObject:observer];
std::vector<__weak id<RCTSurfacePresenterObserver>>::const_iterator it =
std::find(_observers.begin(), _observers.end(), observer);
if (it != _observers.end()) {
_observers.erase(it);
}
}
#pragma mark - RCTMountingManagerDelegate
@@ -401,8 +403,13 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
{
RCTAssertMainQueue();
std::shared_lock<butter::shared_mutex> lock(_observerListMutex);
for (id<RCTSurfacePresenterObserver> observer in _observers) {
NSArray<id<RCTSurfacePresenterObserver>> *observersCopy;
{
std::shared_lock<butter::shared_mutex> lock(_observerListMutex);
observersCopy = [self _getObservers];
}
for (id<RCTSurfacePresenterObserver> observer in observersCopy) {
if ([observer respondsToSelector:@selector(willMountComponentsWithRootTag:)]) {
[observer willMountComponentsWithRootTag:rootTag];
}
@@ -413,12 +420,29 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
{
RCTAssertMainQueue();
std::shared_lock<butter::shared_mutex> lock(_observerListMutex);
for (id<RCTSurfacePresenterObserver> observer in _observers) {
NSArray<id<RCTSurfacePresenterObserver>> *observersCopy;
{
std::shared_lock<butter::shared_mutex> lock(_observerListMutex);
observersCopy = [self _getObservers];
}
for (id<RCTSurfacePresenterObserver> observer in observersCopy) {
if ([observer respondsToSelector:@selector(didMountComponentsWithRootTag:)]) {
[observer didMountComponentsWithRootTag:rootTag];
}
}
}
- (NSArray<id<RCTSurfacePresenterObserver>> *)_getObservers
{
NSMutableArray<id<RCTSurfacePresenterObserver>> *observersCopy = [NSMutableArray new];
for (id<RCTSurfacePresenterObserver> observer : _observers) {
if (observer) {
[observersCopy addObject:observer];
}
}
return observersCopy;
}
@end