[0.46.1] Bump version numbers

RN: Expose unstable_batchedUpdates on react-native
Reviewed By: spicyj Differential Revision: D5284484 fbshipit-source-id: bdc0a1c3babfa1a5c3343f084bdd5d4ff4f2d46a
2025-11-01 09:14:26 +00:00 · 2017-07-07 18:22:18 +02:00 · 2017-07-07 18:19:05 +02:00 · 2017-07-07 18:18:08 +02:00 · 2017-07-05 16:50:01 +02:00 · 2017-07-05 16:48:04 +02:00
301 changed files with 861 additions and 31323 deletions
@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {
  Image,
@@ -58,7 +59,7 @@ type State = {
  containerStyle?: Style,
 };

-var LayoutEventsTest = React.createClass({
+var LayoutEventsTest = createReactClass({
  getInitialState(): State {
    return {
      didAnimation: false,
@@ -10,6 +10,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter');
 var Subscribable = require('Subscribable');
@@ -24,7 +25,7 @@ var reactViewHeight = 102;
 var newReactViewWidth = 201;
 var newReactViewHeight = 202;

-var ReactContentSizeUpdateTest = React.createClass({
+var ReactContentSizeUpdateTest = createReactClass({
  mixins: [Subscribable.Mixin,
           TimerMixin],

@@ -10,6 +10,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter');
 var Subscribable = require('Subscribable');
@@ -22,7 +23,7 @@ var reactViewHeight = 222;

 var finalState = false;

-var SizeFlexibilityUpdateTest = React.createClass({
+var SizeFlexibilityUpdateTest = createReactClass({
  mixins: [Subscribable.Mixin],

  componentWillMount: function() {
@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var TimerMixin = require('react-timer-mixin');

@@ -22,7 +23,7 @@ var {
 } = ReactNative;
 var { TestModule  } = ReactNative.NativeModules;

-var TimersTest = React.createClass({
+var TimersTest = createReactClass({
  mixins: [TimerMixin],

  _nextTest: () => {},
@@ -1218,9 +1218,9 @@ class AnimatedDivision extends AnimatedWithChildren {
  }

  __makeNative() {
-    super.__makeNative();
    this._a.__makeNative();
    this._b.__makeNative();
+    super.__makeNative();
  }

  __getValue(): number {
@@ -1266,9 +1266,9 @@ class AnimatedMultiplication extends AnimatedWithChildren {
  }

  __makeNative() {
-    super.__makeNative();
    this._a.__makeNative();
    this._b.__makeNative();
+    super.__makeNative();
  }

  __getValue(): number {
@@ -1309,8 +1309,8 @@ class AnimatedModulo extends AnimatedWithChildren {
  }

  __makeNative() {
-    super.__makeNative();
    this._a.__makeNative();
+    super.__makeNative();
  }

  __getValue(): number {
@@ -1356,8 +1356,8 @@ class AnimatedDiffClamp extends AnimatedWithChildren {
  }

  __makeNative() {
-    super.__makeNative();
    this._a.__makeNative();
+    super.__makeNative();
  }

  interpolate(config: InterpolationConfigType): AnimatedInterpolation {
@@ -12,7 +12,8 @@
 */
 'use strict';

-const {PropTypes, checkPropTypes} = require('React');
+const PropTypes = require('prop-types');
+const {checkPropTypes} = PropTypes;
 const RCTCameraRollManager = require('NativeModules').CameraRollManager;

 const createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
@@ -20,6 +20,7 @@ const StyleSheet = require('StyleSheet');
 const View = require('View');
 const ViewPropTypes = require('ViewPropTypes');

+const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');

 const GRAY = '#999999';
@@ -36,7 +37,7 @@ type DefaultProps = {
 /**
 * Displays a circular loading indicator.
 */
-const ActivityIndicator = React.createClass({
+const ActivityIndicator = createReactClass({
  mixins: [NativeMethodsMixin],

  propTypes: {
@@ -10,7 +10,7 @@
 * @flow
 */
 'use strict';
-var PropTypes = require('React').PropTypes;
+var PropTypes = require('prop-types');

 /**
 * Additional View properties for Apple TV
@@ -20,6 +20,7 @@ const StyleSheet = require('StyleSheet');
 const View = require('View');
 const ViewPropTypes = require('ViewPropTypes');

+const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');

 type DefaultProps = {
@@ -36,7 +37,7 @@ type Event = Object;
 * source of truth.
 */
 // $FlowFixMe(>=0.41.0)
-const DatePickerIOS = React.createClass({
+const DatePickerIOS = createReactClass({
  // TOOD: Put a better type for _picker
  _picker: (undefined: ?$FlowFixMe),

@@ -24,6 +24,7 @@ var ViewPropTypes = require('ViewPropTypes');

 var DrawerConsts = UIManager.AndroidDrawerLayout.Constants;

+var createReactClass = require('create-react-class');
 var dismissKeyboard = require('dismissKeyboard');
 var requireNativeComponent = require('requireNativeComponent');

@@ -67,7 +68,7 @@ var DRAWER_STATES = [
 * },
 * ```
 */
-var DrawerLayoutAndroid = React.createClass({
+var DrawerLayoutAndroid = createReactClass({
  statics: {
    positions: DrawerConsts.DrawerPosition,
  },
@@ -11,6 +11,7 @@
 */
 'use strict';

+const createReactClass = require('create-react-class');
 const Keyboard = require('Keyboard');
 const LayoutAnimation = require('LayoutAnimation');
 const Platform = require('Platform');
@@ -53,7 +54,7 @@ const viewRef = 'VIEW';
 * It can automatically adjust either its position or bottom padding based on the position of the keyboard.
 */
 // $FlowFixMe(>=0.41.0)
-const KeyboardAvoidingView = React.createClass({
+const KeyboardAvoidingView = createReactClass({
  mixins: [TimerMixin],

  propTypes: {
@@ -11,10 +11,11 @@
 'use strict';

 var React = require('React');
+var createReactClass = require('create-react-class');
 var PropTypes = require('prop-types');
 var TimerMixin = require('react-timer-mixin');

-var LazyRenderer = React.createClass({
+var LazyRenderer = createReactClass({
  mixin: [TimerMixin],

  propTypes: {
@@ -23,6 +23,7 @@ var TVEventHandler = require('TVEventHandler');
 var View = require('View');
 var ViewPropTypes = require('ViewPropTypes');

+var createReactClass = require('create-react-class');
 var invariant = require('fbjs/lib/invariant');
 var logError = require('logError');
 var requireNativeComponent = require('requireNativeComponent');
@@ -304,7 +305,7 @@ type Event = Object;
 * is pushed.
 *
 */
-var NavigatorIOS = React.createClass({
+var NavigatorIOS = createReactClass({

  propTypes: {

@@ -14,6 +14,7 @@

 var ColorPropType = require('ColorPropType');
 var React = require('React');
+var ReactPropTypes = require('prop-types');
 var StyleSheet = require('StyleSheet');
 var StyleSheetPropType = require('StyleSheetPropType');
 const ViewPropTypes = require('ViewPropTypes');
@@ -22,8 +23,6 @@ var ViewStylePropTypes = require('ViewStylePropTypes');
 var processColor = require('processColor');
 var requireNativeComponent = require('requireNativeComponent');

-var ReactPropTypes = React.PropTypes;
-
 var REF_PICKER = 'picker';
 var MODE_DROPDOWN = 'dropdown';

@@ -53,7 +52,7 @@ class PickerAndroid extends React.Component {
  static propTypes = {
    ...ViewPropTypes,
    style: pickerStyleType,
-    selectedValue: React.PropTypes.any,
+    selectedValue: ReactPropTypes.any,
    enabled: ReactPropTypes.bool,
    mode: ReactPropTypes.oneOf(['dialog', 'dropdown']),
    onValueChange: ReactPropTypes.func,
@@ -22,10 +22,11 @@ var View = require('View');
 const ViewPropTypes = require('ViewPropTypes');
 var processColor = require('processColor');

+var createReactClass = require('create-react-class');
 var itemStylePropType = StyleSheetPropType(TextStylePropTypes);
 var requireNativeComponent = require('requireNativeComponent');

-var PickerIOS = React.createClass({
+var PickerIOS = createReactClass({
  mixins: [NativeMethodsMixin],

  propTypes: {
@@ -16,6 +16,7 @@ var PropTypes = require('prop-types');
 var ViewPropTypes = require('ViewPropTypes');
 var ColorPropType = require('ColorPropType');

+var createReactClass = require('create-react-class');
 var requireNativeComponent = require('requireNativeComponent');

 var STYLE_ATTRIBUTES = [
@@ -63,7 +64,7 @@ var indeterminateType = function(props, propName, componentName, ...rest) {
 * },
 * ```
 */
-var ProgressBarAndroid = React.createClass({
+var ProgressBarAndroid = createReactClass({
  propTypes: {
    ...ViewPropTypes,
    /**
@@ -18,13 +18,14 @@ var PropTypes = require('prop-types');
 var StyleSheet = require('StyleSheet');
 var ViewPropTypes = require('ViewPropTypes');

+var createReactClass = require('create-react-class');
 var requireNativeComponent = require('requireNativeComponent');

 /**
 * Use `ProgressViewIOS` to render a UIProgressView on iOS.
 */
 // $FlowFixMe(>=0.41.0)
-var ProgressViewIOS = React.createClass({
+var ProgressViewIOS = createReactClass({
  mixins: [NativeMethodsMixin],

  propTypes: {
@@ -18,6 +18,7 @@ const React = require('React');
 const PropTypes = require('prop-types');
 const ViewPropTypes = require('ViewPropTypes');

+const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');

 if (Platform.OS === 'android') {
@@ -72,7 +73,7 @@ if (Platform.OS === 'android') {
 * in the `onRefresh` function otherwise the refresh indicator will stop immediately.
 */
 // $FlowFixMe(>=0.41.0)
-const RefreshControl = React.createClass({
+const RefreshControl = createReactClass({
  statics: {
    SIZE: RefreshLayoutConsts.SIZE,
  },
@@ -27,6 +27,7 @@ const View = require('View');
 const ViewPropTypes = require('ViewPropTypes');
 const ViewStylePropTypes = require('ViewStylePropTypes');

+const createReactClass = require('create-react-class');
 const dismissKeyboard = require('dismissKeyboard');
 const flattenStyle = require('flattenStyle');
 const invariant = require('fbjs/lib/invariant');
@@ -69,7 +70,7 @@ const requireNativeComponent = require('requireNativeComponent');
 * supports out of the box.
 */
 // $FlowFixMe(>=0.41.0)
-const ScrollView = React.createClass({
+const ScrollView = createReactClass({
  propTypes: {
    ...ViewPropTypes,
    /**
@@ -17,6 +17,7 @@ var PropTypes = require('prop-types');
 var StyleSheet = require('StyleSheet');
 var ViewPropTypes = require('ViewPropTypes');

+var createReactClass = require('create-react-class');
 var requireNativeComponent = require('requireNativeComponent');

 type DefaultProps = {
@@ -49,7 +50,7 @@ type Event = Object;
 * ````
 */
 // $FlowFixMe(>=0.41.0)
-var SegmentedControlIOS = React.createClass({
+var SegmentedControlIOS = createReactClass({
  mixins: [NativeMethodsMixin],

  propTypes: {
@@ -21,6 +21,7 @@ var PropTypes = require('prop-types');
 var StyleSheet = require('StyleSheet');
 var ViewPropTypes = require('ViewPropTypes');

+var createReactClass = require('create-react-class');
 var requireNativeComponent = require('requireNativeComponent');

 type Event = Object;
@@ -29,7 +30,7 @@ type Event = Object;
 * A component used to select a single value from a range of values.
 */
 // $FlowFixMe(>=0.41.0)
-var Slider = React.createClass({
+var Slider = createReactClass({
  mixins: [NativeMethodsMixin],

  propTypes: {
@@ -19,6 +19,7 @@ const PropTypes = require('prop-types');
 var StyleSheet = require('StyleSheet');
 const ViewPropTypes = require('ViewPropTypes');

+var createReactClass = require('create-react-class');
 var requireNativeComponent = require('requireNativeComponent');

 type DefaultProps = {
@@ -38,7 +39,7 @@ type DefaultProps = {
 * @keyword toggle
 */
 // $FlowFixMe(>=0.41.0)
-var Switch = React.createClass({
+var Switch = createReactClass({
  propTypes: {
    ...ViewPropTypes,
    /**
@@ -17,6 +17,7 @@ const EventEmitter = require('EventEmitter');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const Platform = require('Platform');
 const React = require('React');
+const createReactClass = require('create-react-class');
 const PropTypes = require('prop-types');
 const ReactNative = require('ReactNative');
 const StyleSheet = require('StyleSheet');
@@ -168,7 +169,7 @@ const DataDetectorTypes = [
 *
 */
 // $FlowFixMe(>=0.41.0)
-const TextInput = React.createClass({
+const TextInput = createReactClass({
  statics: {
    /* TODO(brentvatne) docs are needed for this */
    State: TextInputState,
@@ -20,6 +20,7 @@ var UIManager = require('UIManager');
 var ViewPropTypes = require('ViewPropTypes');
 var ColorPropType = require('ColorPropType');

+var createReactClass = require('create-react-class');
 var requireNativeComponent = require('requireNativeComponent');
 var resolveAssetSource = require('resolveAssetSource');

@@ -65,7 +66,7 @@ var optionalImageSource = PropTypes.oneOfType([
 *
 * [0]: https://developer.android.com/reference/android/support/v7/widget/Toolbar.html
 */
-var ToolbarAndroid = React.createClass({
+var ToolbarAndroid = createReactClass({
  mixins: [NativeMethodsMixin],

  propTypes: {
@@ -15,6 +15,7 @@ var Animated = require('Animated');
 var EdgeInsetsPropType = require('EdgeInsetsPropType');
 var NativeMethodsMixin = require('NativeMethodsMixin');
 var React = require('React');
+var createReactClass = require('create-react-class');
 var PropTypes = require('prop-types');
 var Touchable = require('Touchable');

@@ -35,7 +36,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 * interesting interactions such as `handleTouchablePress`.
 */
 // $FlowFixMe(>=0.41.0)
-var TouchableBounce = React.createClass({
+var TouchableBounce = createReactClass({
  mixins: [Touchable.Mixin, NativeMethodsMixin],

  propTypes: {
@@ -25,6 +25,7 @@ var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 var View = require('View');
 const ViewPropTypes = require('ViewPropTypes');

+var createReactClass = require('create-react-class');
 var ensureComponentIsNative = require('ensureComponentIsNative');
 var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
 var keyOf = require('fbjs/lib/keyOf');
@@ -68,7 +69,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 * ```
 */

-var TouchableHighlight = React.createClass({
+var TouchableHighlight = createReactClass({
  propTypes: {
    ...TouchableWithoutFeedback.propTypes,
    /**
@@ -18,6 +18,7 @@ var Touchable = require('Touchable');
 var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 var UIManager = require('UIManager');

+var createReactClass = require('create-react-class');
 var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
 var processColor = require('processColor');

@@ -70,7 +71,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 * ```
 */

-var TouchableNativeFeedback = React.createClass({
+var TouchableNativeFeedback = createReactClass({
  propTypes: {
    ...TouchableWithoutFeedback.propTypes,

@@ -22,6 +22,7 @@ var TimerMixin = require('react-timer-mixin');
 var Touchable = require('Touchable');
 var TouchableWithoutFeedback = require('TouchableWithoutFeedback');

+var createReactClass = require('create-react-class');
 var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
 var flattenStyle = require('flattenStyle');

@@ -51,7 +52,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 * },
 * ```
 */
-var TouchableOpacity = React.createClass({
+var TouchableOpacity = createReactClass({
  mixins: [TimerMixin, Touchable.Mixin, NativeMethodsMixin],

  propTypes: {
@@ -17,6 +17,7 @@ const PropTypes = require('prop-types');
 const TimerMixin = require('react-timer-mixin');
 const Touchable = require('Touchable');

+const createReactClass = require('create-react-class');
 const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
 const warning = require('fbjs/lib/warning');

@@ -37,7 +38,7 @@ const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 * If you wish to have several child components, wrap them in a View.
 */
 // $FlowFixMe(>=0.41.0)
-const TouchableWithoutFeedback = React.createClass({
+const TouchableWithoutFeedback = createReactClass({
  mixins: [TimerMixin, Touchable.Mixin],

  propTypes: {
@@ -21,6 +21,7 @@ const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const ViewPropTypes = require('ViewPropTypes');

+const createReactClass = require('create-react-class');
 const invariant = require('fbjs/lib/invariant');
 const requireNativeComponent = require('requireNativeComponent');
 const warning = require('fbjs/lib/warning');
@@ -84,7 +85,7 @@ export type Props = ViewProps;
 *   - `touches` - Array of all current touches on the screen.
 */
 // $FlowFixMe(>=0.41.0)
-const View = React.createClass({
+const View = createReactClass({
  // TODO: We should probably expose the mixins, viewConfig, and statics publicly. For example,
  // one of the props is of type AccessibilityComponentType. That is defined as a const[] above,
  // but it is not rendered by the docs, since `statics` below is not rendered. So its Possible
@@ -13,10 +13,10 @@

 const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const Platform = require('Platform');
+const PropTypes = require('prop-types');
 const StyleSheetPropType = require('StyleSheetPropType');
 const ViewStylePropTypes = require('ViewStylePropTypes');

-const { PropTypes } = require('React');
 const {
  AccessibilityComponentTypes,
  AccessibilityTraits,
@@ -11,9 +11,9 @@
 */
 'use strict';

-var LayoutPropTypes = require('LayoutPropTypes');
-var ReactPropTypes = require('React').PropTypes;
 var ColorPropType = require('ColorPropType');
+var LayoutPropTypes = require('LayoutPropTypes');
+var ReactPropTypes = require('prop-types');
 var ShadowPropTypesIOS = require('ShadowPropTypesIOS');
 var TransformPropTypes = require('TransformPropTypes');

@@ -12,12 +12,11 @@
 'use strict';

 const ListView = require('ListView');
+const PropTypes = require('prop-types');
 const React = require('React');
 const SwipeableListViewDataSource = require('SwipeableListViewDataSource');
 const SwipeableRow = require('SwipeableRow');

-const {PropTypes} = React;
-
 type DefaultProps = {
  bounceFirstRowOnMount: boolean,
  renderQuickActions: Function,
@@ -20,6 +20,7 @@ const StyleSheet = require('StyleSheet');
 const TimerMixin = require('react-timer-mixin');
 const View = require('View');

+const createReactClass = require('create-react-class');
 const emptyFunction = require('fbjs/lib/emptyFunction');

 const IS_RTL = I18nManager.isRTL;
@@ -61,7 +62,7 @@ const RIGHT_SWIPE_THRESHOLD = 30 * SLOW_SPEED_SWIPE_FACTOR;
 * used in a normal ListView. See the renderRow for SwipeableListView to see how
 * to use this component separately.
 */
-const SwipeableRow = React.createClass({
+const SwipeableRow = createReactClass({
  _panResponder: {},
  _previousLeft: CLOSED_LEFT_POSITION,

@@ -25,6 +25,7 @@ var View = require('View');
 var ViewPropTypes = require('ViewPropTypes');
 var ViewStylePropTypes = require('ViewStylePropTypes');

+var createReactClass = require('create-react-class');
 var filterObject = require('fbjs/lib/filterObject');
 var flattenStyle = require('flattenStyle');
 var merge = require('merge');
@@ -76,7 +77,7 @@ var ImageViewAttributes = merge(ReactNativeViewAttributes.UIView, {
 var ViewStyleKeys = new Set(Object.keys(ViewStylePropTypes));
 var ImageSpecificStyleKeys = new Set(Object.keys(ImageStylePropTypes).filter(x => !ViewStyleKeys.has(x)));

-var Image = React.createClass({
+var Image = createReactClass({
  propTypes: {
    ...ViewPropTypes,
    style: StyleSheetPropType(ImageStylePropTypes),
@@ -23,6 +23,7 @@ const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const StyleSheet = require('StyleSheet');
 const StyleSheetPropType = require('StyleSheetPropType');

+const createReactClass = require('create-react-class');
 const flattenStyle = require('flattenStyle');
 const requireNativeComponent = require('requireNativeComponent');
 const resolveAssetSource = require('resolveAssetSource');
@@ -126,7 +127,7 @@ const ImageViewManager = NativeModules.ImageViewManager;
 *
 */
 // $FlowFixMe(>=0.41.0)
-const Image = React.createClass({
+const Image = createReactClass({
  propTypes: {
    /**
     * > `ImageResizeMode` is an `Enum` for different image resizing modes, set via the
@@ -11,7 +11,7 @@
 */
 'use strict';

-const {PropTypes} = require('React');
+const PropTypes = require('prop-types');

 const ImageURISourcePropType = PropTypes.shape({
  /**
@@ -11,14 +11,13 @@
 */
 'use strict';

+var ColorPropType = require('ColorPropType');
 var ImageResizeMode = require('ImageResizeMode');
 var LayoutPropTypes = require('LayoutPropTypes');
-var ColorPropType = require('ColorPropType');
+var ReactPropTypes = require('prop-types');
 var ShadowPropTypesIOS = require('ShadowPropTypesIOS');
 var TransformPropTypes = require('TransformPropTypes');

-var ReactPropTypes = require('React').PropTypes;
-
 var ImageStylePropTypes = {
  ...LayoutPropTypes,
  ...ShadowPropTypesIOS,
@@ -24,6 +24,7 @@ var TimerMixin = require('react-timer-mixin');
 var View = require('View');

 var cloneReferencedElement = require('react-clone-referenced-element');
+var createReactClass = require('create-react-class');
 var isEmpty = require('isEmpty');
 var merge = require('merge');

@@ -85,7 +86,7 @@ var DEFAULT_SCROLL_CALLBACK_THROTTLE = 50;
 *    rendering rows.
 */

-var ListView = React.createClass({
+var ListView = createReactClass({
  _childFrames: ([]: Array<Object>),
  _sentEndForContentLength: (null: ?number),
  _scrollComponent: (null: any),
@@ -13,6 +13,7 @@
 'use strict';

 const EmitterSubscription = require('EmitterSubscription');
+const PropTypes = require('prop-types');
 const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
 const React = require('React');
 const ReactNative = require('ReactNative');
@@ -41,7 +42,7 @@ class AppContainer extends React.Component {
  _subscription: ?EmitterSubscription = null;

  static childContextTypes = {
-    rootTag: React.PropTypes.number,
+    rootTag: PropTypes.number,
  };

  getChildContext(): Context {
@@ -11,9 +11,9 @@
 */
 'use strict';

-var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
+var PropTypes = require('prop-types');

-var {PropTypes} = require('React');
+var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');

 var EdgeInsetsPropType = createStrictShapeTypeChecker({
  top: PropTypes.number,
@@ -11,7 +11,7 @@
 */
 'use strict';

-var ReactPropTypes = require('React').PropTypes;
+var ReactPropTypes = require('prop-types');

 /**
 * React Native's layout system is based on Flexbox and is powered both
@@ -11,7 +11,7 @@
 */
 'use strict';

-var PropTypes = require('React').PropTypes;
+var PropTypes = require('prop-types');

 var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');

@@ -11,9 +11,9 @@
 */
 'use strict';

-var deprecatedPropType = require('deprecatedPropType');
+var ReactPropTypes = require('prop-types');

-var ReactPropTypes = require('React').PropTypes;
+var deprecatedPropType = require('deprecatedPropType');

 var TransformMatrixPropType = function(
  props : Object,
@@ -22,6 +22,7 @@ const StyleSheetPropType = require('StyleSheetPropType');
 const TextStylePropTypes = require('TextStylePropTypes');
 const Touchable = require('Touchable');

+const createReactClass = require('create-react-class');
 const createReactNativeComponentClass = require('createReactNativeComponentClass');
 const mergeFast = require('mergeFast');
 const processColor = require('processColor');
@@ -96,7 +97,7 @@ const viewConfig = {
 */

 // $FlowFixMe(>=0.41.0)
-const Text = React.createClass({
+const Text = createReactClass({
  propTypes: {
    /**
     * When `numberOfLines` is set, this prop defines how text will be truncated.
@@ -11,8 +11,8 @@
 */
 'use strict';

-const ReactPropTypes = require('React').PropTypes;
 const ColorPropType = require('ColorPropType');
+const ReactPropTypes = require('prop-types');
 const ViewStylePropTypes = require('ViewStylePropTypes');

 const TextStylePropTypes = {
@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var TimerMixin = require('react-timer-mixin');
 var {
@@ -22,7 +23,7 @@ var {

 var TestManager = NativeModules.TestManager || NativeModules.SnapshotTestManager;

-var TextUpdateTest = React.createClass({
+var TextUpdateTest = createReactClass({
  mixins: [TimerMixin],
  getInitialState: function() {
    return {seeMore: true};
@@ -97,6 +97,7 @@ const ReactNative = {
  get TimePickerAndroid() { return require('TimePickerAndroid'); },
  get TVEventHandler() { return require('TVEventHandler'); },
  get UIManager() { return require('UIManager'); },
+  get unstable_batchedUpdates() { return require('ReactNative').unstable_batchedUpdates; },
  get Vibration() { return require('Vibration'); },
  get VibrationIOS() { return require('VibrationIOS'); },

@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 const PropTypes = require('prop-types');
 var ReactNative = require('react-native');
 var {
@@ -71,7 +72,7 @@ var propTypes = {

 };

-var CameraRollView = React.createClass({
+var CameraRollView = createReactClass({
  // $FlowFixMe(>=0.41.0)
  propTypes: propTypes,

@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {
  ActivityIndicator,
@@ -29,7 +30,7 @@ var ImageCapInsetsExample = require('./ImageCapInsetsExample');
 const IMAGE_PREFETCH_URL = 'http://origami.design/public/images/bird-logo.png?r=1&t=' + Date.now();
 var prefetchTask = Image.prefetch(IMAGE_PREFETCH_URL);

-var NetworkImageCallbackExample = React.createClass({
+var NetworkImageCallbackExample = createReactClass({
  getInitialState: function() {
    return {
      events: [],
@@ -102,7 +103,7 @@ var NetworkImageCallbackExample = React.createClass({
  }
 });

-var NetworkImageExample = React.createClass({
+var NetworkImageExample = createReactClass({
  getInitialState: function() {
    return {
      error: false,
@@ -130,7 +131,7 @@ var NetworkImageExample = React.createClass({
  }
 });

-var ImageSizeExample = React.createClass({
+var ImageSizeExample = createReactClass({
  getInitialState: function() {
    return {
      width: 0,
@@ -162,7 +163,7 @@ var ImageSizeExample = React.createClass({
  },
 });

-var MultipleSourcesExample = React.createClass({
+var MultipleSourcesExample = createReactClass({
  getInitialState: function() {
    return {
      width: 30,
@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {
  Image,
@@ -24,7 +25,7 @@ var {

 var RNTesterPage = require('./RNTesterPage');

-var ListViewSimpleExample = React.createClass({
+var ListViewSimpleExample = createReactClass({
  statics: {
    title: '<ListView>',
    description: 'Performant, scrollable list of data.'
@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {
  Image,
@@ -37,7 +38,7 @@ var THUMB_URLS = [
  require('./Thumbnails/victory.png'),
 ];

-var ListViewGridLayoutExample = React.createClass({
+var ListViewGridLayoutExample = createReactClass({

  statics: {
    title: '<ListView> - Grid Layout',
@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {
  PanResponder,
@@ -21,7 +22,7 @@ var {

 var CIRCLE_SIZE = 80;

-var PanResponderExample = React.createClass({
+var PanResponderExample = createReactClass({

  statics: {
    title: 'PanResponder Sample',
@@ -13,12 +13,13 @@

 var ProgressBar = require('ProgressBarAndroid');
 var React = require('React');
+var createReactClass = require('create-react-class');
 var RNTesterBlock = require('RNTesterBlock');
 var RNTesterPage = require('RNTesterPage');

 var TimerMixin = require('react-timer-mixin');

-var MovingBar = React.createClass({
+var MovingBar = createReactClass({
  mixins: [TimerMixin],

  getInitialState: function() {
@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {
  ProgressViewIOS,
@@ -20,7 +21,7 @@ var {
 } = ReactNative;
 var TimerMixin = require('react-timer-mixin');

-var ProgressViewExample = React.createClass({
+var ProgressViewExample = createReactClass({
  mixins: [TimerMixin],

  getInitialState() {
@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {
  Image,
@@ -25,7 +26,7 @@ var {

 var RNTesterPage = require('./RNTesterPage');

-var SwipeableListViewSimpleExample = React.createClass({
+var SwipeableListViewSimpleExample = createReactClass({
  statics: {
    title: '<SwipeableListView>',
    description: 'Performant, scrollable, swipeable list of data.'
@@ -13,6 +13,7 @@

 const Platform = require('Platform');
 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {
  Image,
@@ -72,7 +73,7 @@ class AttributeToggler extends React.Component {
  }
 }

-var AdjustingFontSize = React.createClass({
+var AdjustingFontSize = createReactClass({
  getInitialState: function() {
    return {dynamicText:'', shouldRender: true,};
  },
@@ -12,6 +12,7 @@
 'use strict';

 var React = require('react');
+var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
 var {
  AlertIOS,
@@ -111,7 +112,7 @@ class RequestIdleCallbackTester extends React.Component {
  };
 }

-var TimerTester = React.createClass({
+var TimerTester = createReactClass({
  mixins: [TimerMixin],

  _ii: 0,
@@ -103,7 +103,6 @@
 		139D84AF1E273B5600323FB7 /* Bits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 139D849D1E273B5600323FB7 /* Bits.cpp */; };
 		139D84B01E273B5600323FB7 /* Conv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 139D849F1E273B5600323FB7 /* Conv.cpp */; };
 		139D84B11E273B5600323FB7 /* dynamic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 139D84A21E273B5600323FB7 /* dynamic.cpp */; };
-		139D84B21E273B5600323FB7 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 139D84A51E273B5600323FB7 /* File.cpp */; };
 		139D84B31E273B5600323FB7 /* json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 139D84A71E273B5600323FB7 /* json.cpp */; };
 		13A0C2891B74F71200B29F6F /* RCTDevLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */; };
 		13A0C28A1B74F71200B29F6F /* RCTDevMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 13A0C2881B74F71200B29F6F /* RCTDevMenu.m */; };
@@ -488,7 +487,6 @@
 		3D383D2F1EBD27B6005632C8 /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887541E2971C500C3C7A1 /* Unicode.cpp */; };
 		3D383D301EBD27B6005632C8 /* demangle.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7F081E25DE3700323FB7 /* demangle.cc */; };
 		3D383D311EBD27B6005632C8 /* Demangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887521E2971C500C3C7A1 /* Demangle.cpp */; };
-		3D383D321EBD27B6005632C8 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 139D84A51E273B5600323FB7 /* File.cpp */; };
 		3D383D331EBD27B6005632C8 /* logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7EDA1E25DBDC00323FB7 /* logging.cc */; };
 		3D383D341EBD27B6005632C8 /* json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 139D84A71E273B5600323FB7 /* json.cpp */; };
 		3D383D351EBD27B6005632C8 /* BitsFunctexcept.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F8879C1E29740700C3C7A1 /* BitsFunctexcept.cpp */; };
@@ -1671,8 +1669,6 @@
 		139D84A21E273B5600323FB7 /* dynamic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dynamic.cpp; path = "folly-2016.09.26.00/folly/dynamic.cpp"; sourceTree = "<group>"; };
 		139D84A31E273B5600323FB7 /* dynamic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic.h; path = "folly-2016.09.26.00/folly/dynamic.h"; sourceTree = "<group>"; };
 		139D84A41E273B5600323FB7 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Exception.h; path = "folly-2016.09.26.00/folly/Exception.h"; sourceTree = "<group>"; };
-		139D84A51E273B5600323FB7 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = File.cpp; path = "folly-2016.09.26.00/folly/File.cpp"; sourceTree = "<group>"; };
-		139D84A61E273B5600323FB7 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = File.h; path = "folly-2016.09.26.00/folly/File.h"; sourceTree = "<group>"; };
 		139D84A71E273B5600323FB7 /* json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json.cpp; path = "folly-2016.09.26.00/folly/json.cpp"; sourceTree = "<group>"; };
 		139D84A81E273B5600323FB7 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = "folly-2016.09.26.00/folly/json.h"; sourceTree = "<group>"; };
 		139D84A91E273B5600323FB7 /* Memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Memory.h; path = "folly-2016.09.26.00/folly/Memory.h"; sourceTree = "<group>"; };
@@ -2113,8 +2109,6 @@
 				139D84A21E273B5600323FB7 /* dynamic.cpp */,
 				139D84A31E273B5600323FB7 /* dynamic.h */,
 				139D84A41E273B5600323FB7 /* Exception.h */,
-				139D84A51E273B5600323FB7 /* File.cpp */,
-				139D84A61E273B5600323FB7 /* File.h */,
 				139D84A71E273B5600323FB7 /* json.cpp */,
 				139D84A81E273B5600323FB7 /* json.h */,
 				139D84A91E273B5600323FB7 /* Memory.h */,
@@ -3446,7 +3440,6 @@
 				13F8875A1E2971D400C3C7A1 /* Unicode.cpp in Sources */,
 				139D7F091E25DE3700323FB7 /* demangle.cc in Sources */,
 				13F887581E2971D400C3C7A1 /* Demangle.cpp in Sources */,
-				139D84B21E273B5600323FB7 /* File.cpp in Sources */,
 				139D7F021E25DE1100323FB7 /* logging.cc in Sources */,
 				139D84B31E273B5600323FB7 /* json.cpp in Sources */,
 				13F8879F1E29741900C3C7A1 /* BitsFunctexcept.cpp in Sources */,
@@ -3580,7 +3573,6 @@
 				3D383D2F1EBD27B6005632C8 /* Unicode.cpp in Sources */,
 				3D383D301EBD27B6005632C8 /* demangle.cc in Sources */,
 				3D383D311EBD27B6005632C8 /* Demangle.cpp in Sources */,
-				3D383D321EBD27B6005632C8 /* File.cpp in Sources */,
 				3D383D331EBD27B6005632C8 /* logging.cc in Sources */,
 				3D383D341EBD27B6005632C8 /* json.cpp in Sources */,
 				3D383D351EBD27B6005632C8 /* BitsFunctexcept.cpp in Sources */,
@@ -1,4 +1,4 @@
-VERSION_NAME=1000.0.0-master
+VERSION_NAME=0.46.1
 GROUP=com.facebook.react

 POM_NAME=ReactNative
@@ -13,6 +13,7 @@

 var BatchedBridge = require('BatchedBridge');
 var React = require('React');
+var createReactClass = require('create-react-class');
 var View = require('View');
 var ScrollView = require('ScrollView');
 var Text = require('Text');
@@ -64,7 +65,7 @@ var onItemPress = function(itemNumber) {
  ScrollListener.onItemPress(itemNumber);
 };

-var ScrollViewTestApp = React.createClass({
+var ScrollViewTestApp = createReactClass({
  getInitialState: getInitialState,
  onScroll: onScroll,
  onItemPress: onItemPress,
@@ -90,7 +91,7 @@ var ScrollViewTestApp = React.createClass({
  },
 });

-var HorizontalScrollViewTestApp = React.createClass({
+var HorizontalScrollViewTestApp = createReactClass({
  getInitialState: getInitialState,
  onScroll: onScroll,
  onItemPress: onItemPress,
@@ -17,9 +17,10 @@ var StyleSheet = require('StyleSheet');
 var View = require('View');
 var Text = require('Text');

+var createReactClass = require('create-react-class');
 var renderApplication = require('renderApplication');

-var FlexTestApp = React.createClass({
+var FlexTestApp = createReactClass({
  _styles: StyleSheet.create({
    container: {
      width: 200,
@@ -47,7 +48,7 @@ var FlexTestApp = React.createClass({
  }
 });

-var FlexWithText = React.createClass({
+var FlexWithText = createReactClass({
  _styles: StyleSheet.create({
    container: {
      flexDirection: 'column',
@@ -75,7 +76,7 @@ var FlexWithText = React.createClass({
  }
 });

-var AbsolutePositionTestApp = React.createClass({
+var AbsolutePositionTestApp = createReactClass({
  _styles: StyleSheet.create({
    absolute: {
      position: 'absolute',
@@ -90,7 +91,7 @@ var AbsolutePositionTestApp = React.createClass({
  }
 });

-var AbsolutePositionBottomRightTestApp = React.createClass({
+var AbsolutePositionBottomRightTestApp = createReactClass({
  _styles: StyleSheet.create({
    container: {
      width: 100,
@@ -113,7 +114,7 @@ var AbsolutePositionBottomRightTestApp = React.createClass({
  }
 });

-var CenteredTextView = React.createClass({
+var CenteredTextView = createReactClass({
  _styles: StyleSheet.create({
    parent: {
      width: 200,
@@ -139,7 +140,7 @@ var CenteredTextView = React.createClass({
 });

 var flushUpdatePositionInList = null;
-var UpdatePositionInListTestApp = React.createClass({
+var UpdatePositionInListTestApp = createReactClass({
  _styles: StyleSheet.create({
    element: {
      height: 10,
@@ -29,23 +29,23 @@ import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.infer.annotation.ThreadSafe;
 import com.facebook.react.bridge.CatalystInstance;
+import com.facebook.react.bridge.CatalystInstanceImpl;
+import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.bridge.JSCJavaScriptExecutor;
 import com.facebook.react.bridge.JavaJSExecutor;
+import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.JavaScriptModuleRegistry;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
+import com.facebook.react.bridge.NativeModuleRegistry;
 import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
+import com.facebook.react.bridge.ProxyJavaScriptExecutor;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
-import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
-import com.facebook.react.bridge.CatalystInstanceImpl;
-import com.facebook.react.bridge.JSBundleLoader;
-import com.facebook.react.bridge.JSCJavaScriptExecutor;
-import com.facebook.react.bridge.JavaScriptExecutor;
-import com.facebook.react.bridge.NativeModuleRegistry;
-import com.facebook.react.bridge.ProxyJavaScriptExecutor;
 import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.VisibleForTesting;
@@ -695,12 +695,6 @@ public class ReactInstanceManager {

  @ThreadConfined(UI)
  private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
-    synchronized (mAttachedRootViews) {
-      for (ReactRootView reactRootView : mAttachedRootViews) {
-        reactRootView.removeAllViews();
-        reactRootView.setId(View.NO_ID);
-      }
-    }
    recreateReactContextInBackground(
        new ProxyJavaScriptExecutor.Factory(jsExecutorFactory),
        JSBundleLoader.createRemoteDebuggerBundleLoader(
@@ -710,12 +704,6 @@ public class ReactInstanceManager {

  @ThreadConfined(UI)
  private void onJSBundleLoadedFromServer() {
-    synchronized (mAttachedRootViews) {
-      for (ReactRootView reactRootView : mAttachedRootViews) {
-        reactRootView.removeAllViews();
-        reactRootView.setId(View.NO_ID);
-      }
-    }
    recreateReactContextInBackground(
        new JSCJavaScriptExecutor.Factory(mJSCConfig.getConfigMap()),
        JSBundleLoader.createCachedBundleFromNetworkLoader(
@@ -900,11 +888,14 @@ public class ReactInstanceManager {
    if (mLifecycleState == LifecycleState.RESUMED) {
      reactContext.onHostPause();
    }
+
    synchronized (mAttachedRootViews) {
      for (ReactRootView rootView : mAttachedRootViews) {
-        detachViewFromInstance(rootView, reactContext.getCatalystInstance());
+        rootView.removeAllViews();
+        rootView.setId(View.NO_ID);
      }
    }
+
    reactContext.destroy();
    mDevSupportManager.onReactInstanceDestroyed(reactContext);
    mMemoryPressureRouter.removeMemoryPressureListener(reactContext.getCatalystInstance());
@@ -9,6 +9,9 @@

 package com.facebook.react.uimanager;

+import javax.annotation.Nullable;
+import javax.annotation.concurrent.NotThreadSafe;
+
 import android.content.res.Resources;
 import android.util.Log;
 import android.util.SparseArray;
@@ -37,9 +40,6 @@ import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;

-import javax.annotation.Nullable;
-import javax.annotation.concurrent.NotThreadSafe;
-
 /**
 * Delegate of {@link UIManagerModule} that owns the native view hierarchy and mapping between
 * native view names used in JS and corresponding instances of {@link ViewManager}. The
@@ -21,10 +21,10 @@ import com.facebook.react.animation.AnimationRegistry;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.GuardedRunnable;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.modules.core.ReactChoreographer;
@@ -5,7 +5,7 @@ layout: docs
 category: Guides
 permalink: docs/accessibility.html
 next: timers
-previous: debugging
+previous: animations
 ---

 ## Native App Accessibility (iOS and Android)
@@ -153,11 +153,11 @@ Start by following the `Point Gradle to your Android SDK` section of this page.
 ./gradlew ReactAndroid:installArchives
 ```

-This will package everything that would typically be included in the `android` directory of your `node_modules/react-native/` installation in the root directory of your React Native checkout. 
+This will package everything that would typically be included in the `android` directory of your `node_modules/react-native/` installation in the root directory of your React Native checkout.

 ## Testing

-If you made changes to React Native and submit a pull request, all tests will run on your pull request automatically. To run the tests locally, see [Testing](docs/testing.html).
+If you made changes to React Native and submit a pull request, all tests will run on your pull request automatically. To run the tests locally, see [Running Tests](docs/testing.html).

 ## Troubleshooting

@@ -4,8 +4,8 @@ title: Animations
 layout: docs
 category: Guides
 permalink: docs/animations.html
-next: navigation
-previous: handling-touches
+next: accessibility
+previous: images
 ---

 Animations are very important to create a great user experience.
@@ -2,7 +2,7 @@
 id: building-for-apple-tv
 title: Building For Apple TV
 layout: docs
-category: Guides (Apple TV)
+category: Guides (iOS)
 permalink: docs/building-for-apple-tv.html
 banner: ejected
 next: native-modules-android
@@ -84,12 +84,10 @@ class Game2048 extends React.Component {

 ```

- *TV remote animations*: `RCTTVView` native code implements Apple-recommended parallax animations to help guide the eye as the user navigates through views.  The animations can be disabled or adjusted with new optional view properties. 
+- *TV remote animations*: `RCTTVView` native code implements Apple-recommended parallax animations to help guide the eye as the user navigates through views.  The animations can be disabled or adjusted with new optional view properties.

 - *Back navigation with the TV remote menu button*: The `BackHandler` component, originally written to support the Android back button, now also supports back navigation on the Apple TV using the menu button on the TV remote.

 - *Known issues*:

  - [ListView scrolling](https://github.com/facebook/react-native/issues/12793).  The issue can be easily worked around by setting `removeClippedSubviews` to false in ListView and similar components.  For more discussion of this issue, see [this PR](https://github.com/facebook/react-native/pull/12944).
-
-
@@ -1,11 +1,11 @@
 ---
 id: colors
-title: Colors
+title: Color Reference
 layout: docs
 category: Guides
 permalink: docs/colors.html
-next: platform-specific-code
-previous: images
+next: integration-with-existing-apps
+previous: direct-manipulation
 ---

 Components in React Native are [styled using JavaScript](docs/style.html). Color properties usually match how [CSS works on the web](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value).
@@ -0,0 +1,235 @@
+---
+id: components
+title: Components and APIs
+layout: docs
+category: Guides
+permalink: docs/components-and-apis.html
+next: platform-specific-code
+previous: more-resources
+---
+
+React Native provides a number of built-in components. You will find a full list of components and APIs on the sidebar to the left. If you're not sure where to get started, take a look at the following categories:
+
+- [Basic Components](docs/components-and-apis.html#basic-components)
+- [User Interface](docs/components-and-apis.html#user-interface)
+- [Lists Views](docs/components-and-apis.html#lists-views)
+- [iOS-specific](docs/components-and-apis.html#ios-components-and-apis)
+- [Android-specific](docs/components-and-apis.html#android-components-and-apis)
+- [Others](docs/components-and-apis.html#others)
+
+You're not limited to the components and APIs bundled with React Native. React Native is a community of thousands of developers. If you're looking for a library that does something specific, search the npm registry for packages mentioning [react-native](https://www.npmjs.com/search?q=react-native&page=1&ranking=optimal), or check out [Awesome React Native](http://www.awesome-react-native.com/) for a curated list.
+
+## Basic Components
+
+Most apps will end up using one of these basic components. You'll want to get yourself familiarized with all of these if you're new to React Native.
+
+<div class="component-grid component-grid-border">
+  <div class="component">
+    <h3><a href="docs/view.html">View</a></h3>
+    <p>The most fundamental component for building a UI.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/text.html">Text</a></h3>
+    <p>A component for displaying text.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/image.html">Image</a></h3>
+    <p>A component for displaying images.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/textinput.html">TextInput</a></h3>
+    <p>A component for inputting text into the app via a keyboard.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/scrollview.html">ScrollView</a></h3>
+    <p>Provides a scrolling container that can host multiple components and views.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/button.html">Button</a></h3>
+    <p>A basic button component for handling touches that should render nicely on any platform.</p>
+  </div>
+</div>
+
+## User Interface
+
+Render common user interface controls on any platform using the following components. For platform specific components, keep reading.
+
+<div class="component-grid component-grid-border">
+  <div class="component">
+    <h3><a href="docs/picker.html">Picker</a></h3>
+    <p>Renders the native picker component on iOS and Android.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/slider.html">Slider</a></h3>
+    <p>A component used to select a single value from a range of values.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/switch.html">Switch</a></h3>
+    <p>Renders a boolean input.</p>
+  </div>
+</div>
+
+## List Views
+
+Unlike the more generic `ScrollView`, the following list view components only render elements that are currently showing on the screen. This makes them a great choice for displaying long lists of data.
+
+<div class="component-grid component-grid-border">
+  <div class="component">
+    <h3><a href="docs/flatlist.html">FlatList</a></h3>
+    <p>A component for rendering performant scrollable lists.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/sectionlist.html">SectionList</a></h3>
+    <p>Like <code>FlatList</code>, but for sectioned lists.</p>
+  </div>
+</div>
+
+## iOS Components and APIs
+
+Many of the following components provide wrappers for commonly used UIKit classes.
+
+<div class="component-grid component-grid-border">
+  <div class="component">
+    <h3><a href="docs/actionsheetios.html">ActionSheetIOS</a></h3>
+    <p>API to display an iOS action sheet or share sheet.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/adsupportios.html">AdSupportIOS</a></h3>
+    <p>API to access the "advertising identifier" on iOS.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/alertios.html">AlertIOS</a></h3>
+    <p>Create an iOS alert dialog with a message or create a prompt for user input.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/datepickerios.html">DatePickerIOS</a></h3>
+    <p>Renders a date/time picker (selector) on iOS.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/imagepickerios.html">ImagePickerIOS</a></h3>
+    <p>Renders a image picker on iOS.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/navigatorios.html">NavigatorIOS</a></h3>
+    <p>A wrapper around <code>UINavigationController</code>, enabling you to implement a navigation stack.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/progressviewios.html">ProgressViewIOS</a></h3>
+    <p>Renders a <code>UIProgressView</a></code> on iOS.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/pushnotificationios.html">PushNotificationIOS</a></h3>
+    <p>Handle push notifications for your app, including permission handling and icon badge number.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/segmentedcontrolios.html">SegmentedControlIOS</a></h3>
+    <p>Renders a <code>UISegmentedControl</code> on iOS.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/tabbarios.html">TabBarIOS</a></h3>
+    <p>Renders a <code>UITabViewController</code> on iOS. Use with <a href="docs/tabbarios-item.html">TabBarIOS.Item</a>.</p>
+  </div>
+</div>
+
+## Android Components and APIs
+
+Many of the following components provide wrappers for commonly used Android classes.
+
+<div class="component-grid component-grid-border">
+  <div class="component">
+    <h3><a href="docs/backhandler.html">BackHandler</a></h3>
+    <p>Detect hardware button presses for back navigation.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/datepickerandroid.html">DatePickerAndroid</a></h3>
+    <p>Opens the standard Android date picker dialog.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/drawerlayoutandroid.html">DrawerLayoutAndroid</a></h3>
+    <p>Renders a <code>DrawerLayout</code> on Android.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/permissionsandroid.html">PermissionsAndroid</a></h3>
+    <p>Provides access to the permissions model introduced in Android M.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/progressbarandroid.html">ProgressBarAndroid</a></h3>
+    <p>Renders a <code>ProgressBar</code> on Android.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/timepickerandroid.html">TimePickerAndroid</a></h3>
+    <p>Opens the standard Android time picker dialog.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/toastandroid.html">ToastAndroid</a></h3>
+    <p>Create an Android Toast alert.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/toolbarandroid.html">ToolbarAndroid</a></h3>
+    <p>Renders a <code>Toolbar</code> on Android.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/viewpagerandroid.html">ViewPagerAndroid</a></h3>
+    <p>Container that allows to flip left and right between child views.</p>
+  </div>
+</div>
+
+
+## Others
+
+These components may come in handy for certain applications. For an exhaustive list of components and APIs, check out the sidebar to the left.
+
+<div class="component-grid">
+  <div class="component">
+    <h3><a href="docs/activityindicator.html">ActivityIndicator</a></h3>
+    <p>Displays a circular loading indicator.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/alert.html">Alert</a></h3>
+    <p>Launches an alert dialog with the specified title and message.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/cameraroll.html">CameraRoll</a></h3>
+    <p>Provides access to the local camera roll / gallery.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/clipboard.html">Clipboard</a></h3>
+    <p>Provides an interface for setting and getting content from the clipboard on both iOS and Android.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/dimensions.html">Dimensions</a></h3>
+    <p>Provides an interface for getting device dimensions.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/keyboardavoidingview.html">KeyboardAvoidingView</a></h3>
+    <p>Provides a view that moves out of the way of the virtual keyboard automatically.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/linking.html">Linking</a></h3>
+    <p>Provides a general interface to interact with both incoming and outgoing app links.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/modal.html">Modal</a></h3>
+    <p>Provides a simple way to present content above an enclosing view.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/pixelratio.html">PixelRatio</a></h3>
+    <p>Provides access to the device pixel density.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/refreshcontrol.html">RefreshControl</a></h3>
+    <p>This component is used inside a <code>ScrollView</code> to add pull to refresh functionality.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/statusbar.html">StatusBar</a></h3>
+    <p>Component to control the app status bar.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/stylesheet.html">StyleSheet</a></h3>
+    <p>Provides an abstraction layer similar to CSS stylesheets.</p>
+  </div>
+  <div class="component">
+    <h3><a href="docs/webview.html">WebView</a></h3>
+    <p>A component that renders web content in a native view.</p>
+  </div>
+</div>
@@ -4,8 +4,8 @@ title: Debugging
 layout: docs
 category: Guides
 permalink: docs/debugging.html
-next: accessibility
-previous: platform-specific-code
+next: performance
+previous: timers
 ---

 ## Enabling Keyboard Shortcuts
@@ -4,7 +4,7 @@ title: Direct Manipulation
 layout: docs
 category: Guides
 permalink: docs/direct-manipulation.html
-next: performance
+next: colors
 previous: javascript-environment
 ---

@@ -123,7 +123,7 @@ If you run this you will immediately see this error: `Touchable child
 must either be native or forward setNativeProps to a native component`.
 This occurs because `MyButton` isn't directly backed by a native view
 whose opacity should be set. You can think about it like this: if you
-define a component with `React.createClass` you would not expect to be
+define a component with `createReactClass` you would not expect to be
 able to set a style prop on it and have that work - you would need to
 pass the style prop down to a child, unless you are wrapping a native
 component. Similarly, we are going to forward `setNativeProps` to a
@@ -267,4 +267,3 @@ Requests focus for the given input or view. The exact behavior triggered will de
 ### blur()

 Removes focus from an input or view. This is the opposite of `focus()`.
-
@@ -4,7 +4,7 @@ title: Gesture Responder System
 layout: docs
 category: Guides
 permalink: docs/gesture-responder-system.html
-next: testing
+next: javascript-environment
 previous: performance
 ---

@@ -4,7 +4,7 @@ title: Handling Text Input
 layout: docs
 category: The Basics
 permalink: docs/handling-text-input.html
-next: using-a-scrollview
+next: handling-touches
 previous: flexbox
 ---

@@ -2,41 +2,97 @@
 id: handling-touches
 title: Handling Touches
 layout: docs
-category: Guides
+category: The Basics
 permalink: docs/handling-touches.html
-next: animations
-previous: more-resources
+next: using-a-scrollview
+previous: handling-text-input
 ---

-Users interact with mobile apps mainly through touch. They can use a combination of gestures, such as tapping on a button, scrolling a list, or zooming on a map.
+Users interact with mobile apps mainly through touch. They can use a combination of gestures, such as tapping on a button, scrolling a list, or zooming on a map. React Native provides components to handle all sorts of common gestures, as well as a comprehensive [gesture responder system](docs/gesture-responder-system.html) to allow for more advanced gesture recognition, but the one component you will most likely be interested in is the basic Button.

-React Native provides components to handle common gestures, such as taps and swipes, as well as a comprehensive [gesture responder system](docs/gesture-responder-system.html) to allow for more advanced gesture recognition.
+## Displaying a basic button

-## Tappable Components
-
-You can use "Touchable" components when you want to capture a tapping gesture. They take a function through the `onPress` props which will be called when the touch begins and ends within the bounds of the component.
-
-Example:
+[Button](docs/button.html) provides a basic button component that is rendered nicely on all platforms. The minimal example to display a button looks like this:

 ```javascript
-class MyButton extends Component {
+<Button
+  onPress={() => { Alert.alert('You tapped the button!')}}
+  title="Press Me"
+/>
+```
+
+This will render a blue label on iOS, and a blue rounded rectangle with white text on Android. Pressing the button will call the "onPress" function, which in this case displays an alert popup. If you like, you can specify a "color" prop to change the color of your button.
+
+![](img/Button.png)
+
+Go ahead and play around with the `Button` component using the example below. You can select which platform your app is previewed in by clicking on the toggle in the bottom right, then click on "Tap to Play" to preview the app.
+
+```SnackPlayer?name=Button%20Basics
+import React, { Component } from 'react';
+import { Alert, AppRegistry, Button, StyleSheet, View } from 'react-native';
+
+export default class ButtonBasics extends Component {
  _onPressButton() {
-    console.log("You tapped the button!");
+    Alert.alert('You tapped the button!')
  }

  render() {
    return (
-      <TouchableHighlight onPress={this._onPressButton}>
-        <Text>Button</Text>
-      </TouchableHighlight>
+      <View style={styles.container}>
+        <View style={styles.buttonContainer}>
+          <Button
+            onPress={this._onPressButton}
+            title="Press Me"
+          />
+        </View>
+        <View style={styles.buttonContainer}>
+          <Button
+            onPress={this._onPressButton}
+            title="Press Me"
+            color="#841584"
+          />
+        </View>
+        <View style={styles.alternativeLayoutButtonContainer}>
+          <Button
+            onPress={this._onPressButton}
+            title="This looks great!"
+          />
+          <Button
+            onPress={this._onPressButton}
+            title="OK!"
+            color="#841584"
+          />
+        </View>
+      </View>
    );
  }
 }
+
+const styles = StyleSheet.create({
+  container: {
+   flex: 1,
+   justifyContent: 'center',
+  },
+  buttonContainer: {
+    margin: 20
+  },
+  alternativeLayoutButtonContainer: {
+    margin: 20,
+    flexDirection: 'row',
+    justifyContent: 'space-between'
+  }
+})
+
+// skip this line if using Create React Native App
+AppRegistry.registerComponent('AwesomeProject', () => ButtonBasics);
 ```

-Tappable components should provide feedback that show the user what is handling their touch, and what will happen when they lift their finger. The user should also be able to cancel a tap by dragging their finger away.

-Which component you use will depend on what kind of feedback you want to provide:
+## Touchables
+
+If the basic button doesn't look right for your app, you can build your own button using any of the "Touchable" components provided by React Native. The "Touchable" components provide the capability to capture tapping gestures, and can display feedback when a gesture is recognized. These components do not provide any default styling, however, so you will need to do a bit of work to get them looking nicely in your app.
+
+Which "Touchable" component you use will depend on what kind of feedback you want to provide:

 - Generally, you can use [**TouchableHighlight**](docs/touchablehighlight.html) anywhere you would use a button or link on web. The view's background will be darkened when the user presses down on the button.

@@ -46,22 +102,82 @@ Which component you use will depend on what kind of feedback you want to provide

 - If you need to handle a tap gesture but you don't want any feedback to be displayed, use [**TouchableWithoutFeedback**](docs/touchablewithoutfeedback.html).

-### Long presses
+In some cases, you may want to detect when a user presses and holds a view for a set amount of time. These long presses can be handled by passing a function to the `onLongPress` props of any of the "Touchable" components.

-In some cases, you may want to detect when a user presses and holds a view for a set amount of time. These long presses can be handled by passing a function to the `onLongPress` props of any of the touchable components listed above.
+Let's see all of these in action:

-## Scrolling lists and swiping views
+```SnackPlayer?platform=android&name=Touchables
+import React, { Component } from 'react';
+import { Alert, AppRegistry, Platform, StyleSheet, Text, TouchableHighlight, TouchableOpacity, TouchableNativeFeedback, TouchableWithoutFeedback, View } from 'react-native';

-A common pattern to many mobile apps is the scrollable list of items. Users interact with these using panning or swiping gestures. The [ScrollView](docs/using-a-scrollview.html) component displays a list of items that can be scrolled using these gestures.
+export default class Touchables extends Component {
+  _onPressButton() {
+    Alert.alert('You tapped the button!')
+  }

-ScrollViews can scroll vertically or horizontally, and can be configured to allow paging through views using swiping gestures by using the `pagingEnabled` props. Swiping horizontally between views can also be implemented on Android using the [ViewPagerAndroid](docs/viewpagerandroid.html) component.
+  _onLongPressButton() {
+    Alert.alert('You long-pressed the button!')
+  }

-A [FlatList](docs/using-a-listview.html) is a special kind of ScrollView that is best suited for displaying long vertical lists of items. If you want to display section headers and footers, similar to `UITableView`s on iOS, then [SectionList](docs/using-a-listview.html) is the way to go.

-### Pinch-to-zoom
+  render() {
+    return (
+      <View style={styles.container}>
+        <TouchableHighlight onPress={this._onPressButton} underlayColor="white">
+          <View style={styles.button}>
+            <Text style={styles.buttonText}>TouchableHighlight</Text>
+          </View>
+        </TouchableHighlight>
+        <TouchableOpacity onPress={this._onPressButton}>
+          <View style={styles.button}>
+            <Text style={styles.buttonText}>TouchableOpacity</Text>
+          </View>
+        </TouchableOpacity>
+        <TouchableNativeFeedback
+            onPress={this._onPressButton}
+            background={Platform.OS === 'android' ? TouchableNativeFeedback.SelectableBackground() : ''}>
+          <View style={styles.button}>
+            <Text style={styles.buttonText}>TouchableNativeFeedback</Text>
+          </View>
+        </TouchableNativeFeedback>
+        <TouchableWithoutFeedback
+            onPress={this._onPressButton}
+            >
+          <View style={styles.button}>
+            <Text style={styles.buttonText}>TouchableWithoutFeedback</Text>
+          </View>
+        </TouchableWithoutFeedback>
+        <TouchableHighlight onPress={this._onPressButton} onLongPress={this._onLongPressButton} underlayColor="white">
+          <View style={styles.button}>
+            <Text style={styles.buttonText}>Touchable with Long Press</Text>
+          </View>
+        </TouchableHighlight>
+      </View>
+    );
+  }
+}

-A ScrollView with a single item can be used to allow the user to zoom content. Set up the `maximumZoomScale` and `minimumZoomScale` props and your user will be able to use pinch and expand gestures to zoom in and out.
+const styles = StyleSheet.create({
+  container: {
+    paddingTop: 60,
+    alignItems: 'center'
+  },
+  button: {
+    marginBottom: 30,
+    width: 260,
+    alignItems: 'center',
+    backgroundColor: '#2196F3'
+  },
+  buttonText: {
+    padding: 20,
+    color: 'white'
+  }
+})

-## Handling additional gestures
+// skip this line if using Create React Native App
+AppRegistry.registerComponent('AwesomeProject', () => Touchables);
+```

-If you want to allow a user to drag a view around the screen, or you want to implement your own custom pan/drag gesture, take a look at the [PanResponder](docs/panresponder.html) API or the [gesture responder system docs](docs/gesture-responder-system.html).
+## Scrolling lists, swiping pages, and pinch-to-zoom
+
+Another gesture commonly used in mobile apps is the swipe or pan. This gesture allows the user to scroll through a list of items, or swipe through pages of content. In order to handle these and other gestures, we'll learn [how to use a ScrollView](docs/using-a-scrollview.html) next.
@@ -4,7 +4,7 @@ title: Images
 layout: docs
 category: Guides
 permalink: docs/images.html
-next:  colors
+next:  animations
 previous: navigation
 ---

@@ -96,9 +96,9 @@ Many of the images you will display in your app will not be available at compile
 ```

 ### Network Requests for Images
-  
+
  If you would like to set such things as the HTTP-Verb, Headers or a Body along with the image request, you may do this by defining these properties on the source object:
-  
+
  ```javascript
  <Image source={{
      uri: 'https://facebook.github.io/react/img/logo_og.png',
@@ -6,7 +6,7 @@ category: Guides
 permalink: docs/integration-with-existing-apps.html
 banner: ejected
 next: running-on-device
-previous: testing
+previous: colors
 ---

 <style>
@@ -5,7 +5,7 @@ layout: docs
 category: Guides
 permalink: docs/javascript-environment.html
 next: direct-manipulation
-previous: timers
+previous: gesture-responder-system
 ---

 ## JavaScript Runtime
@@ -4,8 +4,8 @@ title: More Resources
 layout: docs
 category: The Basics
 permalink: docs/more-resources.html
-next: handling-touches
-previous: networking
+next: components
+previous: network
 ---

 If you just read through this website, you should be able to build a pretty cool React Native app. But React Native isn't just a product made by one company - it's a community of thousands of developers. So if you're interested in React Native, here's some related stuff you might want to check out.
@@ -16,7 +16,7 @@ If you're using React Native, you probably already know about [React](https://fa

 One common question is how to handle the "state" of your React Native application. The most popular library for this is [Redux](http://redux.js.org/). Don't be afraid of how often Redux uses the word "reducer" - it's a pretty simple library, and there's also a nice [series of videos](https://egghead.io/courses/getting-started-with-redux) explaining it.

-If you're looking for a library that does a specific thing, check out [Awesome React Native](https://github.com/jondot/awesome-react-native), a curated list of components that also has demos, articles, and other stuff.
+If you're looking for a library that does a specific thing, check out [Awesome React Native](http://www.awesome-react-native.com/), a curated list of components that also has demos, articles, and other stuff.

 ## Example Apps

@@ -34,8 +34,6 @@ The folks who built the app for Facebook's F8 conference in 2016 also [open-sour

 [Expo](https://docs.expo.io) is a development environment plus application that focuses on letting you build React Native apps in the Expo development environment, without ever touching Xcode or Android Studio. If you wish React Native was even more JavaScripty and webby, check out Expo.

-[Deco](https://www.decoide.org) is an all-in-one development environment specifically designed for React Native. It can automatically set up a new project, search for open source components, and insert them. You can also tweak your app graphically in real time. Check it out if you use macOS.
-
 ## Where React Native People Hang Out

 The [React Native Community](https://www.facebook.com/groups/react.native.community) Facebook group has thousands of developers, and it's pretty active. Come there to show off your project, or ask how other people solved similar problems.
@@ -46,4 +44,4 @@ The [React Twitter account](https://twitter.com/reactjs) covers both React and R

 There are a lot of [React Native Meetups](http://www.meetup.com/topics/react-native/) that happen around the world. Often there is React Native content in React meetups as well.

-Sometimes we have React conferences. We posted the [videos from React.js Conf 2016](https://www.youtube.com/playlist?list=PLb0IAmt7-GS0M8Q95RIc2lOM6nc77q1IY), and we'll probably have more conferences in the future, too. Stay tuned.
+Sometimes we have React conferences. We posted the [videos from React.js Conf 2017](https://www.youtube.com/playlist?list=PLb0IAmt7-GS3fZ46IGFirdqKTIxlws7e0) and [React.js Conf 2016](https://www.youtube.com/playlist?list=PLb0IAmt7-GS0M8Q95RIc2lOM6nc77q1IY), and we'll probably have more conferences in the future, too. Stay tuned. You can also find a list of dedicated React Native conferences [here](http://www.awesome-react-native.com/#conferences).
@@ -107,7 +107,7 @@ The very final step is to create the JavaScript module that defines the interfac
 ```js
 // ImageView.js

-import { PropTypes } from 'react';
+import PropTypes from 'prop-types';
 import { requireNativeComponent, View } from 'react-native';

 var iface = {
@@ -168,7 +168,7 @@ MyCustomView.propTypes = {
  /**
   * Callback that is called continuously when the user is dragging the map.
   */
-  onChangeMessage: React.PropTypes.func,
+  onChangeMessage: PropTypes.func,
  ...
 };

@@ -84,6 +84,7 @@ This isn't very well documented though - in order to know what properties are av

 ```javascript
 // MapView.js
+import PropTypes from 'prop-types';
 import React from 'react';
 import { requireNativeComponent } from 'react-native';

@@ -101,7 +102,7 @@ MapView.propTypes = {
   * angle is ignored and the map is always displayed as if the user
   * is looking straight down onto it.
   */
-  pitchEnabled: React.PropTypes.bool,
+  pitchEnabled: PropTypes.bool,
 };

 var RNTMap = requireNativeComponent('RNTMap', MapView);
@@ -177,7 +178,7 @@ MapView.propTypes = {
   * angle is ignored and the map is always displayed as if the user
   * is looking straight down onto it.
   */
-  pitchEnabled: React.PropTypes.bool,
+  pitchEnabled: PropTypes.bool,

  /**
   * The region to be displayed by the map.
@@ -185,19 +186,19 @@ MapView.propTypes = {
   * The region is defined by the center coordinates and the span of
   * coordinates to display.
   */
-  region: React.PropTypes.shape({
+  region: PropTypes.shape({
    /**
     * Coordinates for the center of the map.
     */
-    latitude: React.PropTypes.number.isRequired,
-    longitude: React.PropTypes.number.isRequired,
+    latitude: PropTypes.number.isRequired,
+    longitude: PropTypes.number.isRequired,

    /**
     * Distance between the minimum and the maximum latitude/longitude
     * to be displayed.
     */
-    latitudeDelta: React.PropTypes.number.isRequired,
-    longitudeDelta: React.PropTypes.number.isRequired,
+    latitudeDelta: PropTypes.number.isRequired,
+    longitudeDelta: PropTypes.number.isRequired,
  }),
 };

@@ -323,7 +324,7 @@ MapView.propTypes = {
  /**
   * Callback that is called continuously when the user is dragging the map.
   */
-  onChange: React.PropTypes.func,
+  onChange: PropTypes.func,
  ...
 };

@@ -6,7 +6,7 @@ category: Guides (Android)
 permalink: docs/native-modules-android.html
 banner: ejected
 next: native-components-android
-previous: communication-ios
+previous: building-for-apple-tv
 ---

 Sometimes an app needs access to a platform API that React Native doesn't have a corresponding module for yet. Maybe you want to reuse some existing Java code without having to reimplement it in JavaScript, or write some high performance, multi-threaded code such as for image processing, a database, or any number of advanced extensions.
@@ -1,14 +1,17 @@
 ---
 id: navigation
-title: Navigation
+title: Navigating Between Screens
 layout: docs
 category: Guides
 permalink: docs/navigation.html
 next: images
-previous: animations
+previous: platform-specific-code
 ---

-This guide covers the various navigation components available in React Native. If you are just getting started with navigation, you will probably want to use [React Navigation](docs/navigation.html#react-navigation). React Navigation provides an easy to use navigation solution, with the ability to present common stack navigation and tabbed navigation patterns on both iOS and Android. As this is a JavaScript implementation, it provides the greatest amount of configurability as well as flexibility when integrating with state management libraries such as [redux](https://reactnavigation.org/docs/guides/redux).
+Mobile apps are rarely made up of a single screen. Managing the presentation of, and transition between, multiple screens is typically handled by what is known as a navigator.
+
+This guide covers the various navigation components available in React Native.
+If you are just getting started with navigation, you will probably want to use [React Navigation](docs/navigation.html#react-navigation). React Navigation provides an easy to use navigation solution, with the ability to present common stack navigation and tabbed navigation patterns on both iOS and Android. As this is a JavaScript implementation, it provides the greatest amount of configurability as well as flexibility when integrating with state management libraries such as [redux](https://reactnavigation.org/docs/guides/redux).

 If you're only targeting iOS, you may want to also check out [NavigatorIOS](docs/navigation.html#navigatorios) as a way of providing a native look and feel with minimal configuration, as it provides a wrapper around the native `UINavigationController` class. This component will not work on Android, however.

@@ -160,7 +160,6 @@ var ws = new WebSocket('ws://host.com/path');

 ws.onopen = () => {
  // connection opened
-
  ws.send('something'); // send a message
 };

@@ -180,6 +179,6 @@ ws.onclose = (e) => {
 };
 ```

-## High Five! 
+## High Five!

 If you've gotten here by reading linearly through the tutorial, then you are a pretty impressive human being. Congratulations. Next, you might want to check out [all the cool stuff the community does with React Native](docs/more-resources.html).
@@ -5,7 +5,7 @@ layout: docs
 category: Guides
 permalink: docs/performance.html
 next: gesture-responder-system
-previous: direct-manipulation
+previous: debugging
 ---

 A compelling reason for using React Native instead of WebView-based tools is to achieve 60 frames per second and a native look and feel to your apps.
@@ -4,8 +4,8 @@ title: Platform Specific Code
 layout: docs
 category: Guides
 permalink: docs/platform-specific-code.html
-next: debugging
-previous: colors
+next: navigation
+previous: components
 ---

 When building a cross-platform app, you'll want to re-use as much code as possible. Scenarios may arise where it makes sense for the code to be different, for example you may want to implement separate visual components for iOS and Android.
@@ -72,8 +72,8 @@ On Android, the `Platform` module can also be used to detect the version of the
 ```javascript
 import { Platform } from 'react-native';

-if(Platform.Version === 21){
-  console.log('Running on Lollipop!');
+if (Platform.Version === 25) {
+  console.log('Running on Nougat!');
 }
 ```

@@ -80,6 +80,8 @@ previous: integration-with-existing-apps

 It's always a good idea to test your app on an actual device before releasing it to your users. This document will guide you through the necessary steps to run your React Native app on a device and to get it ready for production.

+If you used Create React Native App to set up your project, you can preview your app on a device by scanning the QR code with the Expo app. In order to build and run your app on a device, you will need to eject and install the native code dependencies from the [Getting Started guide](docs/getting-started.html).
+
 <div class="toggler">

  <ul role="tablist" >
@@ -1,17 +1,15 @@
 ---
 id: testing
-title: Testing
+title: Running Tests and Contributing
 layout: docs
 category: Guides
 permalink: docs/testing.html
 next: understanding-cli
-previous: gesture-responder-system
+previous: upgrading
 ---

 This document is about running tests on React Native itself. If you're interested in testing a React Native app, check out the [React Native Tutorial](http://facebook.github.io/jest/docs/tutorial-react-native.html) on the Jest website.

-## Running Tests and Contributing
-
 The React Native repo has several tests you can run to verify you haven't caused a regression with your PR.  These tests are run with the [Travis](https://travis-ci.org/facebook/react-native/builds) and [CircleCI](https://circleci.com/gh/facebook/react-native) continuous integration systems, which will automatically annotate pull requests with the test results.

 Whenever you are fixing a bug or adding new functionality to React Native, you should add a test that covers it. Depending on the change you're making, there are different types of tests that may be appropriate.
@@ -4,7 +4,7 @@ title: Timers
 layout: docs
 category: Guides
 permalink: docs/timers.html
-next: javascript-environment
+next: debugging
 previous: accessibility
 ---

@@ -64,7 +64,7 @@ This library does not ship with React Native - in order to use it on your projec
 ```javascript
 import TimerMixin from 'react-timer-mixin';

-var Component = React.createClass({
+var Component = createReactClass({
  mixins: [TimerMixin],
  componentDidMount: function() {
    this.setTimeout(
@@ -33,23 +33,29 @@ export default class HelloWorldApp extends Component {
 AppRegistry.registerComponent('AwesomeProject', () => HelloWorldApp);
 ```

-If you are feeling curious, you can play around with sample code directly in the web simulators. You can also paste it into your `index.ios.js` or `index.android.js` file to create a real app on your local machine.
+If you are feeling curious, you can play around with sample code directly in the web simulators. You can also paste it into your `App.js`, `index.ios.js`, or `index.android.js` file to create a real app on your local machine.

 ## What's going on here?

-Some of the things in here might not look like JavaScript to you. Don't panic. This is the future.
+Some of the things in here might not look like JavaScript to you. Don't panic. _This is the future_.

-First of all, ES2015 (also known as ES6) is a set of improvements to JavaScript that is now part of the official standard, but not yet supported by all browsers, so often it isn't used yet in web development. React Native ships with ES2015 support, so you can use this stuff without worrying about compatibility. `import`, `from`, `class`, `extends`, and the `() =>` syntax in the example above are all ES2015 features. If you aren't familiar with ES2015, you can probably pick it up just by reading through sample code like this tutorial has. If you want, [this page](https://babeljs.io/docs/learn-es2015/) has a good overview of ES2015 features.
+First of all, ES2015 (also known as ES6) is a set of improvements to JavaScript that is now part of the official standard, but not yet supported by all browsers, so often it isn't used yet in web development. React Native ships with ES2015 support, so you can use this stuff without worrying about compatibility. `import`, `from`, `class`, `extends`, and the `() =>` syntax in the example above are all ES2015 features. If you aren't familiar with ES2015, you can probably pick it up just by reading through sample code like this tutorial has. If you want, [this page](https://babeljs.io/learn-es2015/) has a good overview of ES2015 features.

 The other unusual thing in this code example is `<Text>Hello world!</Text>`. This is JSX - a syntax for embedding XML within JavaScript. Many frameworks use a special templating language which lets you embed code inside markup language. In React, this is reversed. JSX lets you write your markup language inside code. It looks like HTML on the web, except instead of web things like `<div>` or `<span>`, you use React components. In this case, `<Text>`
 is a built-in component that just displays some text.

-## Component and AppRegistry
+## Components

-So this code is defining `HelloWorldApp`, a new `Component`, and it's registering it with the `AppRegistry`. When you're building a React Native app, you'll be making new components a lot. Anything you see on the screen is some sort of component. A component can be pretty simple - the only thing that's required is a `render` function which returns some JSX to render.
+So this code is defining `HelloWorldApp`, a new `Component`. When you're building a React Native app, you'll be making new components a lot. Anything you see on the screen is some sort of component. A component can be pretty simple - the only thing that's required is a `render` function which returns some JSX to render.

-The `AppRegistry` just tells React Native which component is the root one for the whole application. You won't be thinking about `AppRegistry` a lot - there will probably just be one call to `AppRegistry.registerComponent` in your whole app. It's included in these examples so you can paste the whole thing into your `index.ios.js` or `index.android.js` file and get it running. If you have a project from Create React Native App, this is handled for you and it's not necessary to call AppRegistry in your code.
+<div class="banner-crna-ejected">
+  <h3>Projects With Native Code Only</h3>
+  <p>
+    In the particular example above, <code>HelloWorldApp</code> is registered with the <code>AppRegistry</code>. The <code>AppRegistry</code> just tells React Native which component is the root one for the whole application. It's included in these examples so you can paste the whole thing into your <code>index.ios.js</code> or <code>index.android.js</code> file and get it running. If you have a project from Create React Native App, this is handled for you and it's not necessary to call <code>AppRegistry</code> in your code.
+  </p>
+</div>

-## This App Doesn't Do Very Much
+
+## This app doesn't do very much

 Good point. To make components do more interesting things, you need to [learn about Props](docs/props.html).
@@ -5,8 +5,8 @@ layout: docs
 category: Guides
 permalink: docs/understanding-cli.html
 banner: ejected
-next: integration-with-existing-apps
-previous: running-on-device
+next: native-modules-ios
+previous: testing
 ---

 Though you may have installed the `react-native-cli` via npm as a separate module, it is a shell for accessing the CLI embedded
@@ -4,8 +4,8 @@ title: Upgrading to new React Native versions
 layout: docs
 category: Guides
 permalink: docs/upgrading.html
-next: native-modules-ios
-previous: understanding-cli
+next: testing
+previous: running-on-device
 ---

 Upgrading to new versions of React Native will give you access to more APIs, views, developer tools and other goodies. Upgrading requires a small amount of effort, but we try to make it easy for you. The instructions are a bit different depending on whether you used `create-react-native-app` or `react-native init` to create your project.
@@ -58,7 +58,7 @@ const styles = StyleSheet.create({
 AppRegistry.registerComponent('AwesomeProject', () => FlatListBasics);
 ```

-If you want to render a set of data broken into logical sections, maybe with section headers, then a `SectionList` is the way to go.
+If you want to render a set of data broken into logical sections, maybe with section headers, similar to `UITableView`s on iOS, then a [SectionList](docs/sectionlist.html) is the way to go.

 ```SnackPlayer?name=SectionList%20Basics
 import React, { Component } from 'react';
@@ -5,10 +5,10 @@ layout: docs
 category: The Basics
 permalink: docs/using-a-scrollview.html
 next: using-a-listview
-previous: handling-text-input
+previous: handling-touches
 ---

-The [`ScrollView`](docs/scrollview.html) is a generic scrolling container that can host multiple components and views. The scrollable items need not be homogenous, and you can scroll both vertically and horizontally (by setting the `horizontal` property).
+The [ScrollView](docs/scrollview.html) is a generic scrolling container that can host multiple components and views. The scrollable items need not be homogenous, and you can scroll both vertically and horizontally (by setting the `horizontal` property).

 This example creates a vertical `ScrollView` with both images and text mixed together.

@@ -62,4 +62,8 @@ AppRegistry.registerComponent(
  () => IScrolledDownAndWhatHappenedNextShockedMe);
 ```

-`ScrollView` works best to present a small amount of things of a limited size. All the elements and views of a `ScrollView` are rendered, even if they are not currently shown on the screen. If you have a long list of more items that can fit on the screen, you should use a `FlatList` instead. So let's [learn about list views](docs/using-a-listview.html) next.
+ScrollViews can be configured to allow paging through views using swiping gestures by using the `pagingEnabled` props. Swiping horizontally between views can also be implemented on Android using the [ViewPagerAndroid](docs/viewpagerandroid.html) component.
+
+A ScrollView with a single item can be used to allow the user to zoom content. Set up the `maximumZoomScale` and `minimumZoomScale` props and your user will be able to use pinch and expand gestures to zoom in and out.
+
+The ScrollView works best to present a small amount of things of a limited size. All the elements and views of a `ScrollView` are rendered, even if they are not currently shown on the screen. If you have a long list of more items that can fit on the screen, you should use a `FlatList` instead. So let's [learn about list views](docs/using-a-listview.html) next.
@@ -13,17 +13,14 @@
 const babel = require('babel-core');
 const babelRegisterOnly = require('metro-bundler/build/babelRegisterOnly');
 const createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');
-const path = require('path');
+const transformer = require('metro-bundler/build/transformer.js');

 const nodeFiles = RegExp([
  '/local-cli/',
-  '/packager/(?!src/Resolver/polyfills/)',
 ].join('|'));
 const nodeOptions = babelRegisterOnly.config([nodeFiles]);

 babelRegisterOnly([]);
-// has to be required after setting up babelRegisterOnly
-const transformer = require('metro-bundler/build/transformer.js');

 module.exports = {
  process(src/*: string*/, file/*: string*/) {
@@ -49,7 +46,7 @@ module.exports = {

  getCacheKey: createCacheKeyFunction([
    __filename,
-    path.join(__dirname, '../packager/src/transformer.js'),
+    require.resolve('metro-bundler/build/transformer.js'),
    require.resolve('babel-core/package.json'),
  ]),
 };
@@ -10,9 +10,9 @@

 const mockComponent = require.requireActual('./mockComponent');

-require.requireActual('../packager/src/Resolver/polyfills/babelHelpers.js');
-require.requireActual('../packager/src/Resolver/polyfills/Object.es7.js');
-require.requireActual('../packager/src/Resolver/polyfills/error-guard');
+require.requireActual('metro-bundler/build/Resolver/polyfills/babelHelpers.js');
+require.requireActual('metro-bundler/build/Resolver/polyfills/Object.es7.js');
+require.requireActual('metro-bundler/build/Resolver/polyfills/error-guard');

 global.__DEV__ = true;

@@ -1,111 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @flow
- */
-'use strict';
-
-const path = require('path');
-const flatten = require('lodash').flatten;
-const android = require('./android');
-const findAssets = require('./findAssets');
-const ios = require('./ios');
-const windows = require('./windows');
-const wrapCommands = require('./wrapCommands');
-const findPlugins = require('./findPlugins');
-const findSymlinksPaths = require('../util/findSymlinksPaths');
-
-function getProjectPath() {
-  if (__dirname.match(/node_modules[\/\\]react-native[\/\\]local-cli[\/\\]core$/)) {
-    // Packager is running from node_modules.
-    // This is the default case for all projects created using 'react-native init'.
-    return path.resolve(__dirname, '../../../..');
-  } else if (__dirname.match(/Pods[\/\\]React[\/\\]packager$/)) {
-    // React Native was installed using CocoaPods.
-    return path.resolve(__dirname, '../../../..');
-  }
-  return path.resolve(__dirname, '../..');
-}
-
-const getRNPMConfig = (folder) =>
-  // $FlowFixMe non-literal require
-  require(path.join(folder, './package.json')).rnpm || {};
-
-const attachPackage = (command, pkg) => Array.isArray(command)
-  ? command.map(cmd => attachPackage(cmd, pkg))
-  : { ...command, pkg };
-
-const resolveSymlink = (roots) =>
-  roots.concat(
-    findSymlinksPaths(
-      path.join(getProjectPath(), 'node_modules'),
-      roots
-    )
-  );
-
-/**
- * Default configuration for the CLI.
- *
- * If you need to override any of this functions do so by defining the file
- * `rn-cli.config.js` on the root of your project with the functions you need
- * to tweak.
- */
-const config = {
-  getProjectCommands() {
-    const appRoot = process.cwd();
-    const plugins = findPlugins([appRoot])
-      .map(pathToCommands => {
-        const name = pathToCommands.split(path.sep)[0];
-
-        return attachPackage(
-          // $FlowFixMe non-literal require
-          require(path.join(appRoot, 'node_modules', pathToCommands)),
-          // $FlowFixMe non-literal require
-          require(path.join(appRoot, 'node_modules', name, 'package.json'))
-        );
-      });
-
-    return flatten(plugins);
-  },
-  getProjectConfig() {
-    const folder = process.cwd();
-    const rnpm = getRNPMConfig(folder);
-
-    return Object.assign({}, rnpm, {
-      ios: ios.projectConfig(folder, rnpm.ios || {}),
-      android: android.projectConfig(folder, rnpm.android || {}),
-      windows: windows.projectConfig(folder, rnpm.windows || {}),
-      assets: findAssets(folder, rnpm.assets),
-    });
-  },
-  getDependencyConfig(packageName: string) {
-    const folder = path.join(process.cwd(), 'node_modules', packageName);
-    const rnpm = getRNPMConfig(
-      path.join(process.cwd(), 'node_modules', packageName)
-    );
-
-    return Object.assign({}, rnpm, {
-      ios: ios.dependencyConfig(folder, rnpm.ios || {}),
-      android: android.dependencyConfig(folder, rnpm.android || {}),
-      windows: windows.dependencyConfig(folder, rnpm.windows || {}),
-      assets: findAssets(folder, rnpm.assets),
-      commands: wrapCommands(rnpm.commands),
-      params: rnpm.params || [],
-    });
-  },
-  getProjectRoots() {
-    const root = process.env.REACT_NATIVE_APP_ROOT;
-    if (root) {
-      return resolveSymlink([path.resolve(root)]);
-    }
-
-    return resolveSymlink([getProjectPath()]);
-  },
-};
-
-module.exports = config;
@@ -10,9 +10,15 @@
 */
 'use strict';

+const android = require('./android');
 const Config = require('../util/Config');
+const findPlugins = require('./findPlugins');
+const findAssets = require('./findAssets');
+const ios = require('./ios');
+const windows = require('./windows');
+const wrapCommands = require('./wrapCommands');

-const defaultConfig = require('./default.config');
+const flatten = require('lodash').flatten;
 const minimist = require('minimist');
 const path = require('path');

@@ -35,6 +41,61 @@ export type RNConfig = {
  getDependencyConfig(pkgName: string): Object,
 };

+const getRNPMConfig = (folder) =>
+  // $FlowFixMe non-literal require
+  require(path.join(folder, './package.json')).rnpm || {};
+
+const attachPackage = (command, pkg) => Array.isArray(command)
+  ? command.map(cmd => attachPackage(cmd, pkg))
+  : { ...command, pkg };
+
+const defaultRNConfig = {
+  getProjectCommands(): Array<CommandT> {
+    const appRoot = process.cwd();
+    const plugins = findPlugins([appRoot])
+      .map(pathToCommands => {
+        const name = pathToCommands.split(path.sep)[0];
+
+        return attachPackage(
+          // $FlowFixMe non-literal require
+          require(path.join(appRoot, 'node_modules', pathToCommands)),
+          // $FlowFixMe non-literal require
+          require(path.join(appRoot, 'node_modules', name, 'package.json'))
+        );
+      });
+
+    return flatten(plugins);
+  },
+
+  getProjectConfig(): Object {
+    const folder = process.cwd();
+    const rnpm = getRNPMConfig(folder);
+
+    return Object.assign({}, rnpm, {
+      ios: ios.projectConfig(folder, rnpm.ios || {}),
+      android: android.projectConfig(folder, rnpm.android || {}),
+      windows: windows.projectConfig(folder, rnpm.windows || {}),
+      assets: findAssets(folder, rnpm.assets),
+    });
+  },
+
+  getDependencyConfig(packageName: string) {
+    const folder = path.join(process.cwd(), 'node_modules', packageName);
+    const rnpm = getRNPMConfig(
+      path.join(process.cwd(), 'node_modules', packageName)
+    );
+
+    return Object.assign({}, rnpm, {
+      ios: ios.dependencyConfig(folder, rnpm.ios || {}),
+      android: android.dependencyConfig(folder, rnpm.android || {}),
+      windows: windows.dependencyConfig(folder, rnpm.windows || {}),
+      assets: findAssets(folder, rnpm.assets),
+      commands: wrapCommands(rnpm.commands),
+      params: rnpm.params || [],
+    });
+  },
+};
+
 /**
 * Loads the CLI configuration
 */
@@ -44,7 +105,7 @@ function getCliConfig(): RNConfig {
    ? Config.loadFile(path.resolve(__dirname, cliArgs.config))
    : Config.findOptional(__dirname);

-  return {...defaultConfig, ...config};
+  return {...defaultRNConfig, ...config};
 }

 module.exports = getCliConfig();
@@ -1,3 +1,12 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
 'use strict';

 jest.autoMockOff();
@@ -16,11 +25,7 @@ const writePlist = require('../../ios/writePlist');
 const projectPath = path.join(__dirname, '../../__fixtures__/project.pbxproj');
 const infoPlistPath = path.join(__dirname, '../../__fixtures__/Info.plist');

-fs.__setMockFilesystem({
-  'Basic': {
-    'project.pbxproj': readFileSync(projectPath).toString(),
-  }
-});
+fs.readFileSync = jest.fn(() => readFileSync(projectPath).toString());

 const project = xcode.project('/Basic/project.pbxproj');

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mike Grabowski	3a9d4963a3	[0.46.1] Bump version numbers	2017-07-07 18:22:18 +02:00
Tim YungandMike Grabowski	12f945f20c	RN: Expose `unstable_batchedUpdates` on react-native Reviewed By: spicyj Differential Revision: D5284484 fbshipit-source-id: bdc0a1c3babfa1a5c3343f084bdd5d4ff4f2d46a	2017-07-07 18:19:05 +02:00
Parashuram NandMike Grabowski	b5674f22c1	Updating the usage of inquirer API Summary: Inquirer was changed to a later version in https://github.com/facebook/react-native/commit/bada25d158e070fd683a10b8ff9cdcb8d2498b14. However, the API also needed to be updated to use a promise based version. Closes https://github.com/facebook/react-native/pull/14848 Differential Revision: D5375663 Pulled By: javache fbshipit-source-id: 635798a43905301c65db5f63b9cfba1c16964870	2017-07-07 18:18:08 +02:00
Mike Grabowski	a42ebc18ce	[0.46.0] Bump version numbers	2017-07-05 16:50:01 +02:00
Mike Grabowski	2679473a87	Bump react-docgen version to support create-react-class	2017-07-05 16:48:04 +02:00
Seth FitzsimmonsandMike Grabowski	084a18de64	Replace React.createClass with create-react-class	2017-07-05 15:34:50 +02:00
Marc HorowitzandMike Grabowski	2d742e7d5d	Remove unused folly/File.{h,cpp} from OSS React Xcode project Summary: This fixes https://github.com/facebook/react-native/issues/14328 Reviewed By: javache Differential Revision: D5254711 fbshipit-source-id: e9b81e537cca9d6648f44ed61acd127015d2e1f8	2017-07-04 10:25:59 +02:00
Seth FitzsimmonsandMike Grabowski	dee6aab88a	react@16 did away with PropTypes; require prop-types instead Summary: react@16 (a peerDependency) did away with the PropTypes export in favor of the prop-types module. This updates all of the remaining references to `React.PropTypes`. Closes https://github.com/facebook/react-native/pull/14641 Differential Revision: D5287167 Pulled By: javache fbshipit-source-id: a917e29aa0e5470260568995dfe97f5528ec265e	2017-07-04 10:23:19 +02:00
Andrew ImmandMike Grabowski	415fe90ff3	Update remaining PropTypes references Reviewed By: bvaughn Differential Revision: D5231309 fbshipit-source-id: d54ee4f73dae63124f4462c138383447829a2551	2017-07-04 10:23:14 +02:00
Aaron ChiuandMike Grabowski	1ad887eea6	fix dev reloading Reviewed By: achen1 Differential Revision: D5187906 fbshipit-source-id: 8c35ee0747bdc0f6748ecdca54e223eafe37e105	2017-07-04 10:22:44 +02:00
Janic DuplessisandJames Ide	08f41bcbf4	Native Animated - Call x.__makeNative before super.__makeNative Summary: This fixes a `Attempt to get native tag from node not marked as "native"` error that happens because some animated values are not converted to native before calling the base class `__makeNative`. This makes sure we call the `__makeNative` method of input nodes before calling `super.__makeNative`. Test plan Tested that it fixes the issue I encountered and that native animations still work with properly in RNTester. Closes https://github.com/facebook/react-native/pull/14435 Differential Revision: D5236092 Pulled By: javache fbshipit-source-id: cb02616aec05f220c65b58831ca4334b58d0383b	2017-06-14 12:53:09 -07:00
Hector Ramos	eb7d3bae26	[0.46.0-rc.2] Bump version numbers	2017-06-09 13:14:16 -07:00
Adam MiskiewiczandHector Ramos	43c06e263b	Fix broken default getProjectRoots Summary: In <= 0.44, the default implementation of getProjectRoots() came from `local-cli/core/default.config.js`. With changes happening in the CLI and the packager over the course of the last two months, various pieces of this logic (specifically `local-cli/utils/Config.js`) were rewritten, and though default.config.js was still being imported and used in `local-cli/core/index.js`, the default `getProjectRoots()` was being overriden by the defaults specified in `local-cli/utils/Config.js`. This PR moves the logic from default.config.js into Config.js and index.js, as appropriate. Specifically: - The `getProjectCommands()`, `getProjectConfig()`, and `getDependencyConfig()` methods, which have traditionally not been part of the rn-cli.config.js spec, are now defined in `local-cli/core/index.js`. - The `getProjectRoots()` method, which contained logic for properly resolving the _actual_ project root as well as resolving symlinks within that root, has been moved to `local-cli/utils/Config.js`, to match the fact that other default rn-cli.config.js definitions live there. Closes https://github.com/facebook/react-native/pull/14412 Differential Revision: D5216887 Pulled By: hramos fbshipit-source-id: 7a3840ecf0ad8ea3f6d7bbd3d54e4f02950c6a32	2017-06-09 13:13:21 -07:00
Hector Ramos	522f4a5c6a	Restore proper ordering of docs in the sidebar Summary: Quickfix: The ordering here was lost when a previous PR was merged. Closes https://github.com/facebook/react-native/pull/14378 Differential Revision: D5203833 Pulled By: hramos fbshipit-source-id: 9282a5a5c9aa81ae5e1f5fe6692192ac1db57c08	2017-06-07 15:34:59 -07:00
Hector Ramos	c62b9f645e	New Handling Touches Tutorial Summary: Finally, a place where `Button` is properly introduced. This is based on the old Handling Touches guide, which has been simplified (with some content moved over to the scroll views tutorial). I've also updated the ordering of the guides into something that makes more sense to someone just getting started with React Native. Closes https://github.com/facebook/react-native/pull/14371 Differential Revision: D5201127 Pulled By: hramos fbshipit-source-id: 819192e2db9febb8a315f51693dae557752b6002	2017-06-07 12:18:38 -07:00
Hector Ramos	a3ea9377c1	Add Components and APIs Overview Guide Summary: Essential components such as View, Text, and Button are easily overlooked amongst the long list of components and APIs due to a lack of categorization. The basic components are already introduced as part of the tutorial, but they may be missed by people who prefer scanning over the docs. Built website on localhost. Preview of the website as seem on Chrome on macOS: ![screencapture-localhost-8079-react-native-docs-components-and-apis-html-1496357491473](https://cloud.githubusercontent.com/assets/165856/26704237/902d0986-46e2-11e7-9624-17db692ae11e.png) Preview as seen on an iPhone Plus (via Chrome console): ![screen shot 2017-06-01 at 3 57 00 pm](https://cloud.githubusercontent.com/assets/165856/26704309/05c8ff7e-46e3-11e7-99ff-b7402f5265d4.png) Closes https://github.com/facebook/react-native/pull/14265 Differential Revision: D5192597 Pulled By: hramos fbshipit-source-id: f281a14230468458f3da674a82df263fb9f064f4	2017-06-07 12:18:31 -07:00
James Ide	a98a51325e	[0.46.0-rc.1] Bump version numbers	2017-06-07 12:11:26 -07:00
Christoph PojerandJames Ide	335d56ec55	Remove react-native/packager folder. Summary: This folder is not necessary any longer. All the code now lives in https://github.com/facebook/metro-bundler Reviewed By: davidaurelio, jeanlauliac Differential Revision: D5199196 fbshipit-source-id: 35bf0f10a9163f53426db9a76f8f853dceb69167	2017-06-07 12:10:08 -07:00
Mike Grabowski	ee7e4ab1a3	[0.46.0-rc.0] Bump version numbers	2017-06-07 13:37:25 +02:00