Skip to content

Use [RCTUIManager viewForReactTag:] instead of viewRegistry to avoid infinite loop in [RCTComponentViewRegistry objectForKey:] #5957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
piaskowyk merged 1 commit into from
May 1, 2024
Merged

Use [RCTUIManager viewForReactTag:] instead of viewRegistry to avoid infinite loop in [RCTComponentViewRegistry objectForKey:] #5957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions apple/LayoutReanimation/REASwizzledUIManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ - (RCTViewManagerUIBlock)reanimated_uiBlockWithLayoutUpdateForRootView:(RCTRootS
CGSize contentSize = shadowView.layoutMetrics.frame.size;

RCTExecuteOnMainQueue(^{
NSMutableDictionary<NSNumber *, REAUIView *> *viewRegistry = [self valueForKey:@"_viewRegistry"];
REAUIView *view = viewRegistry[reactTag];
RCTUIManager *uiManager = [self valueForKey:@"_uiManager"];
REAUIView *view = [uiManager viewForReactTag:(NSNumber *)reactTag];
RCTAssert(view != nil, @"view (for ID %@) not found", reactTag);

RCTRootView *rootView = (RCTRootView *)[view superview];
Expand All @@ -245,7 +245,7 @@ - (RCTViewManagerUIBlock)reanimated_uiBlockWithLayoutUpdateForRootView:(RCTRootS
for (NSNumber *reactTag in reactTags) {
RCTFrameData frameData = frameDataArray[index++];

REAUIView *view = viewRegistry[reactTag];
REAUIView *view = [uiManager viewForReactTag:(NSNumber *)reactTag];
CGRect frame = frameData.frame;

UIUserInterfaceLayoutDirection layoutDirection = frameData.layoutDirection;
Expand Down Expand Up @@ -331,7 +331,7 @@ - (RCTViewManagerUIBlock)reanimated_uiBlockWithLayoutUpdateForRootView:(RCTRootS
index = 0;
for (NSNumber *reactTag in reactTags) {
RCTFrameData frameData = frameDataArray[index++];
REAUIView *view = viewRegistry[reactTag];
REAUIView *view = [uiManager viewForReactTag:(NSNumber *)reactTag];
BOOL isNew = frameData.isNew;
CGRect frame = frameData.frame;

Expand Down
2 changes: 1 addition & 1 deletion apple/REANodesManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ - (void)configureUiProps:(nonnull NSSet<NSString *> *)uiPropsSet

- (BOOL)isNativeViewMounted:(NSNumber *)viewTag
{
REAUIView *view = _viewRegistry[viewTag];
REAUIView *view = [_uiManager viewForReactTag:(NSNumber *)viewTag];
if (view.superview != nil) {
return YES;
}
Expand Down