Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion webview-bridge/index.android.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ var WebViewBridge = React.createClass({
/>;

return (
<View style={styles.container}>
<View style={[styles.container, this.props.containerStyle || {flex: 0}]}>
{webView}
{otherView}
</View>
Expand Down
4 changes: 3 additions & 1 deletion webview-bridge/index.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ var WebViewBridge = React.createClass({
hideKeyboardAccessoryView: PropTypes.bool,

keyboardDisplayRequiresUserAction: PropTypes.bool,

containerStyle: PropTypes.object
},

getInitialState: function() {
Expand Down Expand Up @@ -197,7 +199,7 @@ var WebViewBridge = React.createClass({
/>;

return (
<View style={styles.container}>
<View style={[styles.container, this.props.containerStyle || {flex: 0}]}>
{webView}
{otherView}
</View>
Expand Down