2015-02-07 updates

- Fixes reference to ReactPackager middleware | Tyler Smalley
- [ReactKit] Fix bug where <Text /> did not refresh (in RCTText) | Alex Akers
- Removed duplication in react-native.js | Nick Lockwood
- [ReactNative] Patch up ReactPerf to work again | Ben Alpert

Libraries/ReactIOS/ReactIOSMount.js

@@ -8,6 +8,7 @@
 var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
 
 var ReactIOSTagHandles = require('ReactIOSTagHandles');
+var ReactPerf = require('ReactPerf');
 
 var instantiateReactComponent = require('instantiateReactComponent');
 var invariant = require('invariant');
@@ -47,7 +48,7 @@ var ReactIOSMount = {
     TOP_ROOT_NODE_IDS[topRootNodeID] = true;
 
     var childRootNodeID = instanceNumberToChildRootID(
-      topRootNodeID, 
+      topRootNodeID,
       ReactIOSMount.instanceCount++
     );
     ReactIOSMount._instancesByContainerID[topRootNodeID] = instance;
@@ -113,4 +114,10 @@ var ReactIOSMount = {
   }
 };
 
+ReactIOSMount.renderComponent = ReactPerf.measure(
+  'ReactMount',
+  '_renderNewRootComponent',
+  ReactIOSMount.renderComponent
+);
+
 module.exports = ReactIOSMount;

Libraries/react-native/react-native.js

@@ -5,49 +5,27 @@
  */
 'use strict';
 
-var Bundler = require('Bundler');
-var ExpandingText = require('ExpandingText');
-var Image = require('Image');
-var ListView = require('ListView');
-var ListViewDataSource = require('ListViewDataSource');
-var NavigatorIOS = require('NavigatorIOS');
-var StatusBarIOS = require('StatusBarIOS');
-var PixelRatio = require('PixelRatio');
-var React = require('React');
-var ScrollView = require('ScrollView');
-var SpinnerIOS = require('SpinnerIOS');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var TextInput = require('TextInput');
-var TimerMixin = require('TimerMixin');
-var TouchableHighlight = require('TouchableHighlight');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-var View = require('View');
-
-var invariant = require('invariant');
-var ix = require('ix');
-
 var ReactNative = {
-  ...React,
+  ...require('React'),
-  Bundler,
+  Bundler: require('Bundler'),
-  ExpandingText,
+  ExpandingText: require('ExpandingText'),
-  Image,
+  Image: require('Image'),
-  ListView,
+  ListView: require('ListView'),
-  ListViewDataSource,
+  ListViewDataSource: require('ListViewDataSource'),
-  NavigatorIOS,
+  NavigatorIOS: require('NavigatorIOS'),
-  StatusBarIOS,
+  PixelRatio: require('PixelRatio'),
-  PixelRatio,
+  ScrollView: require('ScrollView'),
-  ScrollView,
+  SpinnerIOS: require('SpinnerIOS'),
-  SpinnerIOS,
+  StatusBarIOS: require('StatusBarIOS'),
-  StyleSheet,
+  StyleSheet: require('StyleSheet'),
-  Text,
+  Text: require('Text'),
-  TextInput,
+  TextInput: require('TextInput'),
-  TimerMixin,
+  TimerMixin: require('TimerMixin'),
-  TouchableHighlight,
+  TouchableHighlight: require('TouchableHighlight'),
-  TouchableWithoutFeedback,
+  TouchableWithoutFeedback: require('TouchableWithoutFeedback'),
-  View,
+  View: require('View'),
-  invariant,
+  invariant: require('invariant'),
-  ix,
+  ix: require('ix'),
 };
 
 module.exports = ReactNative;

ReactKit/Views/RCTText.h

@@ -6,7 +6,7 @@
 
 @property (nonatomic, copy) NSAttributedString *attributedText;
 @property (nonatomic, assign) NSLineBreakMode lineBreakMode;
-@property (nonatomic, assign) NSInteger numberOfLines;
+@property (nonatomic, assign) NSUInteger numberOfLines;
 
 - (NSNumber *)reactTagAtPoint:(CGPoint)point;
 

ReactKit/Views/RCTText.m

@@ -40,16 +40,18 @@
 - (void)setAttributedText:(NSAttributedString *)attributedText
 {
   [_textStorage setAttributedString:attributedText];
+  [self setNeedsDisplay];
 }
 
-- (NSInteger)numberOfLines
+- (NSUInteger)numberOfLines
 {
   return _textContainer.maximumNumberOfLines;
 }
 
-- (void)setNumberOfLines:(NSInteger)numberOfLines
+- (void)setNumberOfLines:(NSUInteger)numberOfLines
 {
-  _textContainer.maximumNumberOfLines = MAX(0, numberOfLines);
+  _textContainer.maximumNumberOfLines = numberOfLines;
+  [self setNeedsDisplay];
 }
 
 - (NSLineBreakMode)lineBreakMode
@@ -60,6 +62,7 @@
 - (void)setLineBreakMode:(NSLineBreakMode)lineBreakMode
 {
   _textContainer.lineBreakMode = lineBreakMode;
+  [self setNeedsDisplay];
 }
 
 - (void)layoutSubviews

packager/packager.js

@@ -67,7 +67,7 @@ function openStackFrameInEditor(req, res, next) {
 }
 
 function getAppMiddleware(options) {
-  return ReactPackager.catalystMiddleware({
+  return ReactPackager.middleware({
     dev: true,
     projectRoot: options.projectRoot,
     blacklistRE: blacklist(false),