Update fri 29 may

.travis.yml

@@ -1,18 +1,28 @@
 language: objective-c
 
+osx_image: beta-xcode6.3
+
 cache:
-  directories:
-  - node_modules
+    directories:
+        - node_modules
+        - .nvm
 
 before_install:
   - brew update
 install:
-  - brew reinstall flow xctool
+  - brew reinstall flow xctool nvm
+  - mkdir -p .nvm
+  - cp $(brew --prefix nvm)/nvm-exec .nvm/
+  - export NVM_DIR=.nvm
+  - source $(brew --prefix nvm)/nvm.sh
+  - nvm install v0.10
   - npm config set spin=false
   - npm install
 
 script:
 - |
+  nvm use v0.10
+
   if [ "$TEST_TYPE" = objc ]
   then
 

Examples/UIExplorer/BorderExample.js

@@ -81,11 +81,15 @@ var styles = StyleSheet.create({
     borderTopLeftRadius: 100,
   },
   border7: {
-    borderRadius: 20,
+    borderWidth: 10,
+    borderColor: 'rgba(255,0,0,0.5)',
+    borderRadius: 30,
+    overflow: 'hidden',
   },
   border7_inner: {
     backgroundColor: 'blue',
-    flex: 1,
+    width: 100,
+    height: 100
   },
 });
 

Examples/UIExplorer/TextExample.ios.js

