Skip to content

Commit 5f40f08

Browse files
jacobp100facebook-github-bot
authored andcommitted
Implement transform-origin for old arch iOS (facebook#38626)
Summary: Adds transform-origin for old arch iOS See also intergalacticspacehighway's work for iOS Fabric and Android:- - facebook#38559 - facebook#38558 ## Changelog: [IOS] [ADDED] - Added support for transform-origin on old arch Pull Request resolved: facebook#38626 Test Plan: See RN tester Reviewed By: NickGerleman Differential Revision: D48528353 Pulled By: javache fbshipit-source-id: 09592411e26484d81a999a7e601eff751ca7ae0b
1 parent 9e68599 commit 5f40f08

File tree

4 files changed

+100
-7
lines changed

4 files changed

+100
-7
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
#import <Foundation/Foundation.h>
9+
#import <yoga/Yoga.h>
10+
11+
typedef struct {
12+
YGValue x;
13+
YGValue y;
14+
CGFloat z;
15+
} RCTTransformOrigin;

packages/react-native/React/Views/RCTViewManager.m

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#import "RCTConvert.h"
1616
#import "RCTLog.h"
1717
#import "RCTShadowView.h"
18+
#import "RCTTransformOrigin.h"
1819
#import "RCTUIManager.h"
1920
#import "RCTUIManagerUtils.h"
2021
#import "RCTUtils.h"
@@ -121,6 +122,13 @@ @implementation RCTConvert (UIAccessibilityTraits)
121122
UIAccessibilityTraitNone,
122123
unsignedLongLongValue)
123124

125+
+ (RCTTransformOrigin)RCTTransformOrigin:(id)json
126+
{
127+
RCTTransformOrigin transformOrigin = {
128+
[RCTConvert YGValue:json[0]], [RCTConvert YGValue:json[1]], [RCTConvert CGFloat:json[2]]};
129+
return transformOrigin;
130+
}
131+
124132
@end
125133

126134
@implementation RCTViewManager
@@ -216,13 +224,8 @@ - (RCTShadowView *)shadowView
216224
view.layer.shouldRasterize ? [UIScreen mainScreen].scale : defaultView.layer.rasterizationScale;
217225
}
218226

219-
RCT_CUSTOM_VIEW_PROPERTY(transform, CATransform3D, RCTView)
220-
{
221-
view.layer.transform = json ? [RCTConvert CATransform3D:json] : defaultView.layer.transform;
222-
// Enable edge antialiasing in rotation, skew, or perspective transforms
223-
view.layer.allowsEdgeAntialiasing =
224-
view.layer.transform.m12 != 0.0f || view.layer.transform.m21 != 0.0f || view.layer.transform.m34 != 0.0f;
225-
}
227+
RCT_REMAP_VIEW_PROPERTY(transform, reactTransform, CATransform3D)
228+
RCT_REMAP_VIEW_PROPERTY(transformOrigin, reactTransformOrigin, RCTTransformOrigin)
226229

227230
RCT_CUSTOM_VIEW_PROPERTY(accessibilityRole, UIAccessibilityTraits, RCTView)
228231
{

packages/react-native/React/Views/UIView+React.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#import <UIKit/UIKit.h>
99

1010
#import <React/RCTComponent.h>
11+
#import <React/RCTTransformOrigin.h>
1112
#import <yoga/YGEnums.h>
1213

1314
@class RCTShadowView;
@@ -104,6 +105,13 @@
104105
@property (nonatomic, readonly) UIEdgeInsets reactCompoundInsets;
105106
@property (nonatomic, readonly) CGRect reactContentFrame;
106107

108+
/**
109+
* The anchorPoint property doesn't work in the same way as on web - updating it updates the frame.
110+
* To work around this, we take both the transform and the transform-origin, and compute it ourselves
111+
*/
112+
@property (nonatomic, assign) CATransform3D reactTransform;
113+
@property (nonatomic, assign) RCTTransformOrigin reactTransformOrigin;
114+
107115
/**
108116
* The (sub)view which represents this view in terms of accessibility.
109117
* ViewManager will apply all accessibility properties directly to this view.

packages/react-native/React/Views/UIView+React.m

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,73 @@ - (void)reactSetFrame:(CGRect)frame
203203

204204
self.center = position;
205205
self.bounds = bounds;
206+
207+
updateTransform(self);
208+
}
209+
210+
#pragma mark - Transforms
211+
212+
- (CATransform3D)reactTransform
213+
{
214+
id obj = objc_getAssociatedObject(self, _cmd);
215+
return obj != nil ? [obj CATransform3DValue] : CATransform3DIdentity;
216+
}
217+
218+
- (void)setReactTransform:(CATransform3D)reactTransform
219+
{
220+
objc_setAssociatedObject(self, @selector(reactTransform), @(reactTransform), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
221+
updateTransform(self);
222+
}
223+
224+
- (RCTTransformOrigin)reactTransformOrigin
225+
{
226+
id obj = objc_getAssociatedObject(self, _cmd);
227+
if (obj != nil) {
228+
RCTTransformOrigin transformOrigin;
229+
[obj getValue:&transformOrigin];
230+
return transformOrigin;
231+
} else {
232+
return (RCTTransformOrigin){(YGValue){50, YGUnitPercent}, (YGValue){50, YGUnitPercent}, 0};
233+
}
234+
}
235+
236+
- (void)setReactTransformOrigin:(RCTTransformOrigin)reactTransformOrigin
237+
{
238+
id obj = [NSValue value:&reactTransformOrigin withObjCType:@encode(RCTTransformOrigin)];
239+
objc_setAssociatedObject(self, @selector(reactTransformOrigin), obj, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
240+
updateTransform(self);
241+
}
242+
243+
static void updateTransform(UIView *view)
244+
{
245+
CGSize size = view.bounds.size;
246+
RCTTransformOrigin transformOrigin = view.reactTransformOrigin;
247+
248+
CGFloat anchorPointX = 0;
249+
CGFloat anchorPointY = 0;
250+
CGFloat anchorPointZ = 0;
251+
252+
if (transformOrigin.x.unit == YGUnitPoint) {
253+
anchorPointX = transformOrigin.x.value - size.width * 0.5;
254+
} else if (transformOrigin.x.unit == YGUnitPercent) {
255+
anchorPointX = (transformOrigin.x.value * 0.01 - 0.5) * size.width;
256+
}
257+
258+
if (transformOrigin.y.unit == YGUnitPoint) {
259+
anchorPointY = transformOrigin.y.value - size.height * 0.5;
260+
} else if (transformOrigin.y.unit == YGUnitPercent) {
261+
anchorPointY = (transformOrigin.y.value * 0.01 - 0.5) * size.height;
262+
}
263+
264+
anchorPointZ = transformOrigin.z;
265+
266+
CATransform3D transform = CATransform3DMakeTranslation(anchorPointX, anchorPointY, anchorPointZ);
267+
transform = CATransform3DConcat(view.reactTransform, transform);
268+
transform = CATransform3DTranslate(transform, -anchorPointX, -anchorPointY, -anchorPointZ);
269+
270+
view.layer.transform = transform;
271+
// Enable edge antialiasing in rotation, skew, or perspective transforms
272+
view.layer.allowsEdgeAntialiasing = transform.m12 != 0.0f || transform.m21 != 0.0f || transform.m34 != 0.0f;
206273
}
207274

208275
- (UIViewController *)reactViewController

0 commit comments

Comments
 (0)