Working!

Summary:
Added language to explain that you still need to add keys for each section even if you use a keyExtractor method.

No code changed; just clarified documentation.
Closes https://github.com/facebook/react-native/pull/15007

Differential Revision: D5425897

Pulled By: hramos

fbshipit-source-id: db44064a28a673feeda5a6765ea45217d3ae51e2

.eslintignore

@@ -3,4 +3,12 @@
 **/staticBundle.js
 **/main.js
 Libraries/vendor/**/*
-packager/src/worker-farm/**/*
+Libraries/Renderer/*
+website/node_modules
+pr-inactivity-bookmarklet.js
+question-bookmarklet.js
+flow/
+website/core/metadata.js
+website/core/metadata-blog.js
+website/src/react-native/docs/
+website/src/react-native/blog/

.eslintrc

@@ -1,4 +1,6 @@
 {
+  "root": true,
+
   "parser": "babel-eslint",
 
   "ecmaFeatures": {
@@ -11,6 +13,8 @@
   },
 
   "plugins": [
+    "flowtype",
+    "prettier",
     "react"
   ],
 
@@ -49,33 +53,17 @@
     "setTimeout": false,
     "window": false,
     "XMLHttpRequest": false,
-    "pit": false,
-
-    // Flow global types.
-    "ReactComponent": false,
-    "ReactClass": false,
-    "ReactElement": false,
-    "ReactPropsCheckType": false,
-    "ReactPropsChainableTypeChecker": false,
-    "ReactPropTypes": false,
-    "SyntheticEvent": false,
-    "$Either": false,
-    "$All": false,
-    "$ArrayBufferView": false,
-    "$Tuple": false,
-    "$Supertype": false,
-    "$Subtype": false,
-    "$Shape": false,
-    "$Diff": false,
-    "$Keys": false,
-    "$Enum": false,
-    "$Exports": false,
-    "$FlowIssue": false,
-    "$FlowFixMe": false,
-    "$FixMe": false
+    "pit": false
   },
 
   "rules": {
+  // Flow Plugin
+  // The following rules are made available via `eslint-plugin-flowtype`
+    "flowtype/define-flow-type": 1,
+    "flowtype/use-flow-type": 1,
+
+  // General
+
     "comma-dangle": 0,               // disallow trailing commas in object literals
     "no-cond-assign": 1,             // disallow assignment in conditional expressions
     "no-console": 0,                 // disallow use of console (off by default in the node environment)
@@ -176,6 +164,10 @@
     "no-restricted-modules": 1,      // restrict usage of specified node modules (off by default)
     "no-sync": 0,                    // disallow use of synchronous methods (off by default)
 
+  // Prettier Plugin
+  // https://github.com/prettier/eslint-plugin-prettier
+    "prettier/prettier": [2, "fb", "@format"],
+
   // Stylistic Issues
   // These rules are purely matters of style and are quite subjective.
 
@@ -241,6 +233,6 @@
     "react/prop-types": 0,
     "react/react-in-jsx-scope": 1,
     "react/self-closing-comp": 1,
-    "react/wrap-multilines": 0,
+    "react/wrap-multilines": 0
   }
 }

.github/CODEOWNERS

@@ -0,0 +1,9 @@
+docs/* @hramos
+blog/* @hramos
+Libraries/Animated/* @janicduplessis
+Libraries/NativeAnimation/* @janicduplessis
+ReactAndroid/src/main/java/com/facebook/react/animated/* @janicduplessis
+website/* @hramos
+website/showcase.json @hramos
+package.json @hramos @ericnakagawa
+website/package.json @hramos @ericnakagawa

.github/ISSUE_TEMPLATE.md

@@ -16,20 +16,20 @@
   If you answered "No":
 
     We use GitHub Issues exclusively for tracking bugs in React Native. If you're looking for help,
-    check out the How to Get In Touch section of the following guide:
-    https://facebook.github.io/react-native/docs/contributing.html#how-to-get-in-touch
+    check out the How to Get In Touch section of the following guide: 
+    https://github.com/facebook/react-native/blob/master/CONTRIBUTING.md#how-to-get-in-touch
 
   Now scroll below!
 -->
 
 
-### Have you read the Bugs section of the How to Contribute guide?
+### Have you read the Bugs section of the Contributing to React Native Guide?
 
 (Write your answer here.)
 
 <!--
   Please read through the bug reporting guidelines thoroughly:
-  https://facebook.github.io/react-native/docs/contributing.html#bugs
+  https://github.com/facebook/react-native/blob/master/CONTRIBUTING.md#bugs
 -->
 
 ### Environment
@@ -41,15 +41,15 @@
 1. `react-native -v`:
 2. `node -v`:
 3. `npm -v`:
-4. `yarn --version`<!-- (if you use Yarn) -->:
+4. `yarn --version` (if you use Yarn):
 
 Then, specify:
 
 <!-- (What platform are you building for? Choose any from iOS, Android, AppleTV.) -->
-- Target Platform:
+- Target Platform: 
 
 <!-- Which operating system are you using? Specify macOS, Windows, or Linux, along with specific release versions -->
-- Development Operating System:
+- Development Operating System: 
 
 <!-- Include any additional relevant information. Are you using Xcode or Android Studio to build native code? Is the issue specific to a particular iOS or Android SDK? -->
 - Build tools:

.gitignore

@@ -57,3 +57,6 @@ node_modules
 
 /coverage
 /third-party
+
+/website/src
+/website/build

.travis.yml

@@ -5,9 +5,8 @@ osx_image: xcode8.3
 install:
   - nvm install 7
   - rm -Rf "${TMPDIR}/jest_preprocess_cache"
-  - wget https://github.com/yarnpkg/yarn/releases/download/v0.16.0/yarn-0.16.0.js
-  - export yarn="node $(pwd)/yarn-0.16.0.js"
-  - $yarn install
+  - brew install yarn --ignore-dependencies
+  - yarn install
 
 script:
   - if [[ "$TEST_TYPE" = objc-ios ]]; then travis_retry travis_wait 30 ./scripts/objc-test-ios.sh test; fi

.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+    // Use IntelliSense to learn about possible Node.js debug attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "program": "${workspaceRoot}/Libraries/react-native/react-native-implementation.js"
+        }
+    ]
+}

CONTRIBUTING.md

@@ -1,48 +1,16 @@
 # Contributing to React Native
 
-<!-- generated_contributing_start -->
-React Native is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody using Facebook's mobile apps. If you're interested in contributing to React Native, hopefully this document makes the process for contributing clear.
+React Native is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on https://facebook.com. We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and preempts some questions you may have.
 
-Core contributors to React Native meet monthly and post their meeting notes on the [React Native blog](https://facebook.github.io/react-native/blog). You can also find ad hoc discussions in the [React Native Core Contributors](https://www.facebook.com/groups/reactnativeoss/) Facebook group.
-
-## [Code of Conduct](https://code.facebook.com/codeofconduct)
+## Code of Conduct
 
 Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
 
-## How to contribute
-
-There are many ways to contribute to React Native, and many of them do not involve writing any code. Here's a few ideas to get started:
-
-* Simply start using React Native. Go through the [Getting Started](http://facebook.github.io/react-native/docs/getting-started.html) guide. Does everything work as expected? If not, we're always looking for improvements. Let us know by [opening an issue](http://facebook.github.io/react-native/docs/contributing.html#reporting-new-issues).
-* Look through the [open issues](https://github.com/facebook/react-native/issues). Provide workarounds, ask for clarification, or suggest labels. Help [triage issues](http://facebook.github.io/react-native/docs/contributing.html#triaging-issues-and-pull-requests).
-* If you find an issue you would like to fix, [open a pull request](http://facebook.github.io/react-native/docs/contributing.html#your-first-pull-request). Issues tagged as [`Good First Task`](https://github.com/facebook/react-native/labels/Good%20First%20Task) are a good place to get started.
-* Read through the [React Native docs](http://facebook.github.io/react-native/docs). If you find anything that is confusing or can be improved, you can make edits by clicking "Improve this page" at the bottom of most docs.
-* Browse [Stack Overflow](https://stackoverflow.com/questions/tagged/react-native) and answer questions. This will help you get familiarized with common pitfalls or misunderstandings, which can be useful when contributing updates to the documentation.
-* Take a look at the [features requested](https://react-native.canny.io/feature-requests) by others in the community and consider opening a pull request if you see something you want to work on.
-
-Contributions are very welcome. If you think you need help planning your contribution, please hop into [#react-native](https://discord.gg/0ZcbPKXt5bZjGY5n) and let people know you're looking for a mentor.
-
-### Triaging issues and pull requests
-
-One great way you can contribute to the project without writing any code is to help triage issues and pull requests as they come in.
-
-* Ask for more information if the issue does not provide all the details required by the template.
-* Suggest [labels](https://github.com/facebook/react-native/labels) that can help categorize issues.
-* Flag issues that are stale or that should be closed.
-* Ask for test plans and review code.
-
-Adding labels, closing and reopening issues, and merging pull requests is, as you may expect, limited to a subset of contributors. Simply commenting on the issue or pull request can still go a long way towards helping us keep the number of outstanding issues under control.
-
-Once you have become an active contributor in the community, you may gain access to the Facebook GitHub Bot, allowing you to perform some of these operations yourself. You can learn more about the bot in the [maintainer's guide](docs/maintainers.html#facebook-github-bot).
-
-
-## Our development process
+## Our Development Process
 
 Some of the core team will be working directly on [GitHub](https://github.com/facebook/react-native). These changes will be public from the beginning. Other changesets will come via a bridge with Facebook's internal source control. This is a necessity as it allows engineers at Facebook outside of the core team to move fast and contribute from an environment they are comfortable in.
 
-When a change made on GitHub is approved, it will first be imported into Facebook's internal source control. The change will eventually sync back to GitHub as a single commit once it has passed all internal tests.
-
-### Branch organization
+## Branch Organization
 
 We will do our best to keep `master` in good shape, with tests passing at all times. But in order to move fast, we will make API changes that your application might not be compatible with. We will do our best to [communicate these changes](https://github.com/facebook/react-native/releases) and version appropriately so you can lock into a specific version if need be.
 
@@ -50,61 +18,69 @@ To see what changes are coming and provide better feedback to React Native contr
 
 ## Bugs
 
-We use [GitHub Issues](https://github.com/facebook/react-native/issues) for our public bugs. If you would like to report a problem, take a look around and see if someone already opened an issue about it. If you a are certain this is a new, unreported bug, you can submit a [bug report](http://facebook.github.io/react-native/docs/contributing.html#reporting-new-issues).
+#### Where to Find Known Issues
 
-If you have questions about using React Native, the [help page](http://facebook.github.io/react-native/support.html) list various resources that should help you get started.
+We are using [GitHub Issues](https://github.com/facebook/react-native/issues) for our public bugs. Before filing a new task, try to make sure your problem doesn't already exist.
 
-We also have a [place where you can request features or enhancements](https://react-native.canny.io/feature-requests). If you see anything you'd like to be implemented, vote it up and explain your use case.
+Questions and feature requests are tracked elsewhere:
 
-## Reporting new issues
+  - Have a question? [Ask on Stack Overflow](http://stackoverflow.com/questions/tagged/react-native).
+  - If you have a question regarding future plans, check out the [roadmap](https://github.com/facebook/react-native/wiki/Roadmap).
+  - Have a feature request that is not covered in the roadmap? [Add it here](https://react-native.canny.io/feature-requests).
 
-When [opening a new issue](https://github.com/facebook/react-native/issues/new), always make sure to fill out the [issue template](https://raw.githubusercontent.com/facebook/react-native/master/.github/ISSUE_TEMPLATE.md). **This step is very important!** Not doing so may result in your issue getting closed. Don't take this personally if this happens, and feel free to open a new issue once you've gathered all the information required by the template.
+#### Reporting New Issues
 
-* **One issue, one bug:** Please report a single bug per issue.
-* **Provide a Snack:** The best way to get attention on your issue is to provide a reduced test case. You can use [Snack](https://snack.expo.io/) to demonstrate the issue.
-* **Provide reproduction steps:** List all the steps necessary to reproduce the issue. Provide a Snack or upload a sample project to GitHub. The person reading your bug report should be able to follow these steps to reproduce your issue with minimal effort.
-* **Try out the latest version:** Verify that the issue can be reproduced locally by updating your project to use [React Native from `master`](http://facebook.github.io/react-native/versions.html). The bug may have already been fixed!
+The best way to get your bug fixed is to provide a reduced test case. Please provide either a [Sketch](https://sketch.expo.io/) or a public repository with a runnable example.
 
-We're not able to provide support through GitHub Issues. If you're looking for help with your code, consider asking on [Stack Overflow](http://stackoverflow.com/questions/tagged/react-native) or reaching out to the community through [other channels](https://facebook.github.io/react-native/support.html).
+Please report a single bug per issue. Always provide reproduction steps. You can use Snack in many cases to demonstrate an issue: https://snack.expo.io/. If the bug cannot be reproduced using Snack, verify that the issue can be reproduced locally by targeting the latest release candidate. Ideally, check if the issue is present in master as well.
 
-### Security bugs
+Do not forget to include sample code that reproduces the issue. Only open issues for bugs affecting either the latest stable release, or the current release candidate, or master (see http://facebook.github.io/react-native/versions.html). If it is not clear from your report that the issue can be reproduced in one of these releases, your issue will be closed.
+
+We're not able to provide support through GitHub Issues. If you're looking for help with your code, consider asking on Stack Overflow:  http://stackoverflow.com/questions/tagged/react-native
+
+#### Security Bugs
 
 Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. With that in mind, please do not file public issues; go through the process outlined on that page.
 
-## Pull requests
+## How to Get in Touch
 
-### Your first pull request
+Many React Native users are active on [Stack Overflow](http://stackoverflow.com/questions/tagged/react-native).
 
-So you have decided to contribute code back to upstream by opening a pull request. You've invested a good chunk of time, and we appreciate it. We will do our best to work with you and get the PR looked at.
+If you  want to get a general sense of what React Native folks talk about, check out the [React Native Community](https://www.facebook.com/groups/react.native.community) Facebook group.
 
-Working on your first Pull Request? You can learn how from this free video series:
+There is also [an active community of React and React Native users on the Discord chat platform](https://discord.gg/0ZcbPKXt5bZjGY5n) in case you need help.
 
-[**How to Contribute to an Open Source Project on GitHub**](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github)
+The React Native team sends out periodical updates through the following channels:
 
-We have a list of [beginner friendly issues](https://github.com/facebook/react-native/labels/Good%20First%20Task) to help you get your feet wet in the React Native codebase and familiar with our contribution process. This is a great place to get started.
+* [Blog](https://facebook.github.io/react-native/blog/)
+* [Twitter](https://www.twitter.com/reactnative)
 
-### Proposing a change
+Core contributors to React Native meet monthly and post their meeting notes on the React Native blog. You can also find ad hoc discussions in the [React Native Core Contributors](https://www.facebook.com/groups/reactnativeoss/) Facebook group.
 
-If you would like to request a new feature or enhancement but are not yet thinking about opening a pull request, we have a [place to track feature requests](https://react-native.canny.io/feature-requests).
+## Proposing a Change
 
 If you intend to change the public API, or make any non-trivial changes to the implementation, we recommend [filing an issue](https://github.com/facebook/react-native/issues/new). This lets us reach an agreement on your proposal before you put significant effort into it.
 
 If you're only fixing a bug, it's fine to submit a pull request right away but we still recommend to file an issue detailing what you're fixing. This is helpful in case we don't accept that specific fix but want to keep track of the issue.
 
-### Sending a pull request
+## Pull Requests
+
+If you send a pull request, please do it against the master branch. We maintain stable branches for stable releases separately but we don't accept pull requests to them directly. Instead, we cherry-pick non-breaking changes from master to the latest stable version.
+
+The core team will be monitoring for pull requests. When we get one, we'll run some Facebook-specific integration tests on it first. From here, we'll need to get another person to sign off on the changes and then merge the pull request. For API changes we may need to fix internal uses, which could cause some delay. We'll do our best to provide updates and feedback throughout the process.
 
 Small pull requests are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.
 
-**Before submitting a pull request**, please make sure the following is done:
+*Before* submitting a pull request, please make sure the following is done…
 
-1. Fork [the repository](https://github.com/facebook/react-native) and create your branch from `master`.
+1. Fork the repo and create your branch from `master`.
 2. Add the copyright notice to the top of any new files you've added.
-3. Describe your [**test plan**](https://facebook.github.io/react-native/docs/contributing.html#test-plan) in your commit.
-4. Ensure [**tests pass**](https://facebook.github.io/react-native/docs/contributing.html#contrinuous-integration-tests) on both Travis and Circle CI.
-5. Make sure your code lints (`npm run lint`).
-6. If you haven't already, [sign the CLA](https://code.facebook.com/cla).
-
-All pull requests should be opened against the `master` branch.
+3. Describe your **test plan** in your commit.
+4. Ensure **tests pass** on Travis and Circle CI.
+5. Make sure your code lints (`node linter.js <files touched>`).
+6. If you haven't already, sign the CLA: https://code.facebook.com/cla
+7. Squash your commits (`git rebase -i`).
+   One intent alongside one commit makes it clearer for people to review and easier to understand your intention.
 
 > **Note:** It is not necessary to keep clicking `Merge master to your branch` on the PR page. You would want to merge master if there are conflicts or tests are failing. The Facebook-GitHub-Bot ultimately squashes all commits to a single one before merging your PR.
 
@@ -112,15 +88,18 @@ All pull requests should be opened against the `master` branch.
 
 A good test plan has the exact commands you ran and their output, provides screenshots or videos if the pull request changes UI or updates the website.
 
-* If you've added code that should be tested, add tests!
-* If you've changed APIs, update the documentation.
-* If you've updated the docs, verify the website locally and submit screenshots if applicable (see [website/README.md](https://github.com/facebook/react-native/blob/master/website/README.md))
+  - If you've added code that should be tested, add tests!
+  - If you've changed APIs, update the documentation.
+  - If you've updated the docs, verify the website locally and submit screenshots if applicable (see `website/README.md`)
 
-See [What is a Test Plan?](https://medium.com/@martinkonicek/what-is-a-test-plan-8bfc840ec171#.y9lcuqqi9) to learn more.
+See "What is a Test Plan?" to learn more:
+https://medium.com/@martinkonicek/what-is-a-test-plan-8bfc840ec171#.y9lcuqqi9
 
 #### Continuous integration tests
 
-Make sure all **tests pass** on both [Travis][travis] and [Circle CI][circle]. PRs that break tests are unlikely to be merged. Learn more about [testing your changes here](https://facebook.github.io/react-native/docs/testing.html).
+Make sure all **tests pass** on both [Travis][travis] and [Circle CI][circle]. PRs that break tests are unlikely to be merged.
+
+You can learn more about running tests and contributing to React Native here: https://facebook.github.io/react-native/docs/testing.html
 
 [travis]: https://travis-ci.org/facebook/react-native
 [circle]: http://circleci.com/gh/facebook/react-native
@@ -132,10 +111,10 @@ When adding a new breaking change, follow this template in your pull request:
 ```
 ### New breaking change here
 
-* **Who does this affect**:
-* **How to migrate**:
-* **Why make this breaking change**:
-* **Severity (number of people affected x effort)**:
+- **Who does this affect**:
+- **How to migrate**:
+- **Why make this breaking change**:
+- **Severity (number of people affected x effort)**:
 ```
 
 If your pull request is merged, a core contributor will update the [list of breaking changes](https://github.com/facebook/react-native/wiki/Breaking-Changes) which is then used to populate the release notes.
@@ -157,17 +136,15 @@ Copy and paste this to the top of your new file(s):
 
 If you've added a new module, add a `@providesModule <moduleName>` at the end of the comment. This will allow the haste package manager to find it.
 
-#### Contributor License Agreement (CLA)
+### Contributor License Agreement (CLA)
 
-In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, the Facebook GitHub Bot will reply with a link to the CLA form. You may also [complete your CLA here](https://code.facebook.com/cla).
+In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, just let us know that you have completed the CLA and we can cross-check with your GitHub username.
 
-### What happens next?
-
-The core team will be monitoring for pull requests. Read [what to expect from maintainers](https://facebook.github.io/react-native/docs/maintainers.html#handling-pull-requests) to understand what may happen after you open a pull request.
+Complete your CLA here: https://code.facebook.com/cla
 
 ## Style Guide
 
-Our linter will catch most styling issues that may exist in your code. You can check the status of your code styling by simply running `npm run lint`.
+Our linter will catch most styling issues that may exist in your code. You can check the status of your code styling by simply running `node linter.js <files touched>`.
 
 However, there are still some styles that the linter cannot pick up.
 
@@ -217,4 +194,3 @@ However, there are still some styles that the linter cannot pick up.
 ## License
 
 By contributing to React Native, you agree that your contributions will be licensed under its BSD license.
-<!-- generated_contributing_end -->

ContainerShip/Dockerfile.javascript

@@ -1,6 +1,6 @@
 FROM library/node:6.9.2
 
-ENV YARN_VERSION=0.19.1
+ENV YARN_VERSION=0.27.5
 
 # install dependencies
 RUN apt-get update && apt-get install ocaml libelf-dev -y

Libraries/ART/ReactNativeART.js

@@ -392,7 +392,7 @@ class Shape extends React.Component {
   render() {
     var props = this.props;
     var path = props.d || childrenAsString(props.children);
-    var d = new Path(path).toJSON();
+    var d = (path instanceof Path ? path : new Path(path)).toJSON();
     return (
       <NativeShape
         fill={extractBrush(props.fill, props)}
@@ -486,7 +486,8 @@ function extractAlignment(alignment) {
 class Text extends React.Component {
   render() {
     var props = this.props;
-    var textPath = props.path ? new Path(props.path).toJSON() : null;
+    var path = props.path;
+    var textPath = path ? (path instanceof Path ? path : new Path(path)).toJSON() : null;
     var textFrame = extractFontAndLines(
       props.font,
       childrenAsString(props.children)

Libraries/Animated/src/AnimatedImplementation.js

@@ -2825,9 +2825,9 @@ module.exports = {
    *
    *```javascript
    *  onScroll={Animated.event(
-   *    [{nativeEvent: {contentOffset: {x: this._scrollX}}}]
+   *    [{nativeEvent: {contentOffset: {x: this._scrollX}}}],
    *    {listener},          // Optional async listener
-   *  )
+   *  )}
    *  ...
    *  onPanResponderMove: Animated.event([
    *    null,                // raw event arg ignored

Libraries/Components/Keyboard/KeyboardAvoidingView.js

@@ -22,13 +22,8 @@ const View = require('View');
 const ViewPropTypes = require('ViewPropTypes');
 
 import type EmitterSubscription from 'EmitterSubscription';
+import type {ViewLayout, ViewLayoutEvent} from 'ViewPropTypes';
 
-type Rect = {
-  x: number,
-  y: number,
-  width: number,
-  height: number,
-};
 type ScreenRect = {
   screenX: number,
   screenY: number,
@@ -41,11 +36,6 @@ type KeyboardChangeEvent = {
   duration?: number,
   easing?: string,
 };
-type LayoutEvent = {
-  nativeEvent: {
-    layout: Rect,
-  }
-};
 
 const viewRef = 'VIEW';
 
@@ -87,7 +77,7 @@ const KeyboardAvoidingView = createReactClass({
   },
 
   subscriptions: ([]: Array<EmitterSubscription>),
-  frame: (null: ?Rect),
+  frame: (null: ?ViewLayout),
 
   relativeKeyboardHeight(keyboardFrame: ScreenRect): number {
     const frame = this.frame;
@@ -123,7 +113,7 @@ const KeyboardAvoidingView = createReactClass({
     this.setState({bottom: height});
   },
 
-  onLayout(event: LayoutEvent) {
+  onLayout(event: ViewLayoutEvent) {
     this.frame = event.nativeEvent.layout;
   },
 

Libraries/Components/MaskedView/MaskedViewIOS.android.js

@@ -5,22 +5,10 @@
  * 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 MaskedViewIOS
+ * @flow
  */
 'use strict';
 
