Skip to content

Fix transformOrigin calculating based on incorrect value #55796

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

Closed
MazinZ wants to merge 1 commit into from
+12 −1
Closed

Fix transformOrigin calculating based on incorrect value #55796

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
13 changes: 12 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 @@ -566,6 +566,12 @@ - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
// re-applying individual sub-values which weren't changed.
[super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:_layoutMetrics];

// Capture the frame size that was used by updateProps to resolve the
// transform, before overwriting _layoutMetrics. This is important because
// _layoutMetrics may be stale (e.g., from a recycled view) and differ from
// the oldLayoutMetrics parameter (which comes from the shadow tree).
auto previousFrameSize = _layoutMetrics.frame.size;

_layoutMetrics = layoutMetrics;
_needsInvalidateLayer = YES;

Expand All @@ -583,8 +589,12 @@ - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
_backgroundColorLayer.frame = CGRectMake(0, 0, self.layer.bounds.size.width, self.layer.bounds.size.height);
}

// Recompute the transform whenever the layout size differs from what was
// used in updateProps. Using previousFrameSize (the stored _layoutMetrics)
// instead of the oldLayoutMetrics parameter ensures correctness even when
// the view was recycled with stale dimensions.
if ((_props->transformOrigin.isSet() || !_props->transform.operations.empty()) &&
layoutMetrics.frame.size != oldLayoutMetrics.frame.size) {
layoutMetrics.frame.size != previousFrameSize) {
auto newTransform = _props->resolveTransform(layoutMetrics);
self.layer.transform = RCTCATransform3DFromTransformMatrix(newTransform);
}
Expand Down Expand Up @@ -654,6 +664,7 @@ - (void)prepareForRecycle
_isJSResponder = NO;
_removeClippedSubviews = NO;
_reactSubviews = [NSMutableArray new];
_layoutMetrics = {};
}

- (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(NSSet<NSString *> *_Nullable)props
Expand Down