kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-23 20:01:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Extracted rootview-specific shadowview logic into new class

Browse Source 
Summary:It was hard to understand which parts of the shadowview API are designed to be called only on the root view, and which were applicable to any view.

This diff extracts rootview-specific logic out into a new RCTRootShadowView class.

Reviewed By: majak

Differential Revision: D3063905

fb-gh-sync-id: ef890cddfd7625fbd4bf5454314b441acdb03ac8
shipit-source-id: ef890cddfd7625fbd4bf5454314b441acdb03ac8
This commit is contained in:
Nick Lockwood
2016-03-21 03:20:49 -07:00
committed by Facebook Github Bot 9
parent 7d059a12f3
commit d033c45f93
12 changed files with 131 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Examples/UIExplorer/UIExplorerUnitTests/RCTShadowViewTests.m
View File

@@ -15,9 +15,11 @@
#import <XCTest/XCTest.h>
#import "RCTShadowView.h"
#import "RCTRootShadowView.h"
@interface RCTShadowViewTests : XCTestCase
@property (nonatomic, strong) RCTShadowView *parentView;
@property (nonatomic, strong) RCTRootShadowView *parentView;
@end
@implementation RCTShadowViewTests
@@ -25,7 +27,7 @@
- (void)setUp
{
[super setUp];
self.parentView = [self _shadowViewWithStyle:^(css_style_t *style) {
style->flex_direction = CSS_FLEX_DIRECTION_COLUMN;
style->dimensions[0] = 440;
@@ -90,7 +92,7 @@
[self.parentView insertReactSubview:mainView atIndex:1];
[self.parentView insertReactSubview:footerView atIndex:2];
[self.parentView collectRootUpdatedFrames];
[self.parentView collectViewsWithUpdatedFrames];
XCTAssertTrue(CGRectEqualToRect([self.parentView measureLayoutRelativeToAncestor:self.parentView], CGRectMake(0, 0, 440, 440)));
XCTAssertTrue(UIEdgeInsetsEqualToEdgeInsets([self.parentView paddingAsInsets], UIEdgeInsetsMake(10, 10, 10, 10)));
@@ -156,7 +158,7 @@
RCTShadowView *view = [self _shadowViewWithStyle:styleBlock];
[self.parentView insertReactSubview:view atIndex:0];
view.intrinsicContentSize = contentSize;
[self.parentView collectRootUpdatedFrames];
[self.parentView collectViewsWithUpdatedFrames];
CGRect actualRect = [view measureLayoutRelativeToAncestor:self.parentView];
XCTAssertTrue(CGRectEqualToRect(expectedRect, actualRect),
@"Expected layout to be %@, got %@",
@@ -164,9 +166,9 @@
NSStringFromCGRect(actualRect));
}
- (RCTShadowView *)_shadowViewWithStyle:(void(^)(css_style_t *style))styleBlock
- (RCTRootShadowView *)_shadowViewWithStyle:(void(^)(css_style_t *style))styleBlock
{
RCTShadowView *shadowView = [RCTShadowView new];
RCTRootShadowView *shadowView = [RCTRootShadowView new];
css_style_t style = shadowView.cssNode->style;
styleBlock(&style);