-var React = require('React');
-
-var fourOhFour = React.createClass({
-  render: function() {
-    return (
-      <html>
-        <head>
-          <meta httpEquiv="refresh" content="0; /react-native/docs/getting-started.html" />
-        </head>
-        <body />
-      </html>
-    );
-  }
-});
-
-module.exports = fourOhFour;
+module.exports = require('UnimplementedView');

Libraries/Components/MaskedView/MaskedViewIOS.ios.js

@@ -0,0 +1,110 @@
+/**
+ * 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 MaskedViewIOS
+ * @flow
+ */
+
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
+const requireNativeComponent = require('requireNativeComponent');
+const ReactPropTypes = React.PropTypes;
+
+import type { ViewProps } from 'ViewPropTypes';
+
+type Props = ViewProps & {
+  children: any,
+  /**
+   * Should be a React element to be rendered and applied as the
+   * mask for the child element.
+   */
+  maskElement: React.Element<*>,
+};
+
+/**
+ * Renders the child view with a mask specified in the `maskElement` prop.
+ *
+ * ```
+ * import React from 'react';
+ * import { MaskedView, Text, View } from 'react-native';
+ *
+ * class MyMaskedView extends React.Component {
+ *   render() {
+ *     return (
+ *       <MaskedView
+ *         style={{ flex: 1 }}
+ *         maskElement={
+ *           <View style={styles.maskContainerStyle}>
+ *             <Text style={styles.maskTextStyle}>
+ *               Basic Mask
+ *             </Text>
+ *           </View>
+ *         }
+ *       >
+ *         <View style={{ flex: 1, backgroundColor: 'blue' }} />
+ *       </MaskedView>
+ *     );
+ *   }
+ * }
+ * ```
+ *
+ * The above example will render a view with a blue background that fills its
+ * parent, and then mask that view with text that says "Basic Mask".
+ *
+ * The alpha channel of the view rendered by the `maskElement` prop determines how
+ * much of the view's content and background shows through. Fully or partially
+ * opaque pixels allow the underlying content to show through but fully
+ * transparent pixels block that content.
+ *
+ */
+class MaskedViewIOS extends React.Component {
+  props: Props;
+
+  static propTypes = {
+    ...ViewPropTypes,
+    maskElement: ReactPropTypes.element.isRequired,
+  };
+
+  _hasWarnedInvalidRenderMask = false;
+
+  render() {
+    const { maskElement, children, ...otherViewProps } = this.props;
+
+    if (!React.isValidElement(maskElement)) {
+      if (!this._hasWarnedInvalidRenderMask) {
+        console.warn(
+          'MaskedView: Invalid `maskElement` prop was passed to MaskedView. ' +
+            'Expected a React Element. No mask will render.'
+        );
+        this._hasWarnedInvalidRenderMask = true;
+      }
+      return <View {...otherViewProps}>{children}</View>;
+    }
+
+    return (
+      <RCTMaskedView {...otherViewProps}>
+        <View pointerEvents="none" style={StyleSheet.absoluteFill}>
+          {maskElement}
+        </View>
+        {children}
+      </RCTMaskedView>
+    );
+  }
+}
+
+const RCTMaskedView = requireNativeComponent('RCTMaskedView', {
+  name: 'RCTMaskedView',
+  displayName: 'RCTMaskedView',
+  propTypes: {
+    ...ViewPropTypes,
+  },
+});
+
+module.exports = MaskedViewIOS;

Libraries/Components/ScrollView/ScrollView.js

@@ -259,6 +259,8 @@ 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,
     /**

Libraries/Components/StatusBar/StatusBar.js

@@ -63,7 +63,10 @@ type DefaultProps = {
 /**
  * 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 (const prop in cur) {
       if (cur[prop] != null) {
@@ -80,20 +83,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,
   };
 }
@@ -141,7 +153,7 @@ class StatusBar extends React.Component {
   props: {
     hidden?: boolean,
     animated?: boolean,
-    backgroundColor?: $FlowFixMe,
+    backgroundColor?: string,
     translucent?: boolean,
     barStyle?: 'default' | 'light-content' | 'dark-content',
     networkActivityIndicatorVisible?: boolean,
@@ -215,7 +227,9 @@ class StatusBar extends React.Component {
    */
   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;
