From 0ec0c614d7b2ad429044981e818aa6f5fe4a219b Mon Sep 17 00:00:00 2001 From: Anand Rajeswaran Date: Sat, 1 Jul 2023 15:57:47 -0700 Subject: [PATCH 1/2] Make property match --- React/Base/RCTUIKit.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/React/Base/RCTUIKit.h b/React/Base/RCTUIKit.h index 0a3e8e9a99d952..6c6d64481c23c9 100644 --- a/React/Base/RCTUIKit.h +++ b/React/Base/RCTUIKit.h @@ -394,8 +394,8 @@ CGPathRef UIBezierPathCreateCGPathRef(UIBezierPath *path); - (void)setNeedsDisplay; -// An override of an undocumented API that controls the layer's masksToBounds property -@property (nonatomic) BOOL clipsToBounds; +// FUTURE: When building with Xcode 15, we can remove this override since it's now declared on NSView +@property BOOL clipsToBounds; @property (nonatomic, copy) NSColor *backgroundColor; @property (nonatomic) CGAffineTransform transform; @@ -589,7 +589,8 @@ typedef UIImageView RCTUIImageView; #else @interface RCTUIImageView : NSImageView NS_ASSUME_NONNULL_BEGIN -@property (nonatomic, assign) BOOL clipsToBounds; +// FUTURE: When building with Xcode 15, we can remove this override since it's now declared on NSView +@property (assign) BOOL clipsToBounds; @property (nonatomic, strong) RCTUIColor *tintColor; @property (nonatomic, assign) UIViewContentMode contentMode; NS_ASSUME_NONNULL_END From 3f62fc03c518b2a51be2dacd094bd910a155be4b Mon Sep 17 00:00:00 2001 From: Anand Rajeswaran Date: Tue, 4 Jul 2023 20:29:32 -0700 Subject: [PATCH 2/2] Update comment --- React/Base/RCTUIKit.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/React/Base/RCTUIKit.h b/React/Base/RCTUIKit.h index 6c6d64481c23c9..f4192078cab878 100644 --- a/React/Base/RCTUIKit.h +++ b/React/Base/RCTUIKit.h @@ -394,7 +394,7 @@ CGPathRef UIBezierPathCreateCGPathRef(UIBezierPath *path); - (void)setNeedsDisplay; -// FUTURE: When building with Xcode 15, we can remove this override since it's now declared on NSView +// FUTURE: When Xcode 14 is no longer supported (CI is building with Xcode 15), we can remove this override since it's now declared on NSView @property BOOL clipsToBounds; @property (nonatomic, copy) NSColor *backgroundColor; @property (nonatomic) CGAffineTransform transform; @@ -589,7 +589,7 @@ typedef UIImageView RCTUIImageView; #else @interface RCTUIImageView : NSImageView NS_ASSUME_NONNULL_BEGIN -// FUTURE: When building with Xcode 15, we can remove this override since it's now declared on NSView +// FUTURE: When Xcode 14 is no longer supported (CI is building with Xcode 15), we can remove this override since it's now declared on NSView @property (assign) BOOL clipsToBounds; @property (nonatomic, strong) RCTUIColor *tintColor; @property (nonatomic, assign) UIViewContentMode contentMode;