[fix ptmt#56] propagate frame property to WebView

Author: ptmt

Examples/UIExplorer/WebViewExample.js

@@ -178,43 +178,6 @@ var Button = React.createClass({
   }
 });
 
-var ScaledWebView = React.createClass({
-
-  getInitialState: function() {
-    return {
-      scalingEnabled: true,
-    }
-  },
-
-  render: function() {
-    return (
-      <View>
-        <WebView
-          style={{
-            backgroundColor: BGWASH,
-            height: 200,
-          }}
-          source={{uri: 'https://facebook.github.io/react/'}}
-          scalesPageToFit={this.state.scalingEnabled}
-        />
-        <View style={styles.buttons}>
-        { this.state.scalingEnabled ?
-          <Button
-            text="Scaling:ON"
-            enabled={true}
-            onPress={() => this.setState({scalingEnabled: false})}
-          /> :
-          <Button
-            text="Scaling:OFF"
-            enabled={true}
-            onPress={() => this.setState({scalingEnabled: true})}
-          /> }
-        </View>
-      </View>
-    );
-  },
-})
-
 var styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -337,10 +300,6 @@ exports.examples = [
     title: 'Simple Browser',
     render(): ReactElement { return <WebViewExample />; }
   },
-  {
-    title: 'Scale Page to Fit',
-    render(): ReactElement { return <ScaledWebView/>; }
-  },
   {
     title: 'Bundled HTML',
     render(): ReactElement {

React/Views/RCTWebView.m

@@ -75,6 +75,12 @@ - (void)reload
   [_webView reload:self];
 }
 
+- (void)reactSetFrame:(CGRect)frame
+{
+  [super reactSetFrame:frame];
+  [_webView setFrame:frame];
+}
+
 - (void)setSource:(NSDictionary *)source
 {
   if (![_source isEqualToDictionary:source]) {
@@ -122,11 +128,6 @@ - (void)setContentInset:(NSEdgeInsets)contentInset
 //                      updateOffset:NO];
 }
 
-- (void)setScalesPageToFit:(BOOL)scalesPageToFit
-{
-  NSLog(@"setScalesPageToFit is not implemented");
-}
-
 - (BOOL)scalesPageToFit
 {
   return YES;

React/Views/RCTWebViewManager.m

@@ -37,7 +37,6 @@ - (NSView *)view
 RCT_REMAP_VIEW_PROPERTY(bounces, _webView.scrollView.bounces, BOOL)
 RCT_REMAP_VIEW_PROPERTY(scrollEnabled, _webView.scrollView.scrollEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(decelerationRate, _webView.scrollView.decelerationRate, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(scalesPageToFit, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(injectedJavaScript, NSString)
 RCT_EXPORT_VIEW_PROPERTY(contentInset, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(automaticallyAdjustContentInsets, BOOL)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-desktop",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "A framework for building native desktop apps using React",
   "license": "BSD-3-Clause",
   "repository": {