Skip to content

Commit 90724de

Browse files
author
Ali Najafizadeh
committed
Merge pull request #56 from martnu/patch-1
Pass in proxied propTypes on iOS as well.
2 parents 859a2c4 + e3c57fe commit 90724de

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

webview-bridge/index.ios.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,25 +171,21 @@ var WebViewBridge = React.createClass({
171171
});
172172
}
173173
};
174+
175+
const props = {...this.props};
176+
delete props.onBridgeMessage;
177+
delete props.onShouldStartLoadWithRequest;
174178

175179
var webView =
176180
<RCTWebViewBridge
177181
ref={RCT_WEBVIEWBRIDGE_REF}
178182
key="webViewKey"
183+
{...props}
179184
style={webViewStyles}
180-
url={this.props.url}
181-
html={this.props.html}
182-
injectedJavaScript={this.props.injectedJavaScript}
183-
bounces={this.props.bounces}
184-
scrollEnabled={this.props.scrollEnabled}
185-
contentInset={this.props.contentInset}
186-
automaticallyAdjustContentInsets={this.props.automaticallyAdjustContentInsets}
187185
onLoadingStart={this.onLoadingStart}
188186
onLoadingFinish={this.onLoadingFinish}
189187
onLoadingError={this.onLoadingError}
190188
onShouldStartLoadWithRequest={onShouldStartLoadWithRequest}
191-
scalesPageToFit={this.props.scalesPageToFit}
192-
allowsInlineMediaPlayback={this.props.allowsInlineMediaPlayback}
193189
onBridgeMessage={onBridgeMessage}
194190
/>;
195191

0 commit comments

Comments
 (0)