Skip to content

Fix iOS removeClippedSubviews being lost on recycled views #58915

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mozzius wants to merge 1 commit into from
Closed

Fix iOS removeClippedSubviews being lost on recycled views #58915

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
4 changes: 3 additions & 1 deletion packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,9 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &

// Disable `removeClippedSubviews` when Fabric View Culling is enabled.
if (!ReactNativeFeatureFlags::enableViewCulling()) {
if (oldViewProps.removeClippedSubviews != newViewProps.removeClippedSubviews) {
// Compare against the current state, not `_props`: `prepareForRecycle` resets
// `_removeClippedSubviews` but keeps `_props`.
if (_removeClippedSubviews != newViewProps.removeClippedSubviews) {
_removeClippedSubviews = newViewProps.removeClippedSubviews;
[self _updateRemoveClippedSubviewsState];
}
Expand Down
20 changes: 20 additions & 0 deletions packages/react-native/React/Tests/Mounting/RCTViewComponentViewTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,26 @@ - (void)testUnmountAfterToggleOffCleansUpReactSubviews
XCTAssertNil(child2.superview);
}

- (void)testRemoveClippedSubviewsIsKeptOnRecycledView
{
RCTViewComponentView *view = [RCTViewComponentView new];
[view updateProps:makeViewProps(true) oldProps:ViewShadowNode::defaultSharedProps()];
[view prepareForRecycle];

// Reused for another view with removeClippedSubviews. Like the mounting layer
// does for an Insert, pass no old props: the view diffs against its own.
[view updateProps:makeViewProps(true) oldProps:nullptr];

UIView *child = [UIView new];
child.frame = CGRectMake(0, 400, 50, 50);
[view mountChildComponentView:(id)child index:0];

// Clipping is on, so the child is tracked and left for the clipping pass to attach.
XCTAssertNil(child.superview);
NSMutableArray *reactSubviews = [view valueForKey:@"_reactSubviews"];
XCTAssertEqual(reactSubviews.count, 1u);
}

#pragma mark - hitTest against non-invertible transforms (#50797)

- (void)testHitTestReturnsNilForZeroScaleYView
Expand Down
Loading