@@ -300,17 +300,17 @@ exports.examples = [
   title: 'containerBackgroundColor attribute',
   render: function() {
     return (
-      <View>
-        <View style={{flexDirection: 'row', height: 85}}>
-          <View style={{backgroundColor: '#ffaaaa', width: 150}} />
-          <View style={{backgroundColor: '#aaaaff', width: 150}} />
+      <View style={{backgroundColor: 'yellow'}}>
+        <View style={{flexDirection: 'row', position: 'absolute', height: 80}}>
+          <View style={{backgroundColor: '#ffaaaa', width: 140}} />
+          <View style={{backgroundColor: '#aaaaff', width: 140}} />
         </View>
-        <Text style={[styles.backgroundColorText, {top: -80}]}>
+        <Text style={styles.backgroundColorText}>
           Default containerBackgroundColor (inherited) + backgroundColor wash
         </Text>
         <Text style={[
           styles.backgroundColorText,
-          {top: -70, containerBackgroundColor: 'transparent'}]}>
+          {marginBottom: 5, containerBackgroundColor: 'transparent'}]}>
           {"containerBackgroundColor: 'transparent' + backgroundColor wash"}
         </Text>
       </View>
@@ -322,13 +322,13 @@ exports.examples = [
     return (
       <View>
         <Text numberOfLines={1}>
-          Maximum of one line no matter now much I write here. If I keep writing it{"'"}ll just truncate after one line
+          Maximum of one line, no matter how much I write here. If I keep writing, it{"'"}ll just truncate after one line.
         </Text>
         <Text numberOfLines={2} style={{marginTop: 20}}>
-          Maximum of two lines no matter now much I write here. If I keep writing it{"'"}ll just truncate after two lines
+          Maximum of two lines, no matter how much I write here. If I keep writing, it{"'"}ll just truncate after two lines.
         </Text>
         <Text style={{marginTop: 20}}>
-          No maximum lines specified no matter now much I write here. If I keep writing it{"'"}ll just keep going and going
+          No maximum lines specified, no matter how much I write here. If I keep writing, it{"'"}ll just keep going and going.
         </Text>
       </View>
     );
@@ -337,7 +337,8 @@ exports.examples = [
 
 var styles = StyleSheet.create({
   backgroundColorText: {
-    left: 5,
+    margin: 5,
+    marginBottom: 0,
     backgroundColor: 'rgba(100, 100, 100, 0.3)'
   },
   entity: {

Examples/UIExplorer/UIExplorerBlock.js

@@ -77,13 +77,7 @@ var styles = StyleSheet.create({
     paddingHorizontal: 10,
     paddingVertical: 5,
   },
-  titleRow: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    backgroundColor: 'transparent',
-  },
   titleText: {
-    backgroundColor: 'transparent',
     fontSize: 14,
     fontWeight: '500',
   },
@@ -101,8 +95,7 @@ var styles = StyleSheet.create({
     height: 8,
   },
   children: {
-    backgroundColor: 'transparent',
-    padding: 10,
+    margin: 10,
   }
 });
 

Examples/UIExplorer/UIExplorerTests/UIExplorerTests.m

@@ -38,7 +38,7 @@ - (void)setUp
   RCTAssert(!__LP64__, @"Snapshot tests should be run on 32-bit device simulators (e.g. iPhone 5)");
 #endif
   NSString *version = [[UIDevice currentDevice] systemVersion];
-  RCTAssert([version isEqualToString:@"8.1"], @"Snapshot tests should be run on iOS 8.1, found %@", version);
+  RCTAssert([version isEqualToString:@"8.3"], @"Snapshot tests should be run on iOS 8.3, found %@", version);
   _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerApp");
 
   // If tests have changes, set recordMode = YES below and run the affected

Libraries/Components/TextInput/TextInput.js

@@ -407,15 +407,23 @@ var TextInput = React.createClass({
     }
   },
 
+  getChildContext: function(): Object {
+    return {isInAParentText: true};
+  },
+
+  childContextTypes: {
+    isInAParentText: React.PropTypes.bool
+  },
+
   render: function() {
     if (Platform.OS === 'ios') {
-      return this._renderIOs();
+      return this._renderIOS();
     } else if (Platform.OS === 'android') {
       return this._renderAndroid();
     }
   },
 
-  _renderIOs: function() {
+  _renderIOS: function() {
     var textContainer;
 
     var autoCapitalize = autoCapitalizeConsts[this.props.autoCapitalize];
@@ -515,14 +523,25 @@ var TextInput = React.createClass({
     return (
       <TouchableWithoutFeedback
         onPress={this._onPress}
-        rejectResponderTermination={true}>
+        rejectResponderTermination={true}
+        testID={this.props.testID}>
         {textContainer}
       </TouchableWithoutFeedback>
     );
   },
 
   _renderAndroid: function() {
     var autoCapitalize = autoCapitalizeConsts[this.props.autoCapitalize];
+    var children = this.props.children;
+    var childCount = 0;
+    ReactChildren.forEach(children, () => ++childCount);
+    invariant(
+      !(this.props.value && childCount),
+      'Cannot specify both value and children.'
+    );
+    if (childCount > 1) {
+      children = <Text>{children}</Text>;
+    }
     var textContainer =
       <AndroidTextInput
         ref="input"
@@ -540,6 +559,7 @@ var TextInput = React.createClass({
         password={this.props.password || this.props.secureTextEntry}
         placeholder={this.props.placeholder}
         text={this.state.bufferedValue}
+        children={children}
       />;
 
     return (

Libraries/CustomComponents/Navigator/Navigator.js

@@ -549,11 +549,14 @@ var Navigator = React.createClass({
         this.spring.getCurrentValue()
       );
     } else if (this.state.activeGesture != null) {
-      this._transitionBetween(
-        this.state.presentedIndex,
-        this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture),
-        this.spring.getCurrentValue()
-      );
+      var presentedToIndex = this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture);
+      if (presentedToIndex > -1) {
+        this._transitionBetween(
+          this.state.presentedIndex,
+          presentedToIndex,
+          this.spring.getCurrentValue()
+        );
+      }
     }
   },
 

Libraries/ReactIOS/InspectorOverlay.js

@@ -75,7 +75,9 @@ var InspectorOverlay = React.createClass({
 
 var ElementProperties = React.createClass({
   render: function() {
-    var path = this.props.hierarchy.map((instance) => instance.getName()).join(' > ');
+    var path = this.props.hierarchy.map((instance) => {
+      return instance.getName ? instance.getName() : 'Unknown';
+    }).join(' > ');
     return (
       <View style={styles.info}>
         <Text style={styles.path}>

Libraries/ReactNative/ReactNativeStyleAttributes.js

@@ -29,4 +29,7 @@ var ReactNativeStyleAttributes = {
 ReactNativeStyleAttributes.transformMatrix = { diff: matricesDiffer };
 ReactNativeStyleAttributes.shadowOffset = { diff: sizesDiffer };
 
+// Do not rely on this attribute.
+ReactNativeStyleAttributes.decomposedMatrix = 'decomposedMatrix';
+
 module.exports = ReactNativeStyleAttributes;

Libraries/Text/RCTShadowText.h

@@ -29,5 +29,6 @@ extern NSString *const RCTReactTagAttributeName;
 @property (nonatomic, assign) NSWritingDirection writingDirection;
 
 - (NSTextStorage *)buildTextStorageForWidth:(CGFloat)width;
+- (void)recomputeText;
 
 @end

Libraries/Text/RCTShadowText.m

@@ -72,6 +72,12 @@ - (NSTextStorage *)buildTextStorageForWidth:(CGFloat)width
   return textStorage;
 }
 
+- (void)recomputeText
+{
+  [self attributedString];
+  [self setTextComputed];
+}
+
 - (NSAttributedString *)attributedString
 {
   return [self _attributedStringWithFontFamily:nil
@@ -125,13 +131,13 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
   }
 
   if (_color) {
-    [self _addAttribute:NSForegroundColorAttributeName withValue:self.color toAttributedString:attributedString];
+    [self _addAttribute:NSForegroundColorAttributeName withValue:_color toAttributedString:attributedString];
   }
   if (_isHighlighted) {
     [self _addAttribute:RCTIsHighlightedAttributeName withValue:@YES toAttributedString:attributedString];
   }
   if (_textBackgroundColor) {
-    [self _addAttribute:NSBackgroundColorAttributeName withValue:self.textBackgroundColor toAttributedString:attributedString];
+    [self _addAttribute:NSBackgroundColorAttributeName withValue:_textBackgroundColor toAttributedString:attributedString];
   }
 
   UIFont *font = [RCTConvert UIFont:nil withFamily:fontFamily size:fontSize weight:fontWeight style:fontStyle];

Libraries/Text/RCTText.m

@@ -16,12 +16,14 @@
 @implementation RCTText
 {
   NSTextStorage *_textStorage;
+  NSMutableArray *_reactSubviews;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if ((self = [super initWithFrame:frame])) {
     _textStorage = [[NSTextStorage alloc] init];
+    _reactSubviews = [NSMutableArray array];
 
     self.isAccessibilityElement = YES;
     self.accessibilityTraits |= UIAccessibilityTraitStaticText;
@@ -32,6 +34,30 @@ - (instancetype)initWithFrame:(CGRect)frame
   return self;
 }
 
+- (void)reactSetFrame:(CGRect)frame
+{
+  // Text looks super weird if its frame is animated.
+  // This disables the frame animation, without affecting opacity, etc.
+  [UIView performWithoutAnimation:^{
+    [super reactSetFrame:frame];
+  }];
+}
+
+- (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
+{
+  [_reactSubviews insertObject:subview atIndex:atIndex];
+}
+
+- (void)removeReactSubview:(UIView *)subview
+{
+  [_reactSubviews removeObject:subview];
+}
+
+- (NSMutableArray *)reactSubviews
+{
+  return _reactSubviews;
+}
+
 - (void)setTextStorage:(NSTextStorage *)textStorage
 {
   _textStorage = textStorage;