Skip to content

Commit 58c992b

Browse files
committed
fixup: use AppKit equivalents of UIKit classes
1 parent 3140b4f commit 58c992b

4 files changed

Lines changed: 21 additions & 8 deletions

File tree

React/Views/NSView+React.m

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,14 @@ - (NSEdgeInsets)reactCompoundInsets
275275
);
276276
}
277277

278+
static inline CGRect NSEdgeInsetsInsetRect(CGRect rect, NSEdgeInsets insets) {
279+
rect.origin.x += insets.left;
280+
rect.origin.y += insets.top;
281+
rect.size.width -= (insets.left + insets.right);
282+
rect.size.height -= (insets.top + insets.bottom);
283+
return rect;
284+
}
285+
278286
- (CGRect)reactContentFrame
279287
{
280288
return NSEdgeInsetsInsetRect(self.bounds, self.reactCompoundInsets);

React/Views/RCTLayout.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ struct RCTLayoutContext {
3838
};
3939
typedef struct CG_BOXABLE RCTLayoutContext RCTLayoutContext;
4040

41-
static inline CGRect NSEdgeInsetsInsetRect(CGRect rect, NSEdgeInsets insets) {
42-
rect.origin.x += insets.left;
43-
rect.origin.y += insets.top;
44-
rect.size.width -= (insets.left + insets.right);
45-
rect.size.height -= (insets.top + insets.bottom);
46-
return rect;
47-
}
48-
4941
static inline BOOL RCTLayoutMetricsEqualToLayoutMetrics(RCTLayoutMetrics a, RCTLayoutMetrics b)
5042
{
5143
return

React/Views/RCTLayout.m

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
#import "RCTAssert.h"
1313
#import "RCTShadowView+Layout.h"
1414

15+
static inline CGRect NSEdgeInsetsInsetRect(CGRect rect, NSEdgeInsets insets) {
16+
rect.origin.x += insets.left;
17+
rect.origin.y += insets.top;
18+
rect.size.width -= (insets.left + insets.right);
19+
rect.size.height -= (insets.top + insets.bottom);
20+
return rect;
21+
}
22+
1523
RCTLayoutMetrics RCTLayoutMetricsFromYogaNode(YGNodeRef yogaNode)
1624
{
1725
RCTLayoutMetrics layoutMetrics;

React/Views/RCTShadowView.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,11 @@ - (NSNumber *)reactTagAtPoint:(CGPoint)point
381381
return self.reactTag;
382382
}
383383

384+
static inline NSString* NSStringFromCGRect(const CGRect rect)
385+
{
386+
return NSStringFromRect(NSRectFromCGRect(rect));
387+
}
388+
384389
- (NSString *)description
385390
{
386391
NSString *description = super.description;

0 commit comments

Comments
 (0)