@@ -276,11 +290,7 @@ class StatusBar extends React.Component {
     /**
      * Sets the color of the status bar text.
      */
-    barStyle: PropTypes.oneOf([
-      'default',
-      'light-content',
-      'dark-content',
-    ]),
+    barStyle: PropTypes.oneOf(['default', 'light-content', 'dark-content']),
     /**
      * If the network activity indicator should be visible.
      *
@@ -293,10 +303,7 @@ class StatusBar extends React.Component {
      *
      * @platform ios
      */
-    showHideTransition: PropTypes.oneOf([
-      'fade',
-      'slide',
-    ]),
+    showHideTransition: PropTypes.oneOf(['fade', 'slide']),
   };
 
   static defaultProps = {
@@ -343,38 +350,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.barStyle.value !== mergedProps.barStyle.value) {
+        if (
+          !oldProps ||
+          oldProps.barStyle.value !== mergedProps.barStyle.value
+        ) {
           StatusBarManager.setStyle(mergedProps.barStyle.value);
         }
-        if (!oldProps || oldProps.backgroundColor.value !== mergedProps.backgroundColor.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) {

Libraries/Components/Touchable/TouchableHighlight.js

@@ -7,38 +7,36 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule TouchableHighlight
- * @noflow
+ * @flow
  */
 'use strict';
 
-// Note (avik): add @flow when Flow supports spread properties in propTypes
-
-var ColorPropType = require('ColorPropType');
-var NativeMethodsMixin = require('NativeMethodsMixin');
+const ColorPropType = require('ColorPropType');
+const NativeMethodsMixin = require('NativeMethodsMixin');
 const PropTypes = require('prop-types');
-var React = require('React');
-var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-var StyleSheet = require('StyleSheet');
-var TimerMixin = require('react-timer-mixin');
-var Touchable = require('Touchable');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-var View = require('View');
+const React = require('React');
+const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
+const StyleSheet = require('StyleSheet');
+const TimerMixin = require('react-timer-mixin');
+const Touchable = require('Touchable');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const View = require('View');
 const ViewPropTypes = require('ViewPropTypes');
 
-var createReactClass = require('create-react-class');
-var ensureComponentIsNative = require('ensureComponentIsNative');
-var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
-var keyOf = require('fbjs/lib/keyOf');
-var merge = require('merge');
+const createReactClass = require('create-react-class');
+const ensureComponentIsNative = require('ensureComponentIsNative');
+const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
+const keyOf = require('fbjs/lib/keyOf');
+const merge = require('merge');
 
-type Event = Object;
+import type {Event} from 'TouchableWithoutFeedback';
 
-var DEFAULT_PROPS = {
+const DEFAULT_PROPS = {
   activeOpacity: 0.85,
   underlayColor: 'black',
 };
 
-var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
+const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 
 /**
  * A wrapper for making views respond properly to touches.
@@ -110,7 +108,6 @@ var TouchableHighlight = createReactClass({
      * @platform ios
      */
     tvParallaxProperties: PropTypes.object,
-
   },
 
   mixins: [NativeMethodsMixin, TimerMixin, Touchable.Mixin],

Libraries/Components/Touchable/TouchableWithoutFeedback.js

@@ -26,7 +26,7 @@ const {
   AccessibilityTraits,
 } = require('ViewAccessibility');
 
-type Event = Object;
+export type Event = Object;
 
 const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 
@@ -37,7 +37,6 @@ const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
  * TouchableWithoutFeedback supports only one child.
  * If you wish to have several child components, wrap them in a View.
  */
-// $FlowFixMe(>=0.41.0)
 const TouchableWithoutFeedback = createReactClass({
   displayName: 'TouchableWithoutFeedback',
   mixins: [TimerMixin, Touchable.Mixin],
@@ -90,6 +89,7 @@ const TouchableWithoutFeedback = createReactClass({
      * reactivated! Move it back and forth several times while the scroll view
      * is disabled. Ensure you pass in a constant to reduce memory allocations.
      */
+    // $FlowFixMe: Expected a React PropType instead
     pressRetentionOffset: EdgeInsetsPropType,
     /**
      * This defines how far your touch can start away from the button. This is
@@ -99,6 +99,7 @@ const TouchableWithoutFeedback = createReactClass({
      * of sibling views always takes precedence if a touch hits two overlapping
      * views.
      */
+    // $FlowFixMe: Expected a React PropType instead
     hitSlop: EdgeInsetsPropType,
   },
 

Libraries/Components/View/View.js

@@ -9,21 +9,21 @@
  * @providesModule View
  * @flow
  */
-'use strict';
+"use strict";
 
-const NativeMethodsMixin = require('NativeMethodsMixin');
-const Platform = require('Platform');
-const PropTypes = require('prop-types');
-const React = require('React');
-const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
-const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-const ViewPropTypes = require('ViewPropTypes');
+const NativeMethodsMixin = require("NativeMethodsMixin");
+const Platform = require("Platform");
+const PropTypes = require("prop-types");
+const React = require("React");
+const ReactNativeStyleAttributes = require("ReactNativeStyleAttributes");
+const ReactNativeViewAttributes = require("ReactNativeViewAttributes");
+const ViewPropTypes = require("ViewPropTypes");
 
-const createReactClass = require('create-react-class');
-const invariant = require('fbjs/lib/invariant');
-const requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require("create-react-class");
+const invariant = require("fbjs/lib/invariant");
+const requireNativeComponent = require("requireNativeComponent");
 
-import type {ViewProps} from 'ViewPropTypes';
+import type { ViewProps } from "ViewPropTypes";
 
 export type Props = ViewProps;
 
@@ -75,7 +75,7 @@ export type Props = ViewProps;
  */
 // $FlowFixMe(>=0.41.0)
 const View = createReactClass({
-  displayName: 'View',
+  displayName: "View",
   // TODO: We should probably expose the mixins, viewConfig, and statics publicly. For example,
   // one of the props is of type AccessibilityComponentType. That is defined as a const[] above,
   // but it is not rendered by the docs, since `statics` below is not rendered. So its Possible
@@ -93,42 +93,44 @@ const View = createReactClass({
    * make `this` look like an actual native component class.
    */
   viewConfig: {
-    uiViewClassName: 'RCTView',
+    uiViewClassName: "RCTView",
     validAttributes: ReactNativeViewAttributes.RCTView
   },
 
   contextTypes: {
-    isInAParentText: PropTypes.bool,
+    isInAParentText: PropTypes.bool
   },
 
   render: function() {
     invariant(
-      !(this.context.isInAParentText && Platform.OS === 'android'),
-      'Nesting of <View> within <Text> is not supported on Android.');
+      !(this.context.isInAParentText && Platform.OS === "android"),
+      "Nesting of <View> within <Text> is not supported on Android."
+    );
 
     // WARNING: This method will not be used in production mode as in that mode we
     // replace wrapper component View with generated native wrapper RCTView. Avoid
     // adding functionality this component that you'd want to be available in both
     // dev and prod modes.
     return <RCTView {...this.props} />;
-  },
+  }
 });
 
-const RCTView = requireNativeComponent('RCTView', View, {
+const RCTView = requireNativeComponent("RCTView", View, {
   nativeOnly: {
     nativeBackgroundAndroid: true,
-    nativeForegroundAndroid: true,
+    nativeForegroundAndroid: true
   }
 });
 
 if (__DEV__) {
-  const UIManager = require('UIManager');
-  const viewConfig = UIManager.viewConfigs && UIManager.viewConfigs.RCTView || {};
+  const UIManager = require("UIManager");
+  const viewConfig =
+    (UIManager.viewConfigs && UIManager.viewConfigs.RCTView) || {};
   for (const prop in viewConfig.nativeProps) {
     const viewAny: any = View; // Appease flow
     if (!viewAny.propTypes[prop] && !ReactNativeStyleAttributes[prop]) {
       throw new Error(
-        'View is missing propType for native prop `' + prop + '`'
+        "View is missing propType for native prop `" + prop + "`"
       );
     }
   }
@@ -140,4 +142,4 @@ if (__DEV__) {
 }
 
 // No one should depend on the DEV-mode createClass View wrapper.
-module.exports = ((ViewToExport : any) : typeof RCTView);
+module.exports = ((ViewToExport: any): typeof RCTView);

Libraries/Components/View/ViewPropTypes.js

@@ -36,6 +36,19 @@ 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 = {
@@ -50,6 +63,7 @@ export type ViewProps = {
   onMagicTap?: Function,
   testID?: string,
   nativeID?: string,
+  onLayout?: (event: ViewLayoutEvent) => void,
   onResponderGrant?: Function,
   onResponderMove?: Function,
   onResponderReject?: Function,

Libraries/Core/InitializeCore.js

@@ -216,8 +216,6 @@ if (__DEV__) {
       require('setupDevtools');
     }
 
-    require('RCTDebugComponentOwnership');
-
     // Set up inspector
     const JSInspector = require('JSInspector');
     JSInspector.registerAgent(require('NetworkAgent'));

Libraries/DebugComponentHierarchy/RCTDebugComponentOwnership.js

@@ -1,41 +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.
- *
- * Utility class to provide the component owner hierarchy to native code for
- * debugging purposes.
- *
- * @providesModule RCTDebugComponentOwnership
- * @flow
- */
-
-'use strict';
-
-var BatchedBridge = require('BatchedBridge');
-
-var RCTDebugComponentOwnership = {
-  /**
-   * Asynchronously returns the owner hierarchy as an array of strings. Request id is
-   * passed along to the native module so that the native module can identify the
-   * particular call instance.
-   *
-   * Example returned owner hierarchy: ['RootView', 'Dialog', 'TitleView', 'Text']
-   */
-  getOwnerHierarchy: function(requestID: number, tag: number) {
-    // Consider cleaning up these unused modules in a separate diff.
-    throw new Error(
-      'This seems to be unused. Will disable until it is needed again.'
-    );
-  },
-};
-
-BatchedBridge.registerCallableModule(
-  'RCTDebugComponentOwnership',
-  RCTDebugComponentOwnership
-);
-
-module.exports = RCTDebugComponentOwnership;

Libraries/Experimental/SwipeableRow/SwipeableRow.js

@@ -72,6 +72,8 @@ const SwipeableRow = createReactClass({
   propTypes: {
     children: PropTypes.any,
     isOpen: PropTypes.bool,
+    preventSwipeLeft: PropTypes.bool,
+    preventSwipeRight: PropTypes.bool,
     maxSwipeDistance: PropTypes.number.isRequired,
     onOpen: PropTypes.func.isRequired,
     onClose: PropTypes.func.isRequired,
@@ -108,6 +110,8 @@ const SwipeableRow = createReactClass({
   getDefaultProps(): Object {
     return {
       isOpen: false,
+      preventSwipeLeft: false,
+      preventSwipeRight: false,
       maxSwipeDistance: 0,
       onOpen: emptyFunction,
       onClose: emptyFunction,
@@ -335,6 +339,12 @@ 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) {
+      return false;
+    }
     return Math.abs(gestureState.dx) > HORIZONTAL_SWIPE_DISTANCE_THRESHOLD;
   },
 

Libraries/Image/Image.ios.js

@@ -35,8 +35,10 @@ const ImageViewManager = NativeModules.ImageViewManager;
  * including network images, static resources, temporary local images, and
  * images from local disk, such as the camera roll.
  *
- * This example shows both fetching and displaying an image from local
- * storage as well as one from network.
+ * This example shows fetching and displaying an image from local storage
+ * as well as one from network and even from data provided in the `'data:'` uri scheme.
+ *
+ * > Note that for network and data images, you will need to manually specify the dimensions of your image!
  *
  * ```ReactNativeWebPlayer
  * import React, { Component } from 'react';
@@ -53,6 +55,10 @@ const ImageViewManager = NativeModules.ImageViewManager;
  *           style={{width: 50, height: 50}}
  *           source={{uri: 'https://facebook.github.io/react/img/logo_og.png'}}
  *         />
+ *         <Image
+ *           style={{width: 66, height: 58}}
+ *           source={{uri: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADMAAAAzCAYAAAA6oTAqAAAAEXRFWHRTb2Z0d2FyZQBwbmdjcnVzaEB1SfMAAABQSURBVGje7dSxCQBACARB+2/ab8BEeQNhFi6WSYzYLYudDQYGBgYGBgYGBgYGBgYGBgZmcvDqYGBgmhivGQYGBgYGBgYGBgYGBgYGBgbmQw+P/eMrC5UTVAAAAABJRU5ErkJggg=='}}
+ *         />
  *       </View>
  *     );
  *   }
@@ -104,17 +110,17 @@ const ImageViewManager = NativeModules.ImageViewManager;
  * ```
  * dependencies {
  *   // If your app supports Android versions before Ice Cream Sandwich (API level 14)
- *   compile 'com.facebook.fresco:animated-base-support:1.0.1'
+ *   compile 'com.facebook.fresco:animated-base-support:1.3.0'
  *
  *   // For animated GIF support
- *   compile 'com.facebook.fresco:animated-gif:1.0.1'
+ *   compile 'com.facebook.fresco:animated-gif:1.3.0'
  *
  *   // For WebP support, including animated WebP
- *   compile 'com.facebook.fresco:animated-webp:1.0.1'
- *   compile 'com.facebook.fresco:webpsupport:1.0.1'
+ *   compile 'com.facebook.fresco:animated-webp:1.3.0'
+ *   compile 'com.facebook.fresco:webpsupport:1.3.0'
  *
  *   // For WebP support, without animations
- *   compile 'com.facebook.fresco:webpsupport:1.0.1'
+ *   compile 'com.facebook.fresco:webpsupport:1.3.0'
  * }
  * ```
  *

Libraries/Image/ImageBackground.js

@@ -17,6 +17,10 @@ const React = require('React');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
 
+const ensureComponentIsNative = require('ensureComponentIsNative');
+
+import type {NativeMethodsMixinType} from 'ReactNativeTypes';
+
 /**
  * Very simple drop-in replacement for <Image> which supports nesting views.
  *
@@ -42,11 +46,26 @@ const View = require('View');
  * ```
  */
 class ImageBackground extends React.Component {
+  setNativeProps(props: Object) {
+    // Work-around flow
+    const viewRef = this._viewRef;
+    if (viewRef) {
+      ensureComponentIsNative(viewRef);
+      viewRef.setNativeProps(props);
+    }
+  }
+
+  _viewRef: ?NativeMethodsMixinType = null;
+
+  _captureRef = ref => {
+    this._viewRef = ref;
+  };
+
   render() {
     const {children, style, imageStyle, imageRef, ...props} = this.props;
 
     return (
-      <View style={style}>
+      <View style={style} ref={this._captureRef}>
         <Image
           {...props}
           style={[

Libraries/Image/RelativeImageStub.js

@@ -12,7 +12,7 @@
 'use strict';
 
 // This is a stub for flow to make it understand require('./icon.png')
-// See packager/src/Bundler/index.js
+// See metro-bundler/src/Bundler/index.js
 
 var AssetRegistry = require('AssetRegistry');
 

Libraries/Inspector/BoxInspector.js

@@ -35,10 +35,10 @@ class BoxInspector extends React.Component {
         <BoxContainer title="padding" box={padding}>
           <View>
             <Text style={styles.innerText}>
-              ({frame.left}, {frame.top})
+              ({(frame.left || 0).toFixed(1)}, {(frame.top || 0).toFixed(1)})
             </Text>
             <Text style={styles.innerText}>
-              {frame.width} &times; {frame.height}
+              {(frame.width || 0).toFixed(1)} &times; {(frame.height || 0).toFixed(1)}
             </Text>
           </View>
         </BoxContainer>
@@ -110,4 +110,3 @@ var styles = StyleSheet.create({
 });
 
 module.exports = BoxInspector;
-

Libraries/Lists/FlatList.js

@@ -38,7 +38,7 @@ type RequiredProps<ItemT> = {
    *           onShowUnderlay={separators.highlight}
    *           onHideUnderlay={separators.unhighlight}>
    *           <View style={{backgroundColor: 'white'}}>
-   *             <Text>{item.title}}</Text>
+   *             <Text>{item.title}</Text>
    *           </View>
    *         </TouchableHighlight>
    *       )}

Libraries/Lists/ListView/ListView.js

@@ -36,6 +36,12 @@ var DEFAULT_END_REACHED_THRESHOLD = 1000;
 var DEFAULT_SCROLL_CALLBACK_THROTTLE = 50;
 
 /**
+ * DEPRECATED - use one of the new list components, such as [`FlatList`](docs/flatlist.html)
+ * or [`SectionList`](docs/sectionlist.html) for bounded memory use, fewer bugs,
+ * better performance, an easier to use API, and more features. Check out this
+ * [blog post](https://facebook.github.io/react-native/blog/2017/03/13/better-list-views.html)
+ * for more details.
+ *
  * ListView - A core component designed for efficient display of vertically
  * scrolling lists of changing data. The minimal API is to create a
  * [`ListView.DataSource`](docs/listviewdatasource.html), populate it with a simple

Libraries/Lists/SectionList.js

@@ -129,7 +129,8 @@ type OptionalProps<SectionT: SectionBase<any>> = {
   /**
    * Used to extract a unique key for a given item at the specified index. Key is used for caching
    * and as the react key to track item re-ordering. The default extractor checks item.key, then
-   * falls back to using the index, like react does.
+   * falls back to using the index, like react does. Note that this sets keys for each item, but 
+   * each overall section still needs its own key.
    */
   keyExtractor: (item: Item, index: number) => string,
   /**

Libraries/Lists/VirtualizedList.js

@@ -235,7 +235,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
       `scrollToIndex out of range: ${index} vs ${getItemCount(data) - 1}`,
     );
     invariant(
-      getItemLayout || index < this._highestMeasuredFrameIndex,
+      getItemLayout || index <= this._highestMeasuredFrameIndex,
       'scrollToIndex should be used in conjunction with getItemLayout, ' +
         'otherwise there is no way to know the location of an arbitrary index.',
     );

Libraries/Lists/__flowtests__/FlatList-flowtest.js

@@ -60,9 +60,13 @@ module.exports = {
     ];
     return (
       <FlatList
-        renderItem={(
-          info, // $FlowExpectedError - bad widgetCount type 6, should be Object
-        ) => <span>{info.item.widget.missingProp}</span>}
+        renderItem={info =>
+          <span>
+            {
+              // $FlowExpectedError - bad widgetCount type 6, should be Object
+              info.item.widget.missingProp
+            }
+          </span>}
         data={data}
       />
     );

Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m

@@ -170,7 +170,6 @@
     RCTLogError(@"Not a value node.");
     return;
   }
-  [self stopAnimationsForNode:node];
 
   RCTValueAnimatedNode *valueNode = (RCTValueAnimatedNode *)node;
   valueNode.value = value.floatValue;
@@ -265,20 +264,6 @@
   }
 }
 
-- (void)stopAnimationsForNode:(nonnull RCTAnimatedNode *)node
-{
-    NSMutableArray<id<RCTAnimationDriver>> *discarded = [NSMutableArray new];
-    for (id<RCTAnimationDriver> driver in _activeAnimations) {
-        if ([driver.valueNode isEqual:node]) {
-            [discarded addObject:driver];
-        }
-    }
-    for (id<RCTAnimationDriver> driver in discarded) {
-        [driver stopAnimation];
-        [_activeAnimations removeObject:driver];
-    }
-}
-
 #pragma mark -- Events
 
 - (void)addAnimatedEventToView:(nonnull NSNumber *)viewTag
@@ -343,7 +328,6 @@
   NSMutableArray<RCTEventAnimation *> *driversForKey = _eventDrivers[key];
   if (driversForKey) {
     for (RCTEventAnimation *driver in driversForKey) {
-      [self stopAnimationsForNode:driver.valueNode];
       [driver updateWithEvent:event];
     }
 

Libraries/Network/RCTNetworking.android.js

@@ -95,7 +95,7 @@ class RCTNetworking extends NativeEventEmitter {
 if (__DEV__ && !RCTNetworkingNative) {
   class MissingNativeRCTNetworkingShim extends MissingNativeEventEmitterShim {
     constructor() {
-      super('RCTAppState', 'AppState');
+      super('RCTNetworking', 'Networking');
     }
 
     sendRequest(...args: Array<any>) {

Libraries/Network/RCTNetworking.ios.js

@@ -63,7 +63,7 @@ class RCTNetworking extends NativeEventEmitter {
 if (__DEV__ && !RCTNetworkingNative) {
   class MissingNativeRCTNetworkingShim extends MissingNativeEventEmitterShim {
     constructor() {
-      super('RCTAppState', 'AppState');
+      super('RCTNetworking', 'Networking');
     }
 
     sendRequest(...args: Array<any>) {

Libraries/Network/fetch.js

@@ -7,9 +7,11 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule fetch
- * @nolint
  *
  */
+
+/* eslint-disable */
+
 'use strict';
 
 import 'whatwg-fetch';

Libraries/PushNotificationIOS/PushNotificationIOS.js

@@ -128,7 +128,7 @@ class PushNotificationIOS {
   _badgeCount: number;
   _notificationId: string;
   _isRemote: boolean;
-  _remoteNotificationCompleteCalllbackCalled: boolean;
+  _remoteNotificationCompleteCallbackCalled: boolean;
 
   static FetchResult: FetchResult = {
     NewData: 'UIBackgroundFetchResultNewData',
@@ -406,7 +406,7 @@ class PushNotificationIOS {
    */
   constructor(nativeNotif: Object) {
     this._data = {};
-    this._remoteNotificationCompleteCalllbackCalled = false;
+    this._remoteNotificationCompleteCallbackCalled = false;
     this._isRemote = nativeNotif.remote;
     if (this._isRemote) {
       this._notificationId = nativeNotif.notificationId;
@@ -451,10 +451,10 @@ class PushNotificationIOS {
    * be throttled, to read more about it see the above documentation link.
    */
   finish(fetchResult: FetchResult) {
-    if (!this._isRemote || !this._notificationId || this._remoteNotificationCompleteCalllbackCalled) {
+    if (!this._isRemote || !this._notificationId || this._remoteNotificationCompleteCallbackCalled) {
       return;
     }
-    this._remoteNotificationCompleteCalllbackCalled = true;
+    this._remoteNotificationCompleteCallbackCalled = true;
 
     RCTPushNotificationManager.onFinishRemoteNotification(this._notificationId, fetchResult);
   }

Libraries/ReactNative/requireNativeComponent.js

@@ -70,13 +70,19 @@ function requireNativeComponent(
     viewConfig.propTypes = null;
   }
 
-  // The ViewConfig doesn't contain any props inherited from the view manager's
-  // superclass, so we manually merge in the RCTView ones. Other inheritance
-  // patterns are currenty not supported.
-  const nativeProps = {
-    ...UIManager.RCTView.NativeProps,
-    ...viewConfig.NativeProps,
-  };
+  let baseModuleName = viewConfig.baseModuleName;
+  let nativeProps = { ...viewConfig.NativeProps };
+  while (baseModuleName) {
+    const baseModule = UIManager[baseModuleName];
+    if (!baseModule) {
+      warning(false, 'Base module "%s" does not exist', baseModuleName);
+      baseModuleName = null;
+    } else {
+      nativeProps = { ...nativeProps, ...baseModule.NativeProps };
+      baseModuleName = baseModule.baseModuleName;
+    }
+  }
+
   for (const key in nativeProps) {
     let useAttribute = false;
     const attribute = {};

Libraries/StyleSheet/EdgeInsetsPropType.js

@@ -11,11 +11,11 @@
  */
 'use strict';
 
-var PropTypes = require('prop-types');
+const PropTypes = require('prop-types');
 
-var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
+const createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
 
-var EdgeInsetsPropType = createStrictShapeTypeChecker({
+const EdgeInsetsPropType = createStrictShapeTypeChecker({
   top: PropTypes.number,
   left: PropTypes.number,
   bottom: PropTypes.number,

Libraries/Text/RCTBackedTextInputViewProtocol.h

@@ -19,6 +19,5 @@
 @property (nonatomic, strong, nullable) UIFont *font;
 @property (nonatomic, assign) UIEdgeInsets textContainerInset;
 @property (nonatomic, strong, nullable) UIView *inputAccessoryView;
-@property (nonatomic, readonly) CGSize contentSize;
 
 @end

Libraries/Text/RCTTextInput.m

@@ -64,10 +64,10 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 
 - (CGSize)contentSize
 {
-  CGSize contentSize = self.backedTextInputView.contentSize;
-  UIEdgeInsets reactPaddingInsets = self.reactPaddingInsets;
-  contentSize.width -= reactPaddingInsets.left + reactPaddingInsets.right;
-  contentSize.height -= reactPaddingInsets.top + reactPaddingInsets.bottom;
+  CGSize contentSize = self.intrinsicContentSize;
+  UIEdgeInsets compoundInsets = self.reactCompoundInsets;
+  contentSize.width -= compoundInsets.left + compoundInsets.right;
+  contentSize.height -= compoundInsets.top + compoundInsets.bottom;
   // Returning value does NOT include border and padding insets.
   return contentSize;
 }

Libraries/Text/RCTUITextField.m

@@ -114,12 +114,6 @@
 
 #pragma mark - Layout
 
-- (CGSize)contentSize
-{
-  // Returning size DOES contain `textContainerInset` (aka `padding`).
-  return self.intrinsicContentSize;
-}
-
 - (CGSize)intrinsicContentSize
 {
   // Note: `placeholder` defines intrinsic size for `<TextInput>`.
@@ -128,13 +122,11 @@
   size = CGSizeMake(RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height));
   size.width += _textContainerInset.left + _textContainerInset.right;
   size.height += _textContainerInset.top + _textContainerInset.bottom;
-  // Returning size DOES contain `textContainerInset` (aka `padding`).
   return size;
 }
 
 - (CGSize)sizeThatFits:(CGSize)size
 {
-  // All size values here contain `textContainerInset` (aka `padding`).
   CGSize intrinsicSize = self.intrinsicContentSize;
   return CGSizeMake(MIN(size.width, intrinsicSize.width), MIN(size.height, intrinsicSize.height));
 }

Libraries/Text/RCTUITextView.m

@@ -134,7 +134,6 @@ static UIColor *defaultPlaceholderColor()
 
 - (CGFloat)preferredMaxLayoutWidth
 {
-  // Returning size DOES contain `textContainerInset` (aka `padding`).
   return _preferredMaxLayoutWidth ?: self.placeholderSize.width;
 }
 
@@ -150,18 +149,6 @@ static UIColor *defaultPlaceholderColor()
   return placeholderSize;
 }
 
-- (CGSize)contentSize
-{
-  CGSize contentSize = super.contentSize;
-  CGSize placeholderSize = self.placeholderSize;
-  // When a text input is empty, it actually displays a placehoder.
-  // So, we have to consider `placeholderSize` as a minimum `contentSize`.
-  // Returning size DOES contain `textContainerInset` (aka `padding`).
-  return CGSizeMake(
-    MAX(contentSize.width, placeholderSize.width),
-    MAX(contentSize.height, placeholderSize.height));
-}
-
 - (void)layoutSubviews
 {
   [super layoutSubviews];
@@ -174,7 +161,6 @@ static UIColor *defaultPlaceholderColor()
 
 - (CGSize)intrinsicContentSize
 {
-  // Returning size DOES contain `textContainerInset` (aka `padding`).
   return [self sizeThatFits:CGSizeMake(self.preferredMaxLayoutWidth, INFINITY)];
 }
 
@@ -183,7 +169,7 @@ static UIColor *defaultPlaceholderColor()
   // Returned fitting size depends on text size and placeholder size.
   CGSize textSize = [self fixedSizeThatFits:size];
   CGSize placeholderSize = self.placeholderSize;
-  // Returning size DOES contain `textContainerInset` (aka `padding`).
+  // Returning size DOES contain `textContainerInset`.
   return CGSizeMake(MAX(textSize.width, placeholderSize.width), MAX(textSize.height, placeholderSize.height));
 }
 

Libraries/polyfills/Array.es6.js

@@ -0,0 +1,86 @@
+/**
+ * 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.
+ *
+ * @polyfill
+ */
+
+/* eslint-disable */
+
+/**
+ * Creates an array from array like objects.
+ *
+ * https://people.mozilla.org/~jorendorff/es6-draft.html#sec-array.from
+ */
+if (!Array.from) {
+  Array.from = function(arrayLike /*, mapFn, thisArg */) {
+    if (arrayLike == null) {
+      throw new TypeError('Object is null or undefined');
+    }
+
+    // Optional args.
+    var mapFn = arguments[1];
+    var thisArg = arguments[2];
+
+    var C = this;
+    var items = Object(arrayLike);
+    var symbolIterator = typeof Symbol === 'function'
+      ? Symbol.iterator
+      : '@@iterator';
+    var mapping = typeof mapFn === 'function';
+    var usingIterator = typeof items[symbolIterator] === 'function';
+    var key = 0;
+    var ret;
+    var value;
+
+    if (usingIterator) {
+      ret = typeof C === 'function'
+        ? new C()
+        : [];
+      var it = items[symbolIterator]();
+      var next;
+
+      while (!(next = it.next()).done) {
+        value = next.value;
+
+        if (mapping) {
+          value = mapFn.call(thisArg, value, key);
+        }
+
+        ret[key] = value;
+        key += 1;
+      }
+
+      ret.length = key;
+      return ret;
+    }
+
+    var len = items.length;
+    if (isNaN(len) || len < 0) {
+      len = 0;
+    }
+
+    ret = typeof C === 'function'
+      ? new C(len)
+      : new Array(len);
+
+    while (key < len) {
+      value = items[key];
+
+      if (mapping) {
+        value = mapFn.call(thisArg, value, key);
+      }
+
+      ret[key] = value;
+
+      key += 1;
+    }
+
+    ret.length = key;
+    return ret;
+  };
+}

Libraries/polyfills/Array.prototype.es6.js

@@ -0,0 +1,95 @@
+/**
+ * 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.
+ *
+ * @polyfill
+ */
+
+/* eslint-disable */
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex
+function findIndex(predicate, context) {
+  if (this == null) {
+    throw new TypeError(
+      'Array.prototype.findIndex called on null or undefined'
+    );
+  }
+  if (typeof predicate !== 'function') {
+    throw new TypeError('predicate must be a function');
+  }
+  var list = Object(this);
+  var length = list.length >>> 0;
+  for (var i = 0; i < length; i++) {
+    if (predicate.call(context, list[i], i, list)) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+if (!Array.prototype.findIndex) {
+  Object.defineProperty(Array.prototype, 'findIndex', {
+    enumerable: false,
+    writable: true,
+    configurable: true,
+    value: findIndex
+  });
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find
+if (!Array.prototype.find) {
+  Object.defineProperty(Array.prototype, 'find', {
+    enumerable: false,
+    writable: true,
+    configurable: true,
+    value: function(predicate, context) {
+      if (this == null) {
+        throw new TypeError(
+          'Array.prototype.find called on null or undefined'
+        );
+      }
+      var index = findIndex.call(this, predicate, context);
+      return index === -1 ? undefined : this[index];
+    }
+  });
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes
+if (!Array.prototype.includes) {
+  Object.defineProperty(Array.prototype, 'includes', {
+    enumerable: false,
+    writable: true,
+    configurable: true,
+    value: function (searchElement) {
+      var O = Object(this);
+      var len = parseInt(O.length) || 0;
+      if (len === 0) {
+        return false;
+      }
+      var n = parseInt(arguments[1]) || 0;
+      var k;
+      if (n >= 0) {
+        k = n;
+      } else {
+        k = len + n;
+        if (k < 0) {
+          k = 0;
+        }
+      }
+      var currentElement;
+      while (k < len) {
+        currentElement = O[k];
+        if (searchElement === currentElement ||
+          (searchElement !== searchElement && currentElement !== currentElement)) {
+          return true;
+        }
+        k++;
+      }
+      return false;
+    }
+  });
+}

Libraries/polyfills/Number.es6.js

@@ -0,0 +1,41 @@
+/**
+ * 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.
+ *
+ * @polyfill
+ */
+
+/* eslint-disable strict */
+
+if (Number.EPSILON === undefined) {
+  Object.defineProperty(Number, 'EPSILON', {
+    value: Math.pow(2, -52),
+  });
+}
+if (Number.MAX_SAFE_INTEGER === undefined) {
+  Object.defineProperty(Number, 'MAX_SAFE_INTEGER', {
+    value: Math.pow(2, 53) - 1,
+  });
+}
+if (Number.MIN_SAFE_INTEGER === undefined) {
+  Object.defineProperty(Number, 'MIN_SAFE_INTEGER', {
+    value: -(Math.pow(2, 53) - 1),
+  });
+}
+if (!Number.isNaN) {
+  // eslint-disable-next-line max-len
+  // https://github.com/dherman/tc39-codex-wiki/blob/master/data/es6/number/index.md#polyfill-for-numberisnan
+  const globalIsNaN = global.isNaN;
+  Object.defineProperty(Number, 'isNaN', {
+    configurable: true,
+    enumerable: false,
+    value: function isNaN(value) {
+      return typeof value === 'number' && globalIsNaN(value);
+    },
+    writable: true,
+  });
+}

Libraries/polyfills/Object.es6.js

@@ -0,0 +1,68 @@
+/**
+ * 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.
+ *
+ * @polyfill
+ */
+
+/* eslint-disable strict */
+
+// WARNING: This is an optimized version that fails on hasOwnProperty checks
+// and non objects. It's not spec-compliant. It's a perf optimization.
+// This is only needed for iOS 8 and current Android JSC.
+
+Object.assign = function(target, sources) {
+  if (__DEV__) {
+    if (target == null) {
+      throw new TypeError('Object.assign target cannot be null or undefined');
+    }
+    if (typeof target !== 'object' && typeof target !== 'function') {
+      throw new TypeError(
+        'In this environment the target of assign MUST be an object.' +
+        'This error is a performance optimization and not spec compliant.'
+      );
+    }
+  }
+
+  for (var nextIndex = 1; nextIndex < arguments.length; nextIndex++) {
+    var nextSource = arguments[nextIndex];
+    if (nextSource == null) {
+      continue;
+    }
+
+    if (__DEV__) {
+      if (typeof nextSource !== 'object' &&
+          typeof nextSource !== 'function') {
+        throw new TypeError(
+          'In this environment the sources for assign MUST be an object.' +
+          'This error is a performance optimization and not spec compliant.'
+        );
+      }
+    }
+
+    // We don't currently support accessors nor proxies. Therefore this
+    // copy cannot throw. If we ever supported this then we must handle
+    // exceptions and side-effects.
+
+    for (var key in nextSource) {
+      if (__DEV__) {
+        var hasOwnProperty = Object.prototype.hasOwnProperty;
+        if (!hasOwnProperty.call(nextSource, key)) {
+          throw new TypeError(
+            'One of the sources for assign has an enumerable key on the ' +
+            'prototype chain. Are you trying to assign a prototype property? ' +
+            'We don\'t allow it, as this is an edge case that we do not support. ' +
+            'This error is a performance optimization and not spec compliant.'
+          );
+        }
+      }
+      target[key] = nextSource[key];
+    }
+  }
+
+  return target;
+};

Libraries/polyfills/Object.es7.js

@@ -0,0 +1,59 @@
+/**
+ * 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.
+ *
+ * @polyfill
+ */
+
+(function() {
+  'use strict';
+
+  const hasOwnProperty = Object.prototype.hasOwnProperty;
+
+  /**
+   * Returns an array of the given object's own enumerable entries.
+   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries
+   */
+  if (typeof Object.entries !== 'function') {
+    Object.entries = function(object) {
+      // `null` and `undefined` values are not allowed.
+      if (object == null) {
+        throw new TypeError('Object.entries called on non-object');
+      }
+
+      const entries = [];
+      for (const key in object) {
+        if (hasOwnProperty.call(object, key)) {
+          entries.push([key, object[key]]);
+        }
+      }
+      return entries;
+    };
+  }
+
+  /**
+   * Returns an array of the given object's own enumerable entries.
+   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/values
+   */
+  if (typeof Object.values !== 'function') {
+    Object.values = function(object) {
+      // `null` and `undefined` values are not allowed.
+      if (object == null) {
+        throw new TypeError('Object.values called on non-object');
+      }
+
+      const values = [];
+      for (const key in object) {
+        if (hasOwnProperty.call(object, key)) {
+          values.push(object[key]);
+        }
+      }
+      return values;
+    };
+  }
+
+})();

Libraries/polyfills/String.prototype.es6.js

@@ -0,0 +1,92 @@
+/**
+ * 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.
+ *
+ * @polyfill
+ */
+
+/* eslint-disable strict, no-extend-native, no-bitwise */
+
+/*
+ * NOTE: We use (Number(x) || 0) to replace NaN values with zero.
+ */
+
+if (!String.prototype.startsWith) {
+  String.prototype.startsWith = function(search) {
+    'use strict';
+    if (this == null) {
+      throw TypeError();
+    }
+    var string = String(this);
+    var pos = arguments.length > 1 ?
+      (Number(arguments[1]) || 0) : 0;
+    var start = Math.min(Math.max(pos, 0), string.length);
+    return string.indexOf(String(search), pos) === start;
+  };
+}
+
+if (!String.prototype.endsWith) {
+  String.prototype.endsWith = function(search) {
+    'use strict';
+    if (this == null) {
+      throw TypeError();
+    }
+    var string = String(this);
+    var stringLength = string.length;
+    var searchString = String(search);
+    var pos = arguments.length > 1 ?
+      (Number(arguments[1]) || 0) : stringLength;
+    var end = Math.min(Math.max(pos, 0), stringLength);
+    var start = end - searchString.length;
+    if (start < 0) {
+      return false;
+    }
+    return string.lastIndexOf(searchString, start) === start;
+  };
+}
+
+if (!String.prototype.repeat) {
+  String.prototype.repeat = function(count) {
+    'use strict';
+    if (this == null) {
+      throw TypeError();
+    }
+    var string = String(this);
+    count = Number(count) || 0;
+    if (count < 0 || count === Infinity) {
+      throw RangeError();
+    }
+    if (count === 1) {
+      return string;
+    }
+    var result = '';
+    while (count) {
+      if (count & 1) {
+        result += string;
+      }
+      if ((count >>= 1)) {
+        string += string;
+      }
+    }
+    return result;
+  };
+}
+
+if (!String.prototype.includes) {
+  String.prototype.includes = function(search, start) {
+    'use strict';
+    if (typeof start !== 'number') {
+      start = 0;
+    }
+
+    if (start + search.length > this.length) {
+      return false;
+    } else {
+      return this.indexOf(search, start) !== -1;
+    }
+  };
+}

Libraries/polyfills/__tests__/Object.es7-test.js

@@ -0,0 +1,125 @@
+/**
+ * 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.
+ *
+ * @emails oncall+jsinfra
+ */
+
+/* eslint-disable fb-www/object-create-only-one-param */
+
+'use strict';
+
+describe('Object (ES7)', () => {
+  beforeEach(() => {
+    delete Object.entries;
+    delete Object.values;
+    jest.resetModules();
+    require('../Object.es7');
+  });
+
+  describe('Object.entries', () => {
+    it('should have a length of 1', () => {
+      expect(Object.entries.length).toBe(1);
+    });
+
+    it('should check for type', () => {
+      expect(Object.entries.bind(null, null)).toThrow(TypeError(
+        'Object.entries called on non-object'
+      ));
+      expect(Object.entries.bind(null, undefined)).toThrow(TypeError(
+        'Object.entries called on non-object'
+      ));
+      expect(Object.entries.bind(null, [])).not.toThrow();
+      expect(Object.entries.bind(null, () => {})).not.toThrow();
+      expect(Object.entries.bind(null, {})).not.toThrow();
+      expect(Object.entries.bind(null, 'abc')).not.toThrow();
+    });
+
+    it('should return enumerable entries', () => {
+      const foo = Object.defineProperties({}, {
+        x: {value: 10, enumerable: true},
+        y: {value: 20},
+      });
+
+      expect(Object.entries(foo)).toEqual([['x', 10]]);
+
+      const bar = {x: 10, y: 20};
+      expect(Object.entries(bar)).toEqual([['x', 10], ['y', 20]]);
+    });
+
+    it('should work with proto-less objects', () => {
+      const foo = Object.create(null, {
+        x: {value: 10, enumerable: true},
+        y: {value: 20},
+      });
+
+      expect(Object.entries(foo)).toEqual([['x', 10]]);
+    });
+
+    it('should return only own entries', () => {
+      const foo = Object.create({z: 30}, {
+        x: {value: 10, enumerable: true},
+        y: {value: 20},
+      });
+
+      expect(Object.entries(foo)).toEqual([['x', 10]]);
+    });
+
+    it('should convert to object primitive string', () => {
+      expect(Object.entries('ab')).toEqual([['0', 'a'], ['1', 'b']]);
+    });
+  });
+
+  describe('Object.values', () => {
+    it('should have a length of 1', () => {
+      expect(Object.values.length).toBe(1);
+    });
+
+    it('should check for type', () => {
+      expect(Object.values.bind(null, null)).toThrow(TypeError(
+        'Object.values called on non-object'
+      ));
+      expect(Object.values.bind(null, [])).not.toThrow();
+      expect(Object.values.bind(null, () => {})).not.toThrow();
+      expect(Object.values.bind(null, {})).not.toThrow();
+    });
+
+    it('should return enumerable values', () => {
+      const foo = Object.defineProperties({}, {
+        x: {value: 10, enumerable: true},
+        y: {value: 20},
+      });
+
+      expect(Object.values(foo)).toEqual([10]);
+
+      const bar = {x: 10, y: 20};
+      expect(Object.values(bar)).toEqual([10, 20]);
+    });
+
+    it('should work with proto-less objects', () => {
+      const foo = Object.create(null, {
+        x: {value: 10, enumerable: true},
+        y: {value: 20},
+      });
+
+      expect(Object.values(foo)).toEqual([10]);
+    });
+
+    it('should return only own values', () => {
+      const foo = Object.create({z: 30}, {
+        x: {value: 10, enumerable: true},
+        y: {value: 20},
+      });
+
+      expect(Object.values(foo)).toEqual([10]);
+    });
+
+    it('should convert to object primitive string', () => {
+      expect(Object.values('ab')).toEqual(['a', 'b']);
+    });
+  });
+});

Libraries/polyfills/babelHelpers.js

@@ -0,0 +1,247 @@
+/**
+ * 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.
+ *
+ * @polyfill
+ */
+
+/* eslint-disable */
+
+// Created by running:
+// require('babel-core').buildExternalHelpers('_extends classCallCheck createClass createRawReactElement defineProperty get inherits  interopRequireDefault interopRequireWildcard objectWithoutProperties possibleConstructorReturn slicedToArray taggedTemplateLiteral toArray toConsumableArray '.split(' '))
+// then replacing the `global` reference in the last line to also use `this`.
+//
+// actually, that's a lie, because babel6 omits _extends and createRawReactElement
+
+var babelHelpers = global.babelHelpers = {};
+
+babelHelpers.typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+  return typeof obj;
+} : function (obj) {
+  return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+};
+
+babelHelpers.createRawReactElement = (function () {
+  var REACT_ELEMENT_TYPE = typeof Symbol === "function" && Symbol.for && Symbol.for("react.element") || 0xeac7;
+  return function createRawReactElement(type, key, props) {
+    return {
+      $$typeof: REACT_ELEMENT_TYPE,
+      type: type,
+      key: key,
+      ref: null,
+      props: props,
+      _owner: null
+    };
+  };
+})();
+
+babelHelpers.classCallCheck = function (instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+};
+
+babelHelpers.createClass = (function () {
+  function defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  return function (Constructor, protoProps, staticProps) {
+    if (protoProps) defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) defineProperties(Constructor, staticProps);
+    return Constructor;
+  };
+})();
+
+babelHelpers.defineEnumerableProperties = function(obj, descs) {
+  for (var key in descs) {
+    var desc = descs[key];
+    desc.configurable = (desc.enumerable = true);
+    if ('value' in desc) desc.writable = true;
+    Object.defineProperty(obj, key, desc);
+  }
+  return obj;
+};
+
+babelHelpers.defineProperty = function (obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+};
+
+babelHelpers._extends = babelHelpers.extends = Object.assign || function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  return target;
+};
+
+babelHelpers.get = function get(object, property, receiver) {
+  if (object === null) object = Function.prototype;
+  var desc = Object.getOwnPropertyDescriptor(object, property);
+
+  if (desc === undefined) {
+    var parent = Object.getPrototypeOf(object);
+
+    if (parent === null) {
+      return undefined;
+    } else {
+      return get(parent, property, receiver);
+    }
+  } else if ("value" in desc) {
+    return desc.value;
+  } else {
+    var getter = desc.get;
+
+    if (getter === undefined) {
+      return undefined;
+    }
+
+    return getter.call(receiver);
+  }
+};
+
+babelHelpers.inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+};
+
+babelHelpers.interopRequireDefault = function (obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+};
+
+babelHelpers.interopRequireWildcard = function (obj) {
+  if (obj && obj.__esModule) {
+    return obj;
+  } else {
+    var newObj = {};
+
+    if (obj != null) {
+      for (var key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+      }
+    }
+
+    newObj.default = obj;
+    return newObj;
+  }
+};
+
+babelHelpers.objectWithoutProperties = function (obj, keys) {
+  var target = {};
+
+  for (var i in obj) {
+    if (keys.indexOf(i) >= 0) continue;
+    if (!Object.prototype.hasOwnProperty.call(obj, i)) continue;
+    target[i] = obj[i];
+  }
+
+  return target;
+};
+
+babelHelpers.possibleConstructorReturn = function (self, call) {
+  if (!self) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return call && (typeof call === "object" || typeof call === "function") ? call : self;
+};
+
+babelHelpers.slicedToArray = (function () {
+  function sliceIterator(arr, i) {
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _e = undefined;
+
+    try {
+      for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+        _arr.push(_s.value);
+
+        if (i && _arr.length === i) break;
+      }
+    } catch (err) {
+      _d = true;
+      _e = err;
+    } finally {
+      try {
+        if (!_n && _i["return"]) _i["return"]();
+      } finally {
+        if (_d) throw _e;
+      }
+    }
+
+    return _arr;
+  }
+
+  return function (arr, i) {
+    if (Array.isArray(arr)) {
+      return arr;
+    } else if (Symbol.iterator in Object(arr)) {
+      return sliceIterator(arr, i);
+    } else {
+      throw new TypeError("Invalid attempt to destructure non-iterable instance");
+    }
+  };
+})();
+
+babelHelpers.taggedTemplateLiteral = function (strings, raw) {
+  return Object.freeze(Object.defineProperties(strings, {
+    raw: {
+      value: Object.freeze(raw)
+    }
+  }));
+};
+
+babelHelpers.toArray = function (arr) {
+  return Array.isArray(arr) ? arr : Array.from(arr);
+};
+
+babelHelpers.toConsumableArray = function (arr) {
+  if (Array.isArray(arr)) {
+    for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
+
+    return arr2;
+  } else {
+    return Array.from(arr);
+  }
+};

Libraries/polyfills/console.js

@@ -0,0 +1,515 @@
+/**
+ * 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.
+ *
+ * @polyfill
+ * @nolint
+ */
+
+/* eslint-disable */
+
+/**
+ * This pipes all of our console logging functions to native logging so that
+ * JavaScript errors in required modules show up in Xcode via NSLog.
+ */
+const inspect = (function() {
+  // Copyright Joyent, Inc. and other Node contributors.
+  //
+  // 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 to use, copy, modify, merge, publish,
+  // distribute, sublicense, and/or sell copies of the Software, and to permit
+  // persons to whom the Software is furnished to do so, subject to the
+  // following conditions:
+  //
+  // The above copyright notice and this permission notice shall be included
+  // in all copies or substantial portions of the Software.
+  //
+  // 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 NONINFRINGEMENT. IN
+  // NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 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.
+  //
+  // https://github.com/joyent/node/blob/master/lib/util.js
+
+  function inspect(obj, opts) {
+    var ctx = {
+      seen: [],
+      stylize: stylizeNoColor
+    };
+    return formatValue(ctx, obj, opts.depth);
+  }
+
+  function stylizeNoColor(str, styleType) {
+    return str;
+  }
+
+  function arrayToHash(array) {
+    var hash = {};
+
+    array.forEach(function(val, idx) {
+      hash[val] = true;
+    });
+
+    return hash;
+  }
+
+
+  function formatValue(ctx, value, recurseTimes) {
+    // Primitive types cannot have properties
+    var primitive = formatPrimitive(ctx, value);
+    if (primitive) {
+      return primitive;
+    }
+
+    // Look up the keys of the object.
+    var keys = Object.keys(value);
+    var visibleKeys = arrayToHash(keys);
+
+    // IE doesn't make error fields non-enumerable
+    // http://msdn.microsoft.com/en-us/library/ie/dww52sbt(v=vs.94).aspx
+    if (isError(value)
+        && (keys.indexOf('message') >= 0 || keys.indexOf('description') >= 0)) {
+      return formatError(value);
+    }
+
+    // Some type of object without properties can be shortcutted.
+    if (keys.length === 0) {
+      if (isFunction(value)) {
+        var name = value.name ? ': ' + value.name : '';
+        return ctx.stylize('[Function' + name + ']', 'special');
+      }
+      if (isRegExp(value)) {
+        return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+      }
+      if (isDate(value)) {
+        return ctx.stylize(Date.prototype.toString.call(value), 'date');
+      }
+      if (isError(value)) {
+        return formatError(value);
+      }
+    }
+
+    var base = '', array = false, braces = ['{', '}'];
+
+    // Make Array say that they are Array
+    if (isArray(value)) {
+      array = true;
+      braces = ['[', ']'];
+    }
+
+    // Make functions say that they are functions
+    if (isFunction(value)) {
+      var n = value.name ? ': ' + value.name : '';
+      base = ' [Function' + n + ']';
+    }
+
+    // Make RegExps say that they are RegExps
+    if (isRegExp(value)) {
+      base = ' ' + RegExp.prototype.toString.call(value);
+    }
+
+    // Make dates with properties first say the date
+    if (isDate(value)) {
+      base = ' ' + Date.prototype.toUTCString.call(value);
+    }
+
+    // Make error with message first say the error
+    if (isError(value)) {
+      base = ' ' + formatError(value);
+    }
+
+    if (keys.length === 0 && (!array || value.length == 0)) {
+      return braces[0] + base + braces[1];
+    }
+
+    if (recurseTimes < 0) {
+      if (isRegExp(value)) {
+        return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+      } else {
+        return ctx.stylize('[Object]', 'special');
+      }
+    }
+
+    ctx.seen.push(value);
+
+    var output;
+    if (array) {
+      output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+    } else {
+      output = keys.map(function(key) {
+        return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+      });
+    }
+
+    ctx.seen.pop();
+
+    return reduceToSingleString(output, base, braces);
+  }
+
+
+  function formatPrimitive(ctx, value) {
+    if (isUndefined(value))
+      return ctx.stylize('undefined', 'undefined');
+    if (isString(value)) {
+      var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+                                               .replace(/'/g, "\\'")
+                                               .replace(/\\"/g, '"') + '\'';
+      return ctx.stylize(simple, 'string');
+    }
+    if (isNumber(value))
+      return ctx.stylize('' + value, 'number');
+    if (isBoolean(value))
+      return ctx.stylize('' + value, 'boolean');
+    // For some reason typeof null is "object", so special case here.
+    if (isNull(value))
+      return ctx.stylize('null', 'null');
+  }
+
+
+  function formatError(value) {
+    return '[' + Error.prototype.toString.call(value) + ']';
+  }
+
+
+  function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+    var output = [];
+    for (var i = 0, l = value.length; i < l; ++i) {
+      if (hasOwnProperty(value, String(i))) {
+        output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+            String(i), true));
+      } else {
+        output.push('');
+      }
+    }
+    keys.forEach(function(key) {
+      if (!key.match(/^\d+$/)) {
+        output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+            key, true));
+      }
+    });
+    return output;
+  }
+
+
+  function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+    var name, str, desc;
+    desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
+    if (desc.get) {
+      if (desc.set) {
+        str = ctx.stylize('[Getter/Setter]', 'special');
+      } else {
+        str = ctx.stylize('[Getter]', 'special');
+      }
+    } else {
+      if (desc.set) {
+        str = ctx.stylize('[Setter]', 'special');
+      }
+    }
+    if (!hasOwnProperty(visibleKeys, key)) {
+      name = '[' + key + ']';
+    }
+    if (!str) {
+      if (ctx.seen.indexOf(desc.value) < 0) {
+        if (isNull(recurseTimes)) {
+          str = formatValue(ctx, desc.value, null);
+        } else {
+          str = formatValue(ctx, desc.value, recurseTimes - 1);
+        }
+        if (str.indexOf('\n') > -1) {
+          if (array) {
+            str = str.split('\n').map(function(line) {
+              return '  ' + line;
+            }).join('\n').substr(2);
+          } else {
+            str = '\n' + str.split('\n').map(function(line) {
+              return '   ' + line;
+            }).join('\n');
+          }
+        }
+      } else {
+        str = ctx.stylize('[Circular]', 'special');
+      }
+    }
+    if (isUndefined(name)) {
+      if (array && key.match(/^\d+$/)) {
+        return str;
+      }
+      name = JSON.stringify('' + key);
+      if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+        name = name.substr(1, name.length - 2);
+        name = ctx.stylize(name, 'name');
+      } else {
+        name = name.replace(/'/g, "\\'")
+                   .replace(/\\"/g, '"')
+                   .replace(/(^"|"$)/g, "'");
+        name = ctx.stylize(name, 'string');
+      }
+    }
+
+    return name + ': ' + str;
+  }
+
+
+  function reduceToSingleString(output, base, braces) {
+    var numLinesEst = 0;
+    var length = output.reduce(function(prev, cur) {
+      numLinesEst++;
+      if (cur.indexOf('\n') >= 0) numLinesEst++;
+      return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
+    }, 0);
+
+    if (length > 60) {
+      return braces[0] +
+             (base === '' ? '' : base + '\n ') +
+             ' ' +
+             output.join(',\n  ') +
+             ' ' +
+             braces[1];
+    }
+
+    return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+  }
+
+
+  // NOTE: These type checking functions intentionally don't use `instanceof`
+  // because it is fragile and can be easily faked with `Object.create()`.
+  function isArray(ar) {
+    return Array.isArray(ar);
+  }
+
+  function isBoolean(arg) {
+    return typeof arg === 'boolean';
+  }
+
+  function isNull(arg) {
+    return arg === null;
+  }
+
+  function isNullOrUndefined(arg) {
+    return arg == null;
+  }
+
+  function isNumber(arg) {
+    return typeof arg === 'number';
+  }
+
+  function isString(arg) {
+    return typeof arg === 'string';
+  }
+
+  function isSymbol(arg) {
+    return typeof arg === 'symbol';
+  }
+
+  function isUndefined(arg) {
+    return arg === void 0;
+  }
+
+  function isRegExp(re) {
+    return isObject(re) && objectToString(re) === '[object RegExp]';
+  }
+
+  function isObject(arg) {
+    return typeof arg === 'object' && arg !== null;
+  }
+
+  function isDate(d) {
+    return isObject(d) && objectToString(d) === '[object Date]';
+  }
+
+  function isError(e) {
+    return isObject(e) &&
+        (objectToString(e) === '[object Error]' || e instanceof Error);
+  }
+
+  function isFunction(arg) {
+    return typeof arg === 'function';
+  }
+
+  function isPrimitive(arg) {
+    return arg === null ||
+           typeof arg === 'boolean' ||
+           typeof arg === 'number' ||
+           typeof arg === 'string' ||
+           typeof arg === 'symbol' ||  // ES6 symbol
+           typeof arg === 'undefined';
+  }
+
+  function objectToString(o) {
+    return Object.prototype.toString.call(o);
+  }
+
+  function hasOwnProperty(obj, prop) {
+    return Object.prototype.hasOwnProperty.call(obj, prop);
+  }
+
+  return inspect;
+})();
+
+
+const OBJECT_COLUMN_NAME = '(index)';
+const LOG_LEVELS = {
+  trace: 0,
+  info: 1,
+  warn: 2,
+  error: 3
+};
+const INSPECTOR_LEVELS = [];
+INSPECTOR_LEVELS[LOG_LEVELS.trace] = 'debug';
+INSPECTOR_LEVELS[LOG_LEVELS.info] = 'log';
+INSPECTOR_LEVELS[LOG_LEVELS.warn] = 'warning';
+INSPECTOR_LEVELS[LOG_LEVELS.error] = 'error';
+
+// Strip the inner function in getNativeLogFunction(), if in dev also
+// strip method printing to originalConsole.
+const INSPECTOR_FRAMES_TO_SKIP = __DEV__ ? 2 : 1;
+
+if (global.nativeLoggingHook) {
+  function getNativeLogFunction(level) {
+    return function() {
+      let str;
+      if (arguments.length === 1 && typeof arguments[0] === 'string') {
+        str = arguments[0];
+      } else {
+        str = Array.prototype.map.call(arguments, function(arg) {
+          return inspect(arg, {depth: 10});
+        }).join(', ');
+      }
+
+      let logLevel = level;
+      if (str.slice(0, 9) === 'Warning: ' && logLevel >= LOG_LEVELS.error) {
+        // React warnings use console.error so that a stack trace is shown,
+        // but we don't (currently) want these to show a redbox
+        // (Note: Logic duplicated in ExceptionsManager.js.)
+        logLevel = LOG_LEVELS.warn;
+      }
+      if (global.__inspectorLog) {
+        global.__inspectorLog(
+          INSPECTOR_LEVELS[logLevel],
+          str,
+          [].slice.call(arguments),
+          INSPECTOR_FRAMES_TO_SKIP);
+      }
+      global.nativeLoggingHook(str, logLevel);
+    };
+  }
+
+  function repeat(element, n) {
+    return Array.apply(null, Array(n)).map(function() { return element; });
+  };
+
+  function consoleTablePolyfill(rows) {
+    // convert object -> array
+    if (!Array.isArray(rows)) {
+      var data = rows;
+      rows = [];
+      for (var key in data) {
+        if (data.hasOwnProperty(key)) {
+          var row = data[key];
+          row[OBJECT_COLUMN_NAME] = key;
+          rows.push(row);
+        }
+      }
+    }
+    if (rows.length === 0) {
+      global.nativeLoggingHook('', LOG_LEVELS.info);
+      return;
+    }
+
+    var columns = Object.keys(rows[0]).sort();
+    var stringRows = [];
+    var columnWidths = [];
+
+    // Convert each cell to a string. Also
+    // figure out max cell width for each column
+    columns.forEach(function(k, i) {
+      columnWidths[i] = k.length;
+      for (var j = 0; j < rows.length; j++) {
+        var cellStr = (rows[j][k] || '?').toString();
+        stringRows[j] = stringRows[j] || [];
+        stringRows[j][i] = cellStr;
+        columnWidths[i] = Math.max(columnWidths[i], cellStr.length);
+      }
+    });
+
+    // Join all elements in the row into a single string with | separators
+    // (appends extra spaces to each cell to make separators  | alligned)
+    function joinRow(row, space) {
+      var cells = row.map(function(cell, i) {
+        var extraSpaces = repeat(' ', columnWidths[i] - cell.length).join('');
+        return cell + extraSpaces;
+      });
+      space = space || ' ';
+      return cells.join(space + '|' + space);
+    };
+
+    var separators = columnWidths.map(function(columnWidth) {
+      return repeat('-', columnWidth).join('');
+    });
+    var separatorRow = joinRow(separators, '-');
+    var header = joinRow(columns);
+    var table = [header, separatorRow];
+
+    for (var i = 0; i < rows.length; i++) {
+      table.push(joinRow(stringRows[i]));
+    }
+
+    // Notice extra empty line at the beginning.
+    // Native logging hook adds "RCTLog >" at the front of every
+    // logged string, which would shift the header and screw up
+    // the table
+    global.nativeLoggingHook('\n' + table.join('\n'), LOG_LEVELS.info);
+  }
+
+  const originalConsole = global.console;
+  global.console = {
+    error: getNativeLogFunction(LOG_LEVELS.error),
+    info: getNativeLogFunction(LOG_LEVELS.info),
+    log: getNativeLogFunction(LOG_LEVELS.info),
+    warn: getNativeLogFunction(LOG_LEVELS.warn),
+    trace: getNativeLogFunction(LOG_LEVELS.trace),
+    debug: getNativeLogFunction(LOG_LEVELS.trace),
+    table: consoleTablePolyfill
+  };
+
+  // If available, also call the original `console` method since that is
+  // sometimes useful. Ex: on OS X, this will let you see rich output in
+  // the Safari Web Inspector console.
+  if (__DEV__ && originalConsole) {
+    // Preserve the original `console` as `originalConsole`
+    const descriptor = Object.getOwnPropertyDescriptor(global, 'console');
+    if (descriptor) {
+      Object.defineProperty(global, 'originalConsole', descriptor);
+    }
+
+    Object.keys(console).forEach(methodName => {
+      const reactNativeMethod = console[methodName];
+      if (originalConsole[methodName]) {
+        console[methodName] = function() {
+          originalConsole[methodName](...arguments);
+          reactNativeMethod.apply(console, arguments);
+        };
+      }
+    });
+  }
+} else if (!global.console) {
+  function consoleLoggingStub() {};
+  global.console = {
+    error: consoleLoggingStub,
+    info: consoleLoggingStub,
+    log: consoleLoggingStub,
+    warn: consoleLoggingStub,
+    trace: consoleLoggingStub,
+    debug: consoleLoggingStub,
+    table: consoleLoggingStub
+  };
+}

Libraries/polyfills/error-guard.js

@@ -0,0 +1,90 @@
+/**
+ * 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.
+ *
+ * @polyfill
+ */
+
+/* eslint-disable strict */
+
+let _inGuard = 0;
+
+/**
+ * This is the error handler that is called when we encounter an exception
+ * when loading a module. This will report any errors encountered before
+ * ExceptionsManager is configured.
+ */
+let _globalHandler = function onError(e) {
+  throw e;
+};
+
+/**
+ * The particular require runtime that we are using looks for a global
+ * `ErrorUtils` object and if it exists, then it requires modules with the
+ * error handler specified via ErrorUtils.setGlobalHandler by calling the
+ * require function with applyWithGuard. Since the require module is loaded
+ * before any of the modules, this ErrorUtils must be defined (and the handler
+ * set) globally before requiring anything.
+ */
+const ErrorUtils = {
+  setGlobalHandler(fun) {
+    _globalHandler = fun;
+  },
+  getGlobalHandler() {
+    return _globalHandler;
+  },
+  reportError(error) {
+    _globalHandler && _globalHandler(error);
+  },
+  reportFatalError(error) {
+    _globalHandler && _globalHandler(error, true);
+  },
+  applyWithGuard(fun, context, args) {
+    try {
+      _inGuard++;
+      return fun.apply(context, args);
+    } catch (e) {
+      ErrorUtils.reportError(e);
+    } finally {
+      _inGuard--;
+    }
+    return null;
+  },
+  applyWithGuardIfNeeded(fun, context, args) {
+    if (ErrorUtils.inGuard()) {
+      return fun.apply(context, args);
+    } else {
+      ErrorUtils.applyWithGuard(fun, context, args);
+    }
+    return null;
+  },
+  inGuard() {
+    return _inGuard;
+  },
+  guard(fun, name, context) {
+    if (typeof fun !== 'function') {
+      console.warn('A function must be passed to ErrorUtils.guard, got ', fun);
+      return null;
+    }
+    name = name || fun.name || '<generated guard>';
+    function guarded() {
+      return (
+        ErrorUtils.applyWithGuard(
+          fun,
+          context || this,
+          arguments,
+          null,
+          name
+        )
+      );
+    }
+
+    return guarded;
+  },
+};
+
+global.ErrorUtils = ErrorUtils;

Libraries/react-native/react-native-implementation.js

@@ -29,6 +29,7 @@ const ReactNative = {
   get ImageStore() { return require('ImageStore'); },
   get KeyboardAvoidingView() { return require('KeyboardAvoidingView'); },
   get ListView() { return require('ListView'); },
+  get MaskedViewIOS() { return require('MaskedViewIOS'); },
   get Modal() { return require('Modal'); },
   get NavigatorIOS() { return require('NavigatorIOS'); },
   get Picker() { return require('Picker'); },

README.md

@@ -1,33 +1,40 @@
-# [React Native](https://facebook.github.io/react-native/) ·  [![Travis CI Status](https://travis-ci.org/facebook/react-native.svg?branch=master)](https://travis-ci.org/facebook/react-native) [![Circle CI Status](https://circleci.com/gh/facebook/react-native.svg?style=shield)](https://circleci.com/gh/facebook/react-native) [![npm version](https://badge.fury.io/js/react-native.svg)](https://badge.fury.io/js/react-native) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md#pull-requests)
+# React Native [![Build Status](https://travis-ci.org/facebook/react-native.svg?branch=master)](https://travis-ci.org/facebook/react-native) [![Circle CI](https://circleci.com/gh/facebook/react-native.svg?style=shield)](https://circleci.com/gh/facebook/react-native) [![npm version](https://badge.fury.io/js/react-native.svg)](https://badge.fury.io/js/react-native)
 
-Learn once, write anywhere: Build mobile apps with React.
-
-- **Build native mobile apps using JavaScript and React:** React Native lets you build mobile apps using only JavaScript. It uses the same design as [React](https://facebook.github.io/react), letting you compose a rich mobile UI from declarative components.
-- **A React Native app is a real mobile app:** With React Native, you don't build a "mobile web app", an "HTML5 app", or a "hybrid app". You build a real mobile app that's indistinguishable from an app built using Objective-C, Java, or Swift. React Native uses the same fundamental UI building blocks as regular iOS and Android apps. You just put those building blocks together using JavaScript and React.
-- **Don't waste time recompiling:** React Native lets you build your app faster. Instead of recompiling, you can reload your app instantly. With hot reloading, you can even run new code while retaining your application state. Give it a try - it's a magical experience.
-- **Use native code when you need to:** React Native combines smoothly with components written in Objective-C, Java, or Swift. It's simple to drop down to native code if you need to optimize a few aspects of your application. It's also easy to build part of your app in React Native, and part of your app using native code directly - that's how the Facebook app works.
-
-The focus of React Native is on developer efficiency across all the platforms you care about - learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native.
-
-See the official [React Native website](https://facebook.github.io/react-native/) for an introduction to React Native.
+React Native enables you to build world-class application experiences on native platforms using a consistent developer experience based on JavaScript and [React](https://facebook.github.io/react). The focus of React Native is on developer efficiency across all the platforms you care about - learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native.
 
 Supported operating systems are >= Android 4.1 (API 16) and >= iOS 8.0.
 
 - [Getting Started](#getting-started)
 - [Getting Help](#getting-help)
 - [Documentation](#documentation)
+- [Examples](#examples)
+- [Extending React Native](#extending-react-native)
 - [Upgrading](#upgrading)
 - [Opening Issues](#opening-issues)
 - [Contributing](#contributing)
 - [License](#license)
 
+## Introduction
+
+See the official [React Native website](https://facebook.github.io/react-native/) for an introduction to React Native.
+
 ## Getting Started
 
-Follow the [Getting Started guide](https://facebook.github.io/react-native/docs/getting-started.html). The recommended way to install React Native depends on your project. Here you can find short guides for the most common scenarios:
+- Follow the [Getting Started guide](https://facebook.github.io/react-native/docs/getting-started.html) to install React Native and its dependencies.
+- [Open the RNTester app](#examples) to see a list of components that ship with React Native.
+- Install the React Developer Tools for [Chrome](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi) or [Firefox](https://addons.mozilla.org/firefox/addon/react-devtools/) for better debugging [(read more)](https://facebook.github.io/react-native/docs/debugging.html).
+- Try out apps from the [Showcase](https://facebook.github.io/react-native/showcase.html) to see what React Native is capable of!
 
-- [Trying out React Native](https://snack.expo.io/BJ-uC-nrb)
-- [Creating a New Application](http://facebook.github.io/react-native/docs/getting-started.html)
-- [Adding React Native to an Existing Application](http://facebook.github.io/react-native/docs/integration-with-existing-apps.html)
+## Getting Help
+
+Please use these community resources for getting help. We use the GitHub issues for tracking bugs and feature requests and have limited bandwidth to address them.
+
+- Ask a question on [StackOverflow](https://stackoverflow.com/) and tag it with `react-native`
+- Chat with us on [Reactiflux](https://discord.gg/0ZcbPKXt5bWJVmUY) in #react-native
+- Articulate your feature request or upvote existing ones on [Canny](https://react-native.canny.io/feature-requests)
+- Start a thread on the [React Discussion Board](https://discuss.reactjs.org/)
+- Join #reactnative on IRC: chat.freenode.net
+- If it turns out that you may have found a bug, please [open an issue](#opening-issues)
 
 ## Documentation
 
@@ -41,28 +48,54 @@ Another great way to learn more about the components and APIs included with Reac
 
 The React Native documentation only discusses the components, APIs and topics specific to React Native (React on iOS and Android). For further documentation on the React API that is shared between React Native and React DOM, refer to the [React documentation](https://facebook.github.io/react/).
 
+## Examples
+
+- `git clone https://github.com/facebook/react-native.git`
+- `cd react-native && npm install`
+
+### Running the RNTester app on iOS
+
+Now open `RNTester/RNTester.xcodeproj` and hit Run in Xcode.
+
+### Running the RNTester app on Android
+
+Note that you'll need the Android NDK installed, see [prerequisites](https://github.com/facebook/react-native/blob/master/ReactAndroid/README.md#prerequisites).
+
+```bash
+./gradlew :RNTester:android:app:installDebug
+# Start the packager in a separate shell (make sure you ran npm install):
+./scripts/packager.sh
+```
+
+## Extending React Native
+
+- Looking for a component? [JS.coach](https://js.coach/react-native)
+- Fellow developers write and publish React Native modules to npm and open source them on GitHub.
+- Making modules helps grow the React Native ecosystem and community. We recommend writing modules for your use cases and sharing them on npm.
+- Read the guides on Native Modules ([iOS](https://facebook.github.io/react-native/docs/native-modules-ios.html), [Android](https://facebook.github.io/react-native/docs/native-modules-android.html)) and Native UI Components ([iOS](https://facebook.github.io/react-native/docs/native-components-ios.html), [Android](https://facebook.github.io/react-native/docs/native-components-android.html)) if you are interested in extending native functionality.
+
 ## Upgrading
 
 React Native is under active development. See the guide on [upgrading React Native](https://facebook.github.io/react-native/docs/upgrading.html) to keep your project up-to-date.
 
+## Opening Issues
+
+If you encounter a bug with React Native we would like to hear about it. Search the [existing issues](https://github.com/facebook/react-native/issues) and try to make sure your problem doesn’t already exist before opening a new issue. It’s helpful if you include the version of React Native and OS you’re using. Please include a stack trace and reduced repro case when appropriate, too.
+
+The GitHub issues are intended for bug reports and feature requests. For help and questions with using React Native please make use of the resources listed in the [Getting Help](#getting-help) section. [Canny](https://react-native.canny.io/feature-requests) in particular is a good way to signal your interest in a feature or issue. There are limited resources available for handling issues and by keeping the list of open issues lean we can respond in a timely manner.
+
 ## Contributing
 
-Read below to learn how you can take part in improving React Native.
+For more information about contributing PRs and issues, see our [Contribution Guidelines](https://github.com/facebook/react-native/blob/master/CONTRIBUTING.md).
 
-### [Code of Conduct](https://code.facebook.com/codeofconduct)
+[Good First Task](https://github.com/facebook/react-native/labels/Good%20First%20Task) is a great starting point for PRs.
 
-Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
-
-### Contributing Guide
-
-Read our [contributing guide](https://facebook.github.io/react-native/docs/contributing.html) to learn about our development process, how to propose bug fixes and improvements, and how to build and test your changes to React Native.
-
-### Beginner Friendly Bugs
-
-We have a list of [beginner friendly issues](https://github.com/facebook/react-native/labels/Good%20First%20Task) to help you get your feet wet in the React Native codebase and familiar with our contribution process. This is a great place to get started.
+We encourage the community to ask and answer questions on Stack Overflow with [the react-native tag](https://stackoverflow.com/questions/tagged/react-native). It's a great way to help out and be involved!
 
 ## License
 
 React is [BSD licensed](./LICENSE). We also provide an additional [patent grant](./PATENTS).
 
 React documentation is [Creative Commons licensed](./LICENSE-docs).
+
+Examples provided in this repository and in the documentation are [separately licensed](./LICENSE-examples), as are some of the [custom components](./LICENSE-CustomComponents).

RNTester/android/app/BUCK

@@ -15,6 +15,7 @@ android_library(
     deps = [
         ":res",
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
+        react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react:react"),
         react_native_target("java/com/facebook/react/modules/core:core"),

RNTester/js/LayoutEventsExample.js

@@ -21,25 +21,14 @@ var {
   View,
 } = ReactNative;
 
-type Layout = {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-};
-
-type LayoutEvent = {
-  nativeEvent: {
-    layout: Layout,
-  };
-};
+import type {ViewLayout, ViewLayoutEvent} from 'ViewPropTypes';
 
 type State = {
   containerStyle?: { width: number },
   extraText?: string,
-  imageLayout?: Layout,
-  textLayout?: Layout,
-  viewLayout?: Layout,
+  imageLayout?: ViewLayout,
+  textLayout?: ViewLayout,
+  viewLayout?: ViewLayout,
   viewStyle: { margin: number },
 };
 
@@ -76,17 +65,17 @@ class LayoutEventExample extends React.Component {
     this.setState({containerStyle: {width: 280}});
   };
 
-  onViewLayout = (e: LayoutEvent) => {
+  onViewLayout = (e: ViewLayoutEvent) => {
     console.log('received view layout event\n', e.nativeEvent);
     this.setState({viewLayout: e.nativeEvent.layout});
   };
 
-  onTextLayout = (e: LayoutEvent) => {
+  onTextLayout = (e: ViewLayoutEvent) => {
     console.log('received text layout event\n', e.nativeEvent);
     this.setState({textLayout: e.nativeEvent.layout});
   };
 
-  onImageLayout = (e: LayoutEvent) => {
+  onImageLayout = (e: ViewLayoutEvent) => {
     console.log('received image layout event\n', e.nativeEvent);
     this.setState({imageLayout: e.nativeEvent.layout});
   };

RNTester/js/MaskedViewExample.js

@@ -0,0 +1,196 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
+ * @providesModule MaskedViewExample
+ */
+'use strict';
+
+const React = require('react');
+const RNTesterBlock = require('RNTesterBlock');
+const RNTesterPage = require('RNTesterPage');
+const {
+  Animated,
+  Image,
+  MaskedViewIOS,
+  StyleSheet,
+  Text,
+  View,
+} = require('react-native');
+
+class MaskedViewExample extends React.Component {
+  static title = '<MaskedViewIOS>';
+  static description = 'Renders the child view with a mask specified in the `renderMask` prop.';
+
+  state = {
+    alternateChildren: true,
+  };
+
+  _maskRotateAnimatedValue = new Animated.Value(0);
+  _maskScaleAnimatedValue = new Animated.Value(1);
+
+  componentDidMount() {
+    setInterval(() => {
+      this.setState(state => ({
+        alternateChildren: !state.alternateChildren,
+      }));
+    }, 1000);
+
+    Animated.loop(
+      Animated.sequence([
+        Animated.timing(this._maskScaleAnimatedValue, {
+          toValue: 1.3,
+          timing: 750,
+          useNativeDriver: true,
+        }),
+        Animated.timing(this._maskScaleAnimatedValue, {
+          toValue: 1,
+          timing: 750,
+          useNativeDriver: true,
+        }),
+      ])
+    ).start();
+
+    Animated.loop(
+      Animated.timing(this._maskRotateAnimatedValue, {
+        toValue: 360,
+        timing: 2000,
+        useNativeDriver: true,
+      })
+    ).start();
+  }
+
+  render() {
+    return (
+      <RNTesterPage title="<MaskedViewIOS>">
+        <RNTesterBlock title="Basic Mask">
+          <View style={{ width: 300, height: 300, alignSelf: 'center' }}>
+            <MaskedViewIOS
+              style={{ flex: 1 }}
+              maskElement={
+                <View style={styles.maskContainerStyle}>
+                  <Text style={styles.maskTextStyle}>
+                    Basic Mask
+                  </Text>
+                </View>
+              }>
+              <View style={{ flex: 1, backgroundColor: 'blue' }} />
+              <View style={{ flex: 1, backgroundColor: 'red' }} />
+            </MaskedViewIOS>
+          </View>
+        </RNTesterBlock>
+        <RNTesterBlock title="Image Mask">
+          <View
+            style={{
+              width: 300,
+              height: 300,
+              alignSelf: 'center',
+              backgroundColor: '#eeeeee',
+            }}>
+            <MaskedViewIOS
+              style={{ flex: 1 }}
+              maskElement={
+                <View style={styles.maskContainerStyle}>
+                  <Image
+                    style={{ height: 200, width: 200 }}
+                    source={require('./imageMask.png')}
+                  />
+                </View>
+              }>
+              <View style={styles.maskContainerStyle}>
+                <Image
+                  resizeMode="cover"
+                  style={{ width: 200, height: 200 }}
+                  source={{
+                    uri:
+                      'https://38.media.tumblr.com/9e9bd08c6e2d10561dd1fb4197df4c4e/tumblr_mfqekpMktw1rn90umo1_500.gif',
+                  }}
+                />
+              </View>
+            </MaskedViewIOS>
+          </View>
+        </RNTesterBlock>
+        <RNTesterBlock title="Animated Mask">
+          <View style={{ width: 300, height: 300, alignSelf: 'center' }}>
+            <MaskedViewIOS
+              style={{ flex: 1 }}
+              maskElement={
+                <Animated.View
+                  style={[
+                    styles.maskContainerStyle,
+                    { transform: [{ scale: this._maskScaleAnimatedValue }] },
+                  ]}>
+                  <Text style={styles.maskTextStyle}>
+                    Basic Mask
+                  </Text>
+                </Animated.View>
+              }>
+              <Animated.View
+                style={{
+                  flex: 1,
+                  transform: [
+                    {
+                      rotate: this._maskRotateAnimatedValue.interpolate({
+                        inputRange: [0, 360],
+                        outputRange: ['0deg', '360deg'],
+                      }),
+                    },
+                  ],
+                }}>
+                <View style={{ flex: 1, backgroundColor: 'blue' }} />
+                <View style={{ flex: 1, backgroundColor: 'red' }} />
+              </Animated.View>
+            </MaskedViewIOS>
+          </View>
+        </RNTesterBlock>
+        <RNTesterBlock title="Mask w/ Changing Children">
+          <View style={{ width: 300, height: 300, alignSelf: 'center' }}>
+            <MaskedViewIOS
+              style={{ flex: 1 }}
+              maskElement={
+                <View style={styles.maskContainerStyle}>
+                  <Text style={styles.maskTextStyle}>
+                    Basic Mask
+                  </Text>
+                </View>
+              }>
+              {this.state.alternateChildren
+                ? [
+                    <View
+                      key={1}
+                      style={{ flex: 1, backgroundColor: 'blue' }}
+                    />,
+                    <View
+                      key={2}
+                      style={{ flex: 1, backgroundColor: 'red' }}
+                    />,
+                  ]
+                : null}
+            </MaskedViewIOS>
+          </View>
+        </RNTesterBlock>
+      </RNTesterPage>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  maskContainerStyle: {
+    flex: 1,
+    backgroundColor: 'transparent',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  maskTextStyle: {
+    backgroundColor: 'transparent',
+    fontSize: 40,
+    fontWeight: 'bold',
+  },
+});
+
+module.exports = MaskedViewExample;

RNTester/js/RNTesterList.ios.js

@@ -73,6 +73,11 @@ const ComponentExamples: Array<RNTesterExample> = [
     module: require('./ListViewPagingExample'),
     supportsTVOS: true,
   },
+  {
+    key: 'MaskedViewExample',
+    module: require('./MaskedViewExample'),
+    supportsTVOS: true,
+  },
   {
     key: 'ModalExample',
     module: require('./ModalExample'),

RNTester/js/TextInputExample.ios.js

@@ -805,24 +805,6 @@ exports.examples = [
               placeholder="Placeholder defines intrinsic size"
             />
           </View>
-          <View>
-            <TextInput
-              style={{
-                fontSize: 16,
-                backgroundColor: '#eeeeee',
-                borderColor: '#666666',
-                borderWidth: 5,
-                borderTopWidth: 20,
-                borderRadius: 10,
-                borderBottomRightRadius: 20,
-                padding: 10,
-                paddingTop: 20,
-              }}
-              testID="multiline_textinput_with_flex"
-              multiline={true}
-              placeholder="Placeholder defines intrinsic size"
-            />
-          </View>
         </View>
       );
     }

React/Base/RCTAssert.h

@@ -93,12 +93,6 @@ typedef void (^RCTFatalHandler)(NSError *error);
 #define RCTAssertNotMainQueue() RCTAssert(!RCTIsMainQueue(), \
 @"This function must not be called on the main queue")
 
-/**
- * Deprecated, do not use
- */
-#define RCTAssertMainThread() RCTAssertMainQueue()
-#define RCTAssertNotMainThread() RCTAssertNotMainQueue()
-
 /**
  * These methods get and set the current assert function called by the RCTAssert
  * macros. You can use these to replace the standard behavior with custom assert

React/Base/RCTRootView.h

@@ -112,8 +112,8 @@ extern NSString *const RCTContentDidAppearNotification;
 
 /**
  * Calling this will result in emitting a "touches cancelled" event to js,
- * which effectively cancels all js "gesture recognizers" such as as touchable
- * (unless they explicitely ignore cancellation events, but noone should do that).
+ * which effectively cancels all js "gesture recognizers" such as touchable components
+ * (unless they explicitely ignore cancellation events, but no one should do that).
  *
  * This API is exposed for integration purposes where you embed RN rootView
  * in a native view with a native gesture recognizer,

React/CxxBridge/RCTCxxBridge.mm

@@ -29,6 +29,7 @@
 #import <React/RCTProfile.h>
 #import <React/RCTRedBox.h>
 #import <React/RCTUtils.h>
+#import <React/RCTFollyConvert.h>
 #import <cxxreact/CxxNativeModule.h>
 #import <cxxreact/Instance.h>
 #import <cxxreact/JSBundleType.h>
@@ -287,6 +288,7 @@ struct RCTInstanceCallback : public InstanceCallback {
       [self.delegate shouldBridgeUseCustomJSC:self];
     // The arg is a cache dir.  It's not used with standard JSC.
     executorFactory.reset(new JSCExecutorFactory(folly::dynamic::object
+      ("OwnerIdentity", "ReactNative")
       ("UseCustomJSC", (bool)useCustomJSC)
 #if RCT_PROFILE
       ("StartSamplingProfilerOnInit", (bool)self.devSettings.startSamplingProfilerOnLaunch)
@@ -1005,7 +1007,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithBundleURL:(__unused NSURL *)bundleUR
 
     if (self->_reactInstance) {
       self->_reactInstance->callJSFunction([module UTF8String], [method UTF8String],
-                                           [RCTConvert folly_dynamic:args ?: @[]]);
+                                           convertIdToFollyDynamic(args ?: @[]));
 
       // ensureOnJavaScriptThread may execute immediately, so use jsMessageThread, to make sure
       // the block is invoked after callJSFunction
@@ -1041,7 +1043,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithBundleURL:(__unused NSURL *)bundleUR
     RCTProfileEndFlowEvent();
 
     if (self->_reactInstance) {
-      self->_reactInstance->callJSCallback([cbID unsignedLongLongValue], [RCTConvert folly_dynamic:args ?: @[]]);
+      self->_reactInstance->callJSCallback([cbID unsignedLongLongValue], convertIdToFollyDynamic(args ?: @[]));
     }
   }];
 }

React/CxxBridge/RCTObjcExecutor.mm

@@ -50,7 +50,7 @@ public:
       }
 
       m_jsThread->runOnQueue([this, json]{
-        m_delegate->callNativeModules(*this, [RCTConvert folly_dynamic:json], true);
+        m_delegate->callNativeModules(*this, convertIdToFollyDynamic(json), true);
       });
     };
 

React/CxxModule/RCTCxxMethod.mm

@@ -90,7 +90,7 @@ using namespace facebook::react;
     };
   }
 
-  folly::dynamic args = [RCTConvert folly_dynamic:arguments];
+  folly::dynamic args = convertIdToFollyDynamic(arguments);
   args.resize(args.size() - _method->callbacks);
 
   try {

React/CxxModule/RCTCxxUtils.h

@@ -9,21 +9,14 @@
 
 #include <memory>
 
-#import <React/RCTConvert.h>
-#include <JavaScriptCore/JavaScriptCore.h>
-#include <cxxreact/JSCExecutor.h>
-#include <folly/dynamic.h>
-#include <jschelpers/JavaScriptCore.h>
+#import <JavaScriptCore/JavaScriptCore.h>
+
+#import <cxxreact/JSCExecutor.h>
+#import <jschelpers/JavaScriptCore.h>
 
 @class RCTBridge;
 @class RCTModuleData;
 
-@interface RCTConvert (folly)
-
-+ (folly::dynamic)folly_dynamic:(id)json;
-
-@end
-
 namespace facebook {
 namespace react {
 

React/CxxModule/RCTCxxUtils.mm

@@ -12,32 +12,13 @@
 #import <React/RCTFollyConvert.h>
 #import <React/RCTModuleData.h>
 #import <React/RCTUtils.h>
-#include <cxxreact/CxxNativeModule.h>
-#include <jschelpers/Value.h>
+#import <cxxreact/CxxNativeModule.h>
+#import <jschelpers/Value.h>
 
 #import "DispatchMessageQueueThread.h"
 #import "RCTCxxModule.h"
 #import "RCTNativeModule.h"
 
-using namespace facebook::react;
-
-@implementation RCTConvert (folly)
-
-+ (folly::dynamic)folly_dynamic:(id)json;
-{
-  if (json == nil || json == (id)kCFNull) {
-    return nullptr;
-  } else {
-    folly::dynamic dyn = convertIdToFollyDynamic(json);
-     if (dyn == nil) {
-       RCTAssert(false, @"RCTConvert input json is of an impossible type");
-     }
-     return dyn;
-  }
-}
-
-@end
-
 namespace facebook {
 namespace react {
 
@@ -109,7 +90,8 @@ static NSError *errorWithException(const std::exception &e)
   return [NSError errorWithDomain:RCTErrorDomain code:1 userInfo:errorInfo];
 }
 
-NSError *tryAndReturnError(const std::function<void()>& func) {
+NSError *tryAndReturnError(const std::function<void()>& func)
+{
   try {
     @try {
       func();
@@ -133,7 +115,8 @@ NSError *tryAndReturnError(const std::function<void()>& func) {
   }
 }
 
-NSString *deriveSourceURL(NSURL *url) {
+NSString *deriveSourceURL(NSURL *url)
+{
   NSString *sourceUrl;
   if (url.isFileURL) {
     // Url will contain only path to resource (i.g. file:// will be removed)

React/CxxModule/RCTNativeModule.mm

@@ -14,6 +14,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxUtils.h>
 #import <React/RCTFollyConvert.h>
+#import <React/RCTLog.h>
 #import <React/RCTProfile.h>
 #import <React/RCTUtils.h>
 
@@ -49,7 +50,7 @@ folly::dynamic RCTNativeModule::getConstants() {
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways,
     @"[RCTNativeModule getConstants] moduleData.exportedConstants", nil);
   NSDictionary *constants = m_moduleData.exportedConstants;
-  folly::dynamic ret = [RCTConvert folly_dynamic:constants];
+  folly::dynamic ret = convertIdToFollyDynamic(constants);
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
   return ret;
 }

React/DevSupport/RCTInspectorDevServerHelper.mm

@@ -3,6 +3,7 @@
 #if RCT_DEV
 
 #import <jschelpers/JSCWrapper.h>
+#import <UIKit/UIKit.h>
 
 #import "RCTDefines.h"
 #import "RCTInspectorPackagerConnection.h"
@@ -16,10 +17,8 @@ static NSString *getDebugServerHost(NSURL *bundleURL)
     host = @"localhost";
   }
 
-  NSNumber *port = [bundleURL port];
-  if (!port) {
-    port = @8081; // Packager default port
-  }
+  // Inspector Proxy is run on a separate port (from packager).
+  NSNumber *port = @8082;
 
   // this is consistent with the Android implementation, where http:// is the
   // hardcoded implicit scheme for the debug server. Note, packagerURL
@@ -31,11 +30,9 @@ static NSString *getDebugServerHost(NSURL *bundleURL)
 
 static NSURL *getInspectorDeviceUrl(NSURL *bundleURL)
 {
-  // TODO: t19163919: figure out if there's a good way to get a friendly device
-  // name for the end user
   return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/inspector/device?name=%@",
                                                         getDebugServerHost(bundleURL),
-                                                        @""]];
+                                                        [[UIDevice currentDevice] name]]];
 }
 
 

React/Modules/RCTUIManager.m

@@ -65,7 +65,6 @@ NSString *const RCTUIManagerRootViewKey = @"RCTUIManagerRootViewKey";
 
   // Animation
   RCTLayoutAnimationGroup *_layoutAnimationGroup; // Main thread only
-  NSMutableSet<UIView *> *_viewsToBeDeleted; // Main thread only
 
   NSMutableDictionary<NSNumber *, RCTShadowView *> *_shadowViewRegistry; // RCT thread only
   NSMutableDictionary<NSNumber *, UIView *> *_viewRegistry; // Main thread only
@@ -156,8 +155,6 @@ RCT_EXPORT_MODULE()
   _bridgeTransactionListeners = [NSMutableSet new];
   _observerCoordinator = [RCTUIManagerObserverCoordinator new];
 
-  _viewsToBeDeleted = [NSMutableSet new];
-
   // Get view managers from bridge
   NSMutableDictionary *componentDataByName = [NSMutableDictionary new];
   for (Class moduleClass in _bridge.moduleClasses) {
@@ -695,8 +692,7 @@ RCT_EXPORT_METHOD(removeSubviewsFromContainerWithID:(nonnull NSNumber *)containe
     void (^completion)(BOOL) = ^(BOOL finished) {
       completionsCalled++;
 
-      [self->_viewsToBeDeleted removeObject:removedChild];
-      [container removeReactSubview:removedChild];
+      [removedChild removeFromSuperview];
 
       if (animation.callback && completionsCalled == children.count) {
         animation.callback(@[@(finished)]);
@@ -707,10 +703,20 @@ RCT_EXPORT_METHOD(removeSubviewsFromContainerWithID:(nonnull NSNumber *)containe
       }
     };
 
-    [_viewsToBeDeleted addObject:removedChild];
+    // Hack: At this moment we have two contradict intents.
+    // First one: We want to delete the view from view hierarchy.
+    // Second one: We want to animate this view, which implies the existence of this view in the hierarchy.
+    // So, we have to remove this view from React's view hierarchy but postpone removing from UIKit's hierarchy.
+    // Here the problem: the default implementation of `-[UIView removeReactSubview:]` also removes the view from UIKit's hierarchy.
+    // So, let's temporary restore the view back after removing.
+    // To do so, we have to memorize original `superview` (which can differ from `container`) and an index of removed view.
+    UIView *originalSuperview = removedChild.superview;
+    NSUInteger *originalIndex = [originalSuperview.subviews indexOfObject:removedChild];
+    [container removeReactSubview:removedChild];
+    [originalSuperview insertSubview:removedChild atIndex:originalIndex];
 
-    // Disable user interaction while the view is animating since JS won't receive
-    // the view events anyway.
+    // Disable user interaction while the view is animating
+    // since the view is (conseptually) deleted and not supposed to be interactive.
     removedChild.userInteractionEnabled = NO;
 
     NSString *property = deletingLayoutAnimation.property;
@@ -862,6 +868,7 @@ RCT_EXPORT_METHOD(manageChildren:(nonnull NSNumber *)containerTag
   for (NSInteger index = 0, length = temporarilyRemovedChildren.count; index < length; index++) {
     destinationsToChildrenToAdd[moveToIndices[index]] = temporarilyRemovedChildren[index];
   }
+
   for (NSInteger index = 0, length = addAtIndices.count; index < length; index++) {
     id<RCTComponent> view = registry[addChildReactTags[index]];
     if (view) {
@@ -872,22 +879,8 @@ RCT_EXPORT_METHOD(manageChildren:(nonnull NSNumber *)containerTag
   NSArray<NSNumber *> *sortedIndices =
     [destinationsToChildrenToAdd.allKeys sortedArrayUsingSelector:@selector(compare:)];
   for (NSNumber *reactIndex in sortedIndices) {
-    NSInteger insertAtIndex = reactIndex.integerValue;
-
-    // When performing a delete animation, views are not removed immediately
-    // from their container so we need to offset the insertion index if a view
-    // that will be removed appears earlier than the view we are inserting.
-    if (isUIViewRegistry && _viewsToBeDeleted.count > 0) {
-      for (NSInteger index = 0; index < insertAtIndex; index++) {
-        UIView *subview = ((UIView *)container).reactSubviews[index];
-        if ([_viewsToBeDeleted containsObject:subview]) {
-          insertAtIndex++;
-        }
-      }
-    }
-
     [container insertReactSubview:destinationsToChildrenToAdd[reactIndex]
-                          atIndex:insertAtIndex];
+                          atIndex:reactIndex.integerValue];
   }
 }
 
@@ -1403,6 +1396,7 @@ RCT_EXPORT_METHOD(clearJSResponder)
      // Add native props
      NSDictionary<NSString *, id> *viewConfig = [componentData viewConfig];
      moduleConstants[@"NativeProps"] = viewConfig[@"propTypes"];
+     moduleConstants[@"baseModuleName"] = viewConfig[@"baseModuleName"];
 
      // Add direct events
      for (NSString *eventName in viewConfig[@"directEvents"]) {

React/React.xcodeproj/project.pbxproj

@@ -1047,6 +1047,14 @@
 		657734931EE8356100A0E9EA /* RCTInspector.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6577348B1EE8354A00A0E9EA /* RCTInspector.mm */; };
 		657734941EE8356100A0E9EA /* RCTInspectorPackagerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 6577348C1EE8354A00A0E9EA /* RCTInspectorPackagerConnection.h */; };
 		657734951EE8356100A0E9EA /* RCTInspectorPackagerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 6577348D1EE8354A00A0E9EA /* RCTInspectorPackagerConnection.m */; };
+		66CD94B11F1045E700CB3C7C /* RCTMaskedView.h in Headers */ = {isa = PBXBuildFile; fileRef = 66CD94AD1F1045E700CB3C7C /* RCTMaskedView.h */; };
+		66CD94B21F1045E700CB3C7C /* RCTMaskedView.h in Headers */ = {isa = PBXBuildFile; fileRef = 66CD94AD1F1045E700CB3C7C /* RCTMaskedView.h */; };
+		66CD94B31F1045E700CB3C7C /* RCTMaskedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 66CD94AE1F1045E700CB3C7C /* RCTMaskedView.m */; };
+		66CD94B41F1045E700CB3C7C /* RCTMaskedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 66CD94AE1F1045E700CB3C7C /* RCTMaskedView.m */; };
+		66CD94B51F1045E700CB3C7C /* RCTMaskedViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 66CD94AF1F1045E700CB3C7C /* RCTMaskedViewManager.h */; };
+		66CD94B61F1045E700CB3C7C /* RCTMaskedViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 66CD94AF1F1045E700CB3C7C /* RCTMaskedViewManager.h */; };
+		66CD94B71F1045E700CB3C7C /* RCTMaskedViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 66CD94B01F1045E700CB3C7C /* RCTMaskedViewManager.m */; };
+		66CD94B81F1045E700CB3C7C /* RCTMaskedViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 66CD94B01F1045E700CB3C7C /* RCTMaskedViewManager.m */; };
 		68EFE4EE1CF6EB3900A1DE13 /* RCTBundleURLProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */; };
 		830A229E1A66C68A008503DA /* RCTRootView.m in Sources */ = {isa = PBXBuildFile; fileRef = 830A229D1A66C68A008503DA /* RCTRootView.m */; };
 		83392EB31B6634E10013B15F /* RCTModalHostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83392EB21B6634E10013B15F /* RCTModalHostViewController.m */; };
@@ -1957,6 +1965,10 @@
 		6577348B1EE8354A00A0E9EA /* RCTInspector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RCTInspector.mm; path = Inspector/RCTInspector.mm; sourceTree = "<group>"; };
 		6577348C1EE8354A00A0E9EA /* RCTInspectorPackagerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTInspectorPackagerConnection.h; path = Inspector/RCTInspectorPackagerConnection.h; sourceTree = "<group>"; };
 		6577348D1EE8354A00A0E9EA /* RCTInspectorPackagerConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTInspectorPackagerConnection.m; path = Inspector/RCTInspectorPackagerConnection.m; sourceTree = "<group>"; };
+		66CD94AD1F1045E700CB3C7C /* RCTMaskedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMaskedView.h; sourceTree = "<group>"; };
+		66CD94AE1F1045E700CB3C7C /* RCTMaskedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMaskedView.m; sourceTree = "<group>"; };
+		66CD94AF1F1045E700CB3C7C /* RCTMaskedViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMaskedViewManager.h; sourceTree = "<group>"; };
+		66CD94B01F1045E700CB3C7C /* RCTMaskedViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMaskedViewManager.m; sourceTree = "<group>"; };
 		68EFE4EC1CF6EB3000A1DE13 /* RCTBundleURLProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBundleURLProvider.h; sourceTree = "<group>"; };
 		68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBundleURLProvider.m; sourceTree = "<group>"; };
 		6A15FB0C1BDF663500531DFB /* RCTRootViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRootViewInternal.h; sourceTree = "<group>"; };
@@ -2252,6 +2264,10 @@
 				58C571BF1AA56C1900CDF9C8 /* RCTDatePickerManager.m */,
 				3D37B5801D522B190042D5B5 /* RCTFont.h */,
 				3D37B5811D522B190042D5B5 /* RCTFont.mm */,
+				66CD94AD1F1045E700CB3C7C /* RCTMaskedView.h */,
+				66CD94AE1F1045E700CB3C7C /* RCTMaskedView.m */,
+				66CD94AF1F1045E700CB3C7C /* RCTMaskedViewManager.h */,
+				66CD94B01F1045E700CB3C7C /* RCTMaskedViewManager.m */,
 				83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */,
 				83A1FE8B1B62640A00BE0E65 /* RCTModalHostView.m */,
 				83392EB11B6634E10013B15F /* RCTModalHostViewController.h */,
@@ -2699,6 +2715,7 @@
 				590D7BFE1EBD458B00D8A370 /* RCTShadowView+Layout.h in Headers */,
 				13134C9D1E296B2A00B9F3CB /* RCTCxxModule.h in Headers */,
 				59FBEFB11E46D91C0095D885 /* RCTScrollContentShadowView.h in Headers */,
+				66CD94B61F1045E700CB3C7C /* RCTMaskedViewManager.h in Headers */,
 				130443A31E3FEAAE00D93A67 /* RCTFollyConvert.h in Headers */,
 				3D7BFD1E1EA8E351008DFB7A /* RCTPackagerConnection.h in Headers */,
 				59FBEFB51E46D91C0095D885 /* RCTScrollContentViewManager.h in Headers */,
@@ -2816,6 +2833,7 @@
 				CF2731C21E7B8DEF0044CA4F /* RCTDeviceInfo.h in Headers */,
 				3D302F8B1DF828F800D6DDAE /* RCTScrollViewManager.h in Headers */,
 				3D302F8C1DF828F800D6DDAE /* RCTSegmentedControl.h in Headers */,
+				66CD94B21F1045E700CB3C7C /* RCTMaskedView.h in Headers */,
 				3D302F8D1DF828F800D6DDAE /* RCTSegmentedControlManager.h in Headers */,
 				3D302F8E1DF828F800D6DDAE /* RCTShadowView.h in Headers */,
 				3D302F8F1DF828F800D6DDAE /* RCTSlider.h in Headers */,
@@ -3075,6 +3093,7 @@
 				3D80DA661DF820620028D040 /* RCTComponentData.h in Headers */,
 				3DA9819E1E5B0DBB004F2374 /* NSDataBigString.h in Headers */,
 				3D80DA671DF820620028D040 /* RCTConvert+CoreLocation.h in Headers */,
+				66CD94B11F1045E700CB3C7C /* RCTMaskedView.h in Headers */,
 				3D80DA691DF820620028D040 /* RCTDatePicker.h in Headers */,
 				3D80DA6A1DF820620028D040 /* RCTDatePickerManager.h in Headers */,
 				3D80DA6B1DF820620028D040 /* RCTFont.h in Headers */,
@@ -3110,6 +3129,7 @@
 				3D80DA881DF820620028D040 /* RCTTabBar.h in Headers */,
 				3D80DA891DF820620028D040 /* RCTTabBarItem.h in Headers */,
 				3D80DA8A1DF820620028D040 /* RCTTabBarItemManager.h in Headers */,
+				66CD94B51F1045E700CB3C7C /* RCTMaskedViewManager.h in Headers */,
 				3D80DA8B1DF820620028D040 /* RCTTabBarManager.h in Headers */,
 				3D80DA8C1DF820620028D040 /* RCTTextDecorationLineType.h in Headers */,
 				6577348E1EE8354A00A0E9EA /* RCTInspector.h in Headers */,
@@ -3551,6 +3571,7 @@
 				2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */,
 				2D3B5EC91D9B095C00451313 /* RCTBorderDrawing.m in Sources */,
 				C6194AAF1EF156280034D062 /* RCTPackagerConnectionBridgeConfig.m in Sources */,
+				66CD94B81F1045E700CB3C7C /* RCTMaskedViewManager.m in Sources */,
 				2D3B5E991D9B089A00451313 /* RCTDisplayLink.m in Sources */,
 				2D3B5EA11D9B08B600451313 /* RCTModuleData.mm in Sources */,
 				2D3B5EEA1D9B09CD00451313 /* RCTTabBar.m in Sources */,
@@ -3637,6 +3658,7 @@
 				657734861EE834D900A0E9EA /* RCTInspectorDevServerHelper.mm in Sources */,
 				59FBEFB31E46D91C0095D885 /* RCTScrollContentShadowView.m in Sources */,
 				2D3B5ED91D9B098E00451313 /* RCTNavItem.m in Sources */,
+				66CD94B41F1045E700CB3C7C /* RCTMaskedView.m in Sources */,
 				2D74EAFA1DAE9590003B751B /* RCTMultipartDataTask.m in Sources */,
 				2D3B5EC51D9B094D00451313 /* RCTProfileTrampoline-i386.S in Sources */,
 				657734951EE8356100A0E9EA /* RCTInspectorPackagerConnection.m in Sources */,
@@ -3806,6 +3828,7 @@
 				13B07FEF1A69327A00A75B9A /* RCTAlertManager.m in Sources */,
 				3D7BFD231EA8E351008DFB7A /* RCTReloadPackagerMethod.m in Sources */,
 				352DCFF01D19F4C20056D623 /* RCTI18nUtil.m in Sources */,
+				66CD94B71F1045E700CB3C7C /* RCTMaskedViewManager.m in Sources */,
 				008341F61D1DB34400876D9A /* RCTJSStackFrame.m in Sources */,
 				13134C961E296B2A00B9F3CB /* RCTObjcExecutor.mm in Sources */,
 				83CBBACC1A6023D300E9B192 /* RCTConvert.m in Sources */,
@@ -3885,6 +3908,7 @@
 				13C156051AB1A2840079392D /* RCTWebView.m in Sources */,
 				83CBBA601A601EAA00E9B192 /* RCTBridge.m in Sources */,
 				590D7BFF1EBD458B00D8A370 /* RCTShadowView+Layout.m in Sources */,
+				66CD94B31F1045E700CB3C7C /* RCTMaskedView.m in Sources */,
 				13C156061AB1A2840079392D /* RCTWebViewManager.m in Sources */,
 				C6194AAE1EF156280034D062 /* RCTPackagerConnectionBridgeConfig.m in Sources */,
 				58114A161AAE854800E7D092 /* RCTPicker.m in Sources */,

React/Views/RCTComponentData.m

@@ -41,23 +41,7 @@ typedef NSMutableDictionary<NSString *, RCTPropBlock> RCTPropBlockDictionary;
     _viewPropBlocks = [NSMutableDictionary new];
     _shadowPropBlocks = [NSMutableDictionary new];
 
-    // Hackety hack, this partially re-implements RCTBridgeModuleNameForClass
-    // We want to get rid of RCT and RK prefixes, but a lot of JS code still references
-    // view names by prefix. So, while RCTBridgeModuleNameForClass now drops these
-    // prefixes by default, we'll still keep them around here.
-    NSString *name = [managerClass moduleName];
-    if (name.length == 0) {
-      name = NSStringFromClass(managerClass);
-    }
-    if ([name hasPrefix:@"RK"]) {
-      name = [name stringByReplacingCharactersInRange:(NSRange){0, @"RK".length} withString:@"RCT"];
-    }
-    if ([name hasSuffix:@"Manager"]) {
-      name = [name substringToIndex:name.length - @"Manager".length];
-    }
-
-    RCTAssert(name.length, @"Invalid moduleName '%@'", name);
-    _name = name;
+    _name = moduleNameForClass(managerClass);
 
     _implementsUIBlockToAmendWithShadowViewRegistry = NO;
     Class cls = _managerClass;
@@ -439,11 +423,14 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
     }
   }
 #endif
-
+  
+  Class superClass = [_managerClass superclass];
+  
   return @{
     @"propTypes": propTypes,
     @"directEvents": directEvents,
     @"bubblingEvents": bubblingEvents,
+    @"baseModuleName": superClass == [NSObject class] ? (id)kCFNull : moduleNameForClass(superClass),
   };
 }
 
@@ -455,4 +442,26 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
   return nil;
 }
 
+static NSString *moduleNameForClass(Class managerClass)
+{
+  // Hackety hack, this partially re-implements RCTBridgeModuleNameForClass
+  // We want to get rid of RCT and RK prefixes, but a lot of JS code still references
+  // view names by prefix. So, while RCTBridgeModuleNameForClass now drops these
+  // prefixes by default, we'll still keep them around here.
+  NSString *name = [managerClass moduleName];
+  if (name.length == 0) {
+    name = NSStringFromClass(managerClass);
+  }
+  if ([name hasPrefix:@"RK"]) {
+    name = [name stringByReplacingCharactersInRange:(NSRange){0, @"RK".length} withString:@"RCT"];
+  }
+  if ([name hasSuffix:@"Manager"]) {
+    name = [name substringToIndex:name.length - @"Manager".length];
+  }
+  
+  RCTAssert(name.length, @"Invalid moduleName '%@'", name);
+  
+  return name;
+}
+
 @end

React/Views/RCTMaskedView.h

@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTView.h>
+
+@interface RCTMaskedView : RCTView
+
+@end

React/Views/RCTMaskedView.m

@@ -0,0 +1,36 @@
+/**
+ * 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.
+ */
+
+#import "RCTMaskedView.h"
+
+#import <React/UIView+React.h>
+
+@implementation RCTMaskedView
+
+- (void)didUpdateReactSubviews
+{
+  // RCTMaskedView expects that the first subview rendered is the mask.
+  UIView *maskView = [self.reactSubviews firstObject];
+  self.maskView = maskView;
+
+  // Add the other subviews to the view hierarchy
+  for (NSUInteger i = 1; i < self.reactSubviews.count; i++) {
+    UIView *subview = [self.reactSubviews objectAtIndex:i];
+    [self addSubview:subview];
+  }
+}
+
+- (void)displayLayer:(CALayer *)layer
+{
+  // RCTView uses displayLayer to do border rendering.
+  // We don't need to do that in RCTMaskedView, so we
+  // stub this method and override the default implementation.
+}
+
+@end

React/Views/RCTMaskedViewManager.h

@@ -0,0 +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.
+ */
+
+#import <React/RCTViewManager.h>
+
+@interface RCTMaskedViewManager : RCTViewManager
+
+@end

React/Views/RCTMaskedViewManager.m

@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+
+#import "RCTMaskedViewManager.h"
+
+#import "RCTMaskedView.h"
+#import "RCTUIManager.h"
+
+@implementation RCTMaskedViewManager
+
+RCT_EXPORT_MODULE()
+
+- (UIView *)view
+{
+  return [RCTMaskedView new];
+}
+
+@end

ReactAndroid/build.gradle

@@ -281,8 +281,8 @@ dependencies {
     compile 'javax.inject:javax.inject:1'
     compile 'com.android.support:appcompat-v7:23.0.1'
     compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0'
-    compile 'com.facebook.fresco:fresco:1.0.1'
-    compile 'com.facebook.fresco:imagepipeline-okhttp3:1.0.1'
+    compile 'com.facebook.fresco:fresco:1.3.0'
+    compile 'com.facebook.fresco:imagepipeline-okhttp3:1.3.0'
     compile 'com.facebook.soloader:soloader:0.1.0'
     compile 'com.google.code.findbugs:jsr305:3.0.0'
     compile 'com.squareup.okhttp3:okhttp:3.6.0'

ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.47.2
+VERSION_NAME=1000.0.0-master
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

ReactAndroid/src/main/java/com/facebook/react/BUCK

@@ -3,6 +3,9 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "react",
     srcs = glob(["*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
@@ -10,7 +13,6 @@ android_library(
         react_native_dep("java/com/facebook/systrace:systrace"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java

@@ -35,7 +35,6 @@ import com.facebook.react.modules.systeminfo.AndroidInfoModule;
 import com.facebook.react.uimanager.UIImplementationProvider;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.uimanager.debug.DebugComponentOwnershipModule;
 import com.facebook.systrace.Systrace;
 
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_END;
@@ -65,7 +64,6 @@ import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_CORE_REACT_
     UIManagerModule.class,
     DeviceInfoModule.class,
     // Debug only
-    DebugComponentOwnershipModule.class,
     JSCHeapCapture.class,
     JSCSamplingProfiler.class,
   }
@@ -159,13 +157,6 @@ import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_CORE_REACT_
       }));
 
     if (ReactBuildConfig.DEBUG) {
-      moduleSpecList.add(
-        new ModuleSpec(DebugComponentOwnershipModule.class, new Provider<NativeModule>() {
-          @Override
-          public NativeModule get() {
-            return new DebugComponentOwnershipModule(reactContext);
-          }
-        }));
       moduleSpecList.add(
         new ModuleSpec(JSCHeapCapture.class, new Provider<NativeModule>() {
           @Override

ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java

@@ -21,7 +21,6 @@ import com.facebook.react.devsupport.JSCHeapCapture;
 import com.facebook.react.devsupport.JSCSamplingProfiler;
 import com.facebook.react.module.annotations.ReactModuleList;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.uimanager.debug.DebugComponentOwnershipModule;
 
 /**
  * Package defining core framework modules (e.g. UIManager). It should be used for modules that
@@ -30,7 +29,6 @@ import com.facebook.react.uimanager.debug.DebugComponentOwnershipModule;
  */
 @ReactModuleList(
   nativeModules = {
-    DebugComponentOwnershipModule.class,
     JSCHeapCapture.class,
     JSCSamplingProfiler.class,
   }
@@ -43,14 +41,6 @@ import com.facebook.react.uimanager.debug.DebugComponentOwnershipModule;
   @Override
   public List<ModuleSpec> getNativeModules(final ReactApplicationContext reactContext) {
     List<ModuleSpec> moduleSpecList = new ArrayList<>();
-
-    moduleSpecList.add(
-      new ModuleSpec(DebugComponentOwnershipModule.class, new Provider<NativeModule>() {
-          @Override
-          public NativeModule get() {
-            return new DebugComponentOwnershipModule(reactContext);
-          }
-        }));
     moduleSpecList.add(
       new ModuleSpec(JSCHeapCapture.class, new Provider<NativeModule>() {
           @Override

ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -224,7 +224,8 @@ public class ReactInstanceManager {
     boolean setupReactContextInBackgroundEnabled,
     boolean useSeparateUIBackgroundThread,
     int minNumShakes,
-    boolean splitPackagesEnabled) {
+    boolean splitPackagesEnabled,
+    boolean useOnlyDefaultPackages) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.ctor()");
     initializeSoLoaderIfNecessary(applicationContext);
 
@@ -267,14 +268,16 @@ public class ReactInstanceManager {
       mPackages.add(coreModulesPackage);
     } else {
       mPackages.add(new BridgeCorePackage(this, mBackBtnHandler));
-      if (mUseDeveloperSupport) {
-        mPackages.add(new DebugCorePackage());
+      if (!useOnlyDefaultPackages) {
+        if (mUseDeveloperSupport) {
+          mPackages.add(new DebugCorePackage());
+        }
+        mPackages.add(
+          new ReactNativeCorePackage(
+            this,
+            mUIImplementationProvider,
+            mLazyViewManagersEnabled));
       }
-      mPackages.add(
-        new ReactNativeCorePackage(
-          this,
-          mUIImplementationProvider,
-          mLazyViewManagersEnabled));
     }
     mPackages.addAll(packages);
 

ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java

@@ -48,6 +48,7 @@ public class ReactInstanceManagerBuilder {
   protected boolean mUseSeparateUIBackgroundThread;
   protected int mMinNumShakes = 1;
   protected boolean mEnableSplitPackage;
+  protected boolean mUseOnlyDefaultPackages;
 
   /* package protected */ ReactInstanceManagerBuilder() {
   }
@@ -219,6 +220,11 @@ public class ReactInstanceManagerBuilder {
     return this;
   }
 
+  public ReactInstanceManagerBuilder setUseOnlyDefaultPackages(boolean useOnlyDefaultPackages) {
+    mUseOnlyDefaultPackages = useOnlyDefaultPackages;
+    return this;
+  }
+
   /**
    * Instantiates a new {@link ReactInstanceManager}.
    * Before calling {@code build}, the following must be called:
@@ -269,6 +275,7 @@ public class ReactInstanceManagerBuilder {
       mSetupReactContextInBackground,
       mUseSeparateUIBackgroundThread,
       mMinNumShakes,
-      mEnableSplitPackage);
+      mEnableSplitPackage,
+      mUseOnlyDefaultPackages);
   }
 }

ReactAndroid/src/main/java/com/facebook/react/animated/BUCK

@@ -5,12 +5,14 @@ android_library(
     srcs = glob([
         "*.java",
     ]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java

@@ -29,6 +29,7 @@ import com.facebook.react.uimanager.events.EventDispatcherListener;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -144,7 +145,6 @@ import javax.annotation.Nullable;
       throw new JSApplicationIllegalArgumentException("Animated node with tag " + tag +
         " does not exists or is not a 'value' node");
     }
-    stopAnimationsForNode(node);
     ((ValueAnimatedNode) node).mValue = value;
     mUpdatedNodes.put(tag, node);
   }
@@ -208,24 +208,6 @@ import javax.annotation.Nullable;
     mActiveAnimations.put(animationId, animation);
   }
 
-  private void stopAnimationsForNode(AnimatedNode animatedNode) {
-    // in most of the cases there should never be more than a few active animations running at the
-    // same time. Therefore it does not make much sense to create an animationId -> animation
-    // object map that would require additional memory just to support the use-case of stopping
-    // an animation
-    for (int i = 0; i < mActiveAnimations.size(); i++) {
-      AnimationDriver animation = mActiveAnimations.valueAt(i);
-      if (animatedNode.equals(animation.mAnimatedValue)) {
-        // Invoke animation end callback with {finished: false}
-        WritableMap endCallbackResponse = Arguments.createMap();
-        endCallbackResponse.putBoolean("finished", false);
-        animation.mEndCallback.invoke(endCallbackResponse);
-        mActiveAnimations.removeAt(i);
-        i--;
-      }
-    }
-  }
-
   public void stopAnimation(int animationId) {
     // in most of the cases there should never be more than a few active animations running at the
     // same time. Therefore it does not make much sense to create an animationId -> animation
@@ -380,7 +362,6 @@ import javax.annotation.Nullable;
       List<EventAnimationDriver> driversForKey = mEventDrivers.get(event.getViewTag() + eventName);
       if (driversForKey != null) {
         for (EventAnimationDriver driver : driversForKey) {
-          stopAnimationsForNode(driver.mValueNode);
           event.dispatch(driver);
           mRunUpdateNodeList.add(driver.mValueNode);
         }

ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK

@@ -9,6 +9,9 @@ android_library(
         react_native_dep("third-party/java/jsr-330:jsr-330"),
     ],
     proguard_config = "reactnative.pro",
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
@@ -16,7 +19,6 @@ android_library(
         react_native_dep("java/com/facebook/systrace:systrace"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/common:common"),

ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java

@@ -18,6 +18,7 @@ public class JSCJavaScriptExecutor extends JavaScriptExecutor {
     private ReadableNativeMap mJSCConfig;
 
     public Factory(WritableNativeMap jscConfig) {
+      jscConfig.putString("OwnerIdentity", "ReactNative");
       mJSCConfig = jscConfig;
     }
 

ReactAndroid/src/main/java/com/facebook/react/common/BUCK

@@ -13,13 +13,15 @@ android_library(
     exported_deps = [
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),
     ],
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
         ":build_config",
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
     ],

ReactAndroid/src/main/java/com/facebook/react/flat/BUCK

@@ -3,6 +3,9 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "flat",
     srcs = glob(["*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
@@ -14,7 +17,6 @@ android_library(
         react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"),
         react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
         react_native_dep("libraries/textlayoutbuilder:textlayoutbuilder"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK

@@ -3,11 +3,13 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "datepicker",
     srcs = glob(["**/*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK

@@ -3,12 +3,14 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "dialog",
     srcs = glob(["**/*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK

@@ -3,6 +3,10 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "fresco",
     srcs = glob(["**/*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support-annotations:android-support-annotations"),
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
@@ -15,8 +19,6 @@ android_library(
         react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
         react_native_dep("libraries/fresco/fresco-react-native:imagepipeline-okhttp3"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
-        react_native_dep("third-party/android/support-annotations:android-support-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/okhttp:okhttp3"),
         react_native_dep("third-party/java/okhttp:okhttp3-urlconnection"),

ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK

@@ -3,11 +3,13 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "i18nmanager",
     srcs = glob(["*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK

@@ -3,12 +3,14 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "netinfo",
     srcs = glob(["**/*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK

@@ -3,12 +3,14 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "network",
     srcs = glob(["**/*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/okhttp:okhttp3"),

ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK

@@ -3,12 +3,14 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "statusbar",
     srcs = glob(["**/*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java

@@ -13,7 +13,7 @@ public class AndroidInfoHelpers {
   public static final String DEVICE_LOCALHOST = "localhost";
 
   private static final int DEBUG_SERVER_HOST_PORT = 8081;
-  private static final int INSPECTOR_PROXY_PORT = 8081;
+  private static final int INSPECTOR_PROXY_PORT = 8082;
 
   private static boolean isRunningOnGenymotion() {
     return Build.FINGERPRINT.contains("vbox");

ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK

@@ -3,11 +3,13 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "timepicker",
     srcs = glob(["**/*.java"]),
+    provided_deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),

ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java

@@ -159,7 +159,7 @@ public class WebSocketModule extends ReactContextBaseJavaModule {
 
       @Override
       public void onMessage(WebSocket webSocket, ByteString bytes) {
-        String text = bytes.base64();
+        String text = bytes.utf8();
         WritableMap params = Arguments.createMap();
         params.putInt("id", id);
         params.putString("data", text);