Fixed ActivityIndicatorIOS layout

nicklockwood · facebook-github-bot-4 · commit b0b9a56ef87e · 2015-10-23T09:13:24.000-07:00
Summary: public

This has been broken for a while. The styles in the JS were being set on the container instead of the activity view itself.

Also, due to the way frames were set directly on layer properties instead of the view, resizing didn't work properly because the UIImageView inside the UIActivityView was not being realligned when the bounds changed. This also caused problems for other controls such as maps, where it was fixed with a method override, but the simpler solution is just to set the view center and bounds directly.

Before: {F23631143}
After: {F23631144}

Reviewed By: javache, tadeuzagallo

Differential Revision: D2575156

fb-gh-sync-id: e82e56d36648e7c924df77da1750e03037b5d5be
diff --git a/Libraries/Components/ActivityIndicatorIOS/ActivityIndicatorIOS.ios.js b/Libraries/Components/ActivityIndicatorIOS/ActivityIndicatorIOS.ios.js
@@ -74,8 +74,8 @@ var ActivityIndicatorIOS = React.createClass({
     return (
       <View
         onLayout={onLayout}
-        style={[styles.container, sizeStyle, style]}>
-        <RCTActivityIndicatorView {...props} />
+        style={[styles.container, style]}>
+        <RCTActivityIndicatorView {...props} style={sizeStyle} />
       </View>
     );
   }
diff --git a/React/Views/RCTMap.m b/React/Views/RCTMap.m
@@ -47,11 +47,6 @@ - (void)dealloc
   [_regionChangeObserveTimer invalidate];
 }
 
-- (void)reactSetFrame:(CGRect)frame
-{
-  self.frame = frame;
-}
-
 - (void)layoutSubviews
 {
   [super layoutSubviews];
diff --git a/React/Views/UIView+React.m b/React/Views/UIView+React.m
@@ -78,8 +78,8 @@ - (void)reactSetFrame:(CGRect)frame
     return;
   }
 
-  self.layer.position = position;
-  self.layer.bounds = bounds;
+  self.center = position;
+  self.bounds = bounds;
 }
 
 - (void)reactSetInheritedBackgroundColor:(UIColor *)inheritedBackgroundColor

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,6 @@ - (void)dealloc`
`47`	`47`	`[_regionChangeObserveTimer invalidate];`
`48`	`48`	`}`
`49`	`49`
`50`		`-- (void)reactSetFrame:(CGRect)frame`
`51`		`-{`
`52`		`- self.frame = frame;`
`53`		`-}`
`54`		`-`
`55`	`50`	`- (void)layoutSubviews`
`56`	`51`	`{`
`57`	`52`	`[super layoutSubviews];`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ - (void)reactSetFrame:(CGRect)frame`
`78`	`78`	`return;`
`79`	`79`	`}`
`80`	`80`
`81`		`- self.layer.position = position;`
`82`		`- self.layer.bounds = bounds;`
	`81`	`+ self.center = position;`
	`82`	`+ self.bounds = bounds;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`- (void)reactSetInheritedBackgroundColor:(UIColor *)inheritedBackgroundColor`