Merge new changes from fbobjc
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 72 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 87 KiB |
Before Width: | Height: | Size: 264 KiB After Width: | Height: | Size: 267 KiB |
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 95 KiB |
|
@ -40,6 +40,7 @@ var UIExplorerPage = React.createClass({
|
|||
ContentWrapper = (View: ReactClass<any, any, any>);
|
||||
} else {
|
||||
ContentWrapper = (ScrollView: ReactClass<any, any, any>);
|
||||
wrapperProps.automaticallyAdjustContentInsets = !this.props.title;
|
||||
wrapperProps.keyboardShouldPersistTaps = true;
|
||||
wrapperProps.keyboardDismissMode = 'interactive';
|
||||
}
|
||||
|
@ -64,7 +65,6 @@ var UIExplorerPage = React.createClass({
|
|||
var styles = StyleSheet.create({
|
||||
container: {
|
||||
backgroundColor: '#e9eaed',
|
||||
paddingTop: 15,
|
||||
flex: 1,
|
||||
},
|
||||
spacer: {
|
||||
|
@ -72,6 +72,7 @@ var styles = StyleSheet.create({
|
|||
},
|
||||
wrapper: {
|
||||
flex: 1,
|
||||
paddingTop: 10,
|
||||
},
|
||||
});
|
||||
|
||||
|
|
|
@ -41,6 +41,7 @@ var styles = StyleSheet.create({
|
|||
borderWidth: 0.5,
|
||||
borderColor: '#d6d7da',
|
||||
margin: 10,
|
||||
marginBottom: 0,
|
||||
height: 45,
|
||||
padding: 10,
|
||||
backgroundColor: 'white',
|
||||
|
|
|
@ -642,7 +642,7 @@ var NavigatorIOS = React.createClass({
|
|||
navigationBarHidden={this.props.navigationBarHidden}
|
||||
tintColor={this.props.tintColor}
|
||||
barTintColor={this.props.barTintColor}
|
||||
translucent={this.props.translucent}
|
||||
translucent={this.props.translucent !== false}
|
||||
titleTextColor={this.props.titleTextColor}>
|
||||
<Component
|
||||
navigator={this.navigator}
|
||||
|
|
|
@ -78,7 +78,12 @@ NSString *RCTCurrentThreadName(void)
|
|||
#if DEBUG // This is DEBUG not RCT_DEBUG because it *really* must not ship in RC
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||
threadName = @(dispatch_queue_get_label(dispatch_get_current_queue()));
|
||||
const char *label = dispatch_queue_get_label(dispatch_get_current_queue());
|
||||
if (label && strlen(label) > 0) {
|
||||
threadName = @(label);
|
||||
} else {
|
||||
threadName = [NSString stringWithFormat:@"%p", thread];
|
||||
}
|
||||
#pragma clang diagnostic pop
|
||||
#else
|
||||
threadName = [NSString stringWithFormat:@"%p", thread];
|
||||
|
|