From 8a32d0af4d99ce47f7fa3667b4fa9e125dba956f Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Wed, 21 Feb 2018 08:57:30 -0500
Subject: [PATCH 1/3] fix(LICENSE): derive Libraries folder from MIT-licensed
 code

react-native recently moved to the MIT license. In order to remove the BSD+Patents licensing from react-native-windows, we have to re-derive the source code we copied from react-native from the latest source code. This change re-derives the source code in the Libraries folder.
---
 Libraries/Alert/Alert.windows.js              |  81 +--
 .../AccessibilityInfo.windows.js              |  11 +-
 .../ActivityIndicator.windows.js              |  61 +-
 .../AppleTV/TVEventHandler.windows.js         |  29 +-
 Libraries/Components/Button.windows.js        |  47 +-
 .../Components/CheckBox/CheckBox.windows.js   |   6 +-
 .../DatePicker/DatePickerIOS.windows.js       |   6 +-
 .../DatePickerAndroid.windows.js              |   8 +-
 .../DrawerLayoutAndroid.windows.js            |   6 +-
 .../FlipViewWindows.android.js                |   8 +-
 .../FlipViewWindows/FlipViewWindows.ios.js    |   8 +-
 .../FlipViewWindows.windows.js                |   5 +-
 .../FocusableWindows.android.js               |   7 +-
 .../FocusableWindows/FocusableWindows.ios.js  |   7 +-
 .../FocusableWindows.windows.js               |   9 +-
 .../MaskedViewIOS/MaskedViewIOS.windows.js    |   6 +-
 .../Navigation/NavigatorIOS.windows.js        |   6 +-
 .../PasswordBoxWindows.windows.js             | 270 ++++----
 Libraries/Components/Picker/Picker.windows.js |  53 +-
 .../Picker/PickerAndroid.windows.js           |   6 +-
 .../Components/Picker/PickerIOS.windows.js    |   8 +-
 Libraries/Components/Picker/PickerWindows.js  |  97 +--
 .../ProgressBarAndroid.windows.js             |   6 +-
 .../ProgressBarWindows.android.js             |   8 +-
 .../ProgressBarWindows.ios.js                 |   8 +-
 .../ProgressBarWindows.windows.js             |   4 +-
 .../ProgressRingWindows.android.js            |   8 +-
 .../ProgressRingWindows.ios.js                |   8 +-
 .../ProgressRingWindows.windows.js            |   4 +-
 .../ProgressViewIOS.windows.js                |   6 +-
 .../SafeAreaView/SafeAreaView.windows.js      |   6 +-
 .../ScrollView/ScrollView.windows.js          | 202 ++++--
 .../SegmentedControlIOS.windows.js            |   6 +-
 .../SplitViewWindows.android.js               |  10 +-
 .../SplitViewWindows/SplitViewWindows.ios.js  |  10 +-
 .../SplitViewWindows.windows.js               |  74 ++-
 .../Components/StatusBar/StatusBar.windows.js | 213 +++++--
 .../StatusBar/StatusBarIOS.windows.js         |  10 +-
 .../Components/TabBarIOS/TabBarIOS.windows.js |  20 +-
 .../TabBarIOS/TabBarItemIOS.windows.js        |   6 +-
 .../Components/TextInput/TextInput.windows.js | 219 ++++---
 .../TextInput/TextInputState.windows.js       |  13 +-
 .../TimePickerAndroid.windows.js              |   8 +-
 .../ToastAndroid/ToastAndroid.windows.js      |   6 +-
 .../ToolbarAndroid/ToolbarAndroid.windows.js  |   6 +-
 .../TouchableNativeFeedback.windows.js        |   6 +-
 .../View/PlatformViewPropTypes.windows.js     |  47 ++
 .../Components/View/ViewPropTypes.windows.js  | 509 ----------------
 .../ViewPager/ViewPagerAndroid.windows.js     |   6 +-
 .../Components/WebView/WebView.windows.js     | 139 ++++-
 Libraries/Core/ReactNativeVersion.windows.js  |   6 +-
 .../NavigationHeaderBackButton.windows.js     |  69 ---
 .../assets/back-icon@1.5x.windows.png         | Bin 134 -> 0 bytes
 .../assets/back-icon@1x.windows.png           | Bin 100 -> 0 bytes
 .../assets/back-icon@2x.windows.png           | Bin 134 -> 0 bytes
 .../assets/back-icon@3x.windows.png           | Bin 167 -> 0 bytes
 .../assets/back-icon@4x.windows.png           | Bin 207 -> 0 bytes
 ...orBreadcrumbNavigationBarStyles.windows.js | 227 -------
 .../NavigatorNavigationBarStylesWindows.js    | 173 ------
 .../SwipeableRow/SwipeableRow.windows.js      |  37 +-
 Libraries/Image/Image.windows.js              | 228 +++----
 Libraries/Network/NetInfo.windows.js          | 237 ++++---
 Libraries/Network/RCTNetworking.windows.js    |   8 +-
 Libraries/RCTTest/SnapshotViewIOS.windows.js  |   6 +-
 Libraries/Settings/Settings.windows.js        |  13 +-
 Libraries/Text/Text.windows.js                | 576 ------------------
 Libraries/Utilities/BackHandler.windows.js    |  66 +-
 Libraries/Utilities/HMRLoadingView.windows.js |  13 +-
 Libraries/Utilities/Platform.windows.js       |  13 +-
 Libraries/Vibration/Vibration.windows.js      |  43 +-
 Libraries/Vibration/VibrationIOS.windows.js   |  40 +-
 Libraries/WebSocket/WebSocket.windows.js      | 132 +++-
 .../react-native-windows-implementation.js    |  21 +
 .../react-native-windows.js                   |  24 -
 package.json                                  |   2 +-
 75 files changed, 1573 insertions(+), 2674 deletions(-)
 create mode 100644 Libraries/Components/View/PlatformViewPropTypes.windows.js
 delete mode 100644 Libraries/Components/View/ViewPropTypes.windows.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.windows.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.windows.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.windows.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.windows.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.windows.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.windows.png
 delete mode 100644 Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.windows.js
 delete mode 100644 Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesWindows.js
 delete mode 100644 Libraries/Text/Text.windows.js
 create mode 100644 Libraries/react-native-windows/react-native-windows-implementation.js
 delete mode 100644 Libraries/react-native-windows/react-native-windows.js

diff --git a/Libraries/Alert/Alert.windows.js b/Libraries/Alert/Alert.windows.js
index 3b0e59accc2..d7faddb60cb 100644
--- a/Libraries/Alert/Alert.windows.js
+++ b/Libraries/Alert/Alert.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule Alert
  * @flow
  */
@@ -17,7 +20,7 @@ const Platform = require('Platform');
 
 import type { AlertType, AlertButtonStyle } from 'AlertIOS';
 
