Skip to content

Commit 176a578

Browse files
sherginfacebook-github-bot
authored andcommitted
'-[RCTSurfaceRootShadowView sizeThatFitsMinimumSize:]' was removed
Summary: Because we already support this for all kinds of shadow views! Reviewed By: mmmulani Differential Revision: D6665636 fbshipit-source-id: ceee7e4952ede4bbe54aedde5545587a1d13ea5a
1 parent b2a2519 commit 176a578

File tree

3 files changed

+1
-38
lines changed

3 files changed

+1
-38
lines changed

React/Base/Surface/RCTSurface.mm

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#import "RCTAssert.h"
1616
#import "RCTBridge+Private.h"
1717
#import "RCTBridge.h"
18+
#import "RCTShadowView+Layout.h"
1819
#import "RCTSurfaceDelegate.h"
1920
#import "RCTSurfaceRootShadowView.h"
2021
#import "RCTSurfaceRootShadowViewDelegate.h"

React/Base/Surface/RCTSurfaceRootShadowView.h

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222

2323
@property (nonatomic, weak) id<RCTSurfaceRootShadowViewDelegate> delegate;
2424

25-
- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize
26-
maximumSize:(CGSize)maximumSize;
27-
2825
/**
2926
* Layout direction (LTR or RTL) inherited from native environment and
3027
* is using as a base direction value in layout engine.

React/Base/Surface/RCTSurfaceRootShadowView.m

-35
Original file line numberDiff line numberDiff line change
@@ -76,41 +76,6 @@ - (void)calculateLayoutWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)m
7676
return viewsWithNewFrame;
7777
}
7878

79-
- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize
80-
maximumSize:(CGSize)maximumSize
81-
{
82-
// Positive case where requested constraind are aready enforced.
83-
if (CGSizeEqualToSize(minimumSize, _minimumSize) &&
84-
CGSizeEqualToSize(maximumSize, _maximumSize)) {
85-
// We stil need to call `calculateLayoutWithMinimumSize:maximumSize`
86-
// mehtod though.
87-
[self calculateLayoutWithMinimumSize:_minimumSize
88-
maximumSize:_maximumSize];
89-
90-
YGNodeRef yogaNode = self.yogaNode;
91-
return CGSizeMake(YGNodeLayoutGetWidth(yogaNode), YGNodeLayoutGetHeight(yogaNode));
92-
}
93-
94-
// Generic case, where requested constraind are different from enforced.
95-
96-
// Applying given size constraints.
97-
[self calculateLayoutWithMinimumSize:minimumSize
98-
maximumSize:maximumSize];
99-
100-
YGNodeRef yogaNode = self.yogaNode;
101-
CGSize fittingSize =
102-
CGSizeMake(YGNodeLayoutGetWidth(yogaNode), YGNodeLayoutGetHeight(yogaNode));
103-
104-
// Reverting size constraints.
105-
[self calculateLayoutWithMinimumSize:_minimumSize
106-
maximumSize:_maximumSize];
107-
108-
return CGSizeMake(
109-
MAX(minimumSize.width, MIN(maximumSize.width, fittingSize.width)),
110-
MAX(minimumSize.height, MIN(maximumSize.height, fittingSize.height))
111-
);
112-
}
113-
11479
- (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
11580
{
11681
if (CGSizeEqualToSize(minimumSize, _minimumSize) &&

0 commit comments

Comments
 (0)