-type Buttons = Array<{
+export type Buttons = Array<{
   text?: string,
   onPress?: ?Function,
   style?: AlertButtonStyle,
@@ -31,71 +34,15 @@ type Options = {
 /**
  * Launches an alert dialog with the specified title and message.
  *
- * Optionally provide a list of buttons. Tapping any button will fire the
- * respective onPress callback and dismiss the alert. By default, the only
- * button will be an 'OK' button.
- *
- * This is an API that works both on iOS and Android and can show static
- * alerts. To show an alert that prompts the user to enter some information,
- * see `AlertIOS`; entering text in an alert is common on iOS only.
- *
- * ## iOS
- *
- * On iOS you can specify any number of buttons. Each button can optionally
- * specify a style, which is one of 'default', 'cancel' or 'destructive'.
- *
- * ## Android
- *
- * On Android at most three buttons can be specified. Android has a concept
- * of a neutral, negative and a positive button:
- *
- *   - If you specify one button, it will be the 'positive' one (such as 'OK')
- *   - Two buttons mean 'negative', 'positive' (such as 'Cancel', 'OK')
- *   - Three buttons mean 'neutral', 'negative', 'positive' (such as 'Later', 'Cancel', 'OK')
- *
- * By default alerts on Android can be dismissed by tapping outside of the alert
- * box. This event can be handled by providing an optional `options` parameter,
- * with an `onDismiss` callback property `{ onDismiss: () => {} }`.
- *
- * Alternatively, the dismissing behavior can be disabled altogether by providing
- * an optional `options` parameter with the `cancelable` property set to `false`
- * i.e. `{ cancelable: false }`
- *
- * Example usage:
- * ```
- * // Works on both iOS and Android
- * Alert.alert(
- *   'Alert Title',
- *   'My Alert Msg',
- *   [
- *     {text: 'Ask me later', onPress: () => console.log('Ask me later pressed')},
- *     {text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel'},
- *     {text: 'OK', onPress: () => console.log('OK Pressed')},
- *   ],
- *   { cancelable: false }
- * )
- * ```
- * ## Windows
- *
- * On Windows at most two buttons can be specified.
- *
- *   - If you specify one button, it will be the 'positive' one (such as 'OK')
- *   - Two buttons mean 'negative', 'positive' (such as 'Cancel', 'OK')
- *
- * ```
- * // Works on iOS, Android, and Windows
- * Alert.alert(
- *   'Alert Title',
- *   'My Alert Msg',
- *   [
- *     {text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel'},
- *     {text: 'OK', onPress: () => console.log('OK Pressed')},
- *   ]
- * )
- * ```
+ * See http://facebook.github.io/react-native/docs/alert.html
  */
 class Alert {
 
+  /**
+   * Launches an alert dialog with the specified title and message.
+   * 
+   * See http://facebook.github.io/react-native/docs/alert.html#alert
+   */
   static alert(
     title: ?string,
     message?: ?string,
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.windows.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.windows.js
index ee75022c979..3e845a76373 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.windows.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule AccessibilityInfo
  * @flow
  */
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.windows.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.windows.js
index 1746155494a..5998172f1a9 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.windows.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.windows.js
@@ -1,10 +1,13 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * 
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule ActivityIndicator
  * @flow
@@ -14,13 +17,14 @@
 const ColorPropType = require('ColorPropType');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const Platform = require('Platform');
-const React = require('React');
-const createReactClass = require('create-react-class');
+const ProgressBarAndroid = require('ProgressBarAndroid');
 const PropTypes = require('prop-types');
+const React = require('React');
 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,6 +40,8 @@ type DefaultProps = {
 
 /**
  * Displays a circular loading indicator.
+ *
+ * See http://facebook.github.io/react-native/docs/activityindicator.html
  */
 const ActivityIndicator = createReactClass({
   displayName: 'ActivityIndicator',
@@ -45,15 +51,21 @@ const ActivityIndicator = createReactClass({
     ...ViewPropTypes,
     /**
      * Whether to show the indicator (true, the default) or hide it (false).
+     * 
+     * See http://facebook.github.io/react-native/docs/activityindicator.html#animating
      */
     animating: PropTypes.bool,
     /**
      * The foreground color of the spinner (default is gray).
+     * 
+     * See http://facebook.github.io/react-native/docs/activityindicator.html#color
      */
     color: ColorPropType,
     /**
      * Size of the indicator (default is 'small').
      * Passing a number to the size prop is only supported on Android.
+     * 
+     * See http://facebook.github.io/react-native/docs/activityindicator.html#size
      */
     size: PropTypes.oneOfType([
       PropTypes.oneOf([ 'small', 'large' ]),
@@ -63,6 +75,8 @@ const ActivityIndicator = createReactClass({
      * Whether the indicator should hide when not animating (true by default).
      *
      * @platform ios
+     * 
+     * See http://facebook.github.io/react-native/docs/activityindicator.html#hideswhenstopped
      */
     hidesWhenStopped: PropTypes.bool,
   },
@@ -92,19 +106,23 @@ const ActivityIndicator = createReactClass({
         break;
     }
 
+    const nativeProps = {
+      ...props,
+      style: sizeStyle,
+      styleAttr: 'Normal',
+      indeterminate: true,
+    };
+
     return (
-      <View
-        onLayout={onLayout}
-        style={[styles.container, style]}>
-        <RCTActivityIndicator
-          {...props}
-          style={sizeStyle}
-          styleAttr="Normal"
-          indeterminate
-        />
+      <View onLayout={onLayout} style={[styles.container, style]}>
+        {Platform.OS !== 'android' ? (
+          <RCTActivityIndicator {...nativeProps} />
+        ) : (
+          <ProgressBarAndroid {...nativeProps} />
+        )}
       </View>
     );
-  },
+  }
 });
 
 const styles = StyleSheet.create({
@@ -128,17 +146,6 @@ if (Platform.OS === 'ios') {
     ActivityIndicator,
     {nativeOnly: {activityIndicatorViewStyle: true}},
   );
-} else if (Platform.OS === 'android') {
-  var RCTActivityIndicator = requireNativeComponent(
-    'AndroidProgressBar',
-    ActivityIndicator,
-    // Ignore props that are specific to non inderterminate ProgressBar.
-    {nativeOnly: {
-      indeterminate: true,
-      progress: true,
-      styleAttr: true,
-    }},
-  );
 } else if (Platform.OS === 'windows') {
   var RCTActivityIndicator = requireNativeComponent(
       'WindowsProgressRing',
diff --git a/Libraries/Components/AppleTV/TVEventHandler.windows.js b/Libraries/Components/AppleTV/TVEventHandler.windows.js
index 6d52d0d5eff..718fa84a8de 100644
--- a/Libraries/Components/AppleTV/TVEventHandler.windows.js
+++ b/Libraries/Components/AppleTV/TVEventHandler.windows.js
@@ -1,31 +1,8 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TVEventHandler
  * @flow
diff --git a/Libraries/Components/Button.windows.js b/Libraries/Components/Button.windows.js
index b2c50b0270b..18bed8c4138 100644
--- a/Libraries/Components/Button.windows.js
+++ b/Libraries/Components/Button.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule Button
  * @flow
  */
@@ -32,7 +35,6 @@ const KEY_CODE_SPACE = FocusableView.keys.Space;
 const DOWN_KEYCODES = [KEY_CODE_SPACE, KEY_CODE_ENTER];
 const UP_KEYCODES = [KEY_CODE_SPACE];
 
-
 /**
  * A basic button component that should render nicely on any platform. Supports
  * a minimal level of customization.
@@ -48,6 +50,9 @@ const UP_KEYCODES = [KEY_CODE_SPACE];
  * Example usage:
  *
  * ```
+ * import { Button } from 'react-native';
+ * ...
+ *
  * <Button
  *   onPress={onPressLearnMore}
  *   title="Learn More"
@@ -58,17 +63,15 @@ const UP_KEYCODES = [KEY_CODE_SPACE];
  *
  */
 
-class Button extends React.Component {
-
-  props: {
-    title: string,
-    onPress: () => any,
-    color?: ?string,
-    accessibilityLabel?: ?string,
-    disabled?: ?boolean,
-    testID?: ?string,
-  };
-
+class Button extends React.Component<{
+  title: string,
+  onPress: () => any,
+  color?: ?string,
+  accessibilityLabel?: ?string,
+  disabled?: ?boolean,
+  testID?: ?string,
+  hasTVPreferredFocus?: ?boolean,
+}> {
   static propTypes = {
     /**
      * Text to display inside the button
@@ -94,6 +97,12 @@ class Button extends React.Component {
      * Used to locate this view in end-to-end tests.
      */
     testID: PropTypes.string,
+    /**
+     * *(Apple TV only)* TV preferred focus (see documentation for the View component).
+     *
+     * @platform ios
+     */
+    hasTVPreferredFocus: PropTypes.bool,
     /**
      * tabIndex:
      * -1: Control is not keyboard focusable in any way
@@ -118,7 +127,7 @@ class Button extends React.Component {
      * @platform windows
      */
     onFocus: PropTypes.func,
-};
+  };
 
   render() {
     const {
@@ -126,6 +135,7 @@ class Button extends React.Component {
       color,
       onPress,
       title,
+      hasTVPreferredFocus,
       disabled,
       testID,
     } = this.props;
@@ -183,10 +193,11 @@ class Button extends React.Component {
         accessibilityComponentType="button"
         accessibilityLabel={accessibilityLabel}
         accessibilityTraits={accessibilityTraits}
+        hasTVPreferredFocus={hasTVPreferredFocus}
         testID={testID}
         disabled={disabled}
         onPress={onPress}>
-          {content}
+        {content}
       </Touchable>
     );
   }
diff --git a/Libraries/Components/CheckBox/CheckBox.windows.js b/Libraries/Components/CheckBox/CheckBox.windows.js
index 3821a6cbcb6..ebe93cb1e69 100644
--- a/Libraries/Components/CheckBox/CheckBox.windows.js
+++ b/Libraries/Components/CheckBox/CheckBox.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CheckBox
  */
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.windows.js b/Libraries/Components/DatePicker/DatePickerIOS.windows.js
index 9a2b2669711..8a1db045e01 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.windows.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerIOS
  */
diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.windows.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.windows.js
index 4a6d99423f3..a2360212807 100644
--- a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.windows.js
+++ b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.windows.js
@@ -1,18 +1,14 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerAndroid
  * @flow
  */
 'use strict';
 
-var warning = require('fbjs/lib/warning');
-
 const DatePickerAndroid = {
   async open(options: Object): Promise<Object> {
     return Promise.reject({
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.windows.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.windows.js
index 6c0b34e3b59..d5b950c5b41 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.windows.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DrawerLayoutAndroid
  */
diff --git a/Libraries/Components/FlipViewWindows/FlipViewWindows.android.js b/Libraries/Components/FlipViewWindows/FlipViewWindows.android.js
index 2a1a29f8496..dfe42c6adc7 100644
--- a/Libraries/Components/FlipViewWindows/FlipViewWindows.android.js
+++ b/Libraries/Components/FlipViewWindows/FlipViewWindows.android.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule FlipViewWindows
  */
diff --git a/Libraries/Components/FlipViewWindows/FlipViewWindows.ios.js b/Libraries/Components/FlipViewWindows/FlipViewWindows.ios.js
index 2a1a29f8496..dfe42c6adc7 100644
--- a/Libraries/Components/FlipViewWindows/FlipViewWindows.ios.js
+++ b/Libraries/Components/FlipViewWindows/FlipViewWindows.ios.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule FlipViewWindows
  */
diff --git a/Libraries/Components/FlipViewWindows/FlipViewWindows.windows.js b/Libraries/Components/FlipViewWindows/FlipViewWindows.windows.js
index f8be82ca8ab..2e43fb07be0 100644
--- a/Libraries/Components/FlipViewWindows/FlipViewWindows.windows.js
+++ b/Libraries/Components/FlipViewWindows/FlipViewWindows.windows.js
@@ -1,6 +1,7 @@
 /**
- * Copyright 2004-present Facebook. All Rights Reserved.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule FlipViewWindows
  * @flow
  */
diff --git a/Libraries/Components/FocusableWindows/FocusableWindows.android.js b/Libraries/Components/FocusableWindows/FocusableWindows.android.js
index 9421d88bd2c..e0371878409 100644
--- a/Libraries/Components/FocusableWindows/FocusableWindows.android.js
+++ b/Libraries/Components/FocusableWindows/FocusableWindows.android.js
@@ -1,9 +1,6 @@
 /**
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * All rights reserved.
- *
- * This source code is licensed under the MIT-style license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule FocusableWindows
  */
diff --git a/Libraries/Components/FocusableWindows/FocusableWindows.ios.js b/Libraries/Components/FocusableWindows/FocusableWindows.ios.js
index 9421d88bd2c..e0371878409 100644
--- a/Libraries/Components/FocusableWindows/FocusableWindows.ios.js
+++ b/Libraries/Components/FocusableWindows/FocusableWindows.ios.js
@@ -1,9 +1,6 @@
 /**
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * All rights reserved.
- *
- * This source code is licensed under the MIT-style license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule FocusableWindows
  */
diff --git a/Libraries/Components/FocusableWindows/FocusableWindows.windows.js b/Libraries/Components/FocusableWindows/FocusableWindows.windows.js
index 20cb34233b4..9ce279c2cae 100644
--- a/Libraries/Components/FocusableWindows/FocusableWindows.windows.js
+++ b/Libraries/Components/FocusableWindows/FocusableWindows.windows.js
@@ -1,9 +1,6 @@
 /**
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * All rights reserved.
- *
- * This source code is licensed under the MIT-style license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * Helper component for building keyboard focusable custom controls when the original native one has no such support
  *
@@ -155,7 +152,7 @@ function createFocusableComponent(Component: any) {
       this._splitProps(props);
     }
 
-    componentWillReceiveProps(nextProps: Object) {
+    UNSAFE_componentWillReceiveProps(nextProps: Object) {
       this._splitProps(nextProps);      
     }
 
diff --git a/Libraries/Components/MaskedViewIOS/MaskedViewIOS.windows.js b/Libraries/Components/MaskedViewIOS/MaskedViewIOS.windows.js
index 57b4be358ff..ad37017e1c2 100644
--- a/Libraries/Components/MaskedViewIOS/MaskedViewIOS.windows.js
+++ b/Libraries/Components/MaskedViewIOS/MaskedViewIOS.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MaskedViewIOS
  * @flow
diff --git a/Libraries/Components/Navigation/NavigatorIOS.windows.js b/Libraries/Components/Navigation/NavigatorIOS.windows.js
index 12699e09c6a..271f7ea0143 100644
--- a/Libraries/Components/Navigation/NavigatorIOS.windows.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NavigatorIOS
  */
diff --git a/Libraries/Components/PasswordBoxWindows/PasswordBoxWindows.windows.js b/Libraries/Components/PasswordBoxWindows/PasswordBoxWindows.windows.js
index e977b8c7d79..387630d709d 100644
--- a/Libraries/Components/PasswordBoxWindows/PasswordBoxWindows.windows.js
+++ b/Libraries/Components/PasswordBoxWindows/PasswordBoxWindows.windows.js
@@ -1,32 +1,42 @@
 /**
  * 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.
  *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * 
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule PasswordBoxWindows
  * @flow
+ * @format
  */
 'use strict';
 
-var DocumentSelectionState = require('DocumentSelectionState');
-var EventEmitter = require('EventEmitter');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var PropTypes = require('prop-types');
-var React = require('React');
-var createReactClass = require('create-react-class');
-var ReactNative = require('ReactNative');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var TextInputState = require('TextInputState');
-var TimerMixin = require('react-timer-mixin');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-
-var ViewPropTypes = require('ViewPropTypes');
-
-var requireNativeComponent = require('requireNativeComponent');
+const ColorPropType = require('ColorPropType');
+const DocumentSelectionState = require('DocumentSelectionState');
+const EventEmitter = require('EventEmitter');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const createReactClass = require('create-react-class');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const TextInputState = require('TextInputState');
+/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
+ * found when Flow v0.54 was deployed. To see the error delete this comment and
+ * run Flow. */
+const TimerMixin = require('react-timer-mixin');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const ViewPropTypes = require('ViewPropTypes');
+const {ViewContextTypes} = require('ViewContext');
+
+const requireNativeComponent = require('requireNativeComponent');
+
+import type {ViewChildContext} from 'ViewContext';
 
 var NativePasswordBox = requireNativeComponent('PasswordBoxWindows', null);
 
@@ -35,7 +45,7 @@ type Event = Object;
 /**
  * A foundational component for inputting passwords into the app via a
  * keyboard. Props provide configurability for several features, such as
- * placeholder text, and different keyboardvtypes, such as a numeric keypad.
+ * placeholder text, and different keyboard types, such as a numeric keypad.
  *
  * The simplest use case is to plop down a `PasswordBoxWindows` and subscribe to the
  * `onChangeText` events to read the user input. There are also other events,
@@ -49,10 +59,12 @@ type Event = Object;
  *     value={this.state.text}
  *   />
  * ```
+ *
+ * Two methods exposed via the native element are .focus() and .blur() that
+ * will focus or blur the PasswordBox programmatically.
  */
-var PasswordBoxWindows = createReactClass({
+const PasswordBoxWindows = createReactClass({
   displayName: 'PasswordBoxWindows',
-
   statics: {
     /* TODO(brentvatne) docs are needed for this */
     State: TextInputState,
@@ -61,11 +73,12 @@ var PasswordBoxWindows = createReactClass({
   propTypes: {
     ...ViewPropTypes,
     /**
-     * If false, disables auto-correct. The default value is true.
+     * If `true`, focuses the input on `componentDidMount`.
+     * The default value is `false`.
      */
     autoFocus: PropTypes.bool,
     /**
-     * If false, text is not editable. The default value is true.
+     * If `false`, text is not editable. The default value is `true`.
      */
     editable: PropTypes.bool,
     /**
@@ -73,9 +86,9 @@ var PasswordBoxWindows = createReactClass({
      *
      * The following values work across platforms:
      *
-     * - default
-     * - numeric
-     * - email-address
+     * - `default`
+     * - `numeric`
+     * - `email-address`
      */
     keyboardType: PropTypes.oneOf([
       // Cross-platform
@@ -97,36 +110,38 @@ var PasswordBoxWindows = createReactClass({
      * Determines the color of the keyboard.
      * @platform ios
      */
-    keyboardAppearance: PropTypes.oneOf([
-      'default',
-      'light',
-      'dark',
-    ]),
+    keyboardAppearance: PropTypes.oneOf(['default', 'light', 'dark']),
     /**
      * Determines how the return key should look. On Android you can also use
      * `returnKeyLabel`.
      *
+     * *Cross platform*
+     *
      * The following values work across platforms:
      *
-     * - done
-     * - go
-     * - next
-     * - search
-     * - send
+     * - `done`
+     * - `go`
+     * - `next`
+     * - `search`
+     * - `send`
+     *
+     * *Android Only*
      *
      * The following values work on Android only:
      *
-     * - none
-     * - previous
+     * - `none`
+     * - `previous`
+     *
+     * *iOS Only*
      *
      * The following values work on iOS only:
      *
-     * - default
-     * - emergency-call
-     * - google
-     * - join
-     * - route
-     * - yahoo
+     * - `default`
+     * - `emergency-call`
+     * - `google`
+     * - `join`
+     * - `route`
+     * - `yahoo`
      */
     returnKeyType: PropTypes.oneOf([
       // Cross-platform
@@ -150,24 +165,24 @@ var PasswordBoxWindows = createReactClass({
      * Sets the return key to the label. Use it instead of `returnKeyType`.
      * @platform android
      */
-     returnKeyLabel: PropTypes.string,
+    returnKeyLabel: PropTypes.string,
     /**
      * Limits the maximum number of characters that can be entered. Use this
      * instead of implementing the logic in JS to avoid flicker.
      */
     maxLength: PropTypes.number,
     /**
-     * If true, the keyboard disables the return key when there is no text and
-     * automatically enables it when there is text. The default value is false.
+     * If `true`, the keyboard disables the return key when there is no text and
+     * automatically enables it when there is text. The default value is `false`.
      * @platform ios
      */
     enablesReturnKeyAutomatically: PropTypes.bool,
     /**
-     * Callback that is called when the text input is blurred
+     * Callback that is called when the text input is blurred.
      */
     onBlur: PropTypes.func,
     /**
-     * Callback that is called when the text input is focused
+     * Callback that is called when the text input is focused.
      */
     onFocus: PropTypes.func,
     /**
@@ -185,14 +200,15 @@ var PasswordBoxWindows = createReactClass({
     onEndEditing: PropTypes.func,
     /**
      * Callback that is called when the text input's submit button is pressed.
-     * Invalid if multiline={true} is specified.
+     * Invalid if `multiline={true}` is specified.
      */
     onSubmitEditing: PropTypes.func,
     /**
      * Callback that is called when a key is pressed.
-     * Pressed key value is passed as an argument to the callback handler.
-     * Fires before onChange callbacks.
-     * @platform ios
+     * This will be called with `{ nativeEvent: { key: keyValue } }`
+     * where `keyValue` is `'Enter'` or `'Backspace'` for respective keys and
+     * the typed-in character otherwise including `' '` for space.
+     * Fires before `onChange` callbacks.
      */
     onKeyPress: PropTypes.func,
     /**
@@ -208,27 +224,37 @@ var PasswordBoxWindows = createReactClass({
      */
     passwordRevealMode: PropTypes.string,
     /**
-     * The string that will be rendered before text input has been entered
+     * The string that will be rendered before text input has been entered.
      */
     placeholder: PropTypes.string,
     /**
-     * The text color of the placeholder string
+     * The text color of the placeholder string.
      */
-    placeholderTextColor: PropTypes.string,
+    placeholderTextColor: ColorPropType,
     /**
-    * The highlight (and cursor on ios) color of the text input
-    */
-    selectionColor: PropTypes.string,
+     * The highlight and cursor color of the text input.
+     */
+    selectionColor: ColorPropType,
     /**
-     * See DocumentSelectionState.js, some state that is responsible for
-     * maintaining selection information for a document
+     * An instance of `DocumentSelectionState`, this is some state that is responsible for
+     * maintaining selection information for a document.
+     *
+     * Some functionality that can be performed with this instance is:
+     *
+     * - `blur()`
+     * - `focus()`
+     * - `update()`
+     *
+     * > You can reference `DocumentSelectionState` in
+     * > [`vendor/document/selection/DocumentSelectionState.js`](https://github.com/facebook/react-native/blob/master/Libraries/vendor/document/selection/DocumentSelectionState.js)
+     *
      * @platform ios
      */
     selectionState: PropTypes.instanceOf(DocumentSelectionState),
     /**
-     * The value to show for the text input. TextInput is a controlled
+     * The value to show for the text input. `TextInput` is a controlled
      * component, which means the native value will be forced to match this
-     * value prop if provided. For most uses this works great, but in some
+     * value prop if provided. For most uses, this works great, but in some
      * cases this may cause flickering - one common cause is preventing edits
      * by keeping value the same. In addition to simply setting the same value,
      * either set `editable={false}`, or set/update `maxLength` to prevent
@@ -237,12 +263,13 @@ var PasswordBoxWindows = createReactClass({
     value: PropTypes.string,
     /**
      * Provides an initial value that will change when the user starts typing.
-     * Useful for simple use-cases where you don't want to deal with listening
+     * Useful for simple use-cases where you do not want to deal with listening
      * to events and updating the value prop to keep the controlled state in sync.
      */
     defaultValue: PropTypes.string,
     /**
-     * When the clear button should appear on the right side of the text view
+     * When the clear button should appear on the right side of the text view.
+     * This property is supported only for single-line TextInput component.
      * @platform ios
      */
     clearButtonMode: PropTypes.oneOf([
@@ -252,24 +279,38 @@ var PasswordBoxWindows = createReactClass({
       'always',
     ]),
     /**
-     * If true, clears the text field automatically when editing begins
+     * If `true`, clears the text field automatically when editing begins.
      * @platform ios
      */
     clearTextOnFocus: PropTypes.bool,
     /**
-     * If true, all text will automatically be selected on focus
+     * If `true`, all text will automatically be selected on focus.
      */
     selectTextOnFocus: PropTypes.bool,
     /**
-     * If true, the text field will blur when submitted.
+     * If `true`, the text field will blur when submitted.
      * The default value is true for single-line fields and false for
-     * multiline fields. Note that for multiline fields, setting blurOnSubmit
-     * to true means that pressing return will blur the field and trigger the
-     * onSubmitEditing event instead of inserting a newline into the field.
+     * multiline fields. Note that for multiline fields, setting `blurOnSubmit`
+     * to `true` means that pressing return will blur the field and trigger the
+     * `onSubmitEditing` event instead of inserting a newline into the field.
      */
     blurOnSubmit: PropTypes.bool,
     /**
-     * Styles
+     * Note that not all Text styles are supported, an incomplete list of what is not supported includes:
+     *
+     * - `borderLeftWidth`
+     * - `borderTopWidth`
+     * - `borderRightWidth`
+     * - `borderBottomWidth`
+     * - `borderTopLeftRadius`
+     * - `borderTopRightRadius`
+     * - `borderBottomRightRadius`
+     * - `borderBottomLeftRadius`
+     *
+     * see [Issue#7070](https://github.com/facebook/react-native/issues/7070)
+     * for more detail.
+     *
+     * [Styles](docs/style.html)
      */
     style: Text.propTypes.style,
     /**
@@ -285,21 +326,17 @@ var PasswordBoxWindows = createReactClass({
    */
   mixins: [NativeMethodsMixin, TimerMixin],
 
-  viewConfig: NativePasswordBox.viewConfig,
-
   /**
-   * Returns if the input is currently focused.
+   * Returns `true` if the input is currently focused; `false` otherwise.
    */
   isFocused: function(): boolean {
-    return TextInputState.currentlyFocusedField() ===
-      ReactNative.findNodeHandle(this.refs.input);
-  },
-
-  contextTypes: {
-    onFocusRequested: PropTypes.func,
-    focusEmitter: PropTypes.instanceOf(EventEmitter),
+    return (
+      TextInputState.currentlyFocusedField() ===
+      ReactNative.findNodeHandle(this._inputRef)
+    );
   },
 
+  _inputRef: (undefined: any),
   _focusSubscription: (undefined: ?Function),
   _lastNativeText: (undefined: ?string),
 
@@ -313,13 +350,13 @@ var PasswordBoxWindows = createReactClass({
     }
     this._focusSubscription = this.context.focusEmitter.addListener(
       'focus',
-      (el) => {
+      el => {
         if (this === el) {
           this.requestAnimationFrame(this.focus);
         } else if (this.isFocused()) {
           this.blur();
         }
-      }
+      },
     );
     if (this.props.autoFocus) {
       this.context.onFocusRequested(this);
@@ -333,31 +370,43 @@ var PasswordBoxWindows = createReactClass({
     }
   },
 
-  getChildContext: function(): Object {
-    return {isInAParentText: true};
+  getChildContext(): ViewChildContext {
+    return {
+      isInAParentText: true,
+    };
   },
 
-  childContextTypes: {
-    isInAParentText: PropTypes.bool
+  childContextTypes: ViewContextTypes,
+
+  contextTypes: {
+    ...ViewContextTypes,
+    onFocusRequested: PropTypes.func,
+    focusEmitter: PropTypes.instanceOf(EventEmitter),
   },
 
   /**
-   * Removes all text from the input.
+   * Removes all text from the `PasswordBox`.
    */
   clear: function() {
     this.setNativeProps({text: ''});
   },
 
   _getText: function(): ?string {
-    return typeof this.props.value === 'string' ?
-      this.props.value :
-      this.props.defaultValue;
+    return typeof this.props.value === 'string'
+      ? this.props.value
+      : typeof this.props.defaultValue === 'string'
+        ? this.props.defaultValue
+        : '';
+  },
+
+  _setNativeRef: function(ref: any) {
+    this._inputRef = ref;
   },
 
   render: function() {
-    var textContainer =
+    const textContainer =
       <NativePasswordBox
-        ref="input"
+        ref={this._setNativeRef}
         style={[this.props.style]}
         keyboardType={this.props.keyboardType}
         maxLength={this.props.maxLength}
@@ -410,15 +459,17 @@ var PasswordBoxWindows = createReactClass({
   _onChange: function(event: Event) {
     // Make sure to fire the mostRecentEventCount first so it is already set on
     // native when the text value is set.
-    this.refs.input.setNativeProps({
-      mostRecentEventCount: event.nativeEvent.eventCount,
-    });
+    if (this._inputRef) {
+      this._inputRef.setNativeProps({
+        mostRecentEventCount: event.nativeEvent.eventCount,
+      });
+    }
 
     var text = event.nativeEvent.text;
     this.props.onChange && this.props.onChange(event);
     this.props.onChangeText && this.props.onChangeText(text);
 
-    if (!this.refs.input) {
+    if (!this._inputRef) {
       // calling `this.props.onChange` or `this.props.onChangeText`
       // may clean up the input itself. Exits here.
       return;
@@ -428,14 +479,21 @@ var PasswordBoxWindows = createReactClass({
     this.forceUpdate();
   },
 
-  componentDidUpdate: function () {
+  componentDidUpdate: function() {
     // This is necessary in case native updates the text and JS decides
     // that the update should be ignored and we should stick with the value
     // that we have in JS.
-    if (this._lastNativeText !== this.props.value && typeof this.props.value === 'string') {
-      this.refs.input.setNativeProps({
-        text: this.props.value,
-      });
+    const nativeProps = {};
+
+    if (
+      this._lastNativeText !== this.props.value &&
+      typeof this.props.value === 'string'
+    ) {
+      nativeProps.text = this.props.value;
+    }
+
+    if (Object.keys(nativeProps).length > 0 && this._inputRef) {
+      this._inputRef.setNativeProps(nativeProps);
     }
   },
 
diff --git a/Libraries/Components/Picker/Picker.windows.js b/Libraries/Components/Picker/Picker.windows.js
index 349baf3dfe4..7c8f4c2619f 100644
--- a/Libraries/Components/Picker/Picker.windows.js
+++ b/Libraries/Components/Picker/Picker.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule Picker
  * @flow
  */
@@ -38,14 +41,12 @@ var MODE_DROPDOWN = 'dropdown';
 /**
  * Individual selectable item in a Picker.
  */
-class PickerItem extends React.Component {
- props: {
-  label: string,
-  value?: any,
-  color?: ColorPropType,
-  testID?: string,
- };
-
+class PickerItem extends React.Component<{
+ label: string,
+ value?: any,
+ color?: ColorPropType,
+ testID?: string,
+}> {
  static propTypes = {
    /**
     * Text to display for this item.
@@ -83,18 +84,16 @@ class PickerItem extends React.Component {
  *       <Picker.Item label="JavaScript" value="js" />
  *     </Picker>
  */
-class Picker extends React.Component {
- props: {
-  style?: $FlowFixMe,
-  selectedValue?: any,
-  onValueChange?: Function,
-  enabled?: boolean,
-  mode?: 'dialog' | 'dropdown',
-  itemStyle?: $FlowFixMe,
-  prompt?: string,
-  testID?: string,
- };
-
+class Picker extends React.Component<{
+ style?: $FlowFixMe,
+ selectedValue?: any,
+ onValueChange?: Function,
+ enabled?: boolean,
+ mode?: 'dialog' | 'dropdown',
+ itemStyle?: $FlowFixMe,
+ prompt?: string,
+ testID?: string,
+}> {
  /**
   * On Android, display the options in a dialog.
   */
@@ -164,9 +163,9 @@ class Picker extends React.Component {
        // $FlowFixMe found when converting React.createClass to ES6
        return <PickerAndroid {...this.props}>{this.props.children}</PickerAndroid>;
      } else if (Platform.OS === 'windows') {
-       // $FlowFixMe found when converting React.createClass to ES6
-       return <PickerWindows {...this.props}>{this.props.children}</PickerWindows>;
-     } else {
+      // $FlowFixMe found when converting React.createClass to ES6
+      return <PickerWindows {...this.props}>{this.props.children}</PickerWindows>;
+    } else {
        return <UnimplementedView />;
      }
  }
diff --git a/Libraries/Components/Picker/PickerAndroid.windows.js b/Libraries/Components/Picker/PickerAndroid.windows.js
index fc589882864..b84e15bad67 100644
--- a/Libraries/Components/Picker/PickerAndroid.windows.js
+++ b/Libraries/Components/Picker/PickerAndroid.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerAndroid
  */
diff --git a/Libraries/Components/Picker/PickerIOS.windows.js b/Libraries/Components/Picker/PickerIOS.windows.js
index e95b0816a21..ce50c2ad4e4 100644
--- a/Libraries/Components/Picker/PickerIOS.windows.js
+++ b/Libraries/Components/Picker/PickerIOS.windows.js
@@ -1,12 +1,12 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerIOS
+ *
+ * This is a controlled component version of RCTPickerIOS
  */
 'use strict';
 
diff --git a/Libraries/Components/Picker/PickerWindows.js b/Libraries/Components/Picker/PickerWindows.js
index e1a893b785e..73b082297b5 100644
--- a/Libraries/Components/Picker/PickerWindows.js
+++ b/Libraries/Components/Picker/PickerWindows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
  *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * 
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule PickerWindows
  * @flow
  */
@@ -13,15 +16,14 @@
 'use strict';
 
 var ColorPropType = require('ColorPropType');
-var PropTypes = require('prop-types');
 var React = require('React');
+var ReactPropTypes = require('prop-types');
 var StyleSheet = require('StyleSheet');
 var StyleSheetPropType = require('StyleSheetPropType');
-var ViewPropTypes = require('ViewPropTypes');
-
+const ViewPropTypes = require('ViewPropTypes');
 var ViewStylePropTypes = require('ViewStylePropTypes');
-var processColor = require('processColor');
 
+var processColor = require('processColor');
 var requireNativeComponent = require('requireNativeComponent');
 
 var REF_PICKER = 'picker';
@@ -36,50 +38,55 @@ type Event = Object;
 /**
  * Not exposed as a public API - use <Picker> instead.
  */
-class PickerWindows extends React.Component {
-  props: {
-    style?: $FlowFixMe,
-    items?: any,
-    selected?: number,
-    selectedValue?: any,
-    enabled?: boolean,
-    onValueChange?: Function,
-    prompt?: string,
-    testID?: string,
-  };
-
+class PickerWindows extends React.Component<{
+  style?: $FlowFixMe,
+  items?: any,
+  selected?: number,
+  selectedValue?: any,
+  enabled?: boolean,
+  onValueChange?: Function,
+  prompt?: string,
+  testID?: string,
+}, *> {
   static propTypes = {
     ...ViewPropTypes,
     style: pickerStyleType,
-    items: PropTypes.any,
-    selected: PropTypes.number,
-    selectedValue: PropTypes.any,
-    enabled: PropTypes.bool,
-    onValueChange: PropTypes.func,
-    prompt: PropTypes.string,
-    testID: PropTypes.string,
+    items: ReactPropTypes.any,
+    selected: ReactPropTypes.number,
+    selectedValue: ReactPropTypes.any,
+    enabled: ReactPropTypes.bool,
+    onValueChange: ReactPropTypes.func,
+    prompt: ReactPropTypes.string,
+    testID: ReactPropTypes.string,
   };
 
-  componentWillReceiveProps(nextProps: Object) {
+  constructor(props, context) {
+    super(props, context);
+    var state = this._stateFromProps(props);
+
+    this.state = {
+      ...state,
+      initialSelectedIndex: state.selectedIndex,
+    };
+  }
+
+  UNSAFE_componentWillReceiveProps(nextProps) {
     this.setState(this._stateFromProps(nextProps));
   }
 
   // Translate prop and children into stuff that the native picker understands.
   _stateFromProps = (props) => {
     var selectedIndex = 0;
-    let items = React.Children.map(props.children, (child, index) => {
+    const items = React.Children.map(props.children, (child, index) => {
       if (child.props.value === props.selectedValue) {
         selectedIndex = index;
       }
-      let childProps = {
+      const childProps = {
         value: child.props.value,
         label: child.props.label,
       };
       if (child.props.color) {
-        // $FlowIssue: doesn't like adding properties to objects
-        /*::`*/
         childProps.color = processColor(child.props.color);
-        /*::`;*/
       }
       return childProps;
     });
@@ -94,7 +101,7 @@ class PickerWindows extends React.Component {
       items: this.state.items,
       onSelect: this._onChange,
       prompt: this.props.prompt,
-      selected: this.state.selectedIndex,
+      selected: this.state.initialSelectedIndex,
       testID: this.props.testID,
       style: [this.props.style],
     };
@@ -102,29 +109,37 @@ class PickerWindows extends React.Component {
     return <Picker ref={REF_PICKER} {...nativeProps} />;
   }
 
-  _onChange = (event: Object) => {
+  _onChange = (event: Event) => {
     if (this.props.onValueChange) {
       var position = event.nativeEvent.position;
       if (position >= 0) {
-        var value = this.props.children[position].props.value;
+        var children = React.Children.toArray(this.props.children);
+        var value = children[position].props.value;
         this.props.onValueChange(value, position);
       } else {
         this.props.onValueChange(null, position);
       }
     }
+    this._lastNativePosition = event.nativeEvent.position;
+    this.forceUpdate();
+  };
+
+  componentDidMount() {
+    this._lastNativePosition = this.state.initialSelectedIndex;
+  }
 
+  componentDidUpdate() {
     // The picker is a controlled component. This means we expect the
     // on*Change handlers to be in charge of updating our
     // `selectedValue` prop. That way they can also
     // disallow/undo/mutate the selection of certain values. In other
     // words, the embedder of this component should be the source of
     // truth, not the native component.
-    if (this.refs[REF_PICKER] && this.state.selectedIndex !== event.nativeEvent.position) {
+    if (this.refs[REF_PICKER] && this.state.selectedIndex !== this._lastNativePosition) {
       this.refs[REF_PICKER].setNativeProps({selected: this.state.selectedIndex});
+      this._lastNativePosition = this.state.selectedIndex;
     }
-  };
-
-  state = this._stateFromProps(this.props);
+  }
 }
 
 var cfg = {
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.windows.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.windows.js
index 99f01c81f36..92bae8066ab 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.windows.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressBarAndroid
  */
diff --git a/Libraries/Components/ProgressBarWindows/ProgressBarWindows.android.js b/Libraries/Components/ProgressBarWindows/ProgressBarWindows.android.js
index 15a3796c2dc..25df7e2c5e9 100644
--- a/Libraries/Components/ProgressBarWindows/ProgressBarWindows.android.js
+++ b/Libraries/Components/ProgressBarWindows/ProgressBarWindows.android.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule ProgressBarWindows
  */
diff --git a/Libraries/Components/ProgressBarWindows/ProgressBarWindows.ios.js b/Libraries/Components/ProgressBarWindows/ProgressBarWindows.ios.js
index 15a3796c2dc..25df7e2c5e9 100644
--- a/Libraries/Components/ProgressBarWindows/ProgressBarWindows.ios.js
+++ b/Libraries/Components/ProgressBarWindows/ProgressBarWindows.ios.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule ProgressBarWindows
  */
diff --git a/Libraries/Components/ProgressBarWindows/ProgressBarWindows.windows.js b/Libraries/Components/ProgressBarWindows/ProgressBarWindows.windows.js
index 0c81370674e..c9ec25bdd36 100644
--- a/Libraries/Components/ProgressBarWindows/ProgressBarWindows.windows.js
+++ b/Libraries/Components/ProgressBarWindows/ProgressBarWindows.windows.js
@@ -1,8 +1,8 @@
 /**
- * Copyright 2004-present Facebook. All Rights Reserved.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule ProgressBarWindows
- * @flow
  */
 'use strict';
 
diff --git a/Libraries/Components/ProgressRingWindows/ProgressRingWindows.android.js b/Libraries/Components/ProgressRingWindows/ProgressRingWindows.android.js
index f5ecc9390d1..0803bfc3934 100644
--- a/Libraries/Components/ProgressRingWindows/ProgressRingWindows.android.js
+++ b/Libraries/Components/ProgressRingWindows/ProgressRingWindows.android.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule ProgressRingWindows
  */
diff --git a/Libraries/Components/ProgressRingWindows/ProgressRingWindows.ios.js b/Libraries/Components/ProgressRingWindows/ProgressRingWindows.ios.js
index f5ecc9390d1..0803bfc3934 100644
--- a/Libraries/Components/ProgressRingWindows/ProgressRingWindows.ios.js
+++ b/Libraries/Components/ProgressRingWindows/ProgressRingWindows.ios.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule ProgressRingWindows
  */
diff --git a/Libraries/Components/ProgressRingWindows/ProgressRingWindows.windows.js b/Libraries/Components/ProgressRingWindows/ProgressRingWindows.windows.js
index 4902852c172..7a7718ad609 100644
--- a/Libraries/Components/ProgressRingWindows/ProgressRingWindows.windows.js
+++ b/Libraries/Components/ProgressRingWindows/ProgressRingWindows.windows.js
@@ -1,8 +1,8 @@
 /**
- * Copyright 2004-present Facebook. All Rights Reserved.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule ProgressRingWindows
- * @flow
  */
 'use strict';
 
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.windows.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.windows.js
index d9f3a35677e..3034938ed23 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.windows.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressViewIOS
  */
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.windows.js b/Libraries/Components/SafeAreaView/SafeAreaView.windows.js
index 46265995522..62a81a8a284 100644
--- a/Libraries/Components/SafeAreaView/SafeAreaView.windows.js
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SafeAreaView
  * @flow
diff --git a/Libraries/Components/ScrollView/ScrollView.windows.js b/Libraries/Components/ScrollView/ScrollView.windows.js
index 1e5a979c6b9..2511f39fd09 100644
--- a/Libraries/Components/ScrollView/ScrollView.windows.js
+++ b/Libraries/Components/ScrollView/ScrollView.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule ScrollView
  * @flow
  */
@@ -18,7 +21,6 @@ const Platform = require('Platform');
 const PointPropType = require('PointPropType');
 const PropTypes = require('prop-types');
 const React = require('React');
-const createReactClass = require('create-react-class');
 const ReactNative = require('ReactNative');
 const ScrollResponder = require('ScrollResponder');
 const ScrollViewStickyHeader = require('ScrollViewStickyHeader');
@@ -28,12 +30,17 @@ 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');
 const processDecelerationRate = require('processDecelerationRate');
 const requireNativeComponent = require('requireNativeComponent');
+/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
+ * found when Flow v0.54 was deployed. To see the error delete this comment and
+ * run Flow. */
 const warning = require('fbjs/lib/warning');
+const resolveAssetSource = require('resolveAssetSource');
 
 import type {NativeMethodsMixinType} from 'ReactNativeTypes';
 
@@ -75,7 +82,6 @@ import type {NativeMethodsMixinType} from 'ReactNativeTypes';
 // $FlowFixMe(>=0.41.0)
 const ScrollView = createReactClass({
   displayName: 'ScrollView',
-
   propTypes: {
     ...ViewPropTypes,
     /**
@@ -187,6 +193,11 @@ const ScrollView = createReactClass({
       'black',
       'white',
     ]),
+    /**
+     * If sticky headers should stick at the bottom instead of the top of the
+     * ScrollView. This is usually used with inverted ScrollViews.
+     */
+    invertStickyHeaders: PropTypes.bool,
     /**
      * When true, the ScrollView will try to lock to only vertical or horizontal
      * scrolling while dragging.  The default value is false.
@@ -202,16 +213,21 @@ const ScrollView = createReactClass({
     /**
      * Determines whether the keyboard gets dismissed in response to a drag.
      *
+     * *Cross platform*
+     *
      *   - `'none'` (the default), drags do not dismiss the keyboard.
      *   - `'on-drag'`, the keyboard is dismissed when a drag begins.
+     *
+     * *iOS Only*
+     *
      *   - `'interactive'`, the keyboard is dismissed interactively with the drag and moves in
      *     synchrony with the touch; dragging upwards cancels the dismissal.
      *     On android this is not supported and it will have the same behavior as 'none'.
      */
     keyboardDismissMode: PropTypes.oneOf([
       'none', // default
-      'interactive',
-      'on-drag',
+      'on-drag', // Cross-platform
+      'interactive', // iOS-only
     ]),
     /**
      * Determines when the keyboard should stay visible after a tap.
@@ -226,6 +242,34 @@ const ScrollView = createReactClass({
      *   - `true`, deprecated, use 'always' instead
      */
     keyboardShouldPersistTaps: PropTypes.oneOf(['always', 'never', 'handled', false, true]),
+    /**
+     * When set, the scroll view will adjust the scroll position so that the first child that is
+     * currently visible and at or beyond `minIndexForVisible` will not change position. This is
+     * useful for lists that are loading content in both directions, e.g. a chat thread, where new
+     * messages coming in might otherwise cause the scroll position to jump. A value of 0 is common,
+     * but other values such as 1 can be used to skip loading spinners or other content that should
+     * not maintain position.
+     *
+     * The optional `autoscrollToTopThreshold` can be used to make the content automatically scroll
+     * to the top after making the adjustment if the user was within the threshold of the top before
+     * the adjustment was made. This is also useful for chat-like applications where you want to see
+     * new messages scroll into place, but not if the user has scrolled up a ways and it would be
+     * disruptive to scroll a bunch.
+     *
+     * Caveat 1: Reordering elements in the scrollview with this enabled will probably cause
+     * jumpiness and jank. It can be fixed, but there are currently no plans to do so. For now,
+     * don't re-order the content of any ScrollViews or Lists that use this feature.
+     *
+     * Caveat 2: This simply uses `contentOffset` and `frame.origin` in native code to compute
+     * visibility. Occlusion, transforms, and other complexity won't be taken into account as to
+     * whether content is "visible" or not.
+     *
+     * @platform ios
+     */
+    maintainVisibleContentPosition: PropTypes.shape({
+      minIndexForVisible: PropTypes.number.isRequired,
+      autoscrollToTopThreshold: PropTypes.number,
+    }),
     /**
      * The maximum allowed zoom scale. The default value is 1.0.
      * @platform ios
@@ -236,16 +280,28 @@ const ScrollView = createReactClass({
      * @platform ios
      */
     minimumZoomScale: PropTypes.number,
+    /**
+     * Called when the momentum scroll starts (scroll which occurs as the ScrollView glides to a stop).
+     */
+    onMomentumScrollBegin: PropTypes.func,
+    /**
+     * Called when the momentum scroll ends (scroll which occurs as the ScrollView glides to a stop).
+     */
+    onMomentumScrollEnd: PropTypes.func,
     /**
      * Fires at most once per frame during scrolling. The frequency of the
      * events can be controlled using the `scrollEventThrottle` prop.
      */
     onScroll: PropTypes.func,
     /**
-     * Called when a scrolling animation ends.
-     * @platform ios
+     * Called when the user begins to drag the scroll view.
+     */
+    onScrollBeginDrag: PropTypes.func,
+    /**
+     * Called when the user stops dragging the scroll view and it either stops
+     * or begins to glide.
      */
-    onScrollAnimationEnd: PropTypes.func,
+    onScrollEndDrag: PropTypes.func,
     /**
      * Called when scrollable content view of the ScrollView changes.
      *
@@ -260,13 +316,21 @@ const ScrollView = createReactClass({
      * When true, the scroll view stops on multiples of the scroll view's size
      * when scrolling. This can be used for horizontal pagination. The default
      * value is false.
+     *
+     * Note: Vertical pagination is not supported on Android.
      */
     pagingEnabled: PropTypes.bool,
+    /**
+    * When true, ScrollView allows use of pinch gestures to zoom in and out.
+    * The default value is true.
+    * @platform ios
+    */
+    pinchGestureEnabled: PropTypes.bool,
     /**
      * When false, the view cannot be scrolled via touch interaction.
      * The default value is true.
      *
-     * Note that the view can be always be scrolled by calling `scrollTo`.
+     * Note that the view can always be scrolled by calling `scrollTo`.
      */
     scrollEnabled: PropTypes.bool,
     /**
@@ -313,15 +377,14 @@ const ScrollView = createReactClass({
      * with `horizontal={true}`.
      */
     stickyHeaderIndices: PropTypes.arrayOf(PropTypes.number),
-    style: StyleSheetPropType(ViewStylePropTypes),
     /**
      * When set, causes the scroll view to stop at multiples of the value of
      * `snapToInterval`. This can be used for paginating through children
      * that have lengths smaller than the scroll view. Typically used in
-     * combination with `snapToAlignment` and `decelerationRate="fast"`.
+     * combination with `snapToAlignment` and `decelerationRate="fast"` on ios.
      * Overrides less configurable `pagingEnabled` prop.
      *
-     * @platform ios
+     * Supported for horizontal scrollview on android.
      */
     snapToInterval: PropTypes.number,
     /**
@@ -351,7 +414,18 @@ const ScrollView = createReactClass({
      * @platform ios
      */
     zoomScale: PropTypes.number,
-
+    /**
+     * This property specifies how the safe area insets are used to modify the
+     * content area of the scroll view. The default value of this property is
+     * "never". Available on iOS 11 and later.
+     * @platform ios
+     */
+    contentInsetAdjustmentBehavior: PropTypes.oneOf([
+      'automatic',
+      'scrollableAxes',
+      'never', // default
+      'always',
+    ]),
     /**
      * A RefreshControl component, used to provide pull-to-refresh
      * functionality for the ScrollView. Only works for vertical ScrollViews
@@ -409,7 +483,26 @@ const ScrollView = createReactClass({
      * The default value is false.
      * @platform ios
      */
-    DEPRECATED_sendUpdatedChildFrames: PropTypes.bool, 
+    DEPRECATED_sendUpdatedChildFrames: PropTypes.bool,
+    /**
+     * Optionally an image can be used for the scroll bar thumb. This will
+     * override the color. While the image is loading or the image fails to
+     * load the color will be used instead. Use an alpha of 0 in the color
+     * to avoid seeing it while the image is loading.
+     *
+     * - `uri` - a string representing the resource identifier for the image, which
+     * should be either a local file path or the name of a static image resource
+     * - `number` - Opaque type returned by something like
+     * `import IMAGE from './image.jpg'`.
+     * @platform vr
+     */
+     scrollBarThumbImage: PropTypes.oneOfType([
+       PropTypes.shape({
+         uri: PropTypes.string,
+       }),
+       // Opaque type returned by import IMAGE from './image.jpg'
+       PropTypes.number,
+     ]),
     /**
      * Called when key down bubbles from a component that has focus.
      *
@@ -440,17 +533,21 @@ const ScrollView = createReactClass({
   },
 
   mixins: [ScrollResponder.Mixin],
+
   _scrollAnimatedValue: (new Animated.Value(0): Animated.Value),
   _scrollAnimatedValueAttachment: (null: ?{detach: () => void}),
   _stickyHeaderRefs: (new Map(): Map<number, ScrollViewStickyHeader>),
   _headerLayoutYs: (new Map(): Map<string, number>),
-
   getInitialState: function() {
-    return this.scrollResponderMixinGetInitialState();
+    return {
+      ...this.scrollResponderMixinGetInitialState(),
+      layoutHeight: null,
+    };
   },
 
-  componentWillMount: function() {
-    this._scrollAnimatedValue = new Animated.Value(0);
+  UNSAFE_componentWillMount: function() {
+    this._scrollAnimatedValue = new Animated.Value(this.props.contentOffset ? this.props.contentOffset.y : 0);
+    this._scrollAnimatedValue.setOffset(this.props.contentInset ? this.props.contentInset.top : 0);
     this._stickyHeaderRefs = new Map();
     this._headerLayoutYs = new Map();
   },
@@ -605,7 +702,7 @@ const ScrollView = createReactClass({
   _handleScroll: function(e: Object) {
     if (__DEV__) {
       if (this.props.onScroll && this.props.scrollEventThrottle == null && Platform.OS === 'ios') {
-        console.log( // eslint-disable-line no-console-disallow
+        console.log(
           'You specified `onScroll` on a <ScrollView> but not ' +
           '`scrollEventThrottle`. You will only receive one event. ' +
           'Using `16` you get all the events but be aware that it may ' +
@@ -622,19 +719,26 @@ const ScrollView = createReactClass({
     this.scrollResponderHandleScroll(e);
   },
 
+  _handleLayout: function(e: Object) {
+    if (this.props.invertStickyHeaders) {
+      this.setState({ layoutHeight: e.nativeEvent.layout.height });
+    }
+    if (this.props.onLayout) {
+      this.props.onLayout(e);
+    }
+  },
+
   _handleContentOnLayout: function(e: Object) {
     const {width, height} = e.nativeEvent.layout;
     this.props.onContentSizeChange && this.props.onContentSizeChange(width, height);
   },
 
   _scrollViewRef: (null: ?ScrollView),
-
   _setScrollViewRef: function(ref: ?ScrollView) {
     this._scrollViewRef = ref;
   },
 
   _innerViewRef: (null: ?NativeMethodsMixinType),
-
   _setInnerViewRef: function(ref: ?NativeMethodsMixinType) {
     this._innerViewRef = ref;
   },
@@ -642,23 +746,24 @@ const ScrollView = createReactClass({
   render: function() {
     let ScrollViewClass;
     let ScrollContentContainerViewClass;
-    if (Platform.OS === 'ios') {
-      ScrollViewClass = RCTScrollView;
-      ScrollContentContainerViewClass = RCTScrollContentView;
-      warning(
-        !this.props.snapToInterval || !this.props.pagingEnabled,
-        'snapToInterval is currently ignored when pagingEnabled is true.'
-      );
-    } else if (Platform.OS === 'android') {
+    if (Platform.OS === 'android') {
       if (this.props.horizontal) {
         ScrollViewClass = AndroidHorizontalScrollView;
+        ScrollContentContainerViewClass = AndroidHorizontalScrollContentView;
       } else {
         ScrollViewClass = AndroidScrollView;
+        ScrollContentContainerViewClass = View;
       }
-      ScrollContentContainerViewClass = View;
     } else if (Platform.OS === 'windows') {
       ScrollViewClass = RCTScrollView;
       ScrollContentContainerViewClass = View;
+    } else {
+      ScrollViewClass = RCTScrollView;
+      ScrollContentContainerViewClass = RCTScrollContentView;
+      warning(
+        !this.props.snapToInterval || !this.props.pagingEnabled,
+        'snapToInterval is currently ignored when pagingEnabled is true.'
+      );
     }
 
     invariant(
@@ -711,7 +816,9 @@ const ScrollView = createReactClass({
                 this._headerLayoutYs.get(this._getKeyForIndex(nextIndex, childArray))
               }
               onLayout={(event) => this._onStickyHeaderLayout(index, event, key)}
-              scrollAnimatedValue={this._scrollAnimatedValue}>
+              scrollAnimatedValue={this._scrollAnimatedValue}
+              inverted={this.props.invertStickyHeaders}
+              scrollViewHeight={this.state.layoutHeight}>
               {child}
             </ScrollViewStickyHeader>
           );
@@ -758,6 +865,7 @@ const ScrollView = createReactClass({
       // Override the onContentSizeChange from props, since this event can
       // bubble up from TextInputs
       onContentSizeChange: null,
+      onLayout: this._handleLayout,
       onMomentumScrollBegin: this.scrollResponderHandleMomentumScrollBegin,
       onMomentumScrollEnd: this.scrollResponderHandleMomentumScrollEnd,
       onResponderGrant: this.scrollResponderHandleResponderGrant,
@@ -774,6 +882,8 @@ const ScrollView = createReactClass({
       onTouchEnd: this.scrollResponderHandleTouchEnd,
       onTouchMove: this.scrollResponderHandleTouchMove,
       onTouchStart: this.scrollResponderHandleTouchStart,
+      onTouchCancel: this.scrollResponderHandleTouchCancel,
+      scrollBarThumbImage: resolveAssetSource(this.props.scrollBarThumbImage),
       scrollEventThrottle: hasStickyHeaders ? 1 : this.props.scrollEventThrottle,
       sendMomentumEvents: (this.props.onMomentumScrollBegin || this.props.onMomentumScrollEnd) ?
         true : false,
@@ -818,7 +928,7 @@ const ScrollView = createReactClass({
         {contentContainer}
       </ScrollViewClass>
     );
-  },
+  }
 });
 
 const styles = StyleSheet.create({
@@ -841,6 +951,7 @@ const styles = StyleSheet.create({
 
 let nativeOnlyProps,
   AndroidScrollView,
+  AndroidHorizontalScrollContentView,
   AndroidHorizontalScrollView,
   RCTScrollView,
   RCTScrollContentView;
@@ -852,14 +963,17 @@ if (Platform.OS === 'android') {
   };
   AndroidScrollView = requireNativeComponent(
     'RCTScrollView',
-    (ScrollView: ReactClass<any>),
+    (ScrollView: React.ComponentType<any>),
     nativeOnlyProps
   );
   AndroidHorizontalScrollView = requireNativeComponent(
     'AndroidHorizontalScrollView',
-    (ScrollView: ReactClass<any>),
+    (ScrollView: React.ComponentType<any>),
     nativeOnlyProps
   );
+  AndroidHorizontalScrollContentView = requireNativeComponent(
+    'AndroidHorizontalScrollContentView'
+  );
 } else if (Platform.OS === 'ios') {
   nativeOnlyProps = {
     nativeOnly: {
@@ -871,15 +985,25 @@ if (Platform.OS === 'android') {
   };
   RCTScrollView = requireNativeComponent(
     'RCTScrollView',
-    (ScrollView: ReactClass<any>),
+    (ScrollView: React.ComponentType<any>),
     nativeOnlyProps,
   );
-  // $FlowFixMe (bvaughn) Update ComponentInterface in ViewPropTypes to include a string type (for Fiber host components) in a follow-up.
   RCTScrollContentView = requireNativeComponent('RCTScrollContentView', View);
 } else if (Platform.OS === 'windows') {
   RCTScrollView = requireNativeComponent(
     'RCTScrollView',
     ScrollView);
+} else {
+  nativeOnlyProps = {
+    nativeOnly: {
+    }
+  };
+  RCTScrollView = requireNativeComponent(
+    'RCTScrollView',
+    null,
+    nativeOnlyProps,
+  );
+  RCTScrollContentView = requireNativeComponent('RCTScrollContentView', View);
 }
 
 module.exports = ScrollView;
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.windows.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.windows.js
index 6e22c023213..e579bba6eda 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.windows.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SegmentedControlIOS
  */
diff --git a/Libraries/Components/SplitViewWindows/SplitViewWindows.android.js b/Libraries/Components/SplitViewWindows/SplitViewWindows.android.js
index 7793af2af31..50030feb5fc 100644
--- a/Libraries/Components/SplitViewWindows/SplitViewWindows.android.js
+++ b/Libraries/Components/SplitViewWindows/SplitViewWindows.android.js
@@ -1,11 +1,7 @@
 /**
- * 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.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule SplitViewWindows
  */
 'use strict';
diff --git a/Libraries/Components/SplitViewWindows/SplitViewWindows.ios.js b/Libraries/Components/SplitViewWindows/SplitViewWindows.ios.js
index 7793af2af31..50030feb5fc 100644
--- a/Libraries/Components/SplitViewWindows/SplitViewWindows.ios.js
+++ b/Libraries/Components/SplitViewWindows/SplitViewWindows.ios.js
@@ -1,11 +1,7 @@
 /**
- * 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.
- *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule SplitViewWindows
  */
 'use strict';
diff --git a/Libraries/Components/SplitViewWindows/SplitViewWindows.windows.js b/Libraries/Components/SplitViewWindows/SplitViewWindows.windows.js
index 834c5aff157..56071865540 100644
--- a/Libraries/Components/SplitViewWindows/SplitViewWindows.windows.js
+++ b/Libraries/Components/SplitViewWindows/SplitViewWindows.windows.js
@@ -1,29 +1,32 @@
 /**
  * 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.
  *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * 
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule SplitViewWindows
  */
 'use strict';
 
+var ColorPropType = require('ColorPropType');
 var NativeMethodsMixin = require('NativeMethodsMixin');
-var PropTypes = require('prop-types');
 var React = require('React');
-var createReactClass = require('create-react-class');
+var PropTypes = require('prop-types');
 var ReactNative = require('ReactNative');
 var StyleSheet = require('StyleSheet');
 var UIManager = require('UIManager');
-
 var View = require('View');
 var ViewPropTypes = require('ViewPropTypes');
 
 var SplitViewConsts = UIManager.WindowsSplitView.Constants;
-var dismissKeyboard = require('dismissKeyboard');
 
+var createReactClass = require('create-react-class');
+var dismissKeyboard = require('dismissKeyboard');
 var requireNativeComponent = require('requireNativeComponent');
 
 var RK_PANE_REF = 'paneView';
@@ -67,7 +70,6 @@ var SplitViewValidAttributes = {
  */
 var SplitViewWindows = createReactClass({
   displayName: 'SplitViewWindows',
-
   statics: {
     positions: SplitViewConsts.PanePositions,
   },
@@ -83,6 +85,18 @@ var SplitViewWindows = createReactClass({
       'none', // default
       'on-drag',
     ]),
+    /**
+     * Specifies the background color of the pane. The default value is white.
+     * If you want to set the opacity of the pane, use rgba. Example:
+     *
+     * ```
+     * return (
+     *   <SplitViewWindows paneBackgroundColor="rgba(0,0,0,0.5)">
+     *   </SplitViewWindows>
+     * );
+     * ```
+     */
+    paneBackgroundColor: ColorPropType,
     /**
      * Specifies the side of the screen from which the pane will slide in.
      */
@@ -111,13 +125,24 @@ var SplitViewWindows = createReactClass({
 
   mixins: [NativeMethodsMixin],
 
+  getDefaultProps: function(): Object {
+    return {
+      paneBackgroundColor: 'white',
+    };
+  },
+
   getInnerViewNode: function() {
     return this.refs[CONTENT_REF].getInnerViewNode();
   },
 
   render: function() {
     var paneViewWrapper =
-      <View style={[styles.paneSubview, {width: this.props.paneWidth}]} collapsable={false}>
+      <View
+        style={[
+          styles.paneSubview,
+          {width: this.props.paneWidth, backgroundColor: this.props.paneBackgroundColor}
+        ]}
+        collapsable={false}>
         {this.props.renderPaneView()}
       </View>;
     var childrenWrapper =
@@ -130,7 +155,7 @@ var SplitViewWindows = createReactClass({
         ref={RK_PANE_REF}
         paneWidth={this.props.paneWidth}
         panePosition={this.props.panePosition}
-        style={styles.base}
+        style={[styles.base, this.props.style]}
         onPaneOpen={this._onPaneOpen}
         onPaneClose={this._onPaneClose}>
         {childrenWrapper}
@@ -151,6 +176,9 @@ var SplitViewWindows = createReactClass({
     }
   },
 
+  /**
+   * Opens the pane.
+   */
   openPane: function() {
     UIManager.dispatchViewManagerCommand(
       this._getPaneLayoutHandle(),
@@ -159,6 +187,9 @@ var SplitViewWindows = createReactClass({
     );
   },
 
+  /**
+   * Closes the pane.
+   */
   closePane: function() {
     UIManager.dispatchViewManagerCommand(
       this._getPaneLayoutHandle(),
@@ -166,15 +197,32 @@ var SplitViewWindows = createReactClass({
       null
     );
   },
-
+  /**
+  * Closing and opening example
+  * Note: To access the pane you have to give it a ref. Refs do not work on stateless components
+  * render () {
+  *   this.openPane = () => {
+  *     this.refs.PANE.openPane()
+  *   }
+  *   this.closePane = () => {
+  *     this.refs.PANE.closePane()
+  *   }
+  *   return (
+  *     <SplitViewWindows ref={'PANE'}>
+  *     </SplitViewWindows>
+  *   )
+  * }
+  */
   _getPaneLayoutHandle: function() {
     return ReactNative.findNodeHandle(this.refs[RK_PANE_REF]);
   },
+
 });
 
 var styles = StyleSheet.create({
   base: {
     flex: 1,
+    elevation: 16,
   },
   mainSubview: {
     position: 'absolute',
diff --git a/Libraries/Components/StatusBar/StatusBar.windows.js b/Libraries/Components/StatusBar/StatusBar.windows.js
index 2cbc9c919f7..398fc1b5265 100644
--- a/Libraries/Components/StatusBar/StatusBar.windows.js
+++ b/Libraries/Components/StatusBar/StatusBar.windows.js
@@ -1,19 +1,21 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule StatusBar
  * @flow
  */
 'use strict';
 
-const PropTypes = require('prop-types');
-
 const React = require('React');
+const PropTypes = require('prop-types');
 const ColorPropType = require('ColorPropType');
 const Platform = require('Platform');
 
@@ -21,27 +23,55 @@ const processColor = require('processColor');
 
 const StatusBarManager = require('NativeModules').StatusBarManager;
 
+/**
+ * Status bar style
+ */
 export type StatusBarStyle = $Enum<{
+  /**
+   * Default status bar style (dark for iOS, light for Android)
+   */
   'default': string,
+  /**
+   * Dark background, white texts and icons
+   */
   'light-content': string,
+  /**
+   * Light background, dark texts and icons
+   */
+  'dark-content': string,
 }>;
 
+/**
+ * Status bar animation
+ */
 export type StatusBarAnimation = $Enum<{
+  /**
+   * No animation
+   */
   'none': string,
+  /**
+   * Fade animation
+   */
   'fade': string,
+  /**
+   * Slide animation
+   */
   'slide': string,
 }>;
 
 type DefaultProps = {
-  animated: boolean;
+  animated: boolean,
 };
 
 /**
  * Merges the prop stack with the default values.
  */
-function mergePropsStack(propsStack: Array<Object>, defaultValues: Object): Object {
+function mergePropsStack(
+  propsStack: Array<Object>,
+  defaultValues: Object
+): Object {
   return propsStack.reduce((prev, cur) => {
-    for (let prop in cur) {
+    for (const prop in cur) {
       if (cur[prop] != null) {
         prev[prop] = cur[prop];
       }
@@ -56,20 +86,29 @@ function mergePropsStack(propsStack: Array<Object>, defaultValues: Object): Obje
  */
 function createStackEntry(props: any): any {
   return {
-    backgroundColor: props.backgroundColor != null ? {
-      value: props.backgroundColor,
-      animated: props.animated,
-    } : null,
-    barStyle: props.barStyle != null ? {
-      value: props.barStyle,
-      animated: props.animated,
-    } : null,
+    backgroundColor:
+      props.backgroundColor != null
+        ? {
+            value: props.backgroundColor,
+            animated: props.animated,
+          }
+        : null,
+    barStyle:
+      props.barStyle != null
+        ? {
+            value: props.barStyle,
+            animated: props.animated,
+          }
+        : null,
     translucent: props.translucent,
-    hidden: props.hidden != null ? {
-      value: props.hidden,
-      animated: props.animated,
-      transition: props.showHideTransition,
-    } : null,
+    hidden:
+      props.hidden != null
+        ? {
+            value: props.hidden,
+            animated: props.animated,
+            transition: props.showHideTransition,
+          }
+        : null,
     networkActivityIndicatorVisible: props.networkActivityIndicatorVisible,
   };
 }
@@ -108,18 +147,20 @@ function createStackEntry(props: any): any {
  * to use the static API and the component for the same prop because any value
  * set by the static API will get overriden by the one set by the component in
  * the next render.
+ *
+ * ### Constants
+ *
+ * `currentHeight` (Android only) The height of the status bar.
  */
-class StatusBar extends React.Component {
-  props: {
-    hidden?: boolean,
-    animated?: boolean,
-    backgroundColor?: $FlowFixMe,
-    translucent?: boolean,
-    barStyle?: 'default' | 'light-content',
-    networkActivityIndicatorVisible?: boolean,
-    showHideTransition?: 'fade' | 'slide',
-  };
-
+class StatusBar extends React.Component<{
+  hidden?: boolean,
+  animated?: boolean,
+  backgroundColor?: string,
+  translucent?: boolean,
+  barStyle?: 'default' | 'light-content' | 'dark-content',
+  networkActivityIndicatorVisible?: boolean,
+  showHideTransition?: 'fade' | 'slide',
+}> {
   static _propsStack = [];
 
   static _defaultProps = createStackEntry({
@@ -149,6 +190,13 @@ class StatusBar extends React.Component {
 
   // Provide an imperative API as static functions of the component.
   // See the corresponding prop for more detail.
+
+  /**
+   * Show or hide the status bar
+   * @param hidden Hide the status bar.
+   * @param animation Optional animation when
+   *    changing the status bar hidden property.
+   */
   static setHidden(hidden: boolean, animation?: StatusBarAnimation) {
     animation = animation || 'none';
     StatusBar._defaultProps.hidden.value = hidden;
@@ -161,40 +209,61 @@ class StatusBar extends React.Component {
     }
   }
 
+  /**
+   * Set the status bar style
+   * @param style Status bar style to set
+   * @param animated Animate the style change.
+   */
   static setBarStyle(style: StatusBarStyle, animated?: boolean) {
-    if (Platform.OS !== 'ios') {
-      console.warn('`setBarStyle` is only available on iOS');
-      return;
-    }
     animated = animated || false;
     StatusBar._defaultProps.barStyle.value = style;
-    StatusBarManager.setStyle(style, animated);
+    if (Platform.OS === 'ios') {
+      StatusBarManager.setStyle(style, animated);
+    } else if (Platform.OS === 'android') {
+      StatusBarManager.setStyle(style);
+    } else if (Platform.OS === 'windows') {
+      console.warn('`setBarStyle` is not available on Windows');
+      return;
+    }
   }
 
+  /**
+   * Control the visibility of the network activity indicator
+   * @param visible Show the indicator.
+   */
   static setNetworkActivityIndicatorVisible(visible: boolean) {
     if (Platform.OS !== 'ios') {
-      console.warn('`setNetworkActivityIndicatorVisible` is only available on iOS');
+      console.warn(
+        '`setNetworkActivityIndicatorVisible` is only available on iOS'
+      );
       return;
     }
     StatusBar._defaultProps.networkActivityIndicatorVisible = visible;
     StatusBarManager.setNetworkActivityIndicatorVisible(visible);
   }
 
+  /**
+   * Set the background color for the status bar
+   * @param color Background color.
+   * @param animated Animate the style change.
+   */
   static setBackgroundColor(color: string, animated?: boolean) {
     if (Platform.OS === 'ios') {
       console.warn('`setBackgroundColor` is only available on Android and Windows');
-    }
-    else if (Platform.OS === 'android') {
+    } else if (Platform.OS === 'android') {
       animated = animated || false;
       StatusBar._defaultProps.backgroundColor.value = color;
       StatusBarManager.setColor(processColor(color), animated);
-    }
-    else if (Platform.OS === 'windows') {
+    } else if (Platform.OS === 'windows') {
       StatusBar._defaultProps.backgroundColor.value = color;
-      StatusBarManager.setColor(processColor(color));
+      StatusBarManager.setColor(processColor(color));      
     }
   }
 
+  /**
+   * Control the translucency of the status bar
+   * @param translucent Set as translucent.
+   */
   static setTranslucent(translucent: boolean) {
     if (Platform.OS === 'ios') {
       console.warn('`setTranslucent` is not available on iOS');
@@ -229,13 +298,8 @@ class StatusBar extends React.Component {
     translucent: PropTypes.bool,
     /**
      * Sets the color of the status bar text.
-     *
-     * @platform ios
      */
-    barStyle: PropTypes.oneOf([
-      'default',
-      'light-content',
-    ]),
+    barStyle: PropTypes.oneOf(['default', 'light-content', 'dark-content']),
     /**
      * If the network activity indicator should be visible.
      *
@@ -248,10 +312,7 @@ class StatusBar extends React.Component {
      *
      * @platform ios
      */
-    showHideTransition: PropTypes.oneOf([
-      'fade',
-      'slide',
-    ]),
+    showHideTransition: PropTypes.oneOf(['fade', 'slide']),
   };
 
   static defaultProps = {
@@ -265,7 +326,7 @@ class StatusBar extends React.Component {
     // Every time a StatusBar component is mounted, we push it's prop to a stack
     // and always update the native status bar with the props from the top of then
     // stack. This allows having multiple StatusBar components and the one that is
-    // added last or is deeper in the view hierachy will have priority.
+    // added last or is deeper in the view hierarchy will have priority.
     this._stackEntry = createStackEntry(this.props);
     StatusBar._propsStack.push(this._stackEntry);
     this._updatePropsStack();
@@ -296,35 +357,52 @@ class StatusBar extends React.Component {
     clearImmediate(StatusBar._updateImmediate);
     StatusBar._updateImmediate = setImmediate(() => {
       const oldProps = StatusBar._currentValues;
-      const mergedProps = mergePropsStack(StatusBar._propsStack, StatusBar._defaultProps);
+      const mergedProps = mergePropsStack(
+        StatusBar._propsStack,
+        StatusBar._defaultProps
+      );
 
       // Update the props that have changed using the merged values from the props stack.
       if (Platform.OS === 'ios') {
-        if (!oldProps || oldProps.barStyle.value !== mergedProps.barStyle.value) {
+        if (
+          !oldProps ||
+          oldProps.barStyle.value !== mergedProps.barStyle.value
+        ) {
           StatusBarManager.setStyle(
             mergedProps.barStyle.value,
-            mergedProps.barStyle.animated,
+            mergedProps.barStyle.animated
           );
         }
         if (!oldProps || oldProps.hidden.value !== mergedProps.hidden.value) {
           StatusBarManager.setHidden(
             mergedProps.hidden.value,
-            mergedProps.hidden.animated ?
-              mergedProps.hidden.transition :
-              'none',
+            mergedProps.hidden.animated ? mergedProps.hidden.transition : 'none'
           );
         }
 
-        if (!oldProps || oldProps.networkActivityIndicatorVisible !== mergedProps.networkActivityIndicatorVisible) {
+        if (
+          !oldProps ||
+          oldProps.networkActivityIndicatorVisible !==
+            mergedProps.networkActivityIndicatorVisible
+        ) {
           StatusBarManager.setNetworkActivityIndicatorVisible(
             mergedProps.networkActivityIndicatorVisible
           );
         }
       } else if (Platform.OS === 'android') {
-        if (!oldProps || oldProps.backgroundColor.value !== mergedProps.backgroundColor.value) {
+        if (
+          !oldProps ||
+          oldProps.barStyle.value !== mergedProps.barStyle.value
+        ) {
+          StatusBarManager.setStyle(mergedProps.barStyle.value);
+        }
+        if (
+          !oldProps ||
+          oldProps.backgroundColor.value !== mergedProps.backgroundColor.value
+        ) {
           StatusBarManager.setColor(
             processColor(mergedProps.backgroundColor.value),
-            mergedProps.backgroundColor.animated,
+            mergedProps.backgroundColor.animated
           );
         }
         if (!oldProps || oldProps.hidden.value !== mergedProps.hidden.value) {
@@ -334,7 +412,10 @@ class StatusBar extends React.Component {
           StatusBarManager.setTranslucent(mergedProps.translucent);
         }
       } else if (Platform.OS === 'windows') {
-        if (!oldProps || oldProps.backgroundColor.value !== mergedProps.backgroundColor.value) {
+        if (
+          !oldProps ||
+          oldProps.backgroundColor.value !== mergedProps.backgroundColor.value
+        ) {
           StatusBarManager.setColor(
             processColor(mergedProps.backgroundColor.value),
           );
@@ -351,7 +432,7 @@ class StatusBar extends React.Component {
     });
   };
 
-  render(): ?ReactElement {
+  render(): React.Node {
     return null;
   }
 }
diff --git a/Libraries/Components/StatusBar/StatusBarIOS.windows.js b/Libraries/Components/StatusBar/StatusBarIOS.windows.js
index d4ffd63f08a..5c69c15339a 100644
--- a/Libraries/Components/StatusBar/StatusBarIOS.windows.js
+++ b/Libraries/Components/StatusBar/StatusBarIOS.windows.js
@@ -1,14 +1,14 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StatusBarIOS
  * @flow
  */
 'use strict';
 
-module.exports = null;
+const NativeEventEmitter = require('NativeEventEmitter');
+
+module.exports = new NativeEventEmitter('StatusBarManager');
diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.windows.js b/Libraries/Components/TabBarIOS/TabBarIOS.windows.js
index c582903a760..c52d947ebd3 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.windows.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.windows.js
@@ -1,21 +1,23 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarIOS
+ * @flow
  */
 
 'use strict';
 
-var React = require('React');
-var View = require('View');
-var StyleSheet = require('StyleSheet');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const TabBarItemIOS = require('TabBarItemIOS');
+const View = require('View');
+
+class DummyTabBarIOS extends React.Component<$FlowFixMeProps> {
+  static Item = TabBarItemIOS;
 
-class DummyTabBarIOS extends React.Component {
   render() {
     return (
       <View style={[this.props.style, styles.tabGroup]}>
@@ -25,7 +27,7 @@ class DummyTabBarIOS extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   tabGroup: {
     flex: 1,
   }
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.windows.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.windows.js
index 43cf6d429e0..ffd46d9c59d 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.windows.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarItemIOS
  */
diff --git a/Libraries/Components/TextInput/TextInput.windows.js b/Libraries/Components/TextInput/TextInput.windows.js
index 6968584e424..84d6f042a9e 100644
--- a/Libraries/Components/TextInput/TextInput.windows.js
+++ b/Libraries/Components/TextInput/TextInput.windows.js
@@ -1,13 +1,17 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule TextInput
  * @flow
+ * @format
  */
 'use strict';
 
@@ -30,12 +34,10 @@ const TimerMixin = require('react-timer-mixin');
 const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 const UIManager = require('UIManager');
 const ViewPropTypes = require('ViewPropTypes');
+const {ViewContextTypes} = require('ViewContext');
 
 const PasswordBoxWindows = require('react-native-windows').PasswordBoxWindows;
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const emptyFunction = require('fbjs/lib/emptyFunction');
 const invariant = require('fbjs/lib/invariant');
 const requireNativeComponent = require('requireNativeComponent');
@@ -59,11 +61,19 @@ const notSecureTextEntry = {
   onTextInput: true,
 };
 
+import type {ViewChildContext} from 'ViewContext';
+
 if (Platform.OS === 'android') {
   var AndroidTextInput = requireNativeComponent('AndroidTextInput', null);
 } else if (Platform.OS === 'ios') {
-  var RCTTextView = requireNativeComponent('RCTTextView', null);
-  var RCTTextField = requireNativeComponent('RCTTextField', null);
+  var RCTMultilineTextInputView = requireNativeComponent(
+    'RCTMultilineTextInputView',
+    null,
+  );
+  var RCTSinglelineTextInputView = requireNativeComponent(
+    'RCTSinglelineTextInputView',
+    null,
+  );
 } else if (Platform.OS === 'windows') {
   var RCTTextBox = requireNativeComponent('RCTTextBox', null);
 }
@@ -237,7 +247,6 @@ const TextInput = createReactClass({
      * If true, will increase the height of the textbox if need be. If false,
      * the textbox will become scrollable once the height is reached. The
      * default value is false.
-     * @platform android     
      * @platform windows
      */
     autoGrow: PropTypes.bool,
@@ -291,7 +300,7 @@ const TextInput = createReactClass({
       'name-phone-pad',
       'decimal-pad',
       'web-search',
-      // iOS-only 
+      // iOS-only
       'ascii-capable',
       'numbers-and-punctuation',
       'twitter',
@@ -302,11 +311,7 @@ const TextInput = createReactClass({
      * Determines the color of the keyboard.
      * @platform ios
      */
-    keyboardAppearance: PropTypes.oneOf([
-      'default',
-      'light',
-      'dark',
-    ]),
+    keyboardAppearance: PropTypes.oneOf(['default', 'light', 'dark']),
     /**
      * Determines how the return key should look. On Android you can also use
      * `returnKeyLabel`.
@@ -370,6 +375,7 @@ const TextInput = createReactClass({
     /**
      * If autogrow is `true`, limits the height that the TextInput box can grow
      * to. Once it reaches this height, the TextInput becomes scrollable.
+     * @platform windows
      */
     maxHeight: PropTypes.number,
     /**
@@ -450,7 +456,6 @@ const TextInput = createReactClass({
      * where `keyValue` is `'Enter'` or `'Backspace'` for respective keys and
      * the typed-in character otherwise including `' '` for space.
      * Fires before `onChange` callbacks.
-     * @platform ios
      */
     onKeyPress: PropTypes.func,
     /**
@@ -477,8 +482,8 @@ const TextInput = createReactClass({
      */
     secureTextEntry: PropTypes.bool,
     /**
-    * The highlight and cursor color of the text input.
-    */
+     * The highlight and cursor color of the text input.
+     */
     selectionColor: ColorPropType,
     /**
      * An instance of `DocumentSelectionState`, this is some state that is responsible for
@@ -522,6 +527,7 @@ const TextInput = createReactClass({
     defaultValue: PropTypes.string,
     /**
      * When the clear button should appear on the right side of the text view.
+     * This property is supported only for single-line TextInput component.
      * @platform ios
      */
     clearButtonMode: PropTypes.oneOf([
@@ -614,6 +620,7 @@ const TextInput = createReactClass({
     ]),
     /**
      * If `true`, caret is hidden. The default value is `false`.
+     * This property is supported only for single-line TextInput component on iOS.
      */
     caretHidden: PropTypes.bool,
     /**
@@ -645,13 +652,10 @@ const TextInput = createReactClass({
    * Returns `true` if the input is currently focused; `false` otherwise.
    */
   isFocused: function(): boolean {
-    return TextInputState.currentlyFocusedField() ===
-      ReactNative.findNodeHandle(this._inputRef);
-  },
-
-  contextTypes: {
-    onFocusRequested: PropTypes.func,
-    focusEmitter: PropTypes.instanceOf(EventEmitter),
+    return (
+      TextInputState.currentlyFocusedField() ===
+      ReactNative.findNodeHandle(this._inputRef)
+    );
   },
 
   _inputRef: (undefined: any),
@@ -670,32 +674,38 @@ const TextInput = createReactClass({
     }
     this._focusSubscription = this.context.focusEmitter.addListener(
       'focus',
-      (el) => {
+      el => {
         if (this === el) {
           this.requestAnimationFrame(this.focus);
         } else if (this.isFocused()) {
           this.blur();
         }
-      }
+      },
     );
     if (this.props.autoFocus) {
       this.context.onFocusRequested(this);
     }
   },
 
-  componentWillUnmount: function() {
+  UNSAFE_componentWillUnmount: function() {
     this._focusSubscription && this._focusSubscription.remove();
     if (this.isFocused()) {
       this.blur();
     }
   },
 
-  getChildContext: function(): Object {
-    return {isInAParentText: true};
+  getChildContext(): ViewChildContext {
+    return {
+      isInAParentText: true,
+    };
   },
 
-  childContextTypes: {
-    isInAParentText: PropTypes.bool
+  childContextTypes: ViewContextTypes,
+
+  contextTypes: {
+    ...ViewContextTypes,
+    onFocusRequested: PropTypes.func,
+    focusEmitter: PropTypes.instanceOf(EventEmitter),
   },
 
   /**
@@ -707,7 +717,9 @@ const TextInput = createReactClass({
 
   render: function() {
     if (Platform.OS === 'ios') {
-      return this._renderIOS();
+      return UIManager.RCTVirtualText
+        ? this._renderIOS()
+        : this._renderIOSLegacy();
     } else if (Platform.OS === 'android') {
       return this._renderAndroid();
     } else if (Platform.OS === 'windows') {
@@ -716,27 +728,28 @@ const TextInput = createReactClass({
   },
 
   _getText: function(): ?string {
-    return typeof this.props.value === 'string' ?
-      this.props.value :
-      (
-        typeof this.props.defaultValue === 'string' ?
-        this.props.defaultValue :
-        ''
-      );
+    return typeof this.props.value === 'string'
+      ? this.props.value
+      : typeof this.props.defaultValue === 'string'
+        ? this.props.defaultValue
+        : '';
   },
 
   _setNativeRef: function(ref: any) {
     this._inputRef = ref;
   },
 
-  _renderIOS: function() {
+  _renderIOSLegacy: function() {
     var textContainer;
 
     var props = Object.assign({}, this.props);
     props.style = [this.props.style];
 
     if (props.selection && props.selection.end == null) {
-      props.selection = {start: props.selection.start, end: props.selection.start};
+      props.selection = {
+        start: props.selection.start,
+        end: props.selection.start,
+      };
     }
 
     if (!props.multiline) {
@@ -744,14 +757,16 @@ const TextInput = createReactClass({
         for (var propKey in onlyMultiline) {
           if (props[propKey]) {
             const error = new Error(
-              'TextInput prop `' + propKey + '` is only supported with multiline.'
+              'TextInput prop `' +
+                propKey +
+                '` is only supported with multiline.',
             );
             warning(false, '%s', error.stack);
           }
         }
       }
-      textContainer =
-        <RCTTextField
+      textContainer = (
+        <RCTSinglelineTextInputView
           ref={this._setNativeRef}
           {...props}
           onFocus={this._onFocus}
@@ -760,24 +775,29 @@ const TextInput = createReactClass({
           onSelectionChange={this._onSelectionChange}
           onSelectionChangeShouldSetResponder={emptyFunction.thatReturnsTrue}
           text={this._getText()}
-        />;
+        />
+      );
     } else {
       var children = props.children;
       var childCount = 0;
       React.Children.forEach(children, () => ++childCount);
       invariant(
         !(props.value && childCount),
-        'Cannot specify both value and children.'
+        'Cannot specify both value and children.',
       );
       if (childCount >= 1) {
-        children = <Text style={props.style} allowFontScaling={props.allowFontScaling}>{children}</Text>;
+        children = (
+          <Text style={props.style} allowFontScaling={props.allowFontScaling}>
+            {children}
+          </Text>
+        );
       }
       if (props.inputView) {
         children = [children, props.inputView];
       }
       props.style.unshift(styles.multilineInput);
-      textContainer =
-        <RCTTextView
+      textContainer = (
+        <RCTMultilineTextInputView
           ref={this._setNativeRef}
           {...props}
           children={children}
@@ -791,8 +811,61 @@ const TextInput = createReactClass({
           text={this._getText()}
           dataDetectorTypes={this.props.dataDetectorTypes}
           onScroll={this._onScroll}
-        />;
+        />
+      );
     }
+
+    return (
+      <TouchableWithoutFeedback
+        onLayout={props.onLayout}
+        onPress={this._onPress}
+        rejectResponderTermination={true}
+        accessible={props.accessible}
+        accessibilityLabel={props.accessibilityLabel}
+        accessibilityTraits={props.accessibilityTraits}
+        nativeID={this.props.nativeID}
+        testID={props.testID}>
+        {textContainer}
+      </TouchableWithoutFeedback>
+    );
+  },
+
+  _renderIOS: function() {
+    var props = Object.assign({}, this.props);
+    props.style = [this.props.style];
+
+    if (props.selection && props.selection.end == null) {
+      props.selection = {
+        start: props.selection.start,
+        end: props.selection.start,
+      };
+    }
+
+    const RCTTextInputView = props.multiline
+      ? RCTMultilineTextInputView
+      : RCTSinglelineTextInputView;
+
+    if (props.multiline) {
+      props.style.unshift(styles.multilineInput);
+    }
+
+    const textContainer = (
+      <RCTTextInputView
+        ref={this._setNativeRef}
+        {...props}
+        onFocus={this._onFocus}
+        onBlur={this._onBlur}
+        onChange={this._onChange}
+        onContentSizeChange={this.props.onContentSizeChange}
+        onSelectionChange={this._onSelectionChange}
+        onTextInput={this._onTextInput}
+        onSelectionChangeShouldSetResponder={emptyFunction.thatReturnsTrue}
+        text={this._getText()}
+        dataDetectorTypes={this.props.dataDetectorTypes}
+        onScroll={this._onScroll}
+      />
+    );
+
     return (
       <TouchableWithoutFeedback
         onLayout={props.onLayout}
@@ -810,10 +883,7 @@ const TextInput = createReactClass({
 
   _renderAndroid: function() {
     const props = Object.assign({}, this.props);
-    props.style = this.props.style;
-    if (this.state.layoutHeight >= 0) {
-      props.style = [props.style, {height: this.state.layoutHeight}];
-    }
+    props.style = [this.props.style];
     props.autoCapitalize =
       UIManager.AndroidTextInput.Constants.AutoCapitalizationType[
         props.autoCapitalize || 'sentences'
@@ -826,15 +896,20 @@ const TextInput = createReactClass({
     React.Children.forEach(children, () => ++childCount);
     invariant(
       !(this.props.value && childCount),
-      'Cannot specify both value and children.'
+      'Cannot specify both value and children.',
     );
     if (childCount > 1) {
       children = <Text>{children}</Text>;
     }
+
     if (props.selection && props.selection.end == null) {
-      props.selection = {start: props.selection.start, end: props.selection.start};
+      props.selection = {
+        start: props.selection.start,
+        end: props.selection.start,
+      };
     }
-    const textContainer =
+
+    const textContainer = (
       <AndroidTextInput
         ref={this._setNativeRef}
         {...props}
@@ -842,7 +917,6 @@ const TextInput = createReactClass({
         onFocus={this._onFocus}
         onBlur={this._onBlur}
         onChange={this._onChange}
-        onContentSizeChange={this._onContentSizeChange}
         onSelectionChange={this._onSelectionChange}
         onTextInput={this._onTextInput}
         text={this._getText()}
@@ -850,7 +924,8 @@ const TextInput = createReactClass({
         disableFullscreenUI={this.props.disableFullscreenUI}
         textBreakStrategy={this.props.textBreakStrategy}
         onScroll={this._onScroll}
-      />;
+      />
+    );
 
     return (
       <TouchableWithoutFeedback
@@ -873,7 +948,7 @@ const TextInput = createReactClass({
     if (this.state.layoutHeight >= 0) {
       props.style = [props.style, {height: this.state.layoutHeight}];
     }
-
+    
     if (props.secureTextEntry) {
       // Warn if using properties not supported during secureTextEntry
       if (__DEV__) {
@@ -1023,22 +1098,28 @@ const TextInput = createReactClass({
     }
   },
 
-  componentDidUpdate: function () {
+  componentDidUpdate: function() {
     // This is necessary in case native updates the text and JS decides
     // that the update should be ignored and we should stick with the value
     // that we have in JS.
     const nativeProps = {};
 
-    if (this._lastNativeText !== this.props.value && typeof this.props.value === 'string') {
+    if (
+      this._lastNativeText !== this.props.value &&
+      typeof this.props.value === 'string'
+    ) {
       nativeProps.text = this.props.value;
     }
 
     // Selection is also a controlled prop, if the native value doesn't match
     // JS, update to the JS value.
     const {selection} = this.props;
-    if (this._lastNativeSelection && selection &&
-        (this._lastNativeSelection.start !== selection.start ||
-        this._lastNativeSelection.end !== selection.end)) {
+    if (
+      this._lastNativeSelection &&
+      selection &&
+      (this._lastNativeSelection.start !== selection.start ||
+        this._lastNativeSelection.end !== selection.end)
+    ) {
       nativeProps.selection = this.props.selection;
     }
 
@@ -1073,8 +1154,8 @@ const TextInput = createReactClass({
 
 var styles = StyleSheet.create({
   multilineInput: {
-    // This default top inset makes RCTTextView seem as close as possible
-    // to single-line RCTTextField defaults, using the system defaults
+    // This default top inset makes RCTMultilineTextInputView seem as close as possible
+    // to single-line RCTSinglelineTextInputView defaults, using the system defaults
     // of font size 17 and a height of 31 points.
     paddingTop: 5,
   },
diff --git a/Libraries/Components/TextInput/TextInputState.windows.js b/Libraries/Components/TextInput/TextInputState.windows.js
index 3aae576bcdc..356960f6da7 100644
--- a/Libraries/Components/TextInput/TextInputState.windows.js
+++ b/Libraries/Components/TextInput/TextInputState.windows.js
@@ -1,10 +1,13 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule TextInputState
  * @flow
@@ -59,7 +62,7 @@ var TextInputState = {
   },
 
   /**
-   * @param {number} textFieldID id of the text field to focus
+   * @param {number} textFieldID id of the text field to unfocus
    * Unfocuses the specified text field
    * noop if it wasn't focused
    */
diff --git a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.windows.js b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.windows.js
index 0d7ceee4b64..a6b630d7c39 100644
--- a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.windows.js
+++ b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.windows.js
@@ -1,18 +1,14 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimePickerAndroid
  * @flow
  */
 'use strict';
 
-var warning = require('fbjs/lib/warning');
-
 const TimePickerAndroid = {
   async open(options: Object): Promise<Object> {
     return Promise.reject({
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.windows.js b/Libraries/Components/ToastAndroid/ToastAndroid.windows.js
index 4fc912777ab..b44f812ecff 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.windows.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToastAndroid
  * @noflow
diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.windows.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.windows.js
index 28a8901ff89..68ef4ef8300 100644
--- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.windows.js
+++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToolbarAndroid
  */
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.windows.js b/Libraries/Components/Touchable/TouchableNativeFeedback.windows.js
index 99abaa3a070..9b7ff5e7e82 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.windows.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableNativeFeedback
  */
diff --git a/Libraries/Components/View/PlatformViewPropTypes.windows.js b/Libraries/Components/View/PlatformViewPropTypes.windows.js
new file mode 100644
index 00000000000..088775f9ef8
--- /dev/null
+++ b/Libraries/Components/View/PlatformViewPropTypes.windows.js
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ * @providesModule PlatformViewPropTypes
+ * @flow
+ */
+
+const PropTypes = require('prop-types');
+
+module.exports = {
+  /**
+   * Controls how view can be manipulated using gestures. We have not yet added
+   * support for inertia or rails manipulation modes.
+   *
+   * Possible values:
+   *
+   *  - `'system'` - (default) The view responds in the way designated by the
+   *    native system
+   *  - `'none'` - The view does not respond to any touch.
+   *  - `'translateX'` - The view responds to X-dimension gestures.
+   *  - `'translateY'` - The view responds to Y-dimension gestures.
+   *  - `'rotate'` - The view responds to rotate gestures.
+   *  - `'scale'` - The view responds to scale gestures.
+   *  - `'all'` - The view responds to all gesture types.
+   *
+   * @platform windows
+   */
+  manipulationModes: PropTypes.arrayOf(
+    PropTypes.oneOf([
+      'system',
+      'none',
+      'translateX',
+      'translateY',
+      'rotate',
+      'scale',
+      'all',
+    ])),
+
+  /**
+   * A short string description that will appear in a tooltip if the user
+   * hovers their pointer over the View for a short duration.
+   *
+   * @platform windows
+   */
+  tooltip: PropTypes.string,
+};
diff --git a/Libraries/Components/View/ViewPropTypes.windows.js b/Libraries/Components/View/ViewPropTypes.windows.js
deleted file mode 100644
index 696e9aee5e9..00000000000
--- a/Libraries/Components/View/ViewPropTypes.windows.js
+++ /dev/null
@@ -1,509 +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.
- *
- * @providesModule ViewPropTypes
- * @flow
- */
-'use strict';
-
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
-const Platform = require('Platform');
-const PropTypes = require('prop-types');
-const StyleSheetPropType = require('StyleSheetPropType');
-const ViewStylePropTypes = require('ViewStylePropTypes');
-
-const {
-  AccessibilityComponentTypes,
-  AccessibilityTraits,
-} = require('ViewAccessibility');
-
-var TVViewPropTypes = {};
-if (Platform.isTVOS) {
-  TVViewPropTypes = require('TVViewPropTypes');
-}
-
-import type {
-  AccessibilityComponentType,
-  AccessibilityTrait,
-} from 'ViewAccessibility';
-import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
-import type {TVViewProps} from 'TVViewPropTypes';
-
-const stylePropType = StyleSheetPropType(ViewStylePropTypes);
-
-export type ViewLayout = {
-  x: number,
-  y: number,
-  width: number,
-  height: number,
-}
-
-export type ViewLayoutEvent = {
-  nativeEvent: {
-    layout: ViewLayout,
-  }
-}
-
-// There's no easy way to create a different type if(Platform.isTVOS):
-// so we must include TVViewProps
-export type ViewProps = {
-  accessible?: bool,
-  accessibilityLabel?: React$PropType$Primitive<any>,
-  accessibilityComponentType?: AccessibilityComponentType,
-  accessibilityLiveRegion?: 'none' | 'polite' | 'assertive',
-  importantForAccessibility?: 'auto'| 'yes'| 'no'| 'no-hide-descendants',
-  accessibilityTraits?: AccessibilityTrait | Array<AccessibilityTrait>,
-  accessibilityViewIsModal?: bool,
-  onAccessibilityTap?: Function,
-  onMagicTap?: Function,
-  testID?: string,
-  nativeID?: string,
-  onLayout?: (event: ViewLayoutEvent) => void,
-  onResponderGrant?: Function,
-  onResponderMove?: Function,
-  onResponderReject?: Function,
-  onResponderRelease?: Function,
-  onResponderTerminate?: Function,
-  onResponderTerminationRequest?: Function,
-  onStartShouldSetResponder?: Function,
-  onStartShouldSetResponderCapture?: Function,
-  onMoveShouldSetResponder?: Function,
-  onMoveShouldSetResponderCapture?: Function,
-  hitSlop?: EdgeInsetsProp,
-  pointerEvents?: 'box-none'| 'none'| 'box-only'| 'auto',
-  style?: stylePropType,
-  removeClippedSubviews?: bool,
-  renderToHardwareTextureAndroid?: bool,
-  shouldRasterizeIOS?: bool,
-  collapsable?: bool,
-  needsOffscreenAlphaCompositing?: bool,
-  tooltip?: string,
-} & TVViewProps;
-
-module.exports = {
-  ...TVViewPropTypes,
-
-  /**
-   * When `true`, indicates that the view is an accessibility element. By default,
-   * all the touchable elements are accessible.
-   */
-  accessible: PropTypes.bool,
-
-  /**
-   * Overrides the text that's read by the screen reader when the user interacts
-   * with the element. By default, the label is constructed by traversing all the
-   * children and accumulating all the `Text` nodes separated by space.
-   */
-  accessibilityLabel: PropTypes.node,
-
-  /**
-   * Indicates to accessibility services to treat UI component like a
-   * native one. Works for Android only.
-   *
-   * Possible values are one of:
-   *
-   * - `'none'`
-   * - `'button'`
-   * - `'radiobutton_checked'`
-   * - `'radiobutton_unchecked'`
-   *
-   * @platform android
-   */
-  accessibilityComponentType: PropTypes.oneOf(AccessibilityComponentTypes),
-
-  /**
-   * Indicates to accessibility services whether the user should be notified
-   * when this view changes. Works for Android API >= 19 only.
-   * Possible values:
-   *
-   * - `'none'` - Accessibility services should not announce changes to this view.
-   * - `'polite'`- Accessibility services should announce changes to this view.
-   * - `'assertive'` - Accessibility services should interrupt ongoing speech to immediately announce changes to this view.
-   *
-   * See the [Android `View` docs](http://developer.android.com/reference/android/view/View.html#attr_android:accessibilityLiveRegion)
-   * for reference.
-   *
-   * @platform android
-   */
-  accessibilityLiveRegion: PropTypes.oneOf([
-    'none',
-    'polite',
-    'assertive',
-  ]),
-
-  /**
-   * Controls how view is important for accessibility which is if it
-   * fires accessibility events and if it is reported to accessibility services
-   * that query the screen. Works for Android only.
-   *
-   * Possible values:
-   *
-   *  - `'auto'` - The system determines whether the view is important for accessibility -
-   *    default (recommended).
-   *  - `'yes'` - The view is important for accessibility.
-   *  - `'no'` - The view is not important for accessibility.
-   *  - `'no-hide-descendants'` - The view is not important for accessibility,
-   *    nor are any of its descendant views.
-   *
-   * See the [Android `importantForAccessibility` docs](http://developer.android.com/reference/android/R.attr.html#importantForAccessibility)
-   * for reference.
-   *
-   * @platform android
-   */
-  importantForAccessibility: PropTypes.oneOf([
-    'auto',
-    'yes',
-    'no',
-    'no-hide-descendants',
-  ]),
-
-  /**
-   * Provides additional traits to screen reader. By default no traits are
-   * provided unless specified otherwise in element.
-   *
-   * You can provide one trait or an array of many traits.
-   *
-   * Possible values for `AccessibilityTraits` are:
-   *
-   * - `'none'` - The element has no traits.
-   * - `'button'` - The element should be treated as a button.
-   * - `'link'` - The element should be treated as a link.
-   * - `'header'` - The element is a header that divides content into sections.
-   * - `'search'` - The element should be treated as a search field.
-   * - `'image'` - The element should be treated as an image.
-   * - `'selected'` - The element is selected.
-   * - `'plays'` - The element plays sound.
-   * - `'key'` - The element should be treated like a keyboard key.
-   * - `'text'` - The element should be treated as text.
-   * - `'summary'` - The element provides app summary information.
-   * - `'disabled'` - The element is disabled.
-   * - `'frequentUpdates'` - The element frequently changes its value.
-   * - `'startsMedia'` - The element starts a media session.
-   * - `'adjustable'` - The element allows adjustment over a range of values.
-   * - `'allowsDirectInteraction'` - The element allows direct touch interaction for VoiceOver users.
-   * - `'pageTurn'` - Informs VoiceOver that it should scroll to the next page when it finishes reading the contents of the element.
-   *
-   * See the [Accessibility guide](docs/accessibility.html#accessibilitytraits-ios)
-   * for more information.
-   *
-   * @platform ios
-   */
-  accessibilityTraits: PropTypes.oneOfType([
-    PropTypes.oneOf(AccessibilityTraits),
-    PropTypes.arrayOf(PropTypes.oneOf(AccessibilityTraits)),
-  ]),
-
-  /**
-   * A value indicating whether VoiceOver should ignore the elements
-   * within views that are siblings of the receiver.
-   * Default is `false`.
-   *
-   * See the [Accessibility guide](docs/accessibility.html#accessibilitytraits-ios)
-   * for more information.
-   *
-   * @platform ios
-   */
-  accessibilityViewIsModal: PropTypes.bool,
-
-  /**
-   * When `accessible` is true, the system will try to invoke this function
-   * when the user performs accessibility tap gesture.
-   */
-  onAccessibilityTap: PropTypes.func,
-
-  /**
-   * When `accessible` is `true`, the system will invoke this function when the
-   * user performs the magic tap gesture.
-   */
-  onMagicTap: PropTypes.func,
-
-  /**
-   * Used to locate this view in end-to-end tests.
-   *
-   * > This disables the 'layout-only view removal' optimization for this view!
-   */
-  testID: PropTypes.string,
-
-  /**
-   * Used to locate this view from native classes.
-   *
-   * > This disables the 'layout-only view removal' optimization for this view!
-   */
-  nativeID: PropTypes.string,
-
-  /**
-   * For most touch interactions, you'll simply want to wrap your component in
-   * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
-   * `ScrollResponder.js` and `ResponderEventPlugin.js` for more discussion.
-   */
-
-  /**
-   * The View is now responding for touch events. This is the time to highlight and show the user
-   * what is happening.
-   *
-   * `View.props.onResponderGrant: (event) => {}`, where `event` is a synthetic touch event as
-   * described above.
-   */
-  onResponderGrant: PropTypes.func,
-
-  /**
-   * The user is moving their finger.
-   *
-   * `View.props.onResponderMove: (event) => {}`, where `event` is a synthetic touch event as
-   * described above.
-   */
-  onResponderMove: PropTypes.func,
-
-  /**
-   * Another responder is already active and will not release it to that `View` asking to be
-   * the responder.
-   *
-   * `View.props.onResponderReject: (event) => {}`, where `event` is a synthetic touch event as
-   * described above.
-   */
-  onResponderReject: PropTypes.func,
-
-  /**
-   * Fired at the end of the touch.
-   *
-   * `View.props.onResponderRelease: (event) => {}`, where `event` is a synthetic touch event as
-   * described above.
-   */
-  onResponderRelease: PropTypes.func,
-
-  /**
-   * The responder has been taken from the `View`. Might be taken by other views after a call to
-   * `onResponderTerminationRequest`, or might be taken by the OS without asking (e.g., happens
-   * with control center/ notification center on iOS)
-   *
-   * `View.props.onResponderTerminate: (event) => {}`, where `event` is a synthetic touch event as
-   * described above.
-   */
-  onResponderTerminate: PropTypes.func,
-
-  /**
-   * Some other `View` wants to become responder and is asking this `View` to release its
-   * responder. Returning `true` allows its release.
-   *
-   * `View.props.onResponderTerminationRequest: (event) => {}`, where `event` is a synthetic touch
-   * event as described above.
-   */
-  onResponderTerminationRequest: PropTypes.func,
-
-  /**
-   * Does this view want to become responder on the start of a touch?
-   *
-   * `View.props.onStartShouldSetResponder: (event) => [true | false]`, where `event` is a
-   * synthetic touch event as described above.
-   */
-  onStartShouldSetResponder: PropTypes.func,
-
-  /**
-   * If a parent `View` wants to prevent a child `View` from becoming responder on a touch start,
-   * it should have this handler which returns `true`.
-   *
-   * `View.props.onStartShouldSetResponderCapture: (event) => [true | false]`, where `event` is a
-   * synthetic touch event as described above.
-   */
-  onStartShouldSetResponderCapture: PropTypes.func,
-
-  /**
-   * Does this view want to "claim" touch responsiveness? This is called for every touch move on
-   * the `View` when it is not the responder.
-   *
-   * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where `event` is a
-   * synthetic touch event as described above.
-   */
-  onMoveShouldSetResponder: PropTypes.func,
-
-  /**
-  * If a parent `View` wants to prevent a child `View` from becoming responder on a move,
-  * it should have this handler which returns `true`.
-  *
-  * `View.props.onMoveShouldSetResponderCapture: (event) => [true | false]`, where `event` is a
-  * synthetic touch event as described above.
-   */
-  onMoveShouldSetResponderCapture: PropTypes.func,
-
-  /**
-   * This defines how far a touch event can start away from the view.
-   * Typical interface guidelines recommend touch targets that are at least
-   * 30 - 40 points/density-independent pixels.
-   *
-   * For example, if a touchable view has a height of 20 the touchable height can be extended to
-   * 40 with `hitSlop={{top: 10, bottom: 10, left: 0, right: 0}}`
-   *
-   * > The touch area never extends past the parent view bounds and the Z-index
-   * > of sibling views always takes precedence if a touch hits two overlapping
-   * > views.
-   */
-  hitSlop: EdgeInsetsPropType,
-
-  /**
-   * Invoked on mount and layout changes with:
-   *
-   * `{nativeEvent: { layout: {x, y, width, height}}}`
-   *
-   * This event is fired immediately once the layout has been calculated, but
-   * the new layout may not yet be reflected on the screen at the time the
-   * event is received, especially if a layout animation is in progress.
-   */
-  onLayout: PropTypes.func,
-
-  /**
-   * Controls whether the `View` can be the target of touch events.
-   *
-   *   - `'auto'`: The View can be the target of touch events.
-   *   - `'none'`: The View is never the target of touch events.
-   *   - `'box-none'`: The View is never the target of touch events but it's
-   *     subviews can be. It behaves like if the view had the following classes
-   *     in CSS:
-   * ```
-   * .box-none {
-   *      pointer-events: none;
-   * }
-   * .box-none * {
-   *      pointer-events: all;
-   * }
-   * ```
-   *   - `'box-only'`: The view can be the target of touch events but it's
-   *     subviews cannot be. It behaves like if the view had the following classes
-   *     in CSS:
-   * ```
-   * .box-only {
-   *      pointer-events: all;
-   * }
-   * .box-only * {
-   *      pointer-events: none;
-   * }
-   * ```
-   * > Since `pointerEvents` does not affect layout/appearance, and we are
-   * > already deviating from the spec by adding additional modes, we opt to not
-   * > include `pointerEvents` on `style`. On some platforms, we would need to
-   * > implement it as a `className` anyways. Using `style` or not is an
-   * > implementation detail of the platform.
-   */
-  pointerEvents: PropTypes.oneOf([
-    'box-none',
-    'none',
-    'box-only',
-    'auto',
-  ]),
-  style: stylePropType,
-
-  /**
-   * This is a special performance property exposed by `RCTView` and is useful
-   * for scrolling content when there are many subviews, most of which are
-   * offscreen. For this property to be effective, it must be applied to a
-   * view that contains many subviews that extend outside its bound. The
-   * subviews must also have `overflow: hidden`, as should the containing view
-   * (or one of its superviews).
-   */
-  removeClippedSubviews: PropTypes.bool,
-
-  /**
-   * Whether this `View` should render itself (and all of its children) into a
-   * single hardware texture on the GPU.
-   *
-   * On Android, this is useful for animations and interactions that only
-   * modify opacity, rotation, translation, and/or scale: in those cases, the
-   * view doesn't have to be redrawn and display lists don't need to be
-   * re-executed. The texture can just be re-used and re-composited with
-   * different parameters. The downside is that this can use up limited video
-   * memory, so this prop should be set back to false at the end of the
-   * interaction/animation.
-   *
-   * @platform android
-   */
-  renderToHardwareTextureAndroid: PropTypes.bool,
-
-  /**
-   * Whether this `View` should be rendered as a bitmap before compositing.
-   *
-   * On iOS, this is useful for animations and interactions that do not
-   * modify this component's dimensions nor its children; for example, when
-   * translating the position of a static view, rasterization allows the
-   * renderer to reuse a cached bitmap of a static view and quickly composite
-   * it during each frame.
-   *
-   * Rasterization incurs an off-screen drawing pass and the bitmap consumes
-   * memory. Test and measure when using this property.
-   *
-   * @platform ios
-   */
-  shouldRasterizeIOS: PropTypes.bool,
-
-  /**
-   * Views that are only used to layout their children or otherwise don't draw
-   * anything may be automatically removed from the native hierarchy as an
-   * optimization. Set this property to `false` to disable this optimization and
-   * ensure that this `View` exists in the native view hierarchy.
-   *
-   * @platform android
-   */
-  collapsable: PropTypes.bool,
-
-  /**
-   * Whether this `View` needs to rendered offscreen and composited with an alpha
-   * in order to preserve 100% correct colors and blending behavior. The default
-   * (`false`) falls back to drawing the component and its children with an alpha
-   * applied to the paint used to draw each element instead of rendering the full
-   * component offscreen and compositing it back with an alpha value. This default
-   * may be noticeable and undesired in the case where the `View` you are setting
-   * an opacity on has multiple overlapping elements (e.g. multiple overlapping
-   * `View`s, or text and a background).
-   *
-   * Rendering offscreen to preserve correct alpha behavior is extremely
-   * expensive and hard to debug for non-native developers, which is why it is
-   * not turned on by default. If you do need to enable this property for an
-   * animation, consider combining it with renderToHardwareTextureAndroid if the
-   * view **contents** are static (i.e. it doesn't need to be redrawn each frame).
-   * If that property is enabled, this View will be rendered off-screen once,
-   * saved in a hardware texture, and then composited onto the screen with an alpha
-   * each frame without having to switch rendering targets on the GPU.
-   *
-   * @platform android
-   */
-  needsOffscreenAlphaCompositing: PropTypes.bool,
-
-  /**
-   * Controls how view can be manipulated using gestures. We have not yet added
-   * support for inertia or rails manipulation modes.
-   *
-   * Possible values:
-   *
-   *  - `'system'` - (default) The view responds in the way designated by the
-   *    native system
-   *  - `'none'` - The view does not respond to any touch.
-   *  - `'translateX'` - The view responds to X-dimension gestures.
-   *  - `'translateY'` - The view responds to Y-dimension gestures.
-   *  - `'rotate'` - The view responds to rotate gestures.
-   *  - `'scale'` - The view responds to scale gestures.
-   *  - `'all'` - The view responds to all gesture types.
-   *
-   * @platform windows
-   */
-  manipulationModes: PropTypes.arrayOf(
-    PropTypes.oneOf([
-        'system',
-        'none',
-        'translateX',
-        'translateY',
-        'rotate',
-        'scale',
-        'all',
-    ])),
-
-    /**
-     * A short string description that will appear in a tooltip if the user
-     * hovers their pointer over the View for a short duration.
-     *
-     * @platform windows
-     */
-    tooltip: PropTypes.string,
-};
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.windows.js b/Libraries/Components/ViewPager/ViewPagerAndroid.windows.js
index 35d4196b489..ee0022ae545 100644
--- a/Libraries/Components/ViewPager/ViewPagerAndroid.windows.js
+++ b/Libraries/Components/ViewPager/ViewPagerAndroid.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewPagerAndroid
  */
diff --git a/Libraries/Components/WebView/WebView.windows.js b/Libraries/Components/WebView/WebView.windows.js
index 6201f61cb81..4ea159c1056 100644
--- a/Libraries/Components/WebView/WebView.windows.js
+++ b/Libraries/Components/WebView/WebView.windows.js
@@ -1,10 +1,13 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  *
  * @providesModule WebView
  */
@@ -45,6 +48,14 @@ var defaultRenderLoading = () => (
  * Renders a native WebView.
  */
 class WebView extends React.Component {
+  static get extraNativeComponentConfig() {
+    return {
+      nativeOnly: {
+        messagingEnabled: PropTypes.bool,
+      },
+    };
+  }
+
   static propTypes = {
     ...ViewPropTypes,
     renderError: PropTypes.func,
@@ -57,6 +68,7 @@ class WebView extends React.Component {
     contentInset: EdgeInsetsPropType,
     onNavigationStateChange: PropTypes.func,
     onMessage: PropTypes.func,
+    onContentSizeChange: PropTypes.func,
     startInLoadingState: PropTypes.bool, // force WebView to show loadingView on first load
     style: ViewPropTypes.style,
 
@@ -124,12 +136,36 @@ class WebView extends React.Component {
      * @platform windows
      */
     indexedDbEnabled: PropTypes.bool,
-    
+
+    /**
+     * Used on Android Lollipop and above only, third party cookies are enabled
+     * by default for WebView on Android Kitkat and below and on iOS
+     * @platform android
+     */
+    thirdPartyCookiesEnabled: PropTypes.bool,
+
+    /**
+     * Used on Android only, controls whether DOM Storage is enabled or not
+     * @platform android
+     */
+    domStorageEnabled: PropTypes.bool,
+
     /**
      * Sets the JS to be injected when the webpage loads.
      */
     injectedJavaScript: PropTypes.string,
 
+    /**
+     * Sets whether the webpage scales to fit the view and the user can change the scale.
+     */
+    scalesPageToFit: PropTypes.bool,
+
+    /**
+     * Sets the user-agent for this WebView. The user-agent can also be set in native using
+     * WebViewConfig. This prop will overwrite that config.
+     */
+    userAgent: PropTypes.string,
+
     /**
      * Used to locate this view in end-to-end tests.
      */
@@ -141,15 +177,77 @@ class WebView extends React.Component {
      */
     mediaPlaybackRequiresUserAction: PropTypes.bool,
 
+    /**
+     * Boolean that sets whether JavaScript running in the context of a file
+     * scheme URL should be allowed to access content from any origin.
+     * Including accessing content from other file scheme URLs
+     * @platform android
+     */
+    allowUniversalAccessFromFileURLs: PropTypes.bool,
+
     /**
      * Function that accepts a string that will be passed to the WebView and
      * executed immediately as JavaScript.
      */
     injectJavaScript: PropTypes.func,
+
+    /**
+     * Specifies the mixed content mode. i.e WebView will allow a secure origin to load content from any other origin.
+     *
+     * Possible values for `mixedContentMode` are:
+     *
+     * - `'never'` (default) - WebView will not allow a secure origin to load content from an insecure origin.
+     * - `'always'` - WebView will allow a secure origin to load content from any other origin, even if that origin is insecure.
+     * - `'compatibility'` -  WebView will attempt to be compatible with the approach of a modern web browser with regard to mixed content.
+     * @platform android
+     */
+    mixedContentMode: PropTypes.oneOf([
+      'never',
+      'always',
+      'compatibility'
+    ]),
+
+    /**
+     * Used on Android only, controls whether form autocomplete data should be saved
+     * @platform android
+     */
+    saveFormDataDisabled: PropTypes.bool,
+
+    /**
+     * Override the native component used to render the WebView. Enables a custom native
+     * WebView which uses the same JavaScript as the original WebView.
+     */
+    nativeConfig: PropTypes.shape({
+      /*
+       * The native component used to render the WebView.
+       */
+      component: PropTypes.any,
+      /*
+       * Set props directly on the native component WebView. Enables custom props which the
+       * original WebView doesn't pass through.
+       */
+      props: PropTypes.object,
+      /*
+       * Set the ViewManager to use for communcation with the native side.
+       * @platform ios
+       */
+      viewManager: PropTypes.object,
+    }),
+    /*
+     * Used on Android only, controls whether the given list of URL prefixes should
+     * make {@link com.facebook.react.views.webview.ReactWebViewClient} to launch a
+     * default activity intent for those URL instead of loading it within the webview.
+     * Use this to list URLs that WebView cannot handle, e.g. a PDF url.
+     * @platform android
+     */
+    urlPrefixesForDefaultIntent: PropTypes.arrayOf(PropTypes.string),
   };
 
   static defaultProps = {
     javaScriptEnabled : true,
+    thirdPartyCookiesEnabled: true,
+    scalesPageToFit: true,
+    saveFormDataDisabled: false
   };
 
   state = {
@@ -158,7 +256,7 @@ class WebView extends React.Component {
     startInLoadingState: true,
   };
 
-  componentWillMount() {
+  UNSAFE_componentWillMount() {
     if (this.props.startInLoadingState) {
       this.setState({viewState: WebViewState.LOADING});
     }
@@ -193,23 +291,44 @@ class WebView extends React.Component {
       source.uri = this.props.url;
     }
 
+    if (source.method === 'POST' && source.headers) {
+      console.warn('WebView: `source.headers` is not supported when using POST.');
+    } else if (source.method === 'GET' && source.body) {
+      console.warn('WebView: `source.body` is not supported when using GET.');
+    }
+
+    const nativeConfig = this.props.nativeConfig || {};
+
+    let NativeWebView = nativeConfig.component || RCTWebView;
+
     var webView =
-      <RCTWebView
+      <NativeWebView
         ref={RCT_WEBVIEW_REF}
         key="webViewKey"
         style={webViewStyles}
         source={resolveAssetSource(source)}
+        scalesPageToFit={this.props.scalesPageToFit}
         injectedJavaScript={this.props.injectedJavaScript}
+        userAgent={this.props.userAgent}
         javaScriptEnabled={this.props.javaScriptEnabled}
         indexedDbEnabled={this.props.indexedDbEnabled}        
+        thirdPartyCookiesEnabled={this.props.thirdPartyCookiesEnabled}
+        domStorageEnabled={this.props.domStorageEnabled}
         messagingEnabled={typeof this.props.onMessage === 'function'}
         onMessage={this.onMessage}
         contentInset={this.props.contentInset}
         automaticallyAdjustContentInsets={this.props.automaticallyAdjustContentInsets}
+        onContentSizeChange={this.props.onContentSizeChange}
         onLoadingStart={this.onLoadingStart}
         onLoadingFinish={this.onLoadingFinish}
         onLoadingError={this.onLoadingError}
         testID={this.props.testID}
+        mediaPlaybackRequiresUserAction={this.props.mediaPlaybackRequiresUserAction}
+        allowUniversalAccessFromFileURLs={this.props.allowUniversalAccessFromFileURLs}
+        mixedContentMode={this.props.mixedContentMode}
+        saveFormDataDisabled={this.props.saveFormDataDisabled}
+        urlPrefixesForDefaultIntent={this.props.urlPrefixesForDefaultIntent}
+        {...nativeConfig.props}
       />;
 
     return (
@@ -326,11 +445,7 @@ class WebView extends React.Component {
   }
 }
 
-var RCTWebView = requireNativeComponent('RCTWebView', WebView, {
-  nativeOnly: {
-    messagingEnabled: PropTypes.bool,
-  },
-});
+var RCTWebView = requireNativeComponent('RCTWebView', WebView, WebView.extraNativeComponentConfig);
 
 var styles = StyleSheet.create({
   container: {
diff --git a/Libraries/Core/ReactNativeVersion.windows.js b/Libraries/Core/ReactNativeVersion.windows.js
index 2f78126ef69..52b8f9c47b8 100644
--- a/Libraries/Core/ReactNativeVersion.windows.js
+++ b/Libraries/Core/ReactNativeVersion.windows.js
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ReactNativeVersion
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.windows.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.windows.js
deleted file mode 100644
index c48bed72afe..00000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.windows.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * 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.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule NavigationHeaderBackButton
- * @flow
-*/
-'use strict';
-
-const PropTypes = require('prop-types');
-
-const React = require('react');
-const ReactNative = require('react-native');
-
-const {
-  I18nManager,
-  Image,
-  Platform,
-  StyleSheet,
-  TouchableOpacity,
-} = ReactNative;
-
-type Props = {
-  onPress: Function,
-};
-
-const NavigationHeaderBackButton = (props: Props) => (
-  <TouchableOpacity style={styles.buttonContainer} onPress={props.onPress}>
-    <Image style={styles.button} source={require('./assets/back-icon.png')} />
-  </TouchableOpacity>
-);
-
-NavigationHeaderBackButton.propTypes = {
-  onPress: PropTypes.func.isRequired
-};
-
-const styles = StyleSheet.create({
-  buttonContainer: {
-    flex: 1,
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  button: {
-    height: 24,
-    width: 24,
-    margin: Platform.OS === 'ios' ? 10 : 16,
-    resizeMode: 'contain',
-    transform: [{scaleX: I18nManager.isRTL ? -1 : 1}],
-  }
-});
-
-module.exports = NavigationHeaderBackButton;
diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.windows.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.windows.png
deleted file mode 100644
index ad03a63bf3caba175695f5acca85a690dda2d02c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;ucwP+NCjiE#Ight69&c5o}c_J
zydef`Jl72k0*^~vo0xKDg<-rzRAUa4z<R?a4p9;=JFjy{Z=LqyfShU8-4Etno$Ffd
hAHK?nXbNOtu<@R<@!E-pIY5IMJYD@<);T3K0RYZnDc}GA

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.windows.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.windows.png
deleted file mode 100644
index 083db295f474b9903408258c71818c2c49151d35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1ZBG}+kP60RiDL^GIXr{@&3`D~
x%$9kI*}bEvW<n8f%UlzqEg2JL?P=F#U@%v3;@t9ZUpi15gQu&X%Q~loCIG9+96$g7

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.windows.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.windows.png
deleted file mode 100644
index 6de0a1cbb365dfd5d9274890d243ca2321f32235..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tUr!gukP61P(+)Bo5D;KluXOkB
z|6f;`Uoa>nrTyP5;4+Jm;dJDxe#>oP@r$y*#>rHDd13s5eN)8##R;WH*ZD4M;?i1i
i;i&z7`QNqd4J-@3aX4v+{p181%;4$j=d#Wzp$P!F!7nZV

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.windows.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.windows.png
deleted file mode 100644
index 15a983a67d97c9a6c39d91550a528c37c53a9e3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw@;qG}Ln;{G-aN{9*nr0&aBl6p
z15q2fw>DO<$f$_t-m`#N(R0!@qfL6}is!BA-aP5mqcux*S)AYDzOuXc@WF!zU-mWw
z!RNIrdq3B7GJgpV3USMNx+#Bt3lxOZSlm}!I$z&?|8f=2ODy@*gQAaCs?P@6%;4$j
K=d#Wzp$P!X&_+4{

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.windows.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.windows.png
deleted file mode 100644
index 17e52e8550e5668f7117bcb755beb70c3a21c9e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgrg^$JhEy=Vy>(TP*-+rv1Kz7M
z%I*XNJ!<?bcdY)|Wa$ZgiQGVC40bN7r>(VLzdH4Ge@o8ai4)e^3vK%P+bZq#{MQci
z?P`C0d3kxcKa^1~`zt>B;jiLd|K_aKfAEz>edFmDy)D6SUw`+o@R*?B*u=sqq~bB*
zgRIJrKN^lr3+<DqGd8bx>tD}bFTI}~XjubmVU5CWQ(LZ;AgeuH{an^LB{Ts5E|^v%

diff --git a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.windows.js b/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.windows.js
deleted file mode 100644
index 323dab405cf..00000000000
--- a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.windows.js
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigatorBreadcrumbNavigationBarStyles
- */
-'use strict';
-
-var Dimensions = require('Dimensions');
-var NavigatorNavigationBarStylesWindows = require('NavigatorNavigationBarStylesWindows');
-
-var buildStyleInterpolator = require('buildStyleInterpolator');
-var merge = require('merge');
-
-var SCREEN_WIDTH = Dimensions.get('window').width;
-var STATUS_BAR_HEIGHT = NavigatorNavigationBarStylesWindows.General.StatusBarHeight;
-var NAV_BAR_HEIGHT = NavigatorNavigationBarStylesWindows.General.NavBarHeight;
-
-var SPACING = 4;
-var ICON_WIDTH = 40;
-var SEPARATOR_WIDTH = 9;
-var CRUMB_WIDTH = ICON_WIDTH + SEPARATOR_WIDTH;
-
-var OPACITY_RATIO = 100;
-var ICON_INACTIVE_OPACITY = 0.6;
-var MAX_BREADCRUMBS = 10;
-
-var CRUMB_BASE = {
-  position: 'absolute',
-  flexDirection: 'row',
-  top: STATUS_BAR_HEIGHT,
-  width: CRUMB_WIDTH,
-  height: NAV_BAR_HEIGHT,
-  backgroundColor: 'transparent',
-};
-
-var ICON_BASE = {
-  width: ICON_WIDTH,
-  height: NAV_BAR_HEIGHT,
-};
-
-var SEPARATOR_BASE = {
-  width: SEPARATOR_WIDTH,
-  height: NAV_BAR_HEIGHT,
-};
-
-var TITLE_BASE = {
-  position: 'absolute',
-  top: STATUS_BAR_HEIGHT,
-  height: NAV_BAR_HEIGHT,
-  backgroundColor: 'transparent',
-};
-
-// For first title styles, make sure first title is centered
-var FIRST_TITLE_BASE = merge(TITLE_BASE, {
-  left: 0,
-  right: 0,
-  alignItems: 'center',
-  height: NAV_BAR_HEIGHT,
-});
-
-var RIGHT_BUTTON_BASE = {
-  position: 'absolute',
-  top: STATUS_BAR_HEIGHT,
-  right: SPACING,
-  overflow: 'hidden',
-  opacity: 1,
-  height: NAV_BAR_HEIGHT,
-  backgroundColor: 'transparent',
-};
-
-/**
- * Precompute crumb styles so that they don't need to be recomputed on every
- * interaction.
- */
-var LEFT = [];
-var CENTER = [];
-var RIGHT = [];
-for (var i = 0; i < MAX_BREADCRUMBS; i++) {
-  var crumbLeft = CRUMB_WIDTH * i + SPACING;
-  LEFT[i] = {
-    Crumb: merge(CRUMB_BASE, { left: crumbLeft }),
-    Icon: merge(ICON_BASE, { opacity: ICON_INACTIVE_OPACITY }),
-    Separator: merge(SEPARATOR_BASE, { opacity: 1 }),
-    Title: merge(TITLE_BASE, { left: crumbLeft, opacity: 0 }),
-    RightItem: merge(RIGHT_BUTTON_BASE, { opacity: 0 }),
-  };
-  CENTER[i] = {
-    Crumb: merge(CRUMB_BASE, { left: crumbLeft }),
-    Icon: merge(ICON_BASE, { opacity: 1 }),
-    Separator: merge(SEPARATOR_BASE, { opacity: 0 }),
-    Title: merge(TITLE_BASE, {
-      left: crumbLeft + ICON_WIDTH,
-      opacity: 1,
-    }),
-    RightItem: merge(RIGHT_BUTTON_BASE, { opacity: 1 }),
-  };
-  var crumbRight = SCREEN_WIDTH - 100;
-  RIGHT[i] = {
-    Crumb: merge(CRUMB_BASE, { left: crumbRight}),
-    Icon: merge(ICON_BASE, { opacity: 0 }),
-    Separator: merge(SEPARATOR_BASE, { opacity: 0 }),
-    Title: merge(TITLE_BASE, {
-      left: crumbRight + ICON_WIDTH,
-      opacity: 0,
-    }),
-    RightItem: merge(RIGHT_BUTTON_BASE, { opacity: 0 }),
-  };
-}
-
-// Special case the CENTER state of the first scene.
-CENTER[0] = {
-  Crumb: merge(CRUMB_BASE, {left: SCREEN_WIDTH / 4}),
-  Icon: merge(ICON_BASE, {opacity: 0}),
-  Separator: merge(SEPARATOR_BASE, {opacity: 0}),
-  Title: merge(FIRST_TITLE_BASE, {opacity: 1}),
-  RightItem: CENTER[0].RightItem,
-};
-LEFT[0].Title = merge(FIRST_TITLE_BASE, {left: -SCREEN_WIDTH / 4, opacity: 0});
-RIGHT[0].Title = merge(FIRST_TITLE_BASE, {opacity: 0});
-
-
-var buildIndexSceneInterpolator = function(startStyles, endStyles) {
-  return {
-    Crumb: buildStyleInterpolator({
-      left: {
-        type: 'linear',
-        from: startStyles.Crumb.left,
-        to: endStyles.Crumb.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-    Icon: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Icon.opacity,
-        to: endStyles.Icon.opacity,
-        min: 0,
-        max: 1,
-      },
-    }),
-    Separator: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Separator.opacity,
-        to: endStyles.Separator.opacity,
-        min: 0,
-        max: 1,
-      },
-    }),
-    Title: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Title.opacity,
-        to: endStyles.Title.opacity,
-        min: 0,
-        max: 1,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.Title.left,
-        to: endStyles.Title.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-    RightItem: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.RightItem.opacity,
-        to: endStyles.RightItem.opacity,
-        min: 0,
-        max: 1,
-        round: OPACITY_RATIO,
-      },
-    }),
-  };
-};
-
-var Interpolators = CENTER.map(function(_, ii) {
-  return {
-    // Animating *into* the center stage from the right
-    RightToCenter: buildIndexSceneInterpolator(RIGHT[ii], CENTER[ii]),
-    // Animating out of the center stage, to the left
-    CenterToLeft: buildIndexSceneInterpolator(CENTER[ii], LEFT[ii]),
-    // Both stages (animating *past* the center stage)
-    RightToLeft: buildIndexSceneInterpolator(RIGHT[ii], LEFT[ii]),
-  };
-});
-
-/**
- * Contains constants that are used in constructing both `StyleSheet`s and
- * inline styles during transitions.
- */
-module.exports = {
-  Interpolators,
-  Left: LEFT,
-  Center: CENTER,
-  Right: RIGHT,
-  IconWidth: ICON_WIDTH,
-  IconHeight: NAV_BAR_HEIGHT,
-  SeparatorWidth: SEPARATOR_WIDTH,
-  SeparatorHeight: NAV_BAR_HEIGHT,
-};
diff --git a/Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesWindows.js b/Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesWindows.js
deleted file mode 100644
index ae41fc4edd2..00000000000
--- a/Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesWindows.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigatorNavigationBarStylesWindows
- */
-'use strict';
-
-var Dimensions = require('Dimensions');
-
-var buildStyleInterpolator = require('buildStyleInterpolator');
-var merge = require('merge');
-
-var SCREEN_WIDTH = Dimensions.get('window').width;
-var NAV_BAR_HEIGHT = 44;
-var STATUS_BAR_HEIGHT = 20;
-var NAV_HEIGHT = NAV_BAR_HEIGHT + STATUS_BAR_HEIGHT;
-
-var BASE_STYLES = {
-  Title: {
-    position: 'absolute',
-    top: STATUS_BAR_HEIGHT,
-    left: 0,
-    right: 0,
-    alignItems: 'center',
-    height: NAV_BAR_HEIGHT,
-    backgroundColor: 'transparent',
-  },
-  LeftButton: {
-    position: 'absolute',
-    top: STATUS_BAR_HEIGHT,
-    left: 0,
-    overflow: 'hidden',
-    opacity: 1,
-    height: NAV_BAR_HEIGHT,
-    backgroundColor: 'transparent',
-  },
-  RightButton: {
-    position: 'absolute',
-    top: STATUS_BAR_HEIGHT,
-    right: 0,
-    overflow: 'hidden',
-    opacity: 1,
-    alignItems: 'flex-end',
-    height: NAV_BAR_HEIGHT,
-    backgroundColor: 'transparent',
-  },
-};
-
-// There are 3 stages: left, center, right. All previous navigation
-// items are in the left stage. The current navigation item is in the
-// center stage. All upcoming navigation items are in the right stage.
-// Another way to think of the stages is in terms of transitions. When
-// we move forward in the navigation stack, we perform a
-// right-to-center transition on the new navigation item and a
-// center-to-left transition on the current navigation item.
-var Stages = {
-  Left: {
-    Title: merge(BASE_STYLES.Title, { left: -SCREEN_WIDTH / 2, opacity: 0 }),
-    LeftButton: merge(BASE_STYLES.LeftButton, { left: -SCREEN_WIDTH / 3, opacity: 0 }),
-    RightButton: merge(BASE_STYLES.RightButton, { opacity: 0 }),
-  },
-  Center: {
-    Title: merge(BASE_STYLES.Title, { left: 0, opacity: 1 }),
-    LeftButton: merge(BASE_STYLES.LeftButton, { left: 0, opacity: 1 }),
-    RightButton: merge(BASE_STYLES.RightButton, { opacity: 1 }),
-  },
-  Right: {
-    Title: merge(BASE_STYLES.Title, { left: SCREEN_WIDTH / 2, opacity: 0 }),
-    LeftButton: merge(BASE_STYLES.LeftButton, { left: 0, opacity: 0 }),
-    RightButton: merge(BASE_STYLES.RightButton, { opacity: 0 }),
-  },
-};
-
-
-var opacityRatio = 100;
-
-function buildSceneInterpolators(startStyles, endStyles) {
-  return {
-    Title: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Title.opacity,
-        to: endStyles.Title.opacity,
-        min: 0,
-        max: 1,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.Title.left,
-        to: endStyles.Title.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-    LeftButton: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.LeftButton.opacity,
-        to: endStyles.LeftButton.opacity,
-        min: 0,
-        max: 1,
-        round: opacityRatio,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.LeftButton.left,
-        to: endStyles.LeftButton.left,
-        min: 0,
-        max: 1,
-      },
-    }),
-    RightButton: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.RightButton.opacity,
-        to: endStyles.RightButton.opacity,
-        min: 0,
-        max: 1,
-        round: opacityRatio,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.RightButton.left,
-        to: endStyles.RightButton.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-  };
-}
-
-var Interpolators = {
-  // Animating *into* the center stage from the right
-  RightToCenter: buildSceneInterpolators(Stages.Right, Stages.Center),
-  // Animating out of the center stage, to the left
-  CenterToLeft: buildSceneInterpolators(Stages.Center, Stages.Left),
-  // Both stages (animating *past* the center stage)
-  RightToLeft: buildSceneInterpolators(Stages.Right, Stages.Left),
-};
-
-
-module.exports = {
-  General: {
-    NavBarHeight: NAV_BAR_HEIGHT,
-    StatusBarHeight: STATUS_BAR_HEIGHT,
-    TotalNavHeight: NAV_HEIGHT,
-  },
-  Interpolators,
-  Stages,
-};
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableRow.windows.js b/Libraries/Experimental/SwipeableRow/SwipeableRow.windows.js
index 6856808bad6..3a20e92a7ef 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableRow.windows.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableRow.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
  *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree. 
+ * 
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule SwipeableRow
  * @flow
  */
@@ -17,6 +20,9 @@ const PanResponder = require('PanResponder');
 const React = require('React');
 const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
+/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
+ * found when Flow v0.54 was deployed. To see the error delete this comment and
+ * run Flow. */
 const TimerMixin = require('react-timer-mixin');
 const View = require('View');
 
@@ -72,7 +78,6 @@ const SwipeableRow = createReactClass({
   propTypes: {
     children: PropTypes.any,
     isOpen: PropTypes.bool,
-    preventSwipeLeft: PropTypes.bool,
     preventSwipeRight: PropTypes.bool,
     maxSwipeDistance: PropTypes.number.isRequired,
     onOpen: PropTypes.func.isRequired,
@@ -110,7 +115,6 @@ const SwipeableRow = createReactClass({
   getDefaultProps(): Object {
     return {
       isOpen: false,
-      preventSwipeLeft: false,
       preventSwipeRight: false,
       maxSwipeDistance: 0,
       onOpen: emptyFunction,
@@ -121,7 +125,7 @@ const SwipeableRow = createReactClass({
     };
   },
 
-  componentWillMount(): void {
+  UNSAFE_componentWillMount(): void {
     this._panResponder = PanResponder.create({
       onMoveShouldSetPanResponderCapture: this._handleMoveShouldSetPanResponderCapture,
       onPanResponderGrant: this._handlePanResponderGrant,
@@ -145,7 +149,7 @@ const SwipeableRow = createReactClass({
     }
   },
 
-  componentWillReceiveProps(nextProps: Object): void {
+  UNSAFE_componentWillReceiveProps(nextProps: Object): void {
     /**
      * We do not need an "animateOpen(noCallback)" because this animation is
      * handled internally by this component.
@@ -155,15 +159,6 @@ const SwipeableRow = createReactClass({
     }
   },
 
-  shouldComponentUpdate(nextProps: Object, nextState: Object): boolean {
-    if (this.props.shouldBounceOnMount && !nextProps.shouldBounceOnMount) {
-      // No need to rerender if SwipeableListView is disabling the bounce flag
-      return false;
-    }
-
-    return true;
-  },
-
   render(): React.Element<any> {
     // The view hidden behind the main view
     let slideOutView;
@@ -340,12 +335,10 @@ const SwipeableRow = createReactClass({
 
   // Ignore swipes due to user's finger moving slightly when tapping
   _isValidSwipe(gestureState: Object): boolean {
-    if (this.props.preventSwipeLeft && gestureState.dx < 0) {
-      return false;
-    }
-    if (this.props.preventSwipeRight && gestureState.dx > 0) {
+    if (this.props.preventSwipeRight && this._previousLeft === CLOSED_LEFT_POSITION && gestureState.dx > 0) {
       return false;
     }
+
     return Math.abs(gestureState.dx) > HORIZONTAL_SWIPE_DISTANCE_THRESHOLD;
   },
 
diff --git a/Libraries/Image/Image.windows.js b/Libraries/Image/Image.windows.js
index 23dff748695..9539d2474e3 100644
--- a/Libraries/Image/Image.windows.js
+++ b/Libraries/Image/Image.windows.js
@@ -1,40 +1,40 @@
 /**
  * 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.
  *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * 
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule Image
  * @flow
+ * @format
  */
 'use strict';
 
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var NativeModules = require('NativeModules');
 var ImageResizeMode = require('ImageResizeMode');
 var ImageStylePropTypes = require('ImageStylePropTypes');
-var ViewStylePropTypes = require('ViewStylePropTypes');
-const PropTypes = require('prop-types');
+var NativeMethodsMixin = require('NativeMethodsMixin');
+var NativeModules = require('NativeModules');
 var React = require('React');
-var createReactClass = require('create-react-class');
+var PropTypes = require('prop-types');
 var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 var StyleSheet = require('StyleSheet');
 var StyleSheetPropType = require('StyleSheetPropType');
-
 var ViewPropTypes = require('ViewPropTypes');
-var View = require('View');
+
+var createReactClass = require('create-react-class');
 var flattenStyle = require('flattenStyle');
 var merge = require('merge');
 var requireNativeComponent = require('requireNativeComponent');
 var resolveAssetSource = require('resolveAssetSource');
-var Set = require('Set');
 
-var filterObject = require('fbjs/lib/filterObject');
-var {
-  ImageLoader,
-} = NativeModules;
+const {ViewContextTypes} = require('ViewContext');
+
+var {ImageLoader} = NativeModules;
 
 let _requestId = 1;
 function generateRequestId() {
@@ -42,57 +42,24 @@ function generateRequestId() {
 }
 
 /**
- * <Image> - A react component for displaying different types of images,
+ * A React component for displaying different types of images,
  * including network images, static resources, temporary local images, and
- * images from local disk, such as the camera roll.  Example usage:
- *
- *   renderImages: function() {
- *     return (
- *       <View>
- *         <Image
- *           style={styles.icon}
- *           source={require('./myIcon.png')}
- *         />
- *         <Image
- *           style={styles.logo}
- *           source={{uri: 'http://facebook.github.io/react/img/logo_og.png'}}
- *         />
- *       </View>
- *     );
- *   },
+ * images from local disk, such as the camera roll.
  *
- * More example code in ImageExample.js
+ * See https://facebook.github.io/react-native/docs/image.html
  */
-
-var ImageViewAttributes = merge(ReactNativeViewAttributes.UIView, {
-  src: true,
-  loadingIndicatorSrc: true,
-  resizeMode: true,
-  progressiveRenderingEnabled: true,
-  fadeDuration: true,
-  shouldNotifyLoadEvents: true,
-});
-
-var ViewStyleKeys = new Set(Object.keys(ViewStylePropTypes));
-var ImageSpecificStyleKeys = new Set(Object.keys(ImageStylePropTypes).filter(x => !ViewStyleKeys.has(x)));
-
 var Image = createReactClass({
   displayName: 'Image',
-
   propTypes: {
     ...ViewPropTypes,
     style: StyleSheetPropType(ImageStylePropTypes),
-   /**
-     * `uri` is a string representing the resource identifier for the image, which
-     * could be an http address, a local file path, or a static image
-     * resource (which should be wrapped in the `require('./path/to/image.png')` function).
-     * This prop can also contain several remote `uri`, specified together with
-     * their width and height. The native side will then choose the best `uri` to display
-     * based on the measured size of the image container.
+    /**
+     * See https://facebook.github.io/react-native/docs/image.html#source
      */
     source: PropTypes.oneOfType([
       PropTypes.shape({
         uri: PropTypes.string,
+        headers: PropTypes.objectOf(PropTypes.string),
       }),
       // Opaque type returned by require('./image.jpg')
       PropTypes.number,
@@ -102,12 +69,18 @@ var Image = createReactClass({
           uri: PropTypes.string,
           width: PropTypes.number,
           height: PropTypes.number,
-        }))
+          headers: PropTypes.objectOf(PropTypes.string),
+        }),
+      ),
     ]),
     /**
-     * similarly to `source`, this property represents the resource used to render
-     * the loading indicator for the image, displayed until image is ready to be
-     * displayed, typically after when it got downloaded from network.
+     * blurRadius: the blur radius of the blur filter added to the image
+     *
+     * See https://facebook.github.io/react-native/docs/image.html#blurradius
+     */
+    blurRadius: PropTypes.number,
+    /**
+     * See https://facebook.github.io/react-native/docs/image.html#loadingindicatorsource
      */
     loadingIndicatorSource: PropTypes.oneOfType([
       PropTypes.shape({
@@ -138,24 +111,18 @@ var Image = createReactClass({
      * Used to locate this view in end-to-end tests.
      */
     testID: PropTypes.string,
+    /**
+     * The mechanism that should be used to resize the image when the image's dimensions
+     * differ from the image view's dimensions. Defaults to `auto`.
+     *
+     * See https://facebook.github.io/react-native/docs/image.html#resizemethod
+     */
+    resizeMethod: PropTypes.oneOf(['auto', 'resize', 'scale']),
     /**
      * Determines how to resize the image when the frame doesn't match the raw
      * image dimensions.
      *
-     * 'cover': Scale the image uniformly (maintain the image's aspect ratio)
-     * so that both dimensions (width and height) of the image will be equal
-     * to or larger than the corresponding dimension of the view (minus padding).
-     *
-     * 'contain': Scale the image uniformly (maintain the image's aspect ratio)
-     * so that both dimensions (width and height) of the image will be equal to
-     * or less than the corresponding dimension of the view (minus padding).
-     *
-     * 'stretch': Scale width and height independently, This may change the
-     * aspect ratio of the src.
-     *
-     * 'center': Scale the image down so that it is completely visible,
-     * if bigger than the area of the view.
-     * The image will not be scaled up.
+     * See https://facebook.github.io/react-native/docs/image.html#resizemode
      */
     resizeMode: PropTypes.oneOf(['cover', 'contain', 'stretch', 'center']),
   },
@@ -166,20 +133,25 @@ var Image = createReactClass({
     getSize(
       url: string,
       success: (width: number, height: number) => void,
-      failure: (error: any) => void,
+      failure?: (error: any) => void,
     ) {
       return ImageLoader.getSize(url)
         .then(function(sizes) {
           success(sizes.width, sizes.height);
         })
-        .catch(failure || function() {
-          console.warn('Failed to get size for image: ' + url);
-        });
+        .catch(
+          failure ||
+            function() {
+              console.warn('Failed to get size for image: ' + url);
+            },
+        );
     },
 
     /**
      * Prefetches a remote image for later use by downloading it to the disk
      * cache
+     *
+     * See https://facebook.github.io/react-native/docs/image.html#prefetch
      */
     prefetch(url: string, callback: ?Function) {
       const requestId = generateRequestId();
@@ -188,7 +160,9 @@ var Image = createReactClass({
     },
 
     /**
-     * Abort prefetch request
+     * Abort prefetch request.
+     *
+     * See https://facebook.github.io/react-native/docs/image.html#abortprefetch
      */
     abortPrefetch(requestId: number) {
       ImageLoader.abortRequest(requestId);
@@ -197,18 +171,18 @@ var Image = createReactClass({
     /**
      * Perform cache interrogation.
      *
-     * @param urls the list of image URLs to check the cache for.
-     * @return a mapping from url to cache status, such as "disk" or "memory". If a requested URL is
-     *         not in the mapping, it means it's not in the cache.
+     * See https://facebook.github.io/react-native/docs/image.html#querycache
      */
-    async queryCache(urls: Array<string>): Promise<Map<string, 'memory' | 'disk'>> {
+    async queryCache(
+      urls: Array<string>,
+    ): Promise<Map<string, 'memory' | 'disk'>> {
       return await ImageLoader.queryCache(urls);
     },
 
     /**
-     * Resolves an asset reference into an object which has the properties `uri`, `width`,
-     * and `height`. The input may either be a number (opaque type returned by
-     * require('./foo.png')) or an `ImageSource` like { uri: '<http location || file path>' }
+     * Resolves an asset reference into an object.
+     *
+     * See https://facebook.github.io/react-native/docs/image.html#resolveassetsource
      */
     resolveAssetSource: resolveAssetSource,
   },
@@ -217,43 +191,20 @@ var Image = createReactClass({
 
   /**
    * `NativeMethodsMixin` will look for this when invoking `setNativeProps`. We
-   * make `this` look like an actual native component class. Since it can render
-   * as 3 different native components we need to update viewConfig accordingly
+   * make `this` look like an actual native component class.
    */
   viewConfig: {
     uiViewClassName: 'RCTView',
     validAttributes: ReactNativeViewAttributes.RCTView,
   },
 
-  _updateViewConfig: function(props) {
-    if (props.children) {
-      this.viewConfig = {
-        uiViewClassName: 'RCTView',
-        validAttributes: ReactNativeViewAttributes.RCTView,
-      };
-    } else {
-      this.viewConfig = {
-        uiViewClassName: 'RCTImageView',
-        validAttributes: ImageViewAttributes,
-      };
-    }
-  },
-
-  componentWillMount: function() {
-    this._updateViewConfig(this.props);
-  },
-
-  componentWillReceiveProps: function(nextProps: Object) {
-    this._updateViewConfig(nextProps);
-  },
-
-  contextTypes: {
-    isInAParentText: PropTypes.bool
-  },
+  contextTypes: ViewContextTypes,
 
   render: function() {
     const source = resolveAssetSource(this.props.source);
-    const loadingIndicatorSource = resolveAssetSource(this.props.loadingIndicatorSource);
+    const loadingIndicatorSource = resolveAssetSource(
+      this.props.loadingIndicatorSource,
+    );
 
     // As opposed to the ios version, here we render `null` when there is no source, source.uri
     // or source array.
@@ -263,7 +214,15 @@ var Image = createReactClass({
     }
 
     if (this.props.src) {
-      console.warn('The <Image> component requires a `source` property rather than `src`.');
+      console.warn(
+        'The <Image> component requires a `source` property rather than `src`.',
+      );
+    }
+
+    if (this.props.children) {
+      throw new Error(
+        'The <Image> component cannot contain children. If you want to render content on top of the image, consider using the <ImageBackground> component or absolute positioning.',
+      );
     }
 
     if (source && (source.uri || Array.isArray(source))) {
@@ -281,29 +240,20 @@ var Image = createReactClass({
       const {onLoadStart, onLoad, onLoadEnd, onError} = this.props;
       const nativeProps = merge(this.props, {
         style,
-        shouldNotifyLoadEvents: !!(onLoadStart || onLoad || onLoadEnd || onError),
+        shouldNotifyLoadEvents: !!(
+          onLoadStart ||
+          onLoad ||
+          onLoadEnd ||
+          onError
+        ),
         src: sources,
-        loadingIndicatorSrc: loadingIndicatorSource ? loadingIndicatorSource.uri : null,
+        headers: source.headers,
+        loadingIndicatorSrc: loadingIndicatorSource
+          ? loadingIndicatorSource.uri
+          : null,
       });
 
-      if (nativeProps.children) {
-        // TODO(6033040): Consider implementing this as a separate native component
-        const containerStyle = filterObject(style, (val, key) => !ImageSpecificStyleKeys.has(key));
-        const imageStyle = filterObject(style, (val, key) => ImageSpecificStyleKeys.has(key));
-        const imageProps = merge(nativeProps, {
-          style: [imageStyle, styles.absoluteImage],
-          children: undefined,
-        });
-
-        return (
-          <View style={containerStyle}>
-            <RKImage {...imageProps}/>
-            {this.props.children}
-          </View>
-        );
-      } else {
-        return <RKImage {...nativeProps}/>;
-      }
+      return <RKImage {...nativeProps} />;
     }
     return null;
   },
@@ -313,18 +263,12 @@ var styles = StyleSheet.create({
   base: {
     overflow: 'hidden',
   },
-  absoluteImage: {
-    left: 0,
-    right: 0,
-    top: 0,
-    bottom: 0,
-    position: 'absolute'
-  }
 });
 
 var cfg = {
   nativeOnly: {
     src: true,
+    headers: true,
     loadingIndicatorSrc: true,
     shouldNotifyLoadEvents: true,
   },
diff --git a/Libraries/Network/NetInfo.windows.js b/Libraries/Network/NetInfo.windows.js
index 2998c9ca2e5..ebaae9d92d1 100644
--- a/Libraries/Network/NetInfo.windows.js
+++ b/Libraries/Network/NetInfo.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
  *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * 
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule NetInfo
  * @flow
  */
@@ -22,6 +25,7 @@ const NetInfoEventEmitter = new NativeEventEmitter(RCTNetInfo);
 const DEVICE_CONNECTIVITY_EVENT = 'networkStatusDidChange';
 
 type ChangeEventName = $Enum<{
+  connectionChange: string,
   change: string,
 }>;
 
@@ -64,148 +68,75 @@ type ConnectivityStateWindows = $Enum<{
 
 const _subscriptions = new Map();
 
-let _isConnected;
+let _isConnectedDeprecated;
 if (Platform.OS === 'ios') {
-  _isConnected = function(
+  _isConnectedDeprecated = function(
     reachability: ReachabilityStateIOS,
   ): bool {
     return reachability !== 'none' && reachability !== 'unknown';
   };
 } else if (Platform.OS === 'android') {
-  _isConnected = function(
+  _isConnectedDeprecated = function(
       connectionType: ConnectivityStateAndroid,
     ): bool {
     return connectionType !== 'NONE' && connectionType !== 'UNKNOWN';
   };
 } else if (Platform.OS === 'windows') {
-  _isConnected = function(
+  _isConnectedDeprecated = function(
       connectionType: ConnectivityStateWindows,
     ): bool {
     return connectionType !== 'None' && connectionType !== 'LocalAccess';
   };
 }
 
+function _isConnected(connection) {
+  return connection.type !== 'none' && connection.type !== 'unknown';
+}
+
 const _isConnectedSubscriptions = new Map();
 
 /**
- * NetInfo exposes info about online/offline status
- *
- * ```
- * NetInfo.fetch().then((reach) => {
- *   console.log('Initial: ' + reach);
- * });
- * function handleFirstConnectivityChange(reach) {
- *   console.log('First change: ' + reach);
- *   NetInfo.removeEventListener(
- *     'change',
- *     handleFirstConnectivityChange
- *   );
- * }
- * NetInfo.addEventListener(
- *   'change',
- *   handleFirstConnectivityChange
- * );
- * ```
- *
- * ### IOS
- *
- * Asynchronously determine if the device is online and on a cellular network.
- *
- * - `none` - device is offline
- * - `wifi` - device is online and connected via wifi, or is the iOS simulator
- * - `cell` - device is connected via Edge, 3G, WiMax, or LTE
- * - `unknown` - error case and the network status is unknown
- *
- * ### Android
- *
- * To request network info, you need to add the following line to your
- * app's `AndroidManifest.xml`:
- *
- * `<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />`
- * Asynchronously determine if the device is connected and details about that connection.
- *
- * Android Connectivity Types.
- *
- * - `NONE` - device is offline
- * - `BLUETOOTH` - The Bluetooth data connection.
- * - `DUMMY` -  Dummy data connection.
- * - `ETHERNET` - The Ethernet data connection.
- * - `MOBILE` - The Mobile data connection.
- * - `MOBILE_DUN` - A DUN-specific Mobile data connection.
- * - `MOBILE_HIPRI` - A High Priority Mobile data connection.
- * - `MOBILE_MMS` - An MMS-specific Mobile data connection.
- * - `MOBILE_SUPL` -  A SUPL-specific Mobile data connection.
- * - `VPN` -  A virtual network using one or more native bearers. Requires API Level 21
- * - `WIFI` - The WIFI data connection.
- * - `WIMAX` -  The WiMAX data connection.
- * - `UNKNOWN` - Unknown data connection.
- *
- * The rest ConnectivityStates are hidden by the Android API, but can be used if necessary.
- *
- * ### Windows
- *
- * Asynchronously determine if the device is connected and details about that connection.
- *
- * Windows Connectivity Types.
- *
- * - `None` - No connectivity.
- * - `LocalAccess` - Local network access only.
- * - `ConstrainedInternetAccess` - Limited internet access.
- * - `InternetAccess` - Local and Internet access.
- *
- * ### isConnectionExpensive
- *
- * Available on Android. Detect if the current active connection is metered or not. A network is
- * classified as metered when the user is sensitive to heavy data usage on that connection due to
- * monetary costs, data limitations or battery/performance issues.
- *
- * ```
- * NetInfo.isConnectionExpensive()
- * .then(isConnectionExpensive => {
- *   console.log('Connection is ' + (isConnectionExpensive ? 'Expensive' : 'Not Expensive'));
- * })
- * .catch(error => {
- *   console.error(error);
- * });
- * ```
- *
- * ### isConnected
- *
- * Available on all platforms. Asynchronously fetch a boolean to determine
- * internet connectivity.
- *
- * ```
- * NetInfo.isConnected.fetch().then(isConnected => {
- *   console.log('First, is ' + (isConnected ? 'online' : 'offline'));
- * });
- * function handleFirstConnectivityChange(isConnected) {
- *   console.log('Then, is ' + (isConnected ? 'online' : 'offline'));
- *   NetInfo.isConnected.removeEventListener(
- *     'change',
- *     handleFirstConnectivityChange
- *   );
- * }
- * NetInfo.isConnected.addEventListener(
- *   'change',
- *   handleFirstConnectivityChange
- * );
- * ```
+ * NetInfo exposes info about online/offline status.
+ * 
+ * See https://facebook.github.io/react-native/docs/netinfo.html
  */
 const NetInfo = {
   /**
-   * Invokes the listener whenever network status changes.
-   * The listener receives one of the connectivity types listed above.
+   * Adds an event handler.
+   * 
+   * See https://facebook.github.io/react-native/docs/netinfo.html#addeventlistener
    */
   addEventListener(
     eventName: ChangeEventName,
     handler: Function
   ): {remove: () => void} {
-    const listener = NetInfoEventEmitter.addListener(
-      DEVICE_CONNECTIVITY_EVENT,
-      (appStateData) => {
-        handler(appStateData.network_info);
-      }
-    );
+    let listener;
+    if (eventName === 'connectionChange') {
+      listener = NetInfoEventEmitter.addListener(
+        DEVICE_CONNECTIVITY_EVENT,
+        (appStateData) => {
+          handler({
+            type: appStateData.connectionType,
+            effectiveType: appStateData.effectiveConnectionType
+          });
+        }
+      );
+    } else if (eventName === 'change') {
+      console.warn('NetInfo\'s "change" event is deprecated. Listen to the "connectionChange" event instead.');
+
+      listener = NetInfoEventEmitter.addListener(
+        DEVICE_CONNECTIVITY_EVENT,
+        (appStateData) => {
+          handler(appStateData.network_info);
+        }
+      );
+    } else {
+      console.warn('Trying to subscribe to unknown event: "' + eventName + '"');
+      return {
+        remove: () => {}
+      };
+    }
+
     _subscriptions.set(handler, listener);
     return {
       remove: () => NetInfo.removeEventListener(eventName, handler)
@@ -214,6 +145,8 @@ const NetInfo = {
 
   /**
    * Removes the listener for network status changes.
+   * 
+   * See https://facebook.github.io/react-native/docs/netinfo.html#removeeventlistener
    */
   removeEventListener(
     eventName: ChangeEventName,
@@ -228,18 +161,66 @@ const NetInfo = {
   },
 
   /**
-   * Returns a promise that resolves with one of the connectivity types listed
-   * above.
+   * This function is deprecated. Use `getConnectionInfo` instead. 
+   * Returns a promise that resolves with one of the deprecated connectivity
+   * types:
+   * 
+   * The following connectivity types are deprecated. They're used by the
+   * deprecated APIs `fetch` and the `change` event.
+   *
+   * iOS connectivity types (deprecated):
+   * - `none` - device is offline
+   * - `wifi` - device is online and connected via wifi, or is the iOS simulator
+   * - `cell` - device is connected via Edge, 3G, WiMax, or LTE
+   * - `unknown` - error case and the network status is unknown
+   *
+   * Android connectivity types (deprecated).
+   * - `NONE` - device is offline
+   * - `BLUETOOTH` - The Bluetooth data connection.
+   * - `DUMMY` -  Dummy data connection.
+   * - `ETHERNET` - The Ethernet data connection.
+   * - `MOBILE` - The Mobile data connection.
+   * - `MOBILE_DUN` - A DUN-specific Mobile data connection.
+   * - `MOBILE_HIPRI` - A High Priority Mobile data connection.
+   * - `MOBILE_MMS` - An MMS-specific Mobile data connection.
+   * - `MOBILE_SUPL` -  A SUPL-specific Mobile data connection.
+   * - `VPN` -  A virtual network using one or more native bearers. Requires 
+   * API Level 21
+   * - `WIFI` - The WIFI data connection.
+   * - `WIMAX` -  The WiMAX data connection.
+   * - `UNKNOWN` - Unknown data connection.
+   * 
+   * The rest of the connectivity types are hidden by the Android API, but can 
+   * be used if necessary.
+   * 
+   * Windows connectivity types (deprecated).
+   * - `None` - No connectivity.
+   * - `LocalAccess` - Local network access only.
+   * - `ConstrainedInternetAccess` - Limited internet access.
+   * - `InternetAccess` - Local and Internet access.
    */
   fetch(): Promise<any> {
+    console.warn('NetInfo.fetch() is deprecated. Use NetInfo.getConnectionInfo() instead.');
     return RCTNetInfo.getCurrentConnectivity().then(resp => resp.network_info);
   },
 
+  /**
+   * See https://facebook.github.io/react-native/docs/netinfo.html#getconnectioninfo
+   */
+  getConnectionInfo(): Promise<any> {
+    return RCTNetInfo.getCurrentConnectivity().then(resp => {
+      return {
+        type: resp.connectionType,
+        effectiveType: resp.effectiveConnectionType,
+      };
+    });
+  },
+
   /**
    * An object with the same methods as above but the listener receives a
    * boolean which represents the internet connectivity.
-   * Use this if you are only interested with whether the device has internet
-   * connectivity.
+   * 
+   * See https://facebook.github.io/react-native/docs/netinfo.html#isconnected
    */
   isConnected: {
     addEventListener(
@@ -247,7 +228,11 @@ const NetInfo = {
       handler: Function
     ): {remove: () => void} {
       const listener = (connection) => {
-        handler(_isConnected(connection));
+        if (eventName === 'change') {
+          handler(_isConnectedDeprecated(connection));
+        } else if (eventName === 'connectionChange') {
+          handler(_isConnected(connection));
+        }
       };
       _isConnectedSubscriptions.set(handler, listener);
       NetInfo.addEventListener(
@@ -275,9 +260,7 @@ const NetInfo = {
     },
 
     fetch(): Promise<any> {
-      return NetInfo.fetch().then(
-        (connection) => _isConnected(connection)
-      );
+      return NetInfo.getConnectionInfo().then(_isConnected);
     },
   },
 
diff --git a/Libraries/Network/RCTNetworking.windows.js b/Libraries/Network/RCTNetworking.windows.js
index 8c3985071ec..af64bb3932f 100644
--- a/Libraries/Network/RCTNetworking.windows.js
+++ b/Libraries/Network/RCTNetworking.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTNetworking
  * @flow
@@ -93,7 +91,7 @@ class RCTNetworking extends NativeEventEmitter {
 if (__DEV__ && !RCTNetworkingNative) {
   class MissingNativeRCTNetworkingShim extends MissingNativeEventEmitterShim {
     constructor() {
-      super('RCTAppState', 'AppState');
+      super('RCTNetworking', 'Networking');
     }
 
     sendRequest(...args: Array<any>) {
diff --git a/Libraries/RCTTest/SnapshotViewIOS.windows.js b/Libraries/RCTTest/SnapshotViewIOS.windows.js
index c9127822d50..ef8eb9d7bf6 100644
--- a/Libraries/RCTTest/SnapshotViewIOS.windows.js
+++ b/Libraries/RCTTest/SnapshotViewIOS.windows.js
@@ -1,10 +1,8 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SnapshotViewIOS
  */
diff --git a/Libraries/Settings/Settings.windows.js b/Libraries/Settings/Settings.windows.js
index 5f3422c8cb5..955d92088fc 100644
--- a/Libraries/Settings/Settings.windows.js
+++ b/Libraries/Settings/Settings.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
  *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * 
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule Settings
  * @flow
  */
diff --git a/Libraries/Text/Text.windows.js b/Libraries/Text/Text.windows.js
deleted file mode 100644
index c34fb052d02..00000000000
--- a/Libraries/Text/Text.windows.js
+++ /dev/null
@@ -1,576 +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.
- *
- * @providesModule Text
- * @flow
- */
-'use strict';
-
-const ColorPropType = require('ColorPropType');
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
-const NativeMethodsMixin = require('NativeMethodsMixin');
-const Platform = require('Platform');
-const React = require('React');
-const PropTypes = require('prop-types');
-const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-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');
-
-const stylePropType = StyleSheetPropType(TextStylePropTypes);
-
-const viewConfig = {
-  validAttributes: mergeFast(ReactNativeViewAttributes.UIView, {
-    isHighlighted: true,
-    numberOfLines: true,
-    ellipsizeMode: true,
-    allowFontScaling: true,
-    disabled: true,
-    selectable: true,
-    selectionColor: true,
-    adjustsFontSizeToFit: true,
-    minimumFontScale: true,
-    textBreakStrategy: true,
-  }),
-  uiViewClassName: 'RCTText',
-};
-
-/**
- * A React component for displaying text.
- *
- * `Text` supports nesting, styling, and touch handling.
- *
- * In the following example, the nested title and body text will inherit the
- * `fontFamily` from `styles.baseText`, but the title provides its own
- * additional styles.  The title and body will stack on top of each other on
- * account of the literal newlines:
- *
- * ```ReactNativeWebPlayer
- * import React, { Component } from 'react';
- * import { AppRegistry, Text, StyleSheet } from 'react-native';
- *
- * export default class TextInANest extends Component {
- *   constructor(props) {
- *     super(props);
- *     this.state = {
- *       titleText: "Bird's Nest",
- *       bodyText: 'This is not really a bird nest.'
- *     };
- *   }
- *
- *   render() {
- *     return (
- *       <Text style={styles.baseText}>
- *         <Text style={styles.titleText} onPress={this.onPressTitle}>
- *           {this.state.titleText}{'\n'}{'\n'}
- *         </Text>
- *         <Text numberOfLines={5}>
- *           {this.state.bodyText}
- *         </Text>
- *       </Text>
- *     );
- *   }
- * }
- *
- * const styles = StyleSheet.create({
- *   baseText: {
- *     fontFamily: 'Cochin',
- *   },
- *   titleText: {
- *     fontSize: 20,
- *     fontWeight: 'bold',
- *   },
- * });
- *
- * // skip this line if using Create React Native App
- * AppRegistry.registerComponent('TextInANest', () => TextInANest);
- * ```
- *
- * ## Nested text
- *
- * Both iOS and Android allow you to display formatted text by annotating
- * ranges of a string with specific formatting like bold or colored text
- * (`NSAttributedString` on iOS, `SpannableString` on Android, `Inline` on Windows).
- * In practice, this is very tedious. For React Native, we decided to use web 
- * paradigm for this where you can nest text to achieve the same effect.
- *
- *
- * ```ReactNativeWebPlayer
- * import React, { Component } from 'react';
- * import { AppRegistry, Text } from 'react-native';
- *
- * export default class BoldAndBeautiful extends Component {
- *   render() {
- *     return (
- *       <Text style={{fontWeight: 'bold'}}>
- *         I am bold
- *         <Text style={{color: 'red'}}>
- *           and red
- *         </Text>
- *       </Text>
- *     );
- *   }
- * }
- *
- * // skip this line if using Create React Native App
- * AppRegistry.registerComponent('AwesomeProject', () => BoldAndBeautiful);
- * ```
- *
- * Behind the scenes, React Native converts this to a flat `NSAttributedString`
- * or `SpannableString` that contains the following information:
- *
- * ```javascript
- * "I am bold and red"
- * 0-9: bold
- * 9-17: bold, red
- * ```
- *
- * ## Nested views (iOS and Windows only)
- *
- * On iOS and Windows, you can nest views within your Text component. Here's an example:
- *
- * ```ReactNativeWebPlayer
- * import React, { Component } from 'react';
- * import { AppRegistry, Text, View } from 'react-native';
- *
- * export default class BlueIsCool extends Component {
- *   render() {
- *     return (
- *       <Text>
- *         There is a blue square
- *         <View style={{width: 50, height: 50, backgroundColor: 'steelblue'}} />
- *         in between my text.
- *       </Text>
- *     );
- *   }
- * }
- *
- * // skip this line if using Create React Native App
- * AppRegistry.registerComponent('AwesomeProject', () => BlueIsCool);
- * ```
- *
- * > In order to use this feature, you must give the view a `width` and a `height`.
- *
- * ## Containers
- *
- * The `<Text>` element is special relative to layout: everything inside is no
- * longer using the flexbox layout but using text layout. This means that
- * elements inside of a `<Text>` are no longer rectangles, but wrap when they
- * see the end of the line.
- *
- * ```javascript
- * <Text>
- *   <Text>First part and </Text>
- *   <Text>second part</Text>
- * </Text>
- * // Text container: all the text flows as if it was one
- * // |First part |
- * // |and second |
- * // |part       |
- *
- * <View>
- *   <Text>First part and </Text>
- *   <Text>second part</Text>
- * </View>
- * // View container: each text is its own block
- * // |First part |
- * // |and        |
- * // |second part|
- * ```
- *
- * ## Limited Style Inheritance
- *
- * On the web, the usual way to set a font family and size for the entire
- * document is to take advantage of inherited CSS properties like so:
- *
- * ```css
- * html {
- *   font-family: 'lucida grande', tahoma, verdana, arial, sans-serif;
- *   font-size: 11px;
- *   color: #141823;
- * }
- * ```
- *
- * All elements in the document will inherit this font unless they or one of
- * their parents specifies a new rule.
- *
- * In React Native, we are more strict about it: **you must wrap all the text
- * nodes inside of a `<Text>` component**. You cannot have a text node directly
- * under a `<View>`.
- *
- *
- * ```javascript
- * // BAD: will raise exception, can't have a text node as child of a <View>
- * <View>
- *   Some text
- * </View>
- *
- * // GOOD
- * <View>
- *   <Text>
- *     Some text
- *   </Text>
- * </View>
- * ```
- *
- * You also lose the ability to set up a default font for an entire subtree.
- * The recommended way to use consistent fonts and sizes across your
- * application is to create a component `MyAppText` that includes them and use
- * this component across your app. You can also use this component to make more
- * specific components like `MyAppHeaderText` for other kinds of text.
- *
- * ```javascript
- * <View>
- *   <MyAppText>Text styled with the default font for the entire application</MyAppText>
- *   <MyAppHeaderText>Text styled as a header</MyAppHeaderText>
- * </View>
- * ```
- *
- * Assuming that `MyAppText` is a component that simply renders out its
- * children into a `Text` component with styling, then `MyAppHeaderText` can be
- * defined as follows:
- *
- * ```javascript
- * class MyAppHeaderText extends Component {
- *   render() {
- *     <MyAppText>
- *       <Text style={{fontSize: 20}}>
- *         {this.props.children}
- *       </Text>
- *     </MyAppText>
- *   }
- * }
- * ```
- *
- * Composing `MyAppText` in this way ensures that we get the styles from a
- * top-level component, but leaves us the ability to add / override them in
- * specific use cases.
- *
- * React Native still has the concept of style inheritance, but limited to text
- * subtrees. In this case, the second part will be both bold and red.
- *
- * ```javascript
- * <Text style={{fontWeight: 'bold'}}>
- *   I am bold
- *   <Text style={{color: 'red'}}>
- *     and red
- *   </Text>
- * </Text>
- * ```
- *
- * We believe that this more constrained way to style text will yield better
- * apps:
- *
- * - (Developer) React components are designed with strong isolation in mind:
- * You should be able to drop a component anywhere in your application,
- * trusting that as long as the props are the same, it will look and behave the
- * same way. Text properties that could inherit from outside of the props would
- * break this isolation.
- *
- * - (Implementor) The implementation of React Native is also simplified. We do
- * not need to have a `fontFamily` field on every single element, and we do not
- * need to potentially traverse the tree up to the root every time we display a
- * text node. The style inheritance is only encoded inside of the native Text
- * component and doesn't leak to other components or the system itself.
- *
- */
-
-const Text = createReactClass({
-  displayName: 'Text',
-  propTypes: {
-    /**
-     * When `numberOfLines` is set, this prop defines how text will be truncated.
-     * `numberOfLines` must be set in conjunction with this prop.
-     *
-     * This can be one of the following values:
-     *
-     * - `head` - The line is displayed so that the end fits in the container and the missing text
-     * at the beginning of the line is indicated by an ellipsis glyph. e.g., "...wxyz"
-     * - `middle` - The line is displayed so that the beginning and end fit in the container and the
-     * missing text in the middle is indicated by an ellipsis glyph. "ab...yz"
-     * - `tail` - The line is displayed so that the beginning fits in the container and the
-     * missing text at the end of the line is indicated by an ellipsis glyph. e.g., "abcd..."
-     * - `clip` - Lines are not drawn past the edge of the text container.
-     *
-     * The default is `tail`.
-     *
-     * > `clip` is working only for iOS
-     */
-    ellipsizeMode: PropTypes.oneOf(['head', 'middle', 'tail', 'clip']),
-    /**
-     * Used to truncate the text with an ellipsis after computing the text
-     * layout, including line wrapping, such that the total number of lines
-     * does not exceed this number.
-     *
-     * This prop is commonly used with `ellipsizeMode`.
-     */
-    numberOfLines: PropTypes.number,
-    /**
-     * Set text break strategy on Android API Level 23+, possible values are `simple`, `highQuality`, `balanced`
-     * The default value is `highQuality`.
-     * @platform android
-     */
-    textBreakStrategy: PropTypes.oneOf(['simple', 'highQuality', 'balanced']),
-    /**
-     * Invoked on mount and layout changes with
-     *
-     *   `{nativeEvent: {layout: {x, y, width, height}}}`
-     */
-    onLayout: PropTypes.func,
-    /**
-     * This function is called on press.
-     *
-     * e.g., `onPress={() => console.log('1st')}`
-     */
-    onPress: PropTypes.func,
-    /**
-     * This function is called on long press.
-     *
-     * e.g., `onLongPress={this.increaseSize}>`
-     */
-    onLongPress: PropTypes.func,
-    /**
-     * When the scroll view is disabled, this defines how far your touch may
-     * move off of the button, before deactivating the button. Once deactivated,
-     * try moving it back and you'll see that the button is once again
-     * reactivated! Move it back and forth several times while the scroll view
-     * is disabled. Ensure you pass in a constant to reduce memory allocations.
-     */
-    pressRetentionOffset: EdgeInsetsPropType,
-    /**
-     * Lets the user select text, to use the native copy and paste functionality.
-     */
-    selectable: PropTypes.bool,
-    /**
-     * The highlight color of the text.
-     * @platform android
-     * @platform windows
-     */
-    selectionColor: ColorPropType,
-    /**
-     * When `true`, no visual change is made when text is pressed down. By
-     * default, a gray oval highlights the text on press down.
-     * @platform ios
-     */
-    suppressHighlighting: PropTypes.bool,
-    style: stylePropType,
-    /**
-     * Used to locate this view in end-to-end tests.
-     */
-    testID: PropTypes.string,
-    /**
-     * Used to locate this view from native code.
-     */
-    nativeID: PropTypes.string,
-    /**
-     * Specifies whether fonts should scale to respect Text Size accessibility settings. The
-     * default is `true`.
-     */
-    allowFontScaling: PropTypes.bool,
-    /**
-     * When set to `true`, indicates that the view is an accessibility element. The default value
-     * for a `Text` element is `true`.
-     *
-     * See the
-     * [Accessibility guide](docs/accessibility.html#accessible-ios-android)
-     * for more information.
-     */
-    accessible: PropTypes.bool,
-    /**
-     * Specifies whether font should be scaled down automatically to fit given style constraints.
-     * @platform ios
-     */
-    adjustsFontSizeToFit: PropTypes.bool,
-
-    /**
-     * Specifies smallest possible scale a font can reach when adjustsFontSizeToFit is enabled. (values 0.01-1.0).
-     * @platform ios
-     */
-    minimumFontScale: PropTypes.number,
-    /**
-     * Specifies the disabled state of the text view for testing purposes
-     * @platform android
-     */
-    disabled: PropTypes.bool,
-  },
-  getDefaultProps(): Object {
-    return {
-      accessible: true,
-      allowFontScaling: true,
-      ellipsizeMode: 'tail',
-    };
-  },
-  getInitialState: function(): Object {
-    return mergeFast(Touchable.Mixin.touchableGetInitialState(), {
-      isHighlighted: false,
-    });
-  },
-  mixins: [NativeMethodsMixin],
-  viewConfig: viewConfig,
-  getChildContext(): Object {
-    return {isInAParentText: true};
-  },
-  childContextTypes: {
-    isInAParentText: PropTypes.bool
-  },
-  contextTypes: {
-    isInAParentText: PropTypes.bool
-  },
-  /**
-   * Only assigned if touch is needed.
-   */
-  _handlers: (null: ?Object),
-  _hasPressHandler(): boolean {
-    return !!this.props.onPress || !!this.props.onLongPress;
-  },
-  /**
-   * These are assigned lazily the first time the responder is set to make plain
-   * text nodes as cheap as possible.
-   */
-  touchableHandleActivePressIn: (null: ?Function),
-  touchableHandleActivePressOut: (null: ?Function),
-  touchableHandlePress: (null: ?Function),
-  touchableHandleLongPress: (null: ?Function),
-  touchableGetPressRectOffset: (null: ?Function),
-  render(): React.Element<any> {
-    let newProps = this.props;
-    if (this.props.onStartShouldSetResponder || this._hasPressHandler()) {
-      if (!this._handlers) {
-        this._handlers = {
-          onStartShouldSetResponder: (): bool => {
-            const shouldSetFromProps = this.props.onStartShouldSetResponder &&
-                // $FlowFixMe(>=0.41.0)
-                this.props.onStartShouldSetResponder();
-            const setResponder = shouldSetFromProps || this._hasPressHandler();
-            if (setResponder && !this.touchableHandleActivePressIn) {
-              // Attach and bind all the other handlers only the first time a touch
-              // actually happens.
-              for (const key in Touchable.Mixin) {
-                if (typeof Touchable.Mixin[key] === 'function') {
-                  (this: any)[key] = Touchable.Mixin[key].bind(this);
-                }
-              }
-              this.touchableHandleActivePressIn = () => {
-                if (this.props.suppressHighlighting || !this._hasPressHandler()) {
-                  return;
-                }
-                this.setState({
-                  isHighlighted: true,
-                });
-              };
-
-              this.touchableHandleActivePressOut = () => {
-                if (this.props.suppressHighlighting || !this._hasPressHandler()) {
-                  return;
-                }
-                this.setState({
-                  isHighlighted: false,
-                });
-              };
-
-              this.touchableHandlePress = (e: SyntheticEvent<>) => {
-                this.props.onPress && this.props.onPress(e);
-              };
-
-              this.touchableHandleLongPress = (e: SyntheticEvent<>) => {
-                this.props.onLongPress && this.props.onLongPress(e);
-              };
-
-              this.touchableGetPressRectOffset = function(): RectOffset {
-                return this.props.pressRetentionOffset || PRESS_RECT_OFFSET;
-              };
-            }
-            return setResponder;
-          },
-          onResponderGrant: function(e: SyntheticEvent<>, dispatchID: string) {
-            this.touchableHandleResponderGrant(e, dispatchID);
-            this.props.onResponderGrant &&
-              this.props.onResponderGrant.apply(this, arguments);
-          }.bind(this),
-          onResponderMove: function(e: SyntheticEvent<>) {
-            this.touchableHandleResponderMove(e);
-            this.props.onResponderMove &&
-              this.props.onResponderMove.apply(this, arguments);
-          }.bind(this),
-          onResponderRelease: function(e: SyntheticEvent<>) {
-            this.touchableHandleResponderRelease(e);
-            this.props.onResponderRelease &&
-              this.props.onResponderRelease.apply(this, arguments);
-          }.bind(this),
-          onResponderTerminate: function(e: SyntheticEvent<>) {
-            this.touchableHandleResponderTerminate(e);
-            this.props.onResponderTerminate &&
-              this.props.onResponderTerminate.apply(this, arguments);
-          }.bind(this),
-          onResponderTerminationRequest: function(): bool {
-            // Allow touchable or props.onResponderTerminationRequest to deny
-            // the request
-            var allowTermination = this.touchableHandleResponderTerminationRequest();
-            if (allowTermination && this.props.onResponderTerminationRequest) {
-              allowTermination = this.props.onResponderTerminationRequest.apply(this, arguments);
-            }
-            return allowTermination;
-          }.bind(this),
-        };
-      }
-      newProps = {
-        ...this.props,
-        ...this._handlers,
-        isHighlighted: this.state.isHighlighted,
-      };
-    }
-    if (newProps.selectionColor != null) {
-      newProps = {
-        ...newProps,
-        selectionColor: processColor(newProps.selectionColor)
-      };
-    }
-    if (Touchable.TOUCH_TARGET_DEBUG && newProps.onPress) {
-      newProps = {
-        ...newProps,
-        style: [this.props.style, {color: 'magenta'}],
-      };
-    }
-    if (this.context.isInAParentText) {
-      return <RCTVirtualText {...newProps} />;
-    } else {
-      return <RCTText {...newProps} />;
-    }
-  },
-});
-
-type RectOffset = {
-  top: number,
-  left: number,
-  right: number,
-  bottom: number,
-}
-
-var PRESS_RECT_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
-
-var RCTText = createReactNativeComponentClass(
-  viewConfig.uiViewClassName,
-  () => viewConfig
-);
-var RCTVirtualText = RCTText;
-
-if (Platform.OS === 'android' || Platform.OS === 'windows') {
-  RCTVirtualText = createReactNativeComponentClass('RCTVirtualText', () => ({
-    validAttributes: mergeFast(ReactNativeViewAttributes.UIView, {
-      isHighlighted: true,
-    }),
-    uiViewClassName: 'RCTVirtualText',
-  }));
-}
-
-module.exports = Text;
diff --git a/Libraries/Utilities/BackHandler.windows.js b/Libraries/Utilities/BackHandler.windows.js
index 663eb39c6ba..27754d3271f 100644
--- a/Libraries/Utilities/BackHandler.windows.js
+++ b/Libraries/Utilities/BackHandler.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
  *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * 
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule BackHandler
  */
 
@@ -17,37 +20,57 @@ var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
 var DEVICE_BACK_EVENT = 'hardwareBackPress';
 
 type BackPressEventName = $Enum<{
-  backPress: string;
+  backPress: string,
 }>;
 
 var _backPressSubscriptions = new Set();
 
 RCTDeviceEventEmitter.addListener(DEVICE_BACK_EVENT, function() {
-  var backPressSubscriptions = new Set(_backPressSubscriptions);
   var invokeDefault = true;
-  backPressSubscriptions.forEach((subscription) => {
-    if (subscription()) {
+  var subscriptions = Array.from(_backPressSubscriptions.values()).reverse();
+
+  for (var i = 0; i < subscriptions.length; ++i) {
+    if (subscriptions[i]()) {
       invokeDefault = false;
+      break;
     }
-  });
+  }
+
   if (invokeDefault) {
     BackHandler.exitApp();
   }
 });
 
 /**
- * Detect hardware back button presses, and programmatically invoke the default back button
+ * Detect hardware button presses for back navigation.
+ *
+ * Android: Detect hardware back button presses, and programmatically invoke the default back button
  * functionality to exit the app if there are no listeners or if none of the listeners return true.
  *
+ * tvOS: Detect presses of the menu button on the TV remote.  (Still to be implemented:
+ * programmatically disable menu button handling
+ * functionality to exit the app if there are no listeners or if none of the listeners return true.)
+ *
+ * iOS: Not applicable.
+ *
+ * Windows: Detect hardware and app bar back button presses, and programmatically invoke the default back button
+ * functionality to exit the app if there are no listeners or if none of the listeners return true.
+ * 
+ * The event subscriptions are called in reverse order (i.e. last registered subscription first),
+ * and if one subscription returns true then subscriptions registered earlier will not be called.
+ *
  * Example:
  *
- * ```js
+ * ```javascript
  * BackHandler.addEventListener('hardwareBackPress', function() {
- * 	 if (!this.onMainScreen()) {
- * 	   this.goBack();
- * 	   return true;
- * 	 }
- * 	 return false;
+ *  // this.onMainScreen and this.goBack are just examples, you need to use your own implementation here
+ *  // Typically you would use the navigator here to go to the last state.
+ *
+ *  if (!this.onMainScreen()) {
+ *    this.goBack();
+ *    return true;
+ *  }
+ *  return false;
  * });
  * ```
  */
@@ -57,6 +80,12 @@ var BackHandler = {
     DeviceEventManager.invokeDefaultBackPressHandler();
   },
 
+  /**
+   * Adds an event handler. Supported events:
+   *
+   * - `hardwareBackPress`: Fires when the Android or Windows hardware back button is pressed or when the
+   * tvOS menu button is pressed.
+   */
   addEventListener: function (
     eventName: BackPressEventName,
     handler: Function
@@ -67,6 +96,9 @@ var BackHandler = {
     };
   },
 
+  /**
+   * Removes the event handler.
+   */
   removeEventListener: function(
     eventName: BackPressEventName,
     handler: Function
diff --git a/Libraries/Utilities/HMRLoadingView.windows.js b/Libraries/Utilities/HMRLoadingView.windows.js
index fdf7fd999cb..ddff35c14c5 100644
--- a/Libraries/Utilities/HMRLoadingView.windows.js
+++ b/Libraries/Utilities/HMRLoadingView.windows.js
@@ -1,11 +1,14 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule HMRLoadingView
  * @flow
  */
@@ -14,7 +17,7 @@
 
 class HMRLoadingView {
   static showMessage(message: string) {
-    //noop
+    // noop
   }
 
   static hide() {
diff --git a/Libraries/Utilities/Platform.windows.js b/Libraries/Utilities/Platform.windows.js
index efb8b3847e3..68d9a1491b2 100644
--- a/Libraries/Utilities/Platform.windows.js
+++ b/Libraries/Utilities/Platform.windows.js
@@ -1,18 +1,21 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule Platform
  * @flow
  */
 
 'use strict';
 
-var Platform = {
+const Platform = {
   OS: 'windows',
   select: (obj: Object) => 'windows' in obj ? obj.windows : obj.default,
 };
diff --git a/Libraries/Vibration/Vibration.windows.js b/Libraries/Vibration/Vibration.windows.js
index cf72628ba2d..57f5a9926c1 100644
--- a/Libraries/Vibration/Vibration.windows.js
+++ b/Libraries/Vibration/Vibration.windows.js
@@ -1,13 +1,17 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule Vibration
  * @flow
+ * @jsdoc
  */
 'use strict';
 
@@ -15,27 +19,9 @@ var RCTVibration = require('NativeModules').Vibration;
 var Platform = require('Platform');
 
 /**
- * The Vibration API is exposed at `Vibration.vibrate()`.
- * The vibration is asynchronous so this method will return immediately.
- *
- * There will be no effect on devices that do not support Vibration, eg. the simulator.
- *
- * **Note for android**
- * add `<uses-permission android:name="android.permission.VIBRATE"/>` to `AndroidManifest.xml`
- *
- * **Android Usage:**
- *
- * [0, 500, 200, 500]
- * V(0.5s) --wait(0.2s)--> V(0.5s)
- *
- * [300, 500, 200, 500]
- * --wait(0.3s)--> V(0.5s) --wait(0.2s)--> V(0.5s)
- *
- * **iOS Usage:**
- * if first argument is 0, it will not be included in pattern array.
- *
- * [0, 1000, 2000, 3000]
- * V(fixed) --wait(1s)--> V(fixed) --wait(2s)--> V(fixed) --wait(3s)--> V(fixed)
+ * Vibration API
+ * 
+ * See https://facebook.github.io/react-native/docs/vibration.html
  */
 
 var _vibrating: boolean = false;
@@ -74,6 +60,11 @@ function vibrateScheduler(id, pattern: Array<number>, repeat: boolean, nextIndex
 }
 
 var Vibration = {
+  /**
+   * Trigger a vibration with specified `pattern`.
+   * 
+   * See https://facebook.github.io/react-native/docs/vibration.html#vibrate
+   */
   vibrate: function(pattern: number | Array<number> = 400, repeat: boolean = false) {
     if (Platform.OS === 'android') {
       if (typeof pattern === 'number') {
@@ -104,6 +95,8 @@ var Vibration = {
   },
   /**
    * Stop vibration
+   * 
+   * See https://facebook.github.io/react-native/docs/vibration.html#cancel
    */
   cancel: function() {
     if (Platform.OS === 'ios') {
diff --git a/Libraries/Vibration/VibrationIOS.windows.js b/Libraries/Vibration/VibrationIOS.windows.js
index 56da5a815b1..597214afb45 100644
--- a/Libraries/Vibration/VibrationIOS.windows.js
+++ b/Libraries/Vibration/VibrationIOS.windows.js
@@ -1,43 +1,25 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
+ * Stub of VibrationIOS for Windows.
  *
  * @providesModule VibrationIOS
- * @flow
  */
 'use strict';
 
-var RCTVibration = require('NativeModules').Vibration;
-
-var invariant = require('fbjs/lib/invariant');
-
-/**
- * NOTE: `VibrationIOS` is being deprecated. Use `Vibration` instead.
- *
- * The Vibration API is exposed at `VibrationIOS.vibrate()`. On iOS, calling this
- * function will trigger a one second vibration. The vibration is asynchronous
- * so this method will return immediately.
- *
- * There will be no effect on devices that do not support Vibration, eg. the iOS
- * simulator.
- *
- * Vibration patterns are currently unsupported.
- */
+var warning = require('fbjs/lib/warning');
 
 var VibrationIOS = {
-  /**
-   * @deprecated
-   */
   vibrate: function() {
-    invariant(
-      arguments[0] === undefined,
-      'Vibration patterns not supported.'
-    );
-    RCTVibration.vibrate();
+    warning('VibrationIOS is not supported on this platform!');
   }
 };
 
diff --git a/Libraries/WebSocket/WebSocket.windows.js b/Libraries/WebSocket/WebSocket.windows.js
index 202ddbb55fd..38ba8fb03b5 100644
--- a/Libraries/WebSocket/WebSocket.windows.js
+++ b/Libraries/WebSocket/WebSocket.windows.js
@@ -1,27 +1,52 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
+ * Portions copyright for react-native-windows:
+ * 
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
  * @providesModule WebSocket
  * @flow
  */
 'use strict';
 
+const Blob = require('Blob');
+const EventTarget = require('event-target-shim');
 const NativeEventEmitter = require('NativeEventEmitter');
+const BlobManager = require('BlobManager');
+const NativeModules = require('NativeModules');
 const Platform = require('Platform');
-const RCTWebSocketModule = require('NativeModules').WebSocketModule;
 const WebSocketEvent = require('WebSocketEvent');
-const binaryToBase64 = require('binaryToBase64');
 
-const EventTarget = require('event-target-shim');
+/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
+ * found when Flow v0.54 was deployed. To see the error delete this comment and
+ * run Flow. */
 const base64 = require('base64-js');
+const binaryToBase64 = require('binaryToBase64');
+const invariant = require('fbjs/lib/invariant');
+
+const {WebSocketModule} = NativeModules;
 
 import type EventSubscription from 'EventSubscription';
 
+type ArrayBufferView =
+  | Int8Array
+  | Uint8Array
+  | Uint8ClampedArray
+  | Int16Array
+  | Uint16Array
+  | Int32Array
+  | Uint32Array
+  | Float32Array
+  | Float64Array
+  | DataView
+
+type BinaryType = 'blob' | 'arraybuffer'
+
 const CONNECTING = 0;
 const OPEN = 1;
 const CLOSING = 2;
@@ -58,42 +83,86 @@ class WebSocket extends EventTarget(...WEBSOCKET_EVENTS) {
   _socketId: number;
   _eventEmitter: NativeEventEmitter;
   _subscriptions: Array<EventSubscription>;
+  _binaryType: ?BinaryType;
 
   onclose: ?Function;
   onerror: ?Function;
   onmessage: ?Function;
   onopen: ?Function;
 
-  binaryType: ?string;
   bufferedAmount: number;
   extension: ?string;
   protocol: ?string;
   readyState: number = CONNECTING;
   url: ?string;
 
-  // This module depends on the native `RCTWebSocketModule` module. If you don't include it,
+  // This module depends on the native `WebSocketModule` module. If you don't include it,
   // `WebSocket.isAvailable` will return `false`, and WebSocket constructor will throw an error
-  static isAvailable: boolean = !!RCTWebSocketModule;
+  static isAvailable: boolean = !!WebSocketModule;
 
-  constructor(url: string, protocols: ?string | ?Array<string>, options: ?{origin?: string}) {
+  constructor(url: string, protocols: ?string | ?Array<string>, options: ?{headers?: {origin?: string}}) {
     super();
     if (typeof protocols === 'string') {
       protocols = [protocols];
     }
 
+    const {headers = {}, ...unrecognized} = options || {};
+
+    // Preserve deprecated backwards compatibility for the 'origin' option
+    if (unrecognized && typeof unrecognized.origin === 'string') {
+      console.warn('Specifying `origin` as a WebSocket connection option is deprecated. Include it under `headers` instead.');
+      /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
+       * comment suppresses an error found when Flow v0.54 was deployed. To see
+       * the error delete this comment and run Flow. */
+      headers.origin = unrecognized.origin;
+      /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
+       * comment suppresses an error found when Flow v0.54 was deployed. To see
+       * the error delete this comment and run Flow. */
+      delete unrecognized.origin;
+    }
+
+    // Warn about and discard anything else
+    if (Object.keys(unrecognized).length > 0) {
+      console.warn('Unrecognized WebSocket connection option(s) `' + Object.keys(unrecognized).join('`, `') + '`. '
+        + 'Did you mean to put these under `headers`?');
+    }
+
     if (!Array.isArray(protocols)) {
       protocols = null;
     }
 
     if (!WebSocket.isAvailable) {
       throw new Error('Cannot initialize WebSocket module. ' +
-      'Native module RCTWebSocketModule is missing.');
+      'Native module WebSocketModule is missing.');
     }
 
-    this._eventEmitter = new NativeEventEmitter(RCTWebSocketModule);
+    this._eventEmitter = new NativeEventEmitter(WebSocketModule);
     this._socketId = nextWebSocketId++;
     this._registerEvents();
-    RCTWebSocketModule.connect(url, protocols, options, this._socketId);
+    WebSocketModule.connect(url, protocols, { headers }, this._socketId);
+  }
+
+  get binaryType(): ?BinaryType {
+    return this._binaryType;
+  }
+
+  set binaryType(binaryType: BinaryType): void {
+    if (binaryType !== 'blob' && binaryType !== 'arraybuffer') {
+      throw new Error('binaryType must be either \'blob\' or \'arraybuffer\'');
+    }
+    if (this._binaryType === 'blob' || binaryType === 'blob') {
+      invariant(BlobManager.isAvailable, 'Native module BlobModule is required for blob support');
+      if (binaryType === 'blob') {
+        BlobManager.addWebSocketHandler(this._socketId);
+      } else {
+        BlobManager.removeWebSocketHandler(this._socketId);
+      }
+    }
+    this._binaryType = binaryType;
+  }
+
+  get binaryType(): ?BinaryType {
+    return this._binaryType;
   }
 
   close(code?: number, reason?: string): void {
@@ -106,18 +175,24 @@ class WebSocket extends EventTarget(...WEBSOCKET_EVENTS) {
     this._close(code, reason);
   }
 
-  send(data: string | ArrayBuffer | $ArrayBufferView): void {
+  send(data: string | ArrayBuffer | ArrayBufferView | Blob): void {
     if (this.readyState === this.CONNECTING) {
       throw new Error('INVALID_STATE_ERR');
     }
 
+    if (data instanceof Blob) {
+      invariant(BlobManager.isAvailable, 'Native module BlobModule is required for blob support');
+      BlobManager.sendOverSocket(data, this._socketId);
+      return;
+    }
+
     if (typeof data === 'string') {
-      RCTWebSocketModule.send(data, this._socketId);
+      WebSocketModule.send(data, this._socketId);
       return;
     }
 
     if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) {
-      RCTWebSocketModule.sendBinary(binaryToBase64(data), this._socketId);
+      WebSocketModule.sendBinary(binaryToBase64(data), this._socketId);
       return;
     }
 
@@ -129,7 +204,7 @@ class WebSocket extends EventTarget(...WEBSOCKET_EVENTS) {
         throw new Error('INVALID_STATE_ERR');
     }
 
-    RCTWebSocketModule.ping(this._socketId);
+    WebSocketModule.ping(this._socketId);
   }
 
   _close(code?: number, reason?: string): void {
@@ -137,9 +212,13 @@ class WebSocket extends EventTarget(...WEBSOCKET_EVENTS) {
       // See https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
       const statusCode = typeof code === 'number' ? code : CLOSE_NORMAL;
       const closeReason = typeof reason === 'string' ? reason : '';
-      RCTWebSocketModule.close(statusCode, closeReason, this._socketId);
+      WebSocketModule.close(statusCode, closeReason, this._socketId);
     } else {
-      RCTWebSocketModule.close(this._socketId);
+      WebSocketModule.close(this._socketId);
+    }
+
+    if (BlobManager.isAvailable && this._binaryType === 'blob') {
+      BlobManager.removeWebSocketHandler(this._socketId);
     }
   }
 
@@ -154,9 +233,16 @@ class WebSocket extends EventTarget(...WEBSOCKET_EVENTS) {
         if (ev.id !== this._socketId) {
           return;
         }
-        this.dispatchEvent(new WebSocketEvent('message', {
-          data: (ev.type === 'binary') ? base64.toByteArray(ev.data).buffer : ev.data
-        }));
+        let data = ev.data;
+        switch (ev.type) {
+          case 'binary':
+            data = base64.toByteArray(ev.data).buffer;
+            break;
+          case 'blob':
+            data = BlobManager.createFromOptions(ev.data);
+            break;
+        }
+        this.dispatchEvent(new WebSocketEvent('message', { data }));
       }),
       this._eventEmitter.addListener('websocketOpen', ev => {
         if (ev.id !== this._socketId) {
diff --git a/Libraries/react-native-windows/react-native-windows-implementation.js b/Libraries/react-native-windows/react-native-windows-implementation.js
new file mode 100644
index 00000000000..0b3e7394e56
--- /dev/null
+++ b/Libraries/react-native-windows/react-native-windows-implementation.js
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * 
+ * @providesModule react-native-windows-implementation
+ * @flow
+ */
+'use strict';
+
+var ReactWindows = {
+  // Components
+  get FlipViewWindows() { return require('FlipViewWindows'); },
+  get PasswordBoxWindows() { return require('PasswordBoxWindows'); },
+  get ProgressBarWindows() { return require('ProgressBarWindows'); },
+  get ProgressRingWindows() { return require('ProgressRingWindows'); },
+  get SplitViewWindows() { return require('SplitViewWindows'); },
+
+  get createFocusableComponent() { return require('FocusableWindows'); },
+};
+
+module.exports = ReactWindows;
diff --git a/Libraries/react-native-windows/react-native-windows.js b/Libraries/react-native-windows/react-native-windows.js
deleted file mode 100644
index 52a0ca727d3..00000000000
--- a/Libraries/react-native-windows/react-native-windows.js
+++ /dev/null
@@ -1,24 +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.
- *
- * @noflow - get/set properties not yet supported by flow. also `...require(x)` is broken #6560135
- */
-'use strict';
-
-var ReactWindows = {
-  // Components
-  get FlipViewWindows() { return require('FlipViewWindows'); },
-  get PasswordBoxWindows() { return require('PasswordBoxWindows'); },
-  get ProgressBarWindows() {return require('ProgressBarWindows');},
-  get ProgressRingWindows() {return require('ProgressRingWindows');},
-  get SplitViewWindows() { return require('SplitViewWindows'); },
-
-  get createFocusableComponent() { return require('FocusableWindows'); },
-};
-
-module.exports = ReactWindows;
diff --git a/package.json b/package.json
index 22551761c76..f71f0339628 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "node": ">=4"
   },
   "engineStrict": true,
-  "main": "Libraries/react-native-windows/react-native-windows.js",
+  "main": "Libraries/react-native-windows/react-native-windows-implementation.js",
   "scripts": {
     "test": "jasmine",
     "lint": "eslint .",

From bd9a6b314196fa27a91ed2f8b6382ceb202e2310 Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Thu, 1 Mar 2018 05:11:28 -0500
Subject: [PATCH 2/3] fix(LICENSE): fixing copyright headers for scripts and
 local-cli

Many of these files never existed in react-native. In most cases, the copyright header was just copied from other files. This was incorrect, the header should have originally reflected a Microsoft copyright. This commit fixes that, and also rebases copy-paste code against Facebook's latest MIT-licensed code.
---
 local-cli/core/windows/findDependencyProject.js          | 8 ++------
 local-cli/core/windows/findMainFile.js                   | 8 ++------
 local-cli/core/windows/findNamespace.js                  | 8 ++------
 local-cli/core/windows/findPackageClassName.js           | 8 ++------
 local-cli/core/windows/findProject.js                    | 8 ++------
 local-cli/core/windows/findProjectGUID.js                | 8 ++------
 local-cli/core/windows/findProjectName.js                | 8 ++------
 local-cli/core/windows/findProjectWithFilePattern.js     | 8 ++------
 local-cli/core/windows/findWindowsSolution.js            | 8 ++------
 local-cli/core/windows/index.js                          | 8 ++------
 local-cli/generator-utils.js                             | 8 ++------
 local-cli/link/windows/patches/applyParams.js            | 9 ++-------
 local-cli/rnpm/windows/src/common.js                     | 9 ++-------
 local-cli/rnpm/windows/src/windows.js                    | 9 ++-------
 local-cli/rnpm/windows/src/wpf.js                        | 9 ++-------
 scripts/bump-oss-version.js                              | 6 ++----
 .../ReactNativeVersion.windows.js.template               | 6 ++----
 17 files changed, 34 insertions(+), 102 deletions(-)

diff --git a/local-cli/core/windows/findDependencyProject.js b/local-cli/core/windows/findDependencyProject.js
index 9c1eb8e15c9..27d6bb7f5a2 100644
--- a/local-cli/core/windows/findDependencyProject.js
+++ b/local-cli/core/windows/findDependencyProject.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/core/windows/findMainFile.js b/local-cli/core/windows/findMainFile.js
index e0bdfdb62c5..1dae78e1270 100644
--- a/local-cli/core/windows/findMainFile.js
+++ b/local-cli/core/windows/findMainFile.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/core/windows/findNamespace.js b/local-cli/core/windows/findNamespace.js
index 4867368f122..27b23bfa005 100644
--- a/local-cli/core/windows/findNamespace.js
+++ b/local-cli/core/windows/findNamespace.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/core/windows/findPackageClassName.js b/local-cli/core/windows/findPackageClassName.js
index 279610eac7f..749a5cacbf2 100644
--- a/local-cli/core/windows/findPackageClassName.js
+++ b/local-cli/core/windows/findPackageClassName.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/core/windows/findProject.js b/local-cli/core/windows/findProject.js
index 3e89b837c4a..a07a49f2f13 100644
--- a/local-cli/core/windows/findProject.js
+++ b/local-cli/core/windows/findProject.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/core/windows/findProjectGUID.js b/local-cli/core/windows/findProjectGUID.js
index 06ae5a17042..fdf9da9cc5d 100644
--- a/local-cli/core/windows/findProjectGUID.js
+++ b/local-cli/core/windows/findProjectGUID.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/core/windows/findProjectName.js b/local-cli/core/windows/findProjectName.js
index c689de9575e..1dc096d6bb2 100644
--- a/local-cli/core/windows/findProjectName.js
+++ b/local-cli/core/windows/findProjectName.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/core/windows/findProjectWithFilePattern.js b/local-cli/core/windows/findProjectWithFilePattern.js
index 3e95a2005f1..89cad928e56 100644
--- a/local-cli/core/windows/findProjectWithFilePattern.js
+++ b/local-cli/core/windows/findProjectWithFilePattern.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/core/windows/findWindowsSolution.js b/local-cli/core/windows/findWindowsSolution.js
index fb6782633b9..fe60e073234 100644
--- a/local-cli/core/windows/findWindowsSolution.js
+++ b/local-cli/core/windows/findWindowsSolution.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/core/windows/index.js b/local-cli/core/windows/index.js
index f403022bbe6..96b9858ba74 100644
--- a/local-cli/core/windows/index.js
+++ b/local-cli/core/windows/index.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/generator-utils.js b/local-cli/generator-utils.js
index 9f58f2e53de..9a1a7673e85 100644
--- a/local-cli/generator-utils.js
+++ b/local-cli/generator-utils.js
@@ -1,10 +1,6 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
 'use strict';
 
diff --git a/local-cli/link/windows/patches/applyParams.js b/local-cli/link/windows/patches/applyParams.js
index 21c1e9545bc..d60a5344593 100644
--- a/local-cli/link/windows/patches/applyParams.js
+++ b/local-cli/link/windows/patches/applyParams.js
@@ -1,12 +1,7 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
-
 const toCamelCase = require('lodash').camelCase;
 
 module.exports = function applyParams(str, params, prefix) {
diff --git a/local-cli/rnpm/windows/src/common.js b/local-cli/rnpm/windows/src/common.js
index 4e41acfa07c..c8e23e49a2f 100644
--- a/local-cli/rnpm/windows/src/common.js
+++ b/local-cli/rnpm/windows/src/common.js
@@ -1,12 +1,7 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
-
 'use strict';
 
 const fs = require('fs');
diff --git a/local-cli/rnpm/windows/src/windows.js b/local-cli/rnpm/windows/src/windows.js
index 9fe8519d47d..982d97105df 100644
--- a/local-cli/rnpm/windows/src/windows.js
+++ b/local-cli/rnpm/windows/src/windows.js
@@ -1,12 +1,7 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
-
 'use strict';
 
 const Common = require('./common');
diff --git a/local-cli/rnpm/windows/src/wpf.js b/local-cli/rnpm/windows/src/wpf.js
index 2bc241cba42..11c64d39539 100644
--- a/local-cli/rnpm/windows/src/wpf.js
+++ b/local-cli/rnpm/windows/src/wpf.js
@@ -1,12 +1,7 @@
 /**
- * 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.
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
  */
-
 'use strict';
 
 const Common = require('./common');
diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js
index 118b7c30736..558bb2fe42d 100644
--- a/scripts/bump-oss-version.js
+++ b/scripts/bump-oss-version.js
@@ -1,11 +1,9 @@
 #!/usr/bin/env node
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/scripts/versiontemplates/ReactNativeVersion.windows.js.template b/scripts/versiontemplates/ReactNativeVersion.windows.js.template
index 357625b8723..1f1ccdd741d 100644
--- a/scripts/versiontemplates/ReactNativeVersion.windows.js.template
+++ b/scripts/versiontemplates/ReactNativeVersion.windows.js.template
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ReactNativeVersion

From 45d572bf04bfe227061c9b0f2a4582853a7e4343 Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Thu, 1 Mar 2018 05:18:12 -0500
Subject: [PATCH 3/3] fix(LICENSE): Remove FacebookLicense folder, all local
 source code now MIT

Updates the README and the LICENSE at the root folder to reflect that portions of the React Native Windows plugin derived from Facebook are copyright Facebook. Both derived and original contributions in React Native Windows are provided under the MIT license.
---
 FacebookLicense/LICENSE   | 30 ------------------------------
 FacebookLicense/PATENTS   | 33 ---------------------------------
 FacebookLicense/README.md | 20 --------------------
 LICENSE                   |  4 ++++
 README.md                 |  4 +---
 5 files changed, 5 insertions(+), 86 deletions(-)
 delete mode 100644 FacebookLicense/LICENSE
 delete mode 100644 FacebookLicense/PATENTS
 delete mode 100644 FacebookLicense/README.md

diff --git a/FacebookLicense/LICENSE b/FacebookLicense/LICENSE
deleted file mode 100644
index 8085fec497c..00000000000
--- a/FacebookLicense/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-BSD License
-
-For React Native software
-
-Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/FacebookLicense/PATENTS b/FacebookLicense/PATENTS
deleted file mode 100644
index f26186660aa..00000000000
--- a/FacebookLicense/PATENTS
+++ /dev/null
@@ -1,33 +0,0 @@
-Additional Grant of Patent Rights Version 2
-
-"Software" means the React Native software distributed by Facebook, Inc.
-
-Facebook, Inc. (“Facebook”) hereby grants to each recipient of the Software
-(“you”) a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
-(subject to the termination provision below) license under any Necessary
-Claims, to make, have made, use, sell, offer to sell, import, and otherwise
-transfer the Software. For avoidance of doubt, no license is granted under
-Facebook's rights in any patent claims that are infringed by (i) modifications
-to the Software made by you or any third party or (ii) the Software in
-combination with any software or other technology.
-
-The license granted hereunder will terminate, automatically and without notice,
-if you (or any of your subsidiaries, corporate affiliates or agents) initiate
-directly or indirectly, or take a direct financial interest in, any Patent
-Assertion: (i) against Facebook or any of its subsidiaries or corporate
-affiliates, (ii) against any party if such Patent Assertion arises in whole or
-in part from any software, technology, product or service of Facebook or any of
-its subsidiaries or corporate affiliates, or (iii) against any party relating
-to the Software. Notwithstanding the foregoing, if Facebook or any of its
-subsidiaries or corporate affiliates files a lawsuit alleging patent
-infringement against you in the first instance, and you respond by filing a
-patent infringement counterclaim in that lawsuit against that party that is
-unrelated to the Software, the license granted hereunder will not terminate
-under section (i) of this paragraph due to such counterclaim.
-
-A "Necessary Claim" is a claim of a patent owned by Facebook that is
-necessarily infringed by the Software standing alone.
-
-A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
-or contributory infringement or inducement to infringe any patent, including a
-cross-claim or counterclaim.
diff --git a/FacebookLicense/README.md b/FacebookLicense/README.md
deleted file mode 100644
index d15c0d9b7dc..00000000000
--- a/FacebookLicense/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-## Facebook License and Grant of Patent Rights
-
-A subset of the source code in React Native Windows is derived from React Native.  Files that are derived from React Native contain the following copyright headers:
-
-```
-/**
- * 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.
- */
-```
-
-In React Native Windows, the BSD-style license referred to above can be found in the [LICENSE](LICENSE) file in this folder. The grant of patent rights can be found in the [PATENTS](PATENTS) file in this folder.
-
-A non-exhaustive list of that source code can be found in the following directories:
-- [Libraries](/Libraries)
-- [RNTester](https://github.com/Microsoft/react-native-windows/tree/rntester)
diff --git a/LICENSE b/LICENSE
index d1ed057e124..b4f554e2b73 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,6 +2,10 @@ The MIT License (MIT)
 
 Copyright (c) Microsoft Corporation and contributors. All rights reserved.
 
+Portions derived from React Native:
+
+Copyright (c) 2015-present, Facebook, Inc.
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/README.md b/README.md
index 5308039e67a..4d676410444 100644
--- a/README.md
+++ b/README.md
@@ -96,9 +96,7 @@ Each pull request has the unit tests, code analysis, and a [Winium](https://gith
 
 ## License
 
-Portions of the React Native Windows plugin are subject to certain Facebook provided license terms. More information can be found in the [FacebookLicense](FacebookLicense) directory.
-
-All modifications to the original Facebook source code, and all newly contributed code to the React Native Windows plugin are provided under the [MIT License](LICENSE).
+The React Native Windows plugin, including modifications to the original Facebook source code, and all newly contributed code is provided under the [MIT License](LICENSE). Portions of the React Native Windows plugin derived from React Native are copyright Facebook.
 
 ## Code of Conduct