[0.49.4] Bump version numbers

Fix broken releases script
Summary: Fails on my machine due to fact that `replace` returns an instance of a String, rather than an instance of ShellString (that includes `to` on its prototype). Solution is to use an explicit `writeFileSync`. You can see that change in the wild on 0.50-stable branch. CC janicduplessis (edit by hramos) Closes https://github.com/facebook/react-native/pull/16303 Differential Revision: D6031331 Pulled By: hramos fbshipit-source-id: 41c583d53df75bea1a55fa19174d912e414209c0
2025-11-01 09:14:26 +00:00 · 2017-10-13 08:53:48 +02:00 · 2017-10-13 08:53:31 +02:00 · 2017-10-13 08:53:09 +02:00 · 2017-10-09 02:03:33 -07:00 · 2017-10-09 02:03:04 -07:00
772 changed files with 28068 additions and 21239 deletions
@@ -12,3 +12,4 @@ website/core/metadata.js
 website/core/metadata-blog.js
 website/src/react-native/docs/
 website/src/react-native/blog/
+danger/
@@ -64,7 +64,17 @@

  // General

-    "comma-dangle": 0,               // disallow trailing commas in object literals
+    // This must be disallowed in this repo because the minimum supported
+    // version of node is 4 which doesn't support trailing commas.
+    // Once the minimum supported version is 8 or greater this can be changed
+    "comma-dangle": [2, {            // disallow trailing commas in object literals
+        "arrays": "ignore",
+        "objects": "ignore",
+        "imports": "ignore",
+        "exports": "ignore",
+        "functions": "never"
+    }],
+
    "no-cond-assign": 1,             // disallow assignment in conditional expressions
    "no-console": 0,                 // disallow use of console (off by default in the node environment)
    "no-const-assign": 2,            // disallow assignment to const-declared variables
@@ -220,6 +230,7 @@

    "react/display-name": 0,
    "react/jsx-boolean-value": 0,
+    "react/jsx-no-comment-textnodes": 1,
    "react/jsx-no-duplicate-props": 2,
    "react/jsx-no-undef": 1,
    "react/jsx-sort-props": 0,
@@ -8,6 +8,9 @@
 ; Ignore the website subdir
 <PROJECT_ROOT>/website/.*

+; Ignore the Dangerfile
+<PROJECT_ROOT>/danger/dangerfile.js
+
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/

@@ -19,6 +22,9 @@
 ; "node_modules/react-native" but in the source repo it is in the root
 .*/Libraries/react-native/React.js

+; Ignore polyfills
+.*/Libraries/polyfills/.*
+
 [include]

 [libs]
@@ -36,14 +42,16 @@ module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|we

 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
+suppress_type=$FlowFixMeProps
+suppress_type=$FlowFixMeState
 suppress_type=$FixMe

-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-3]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-3]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

 unsafe.enable_getters_and_setters=true

 [version]
-^0.49.1
+^0.53.0
@@ -2,8 +2,17 @@ docs/* @hramos
 blog/* @hramos
 Libraries/Animated/* @janicduplessis
 Libraries/NativeAnimation/* @janicduplessis
+Libraries/Image/* @shergin
+Libraries/Text/* @shergin
+React/Base/* @shergin
+React/Views/* @shergin
+React/Modules/* @shergin
+React/CxxBridge/* @mhorowitz
 ReactAndroid/src/main/java/com/facebook/react/animated/* @janicduplessis
 website/* @hramos
 website/showcase.json @hramos
-package.json @hramos @ericnakagawa
-website/package.json @hramos @ericnakagawa
+package.json @hramos
+website/package.json @hramos
+local-cli/core/* @grabbou @kureev
+local-cli/link/* @grabbou @kureev
+local-cli/unlink/* @grabbou @kureev
@@ -16,22 +16,16 @@
  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://github.com/facebook/react-native/blob/master/CONTRIBUTING.md#how-to-get-in-touch
+    the Community page at http://facebook.github.io/react-native/support.html list various resources 
+    that should help you get started.

  Now scroll below!
 -->

-
-### Have you read the Bugs section of the Contributing to React Native Guide?
+### Have you read the [Contributing Guidelines](https://facebook.github.io/react-native/docs/contributing.html)?

 (Write your answer here.)

-<!--
-  Please read through the bug reporting guidelines thoroughly:
-  https://github.com/facebook/react-native/blob/master/CONTRIBUTING.md#bugs
-->
-
 ### Environment

 <!--
@@ -41,15 +35,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:
@@ -1,9 +1,16 @@
 <!--
-Thank you for sending the PR!
+Thank you for sending the PR! We appreciate you spending the time to work on these changes. 

-If you changed any code, please provide us with clear instructions on how you verified your changes work. In other words, a test plan is *required*. Bonus points for screenshots and videos!
+Help us understand your motivation by explaining why you decided to make this change.

-Please read the Contribution Guidelines at https://github.com/facebook/react-native/blob/master/CONTRIBUTING.md to learn more about contributing to React Native.
+You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

 Happy contributing!
+
 -->
+
+(Write your motivation here.)
+
+## Test Plan
+
+(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Bonus points for screenshots and videos!)
@@ -47,6 +47,7 @@ local.properties
 node_modules
 *.log
 .nvm
+/danger/node_modules/

 # OS X
 .DS_Store
@@ -6,6 +6,7 @@ install:
  - nvm install 7
  - rm -Rf "${TMPDIR}/jest_preprocess_cache"
  - brew install yarn --ignore-dependencies
+  - brew install watchman
  - yarn install

 script:
@@ -45,3 +46,4 @@ notifications:
    on_pull_requests: false
    on_failure: change
    on_success: change
+  webhooks: https://code.facebook.com/travis/webhook/
@@ -1,16 +1,45 @@
 # Contributing to React Native

-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.
+<!-- 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.

-## Code of Conduct
+## [Code of Conduct](https://code.facebook.com/codeofconduct)

 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.

-## Our Development Process
+## Get involved
+
+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.
+
+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.
+
+### 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.
+
+You can learn more about handling issues in the [maintainer's guide](docs/maintainers.html#handling-issues).
+
+## 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.

-## Branch Organization
+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

 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.

@@ -18,69 +47,61 @@ To see what changes are coming and provide better feedback to React Native contr

 ## Bugs

-#### Where to Find Known Issues
+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).

-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.
+If you have questions about using React Native, the [Community page](http://facebook.github.io/react-native/support.html) list various resources that should help you get started.

-Questions and feature requests are tracked elsewhere:
+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.

-  - 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).
+## Reporting new issues

-#### Reporting New Issues
+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.

-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.
+* **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!

-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.
+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).

-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
+### 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.

-## How to Get in Touch
+## Pull requests

-Many React Native users are active on [Stack Overflow](http://stackoverflow.com/questions/tagged/react-native).
+### Your first pull request

-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.
+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.

-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.
+Working on your first Pull Request? You can learn how from this free video series:

-The React Native team sends out periodical updates through the following channels:
+[**How to Contribute to an Open Source Project on GitHub**](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github)

-* [Blog](https://facebook.github.io/react-native/blog/)
-* [Twitter](https://www.twitter.com/reactnative)
+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.

-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.
+### Proposing a change

-## Proposing a Change
+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).

-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 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?title=%5BProposal%5D) that includes `[Proposal]` in the title. This lets us reach an agreement on your proposal before you put significant effort into it. These types of issues should be rare. If you have been contributing to the project long enough, you will probably already have access to the [React Native Core Contributors](https://www.facebook.com/groups/reactnativeoss/) Facebook Group, where this sort of discussion is usually held.

 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.

-## 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.
+### Sending a pull request

 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 repo and create your branch from `master`.
+1. Fork [the repository](https://github.com/facebook/react-native) 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** 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.
+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.

 > **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.

@@ -88,18 +109,15 @@ Small pull requests are much easier to review and more likely to get merged. Mak

 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`)
+* 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))

-See "What is a Test Plan?" to learn more:
-https://medium.com/@martinkonicek/what-is-a-test-plan-8bfc840ec171#.y9lcuqqi9
+See [What is a Test Plan?](https://medium.com/@martinkonicek/what-is-a-test-plan-8bfc840ec171#.y9lcuqqi9) to learn more.

 #### 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.
-
-You can learn more about running tests and contributing to React Native 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. Learn more about [testing your changes 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
@@ -111,10 +129,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.
@@ -136,15 +154,17 @@ 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, just let us know that you have completed the CLA and we can cross-check with your GitHub username.
+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).

-Complete your CLA here: https://code.facebook.com/cla
+### 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.

 ## 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 `node linter.js <files touched>`.
+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`.

 However, there are still some styles that the linter cannot pick up.

@@ -194,3 +214,4 @@ 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 -->
@@ -230,13 +230,13 @@ function e2e_suite() {
    # js tests
    if [ $RUN_JS -ne 0 ]; then
      # Check the packager produces a bundle (doesn't throw an error)
-      react-native bundle --max-workers 1 --platform android --dev true --entry-file index.android.js --bundle-output android-bundle.js
+      react-native bundle --max-workers 1 --platform android --dev true --entry-file index.js --bundle-output android-bundle.js
      if [ $? -ne 0 ]; then
        echo "Could not build android bundle"
        return 1
      fi

-      react-native bundle --max-workers 1 --platform ios --dev true --entry-file index.ios.js --bundle-output ios-bundle.js
+      react-native bundle --max-workers 1 --platform ios --dev true --entry-file index.js --bundle-output ios-bundle.js
      if [ $? -ne 0 ]; then
        echo "Could not build iOS bundle"
        return 1
@@ -21,7 +21,7 @@ const {
 } = ReactNative.NativeModules;


-class AccessibilityManagerTest extends React.Component {
+class AccessibilityManagerTest extends React.Component<{}> {
  componentDidMount() {
    AccessibilityManager.setAccessibilityContentSizeMultipliers({
      'extraSmall': 1.0,
@@ -42,7 +42,7 @@ class AccessibilityManagerTest extends React.Component {
    });
  }

-  render(): React.Element<any> {
+  render(): React.Node {
    return <View />;
  }
 }
@@ -32,7 +32,7 @@ type State = {
  elapsed?: string,
 };

-class AppEventsTest extends React.Component {
+class AppEventsTest extends React.Component<{}, State> {
  state: State = {sent: 'none', received: 'none'};

  componentDidMount() {
@@ -168,7 +168,7 @@ function testOptimizedMultiGet() {
 }


-class AsyncStorageTest extends React.Component {
+class AsyncStorageTest extends React.Component<{}, $FlowFixMeState> {
  state = {
    messages: 'Initializing...',
    done: false,
@@ -41,7 +41,7 @@ type State = {
  'force-cache'?: boolean,
 }

-class ImageCachePolicyTest extends React.Component {
+class ImageCachePolicyTest extends React.Component<Props, $FlowFixMeState> {
  state = {}

  shouldComponentUpdate(nextProps: Props, nextState: State) {
@@ -19,7 +19,7 @@ var {
 } = ReactNative;
 var { TestModule } = ReactNative.NativeModules;

-class ImageSnapshotTest extends React.Component {
+class ImageSnapshotTest extends React.Component<{}> {
  componentDidMount() {
    if (!TestModule.verifySnapshot) {
      throw new Error('TestModule.verifySnapshot not defined.');
@@ -21,12 +21,10 @@ var {
 } = ReactNative;
 var { TestModule } = ReactNative.NativeModules;

-class IntegrationTestHarnessTest extends React.Component {
-  props: {
-    shouldThrow?: boolean,
-    waitOneFrame?: boolean,
-  };
-
+class IntegrationTestHarnessTest extends React.Component<{
+  shouldThrow?: boolean,
+  waitOneFrame?: boolean,
+}, $FlowFixMeState> {
  static propTypes = {
    shouldThrow: PropTypes.bool,
    waitOneFrame: PropTypes.bool,
@@ -33,6 +33,7 @@ var TESTS = [
  require('./ImageCachePolicyTest'),
  require('./ImageSnapshotTest'),
  require('./PromiseTest'),
+  require('./WebViewTest'),
  require('./SyncMethodTest'),
  require('./WebSocketTest'),
  require('./AccessibilityManagerTest'),
@@ -47,7 +48,7 @@ require('LoggingTestModule');

 type Test = any;

-class IntegrationTestsApp extends React.Component {
+class IntegrationTestsApp extends React.Component<{}, $FlowFixMeState> {
  state = {
    test: (null: ?Test),
  };
@@ -56,6 +57,9 @@ class IntegrationTestsApp extends React.Component {
    if (this.state.test) {
      return (
        <ScrollView>
+          {/* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+            * comment suppresses an error when upgrading Flow's support for
+            * React. To see the error delete this comment and run Flow. */}
          <this.state.test />
        </ScrollView>
      );
@@ -16,7 +16,7 @@ var ReactNative = require('react-native');
 var { View } = ReactNative;
 var { TestModule } = ReactNative.NativeModules;

-class PromiseTest extends React.Component {
+class PromiseTest extends React.Component<{}> {
  shouldResolve = false;
  shouldReject = false;
  shouldSucceedAsync = false;
@@ -66,7 +66,7 @@ class PromiseTest extends React.Component {
    }
  };

-  render(): React.Element<any> {
+  render(): React.Node {
    return <View />;
  }
 }
@@ -21,7 +21,7 @@ var {
 } = ReactNative;
 var { TestModule } = ReactNative.NativeModules;

-class SimpleSnapshotTest extends React.Component {
+class SimpleSnapshotTest extends React.Component<{}> {
  componentDidMount() {
    if (!TestModule.verifySnapshot) {
      throw new Error('TestModule.verifySnapshot not defined.');
@@ -21,7 +21,7 @@ const {
 } = ReactNative.NativeModules;


-class SyncMethodTest extends React.Component {
+class SyncMethodTest extends React.Component<{}> {
  componentDidMount() {
    if (RNTesterTestModule.echoString('test string value') !== 'test string value') {
      throw new Error('Something wrong with sync method export');
@@ -32,7 +32,7 @@ class SyncMethodTest extends React.Component {
    TestModule.markTestCompleted();
  }

-  render(): React.Element<any> {
+  render(): React.Node {
    return <View />;
  }
 }
@@ -42,7 +42,7 @@ type State = {
  testExpectedResponse: string;
 };

-class WebSocketTest extends React.Component {
+class WebSocketTest extends React.Component<{}, State> {
  state: State = {
    url: DEFAULT_WS_URL,
    fetchStatus: null,
@@ -158,7 +158,7 @@ class WebSocketTest extends React.Component {
    });
  }

-  render(): React.Element<any> {
+  render(): React.Node {
    return <View />;
  }
 }
@@ -0,0 +1,61 @@
+/**
+ * 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 WebViewTest
+ */
+'use strict';
+
+var React = require('react');
+var ReactNative = require('react-native');
+var {
+  WebView,
+} = ReactNative;
+
+var { TestModule } = ReactNative.NativeModules;
+
+class WebViewTest extends React.Component {
+
+  render() {
+    var firstMessageReceived = false;
+    var secondMessageReceived = false;
+    function processMessage(e) {
+      var message = e.nativeEvent.data;
+      if (message === 'First') {firstMessageReceived = true;}
+      if (message === 'Second') {secondMessageReceived = true;}
+
+      // got both messages
+      if (firstMessageReceived && secondMessageReceived) {TestModule.markTestPassed(true);}
+      // wait for next message
+      else if (firstMessageReceived && !secondMessageReceived) {return;}
+      // first message got lost
+      else if (!firstMessageReceived && secondMessageReceived) {throw new Error('First message got lost');}
+    }
+    var html = 'Hello world'
+      + '<script>'
+      + "window.setTimeout(function(){window.postMessage('First'); window.postMessage('Second')}, 0)"
+      + '</script>';
+
+    // fail if messages didn't get through;
+    window.setTimeout(function() { throw new Error(firstMessageReceived ? 'Both messages got lost' : 'Second message got lost');}, 10000);
+
+    var source = {
+      html: html,
+      };
+
+    return (
+      <WebView
+        source={source}
+        onMessage = {processMessage}
+        />
+    );
+  }
+}
+
+WebViewTest.displayName = 'WebViewTest';
+
+module.exports = WebViewTest;
@@ -1,13 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#import "JSContextRef.h"
-
-extern "C" {
-
-void nativeProfilerEnableBytecode(void);
-void nativeProfilerStart(JSContextRef ctx, const char *title);
-void nativeProfilerEnd(JSContextRef ctx, const char *title, const char *filename);
-
-}
@@ -1,311 +0,0 @@
-#include "JSCLegacyProfiler.h"
-
-#include "APICast.h"
-#include "LegacyProfiler.h"
-#include "OpaqueJSString.h"
-#include "JSProfilerPrivate.h"
-#include "JSStringRef.h"
-#include "String.h"
-#include "Options.h"
-
-enum json_gen_status {
-  json_gen_status_ok = 0,
-  json_gen_status_error = 1,
-};
-
-enum json_entry {
-  json_entry_key,
-  json_entry_value,
-};
-
-namespace {
-
-struct json_state {
-  FILE *fileOut;
-  bool hasFirst;
-};
-
-}
-
-typedef json_state *json_gen;
-
-static void json_escaped_cstring_printf(json_gen gen, const char *str) {
-  const char *cursor = str;
-  fputc('"', gen->fileOut);
-  while (*cursor) {
-    const char *escape = nullptr;
-    switch (*cursor) {
-      case '"':
-        escape = "\\\"";
-        break;
-      case '\b':
-        escape = "\\b";
-        break;
-      case '\f':
-        escape = "\\f";
-        break;
-      case '\n':
-        escape = "\\n";
-        break;
-      case '\r':
-        escape = "\\r";
-        break;
-      case '\t':
-        escape = "\\t";
-        break;
-      case '\\':
-        escape = "\\\\";
-        break;
-      default:
-        break;
-    }
-    if (escape != nullptr) {
-      fwrite(escape, 1, strlen(escape), gen->fileOut);
-    } else {
-      fputc(*cursor, gen->fileOut);
-    }
-    cursor++;
-  }
-  fputc('"', gen->fileOut);
-}
-
-static json_gen_status json_gen_key_cstring(json_gen gen, const char *buffer) {
-  if (gen->fileOut == nullptr) {
-    return json_gen_status_error;
-  }
-
-  if (gen->hasFirst) {
-    fprintf(gen->fileOut, ",");
-  }
-  gen->hasFirst = true;
-
-  json_escaped_cstring_printf(gen, buffer);
-  return json_gen_status_ok;
-}
-
-static json_gen_status json_gen_map_open(json_gen gen, json_entry entryType) {
-  if (gen->fileOut == nullptr) {
-    return json_gen_status_error;
-  }
-
-  if (entryType == json_entry_value) {
-    fprintf(gen->fileOut, ":");
-  } else if (entryType == json_entry_key) {
-    if (gen->hasFirst) {
-      fprintf(gen->fileOut, ",");
-    }
-  }
-  fprintf(gen->fileOut, "{");
-  gen->hasFirst = false;
-  return json_gen_status_ok;
-}
-
-static json_gen_status json_gen_map_close(json_gen gen) {
-  if (gen->fileOut == nullptr) {
-    return json_gen_status_error;
-  }
-
-  fprintf(gen->fileOut, "}");
-  gen->hasFirst = true;
-  return json_gen_status_ok;
-}
-
-static json_gen_status json_gen_array_open(json_gen gen, json_entry entryType) {
-  if (gen->fileOut == nullptr) {
-    return json_gen_status_error;
-  }
-
-  if (entryType == json_entry_value) {
-    fprintf(gen->fileOut, ":");
-  } else if (entryType == json_entry_key) {
-    if (gen->hasFirst) {
-      fprintf(gen->fileOut, ",");
-    }
-  }
-  fprintf(gen->fileOut, "[");
-  gen->hasFirst = false;
-  return json_gen_status_ok;
-}
-
-static json_gen_status json_gen_array_close(json_gen gen) {
-  if (gen->fileOut == nullptr) {
-    return json_gen_status_error;
-  }
-
-  fprintf(gen->fileOut, "]");
-  gen->hasFirst = true;
-  return json_gen_status_ok;
-}
-
-static json_gen_status json_gen_keyvalue_cstring(json_gen gen, const char *key, const char *value) {
-  if (gen->fileOut == nullptr) {
-    return json_gen_status_error;
-  }
-
-  if (gen->hasFirst) {
-    fprintf(gen->fileOut, ",");
-  }
-  gen->hasFirst = true;
-
-  fprintf(gen->fileOut, "\"%s\" : ", key);
-  json_escaped_cstring_printf(gen, value);
-
-  return json_gen_status_ok;
-}
-
-
-static json_gen_status json_gen_keyvalue_integer(json_gen gen, const char *key, int value) {
-  if (gen->fileOut == nullptr) {
-    return json_gen_status_error;
-  }
-
-  if (gen->hasFirst) {
-    fprintf(gen->fileOut, ",");
-  }
-  gen->hasFirst = true;
-
-  fprintf(gen->fileOut, "\"%s\": %d", key, value);
-  return json_gen_status_ok;
-}
-
-static json_gen_status json_gen_keyvalue_double(json_gen gen, const char *key, double value) {
-  if (gen->fileOut == nullptr) {
-    return json_gen_status_error;
-  }
-
-  if (gen->hasFirst) {
-    fprintf(gen->fileOut, ",");
-  }
-  gen->hasFirst = true;
-
-  fprintf(gen->fileOut, "\"%s\": %.20g", key, value);
-  return json_gen_status_ok;
-}
-
-static json_gen json_gen_alloc(const char *fileName) {
-  json_gen gen = (json_gen)malloc(sizeof(json_state));
-  memset(gen, 0, sizeof(json_state));
-  gen->fileOut = fopen(fileName, "wb");
-  return gen;
-}
-
-static void json_gen_free(json_gen gen) {
-  if (gen->fileOut) {
-    fclose(gen->fileOut);
-  }
-  free(gen);
-}
-
-#define GEN_AND_CHECK(expr) \
-  do { \
-    json_gen_status GEN_AND_CHECK_status = (expr); \
-    if (GEN_AND_CHECK_status != json_gen_status_ok) { \
-      return GEN_AND_CHECK_status; \
-    } \
-  } while (false)
-
-
-static json_gen_status append_children_array_json(json_gen gen, const JSC::ProfileNode *node);
-static json_gen_status append_node_json(json_gen gen, const JSC::ProfileNode *node);
-
-static json_gen_status append_root_json(json_gen gen, const JSC::Profile *profile) {
-  GEN_AND_CHECK(json_gen_map_open(gen, json_entry_key));
-  GEN_AND_CHECK(json_gen_key_cstring(gen, "rootNodes"));
-#if IOS8
-  GEN_AND_CHECK(append_children_array_json(gen, profile->head()));
-#else
-  GEN_AND_CHECK(append_children_array_json(gen, profile->rootNode()));
-#endif
-  GEN_AND_CHECK(json_gen_map_close(gen));
-
-  return json_gen_status_ok;
-}
-
-static json_gen_status append_children_array_json(json_gen gen, const JSC::ProfileNode *node) {
-  GEN_AND_CHECK(json_gen_array_open(gen, json_entry_value));
-  for (RefPtr<JSC::ProfileNode> child : node->children()) {
-    GEN_AND_CHECK(append_node_json(gen, child.get()));
-  }
-  GEN_AND_CHECK(json_gen_array_close(gen));
-
-  return json_gen_status_ok;
-}
-
-static json_gen_status append_node_json(json_gen gen, const JSC::ProfileNode *node) {
-  GEN_AND_CHECK(json_gen_map_open(gen, json_entry_key));
-  GEN_AND_CHECK(json_gen_keyvalue_integer(gen, "id", node->id()));
-
-  if (!node->functionName().isEmpty()) {
-    GEN_AND_CHECK(json_gen_keyvalue_cstring(gen, "functionName", node->functionName().utf8().data()));
-  }
-
-  if (!node->url().isEmpty()) {
-    GEN_AND_CHECK(json_gen_keyvalue_cstring(gen, "url", node->url().utf8().data()));
-    GEN_AND_CHECK(json_gen_keyvalue_integer(gen, "lineNumber", node->lineNumber()));
-    GEN_AND_CHECK(json_gen_keyvalue_integer(gen, "columnNumber", node->columnNumber()));
-  }
-
-  GEN_AND_CHECK(json_gen_key_cstring(gen, "calls"));
-  GEN_AND_CHECK(json_gen_array_open(gen, json_entry_value));
-  for (const JSC::ProfileNode::Call &call : node->calls()) {
-    GEN_AND_CHECK(json_gen_map_open(gen, json_entry_key));
-    GEN_AND_CHECK(json_gen_keyvalue_double(gen, "startTime", call.startTime()));
-#if IOS8
-    GEN_AND_CHECK(json_gen_keyvalue_double(gen, "totalTime", call.totalTime()));
-#else
-    GEN_AND_CHECK(json_gen_keyvalue_double(gen, "totalTime", call.elapsedTime()));
-#endif
-    GEN_AND_CHECK(json_gen_map_close(gen));
-  }
-  GEN_AND_CHECK(json_gen_array_close(gen));
-
-  if (!node->children().isEmpty()) {
-    GEN_AND_CHECK(json_gen_key_cstring(gen, "children"));
-    GEN_AND_CHECK(append_children_array_json(gen, node));
-  }
-
-  GEN_AND_CHECK(json_gen_map_close(gen));
-
-  return json_gen_status_ok;
-}
-
-static void convert_to_json(const JSC::Profile *profile, const char *filename) {
-  json_gen_status status;
-  json_gen gen = json_gen_alloc(filename);
-
-  status = append_root_json(gen, profile);
-  if (status != json_gen_status_ok) {
-    FILE *fileOut = fopen(filename, "wb");
-    if (fileOut != nullptr) {
-      fprintf(fileOut, "{\"error\": %d}", (int)status);
-      fclose(fileOut);
-    }
-  }
-  json_gen_free(gen);
-}
-
-// Based on JSEndProfiling, with a little extra code to return the profile as JSON.
-static void JSEndProfilingAndRender(JSContextRef ctx, const char *title, const char *filename)
-{
-    JSC::ExecState *exec = toJS(ctx);
-    JSC::LegacyProfiler *profiler = JSC::LegacyProfiler::profiler();
-    RefPtr<JSC::Profile> rawProfile = profiler->stopProfiling(exec, WTF::String(title));
-    convert_to_json(rawProfile.get(), filename);
-}
-
-extern "C" {
-
-void nativeProfilerEnableBytecode(void)
-{
-    JSC::Options::setOption("forceProfilerBytecodeGeneration=true");
-}
-
-void nativeProfilerStart(JSContextRef ctx, const char *title) {
-  JSStartProfiling(ctx, JSStringCreateWithUTF8CString(title));
-}
-
-void nativeProfilerEnd(JSContextRef ctx, const char *title, const char *filename) {
-  JSEndProfilingAndRender(ctx, title, filename);
-}
-
-}
@@ -1,18 +0,0 @@
-ios9:
-	IOS_VERSION=9 \
-	JSC_VERSION=7601.1.46.3 \
-	WEB_CORE_VERSION=7601.1.46.10 \
-	WTF_VERSION=7601.1.46.3 \
-	make -f Makefile.base
-
-ios8:
-	IOS_VERSION=8 \
-	JSC_VERSION=7600.1.17 \
-	WEB_CORE_VERSION=7600.1.25 \
-	WTF_VERSION=7600.1.24 \
-	make -f Makefile.base
-
-.PHONY: clean
-clean:
-	-rm -rf $(wildcard *.dylib)
-	-rm -rf download
@@ -1,80 +0,0 @@
-HEADER_PATHS := `find download/JavaScriptCore/JavaScriptCore-$(JSC_VERSION) -name '*.h' | xargs -I{} dirname {} | uniq | xargs -I{} echo "-I {}"`
-
-XCODE_PATH ?= $(shell xcode-select -p)
-SDK_PATH = $(XCODE_PATH)/Platforms/$1.platform/Developer/SDKs/$1.sdk
-SDK_VERSION = $(shell plutil -convert json -o - $(call SDK_PATH,iPhoneOS)/SDKSettings.plist | awk -f parseSDKVersion.awk)
-
-CERT ?= iPhone Developer
-
-ARCHS = x86_64 arm64 armv7 i386
-
-PLATFORM = \
-	if [[ "$*" = "x86_64" || "$*" = "i386" ]]; then \
-		PLATFORM=iPhoneSimulator; \
-	else \
-		PLATFORM=iPhoneOS; \
-	fi;
-
-SYSROOT = -isysroot $(call SDK_PATH,$${PLATFORM})
-
-IOS_LIBS = \
-	download/JavaScriptCore/JavaScriptCore-$(JSC_VERSION) \
-	download/WebCore/WebCore-$(WEB_CORE_VERSION) \
-	download/WTF/WTF-$(WTF_VERSION) \
-	download/JavaScriptCore/JavaScriptCore-$(JSC_VERSION)/Bytecodes.h
-
-IOS_EXT=ios$(IOS_VERSION)
-
-ifneq ($(SDK_VERSION), $(IOS_VERSION))
-
-all:
-	$(error "Expected to be compiled with iOS SDK version 8, found $(SDK_VERSION)")
-
-else
-
-all: RCTJSCProfiler.$(IOS_EXT).dylib /tmp/RCTJSCProfiler
-	cp $^
-
-endif
-
-/tmp/RCTJSCProfiler:
-	mkdir -p $@
-
-RCTJSCProfiler.$(IOS_EXT).dylib: RCTJSCProfiler_unsigned.$(IOS_EXT).dylib
-	cp $< $@
-	codesign -f -s "${CERT}" $@
-
-.PRECIOUS: RCTJSCProfiler_unsigned.$(IOS_EXT).dylib
-RCTJSCProfiler_unsigned.$(IOS_EXT).dylib: $(patsubst %,RCTJSCProfiler_%.$(IOS_EXT).dylib,$(ARCHS))
-	lipo -create -output $@ $^
-
-.PRECIOUS: RCTJSCProfiler_%.$(IOS_EXT).dylib
-RCTJSCProfiler_%.$(IOS_EXT).dylib: $(IOS_LIBS)
-	$(PLATFORM) \
-	clang -w -dynamiclib -o RCTJSCProfiler_$*.$(IOS_EXT).dylib -std=c++11 \
-		-arch $* \
-		-install_name RCTJSCProfiler.$(IOS_EXT).dylib \
-		-include ./download/JavaScriptCore/JavaScriptCore-$(JSC_VERSION)/config.h \
-		-I download \
-		-I download/WebCore/WebCore-$(WEB_CORE_VERSION)/icu \
-		-I download/WTF/WTF-$(WTF_VERSION) \
-		-DNDEBUG=1 \
-		-DIOS$(IOS_VERSION)=1 \
-		-miphoneos-version-min=8.0 \
-		$(SYSROOT) \
-		$(HEADER_PATHS) \
-		-undefined dynamic_lookup \
-		JSCLegacyProfiler.mm
-
-.PRECIOUS: %/Bytecodes.h
-%/Bytecodes.h:
-	python $*/generate-bytecode-files --bytecodes_h $@ $*/bytecode/BytecodeList.json
-
-.PRECIOUS: download/%
-download/%: download/%.tar.gz
-	tar -zxvf $< -C `dirname $@` > /dev/null
-
-.PRECIOUS: %.tar.gz
-%.tar.gz:
-	mkdir -p `dirname $@`
-	curl -o $@ http://www.opensource.apple.com/tarballs/$(patsubst download/%,%,$@)
@@ -1,254 +0,0 @@
-#!/usr/bin/env python
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import argparse
-import json
-import smap
-import trace_data
-import urllib
-
-SECONDS_TO_NANOSECONDS = (1000*1000)
-SAMPLE_DELTA_IN_SECONDS = 0.0001
-
-class Marker(object):
-    def __init__(self, _name, _timestamp, _depth, _is_end, _ident, url, line, col):
-        self.name = _name
-        self.timestamp = _timestamp
-        self.depth = _depth
-        self.is_end = _is_end
-        self.ident = _ident
-        self.url = url
-        self.line = line
-        self.col = col
-
-# sort markers making sure they are ordered by timestamp then depth of function call
-# and finally that markers of the same ident are sorted in the order begin then end
-    def __cmp__(self, other):
-        if self.timestamp < other.timestamp:
-            return -1
-        if self.timestamp > other.timestamp:
-            return 1
-        if self.depth < other.depth:
-            return -1
-        if self.depth > other.depth:
-            return 1
-        if self.ident == other.ident:
-            if self.is_end:
-                return 1
-        return 0
-
-# calculate marker name based on combination of function name and location
-def _calcname(entry):
-    funcname = ""
-    if "functionName" in entry:
-        funcname = funcname + entry["functionName"]
-    return funcname
-
-def _calcurl(mapcache, entry, map_file):
-    if entry.url not in mapcache:
-        map_url = entry.url.replace('.bundle', '.map')
-
-        if map_url != entry.url:
-            if map_file:
-                print('Loading sourcemap from:' + map_file)
-                map_url = map_file
-
-            try:
-                url_file = urllib.urlopen(map_url)
-                if url_file != None:
-                    entries = smap.parse(url_file)
-                    mapcache[entry.url] = entries
-            except Exception, e:
-                mapcache[entry.url] = []
-
-    if entry.url in mapcache:
-        source_entry = smap.find(mapcache[entry.url], entry.line, entry.col)
-        if source_entry:
-            entry.url = 'file://' + source_entry.src
-            entry.line = source_entry.src_line
-            entry.col = source_entry.src_col
-
-def _compute_markers(markers, call_point, depth):
-    name = _calcname(call_point)
-    ident = len(markers)
-    url = ""
-    lineNumber = -1
-    columnNumber = -1
-    if "url" in call_point:
-        url = call_point["url"]
-    if "lineNumber" in call_point:
-        lineNumber = call_point["lineNumber"]
-    if "columnNumber" in call_point:
-        columnNumber = call_point["columnNumber"]
-
-    for call in call_point["calls"]:
-        markers.append(Marker(name, call["startTime"], depth, 0, ident, url, lineNumber, columnNumber))
-        markers.append(Marker(name, call["startTime"] + call["totalTime"], depth, 1, ident, url, lineNumber, columnNumber))
-        ident = ident + 2
-    if "children" in call_point:
-        for child in call_point["children"]:
-            _compute_markers(markers, child, depth+1);
-
-def _find_child(children, name):
-    for child in children:
-        if child['functionName'] == name:
-            return child
-    return None
-
-def _add_entry_cpuprofiler_program(newtime, cpuprofiler):
-    curnode = _find_child(cpuprofiler['head']['children'], '(program)')
-    if cpuprofiler['lastTime'] != None:
-        lastTime = cpuprofiler['lastTime']
-        while lastTime < newtime:
-            curnode['hitCount'] += 1
-            cpuprofiler['samples'].append(curnode['callUID'])
-            cpuprofiler['timestamps'].append(int(lastTime*SECONDS_TO_NANOSECONDS))
-            lastTime += SAMPLE_DELTA_IN_SECONDS
-        cpuprofiler['lastTime'] = lastTime
-    else:
-        cpuprofiler['lastTime'] = newtime
-
-
-def _add_entry_cpuprofiler(stack, newtime, cpuprofiler):
-    index = len(stack) - 1
-    marker = stack[index]
-
-    if marker.name not in cpuprofiler['markers']:
-        cpuprofiler['markers'][marker.name] = cpuprofiler['id']
-        cpuprofiler['callUID'] += 1
-    callUID = cpuprofiler['markers'][marker.name]
-
-    curnode = cpuprofiler['head']
-    index = 0
-    while index < len(stack):
-        newnode = _find_child(curnode['children'], stack[index].name)
-        if newnode == None:
-            newnode = {}
-            newnode['callUID'] = callUID
-            newnode['url'] = marker.url
-            newnode['functionName'] = stack[index].name
-            newnode['hitCount'] = 0
-            newnode['lineNumber'] = marker.line
-            newnode['columnNumber'] = marker.col
-            newnode['scriptId'] = callUID
-            newnode['positionTicks'] = []
-            newnode['id'] = cpuprofiler['id']
-            cpuprofiler['id'] += 1
-            newnode['children'] = []
-            curnode['children'].append(newnode)
-            curnode['deoptReason'] = ''
-        curnode = newnode
-        index += 1
-
-    if cpuprofiler['lastTime'] == None:
-        cpuprofiler['lastTime'] = newtime
-
-    if cpuprofiler['lastTime'] != None:
-        lastTime = cpuprofiler['lastTime']
-        while lastTime < newtime:
-            curnode['hitCount'] += 1
-            if len(curnode['positionTicks']) == 0:
-                ticks = {}
-                ticks['line'] = curnode['callUID']
-                ticks['ticks'] = 0
-                curnode['positionTicks'].append(ticks)
-            curnode['positionTicks'][0]['ticks'] += 1
-            cpuprofiler['samples'].append(curnode['callUID'])
-            cpuprofiler['timestamps'].append(int(lastTime*1000*1000))
-            lastTime += 0.0001
-        cpuprofiler['lastTime'] = lastTime
-
-def _create_default_cpuprofiler_node(name, _id, _uid):
-    return {'functionName': name,
-            'scriptId':'0',
-            'url':'',
-            'lineNumber':0,
-            'columnNumber':0,
-            'positionTicks':[],
-            'id':_id,
-            'callUID':_uid,
-            'children': [],
-            'hitCount': 0,
-            'deoptReason':''}
-
-def main():
-    parser = argparse.ArgumentParser(description="Converts JSON profile format to fbsystrace text output")
-
-    parser.add_argument(
-        "-o",
-        dest = "output_file",
-        default = None,
-        help = "Output file for trace data")
-    parser.add_argument(
-        "-cpuprofiler",
-        dest = "output_cpuprofiler",
-        default = None,
-        help = "Output file for cpuprofiler data")
-    parser.add_argument(
-        "-map",
-        dest = "map_file",
-        default = None,
-        help = "Map file for symbolicating")
-    parser.add_argument( "file", help = "JSON trace input_file")
-
-    args = parser.parse_args()
-
-    markers = []
-    with open(args.file, "r") as trace_file:
-        trace = json.load(trace_file)
-        for root_entry in trace["rootNodes"]:
-            _compute_markers(markers, root_entry, 0)
-
-    mapcache = {}
-    for m in markers:
-        _calcurl(mapcache, m, args.map_file)
-
-    sorted_markers = list(sorted(markers));
-
-    if args.output_cpuprofiler != None:
-        cpuprofiler = {}
-        cpuprofiler['startTime'] = None
-        cpuprofiler['endTime'] = None
-        cpuprofiler['lastTime'] = None
-        cpuprofiler['id'] = 4
-        cpuprofiler['callUID'] = 4
-        cpuprofiler['samples'] = []
-        cpuprofiler['timestamps'] = []
-        cpuprofiler['markers'] = {}
-        cpuprofiler['head'] = _create_default_cpuprofiler_node('(root)', 1, 1)
-        cpuprofiler['head']['children'].append(_create_default_cpuprofiler_node('(root)', 2, 2))
-        cpuprofiler['head']['children'].append(_create_default_cpuprofiler_node('(program)', 3, 3))
-        marker_stack = []
-        with open(args.output_cpuprofiler, 'w') as file_out:
-            for marker in sorted_markers:
-                if len(marker_stack):
-                    _add_entry_cpuprofiler(marker_stack, marker.timestamp, cpuprofiler)
-                else:
-                    _add_entry_cpuprofiler_program(marker.timestamp, cpuprofiler)
-                if marker.is_end:
-                    marker_stack.pop()
-                else:
-                    marker_stack.append(marker)
-            cpuprofiler['startTime'] = cpuprofiler['timestamps'][0] / 1000000.0
-            cpuprofiler['endTime'] = cpuprofiler['timestamps'][len(cpuprofiler['timestamps']) - 1] / 1000000.0
-            json.dump(cpuprofiler, file_out, sort_keys=False, indent=4, separators=(',', ': '))
-
-
-    if args.output_file != None:
-      with open(args.output_file,"w") as trace_file:
-        for marker in sorted_markers:
-            start_or_end = None
-            if marker.is_end:
-                start_or_end = "E"
-            else:
-                start_or_end = "B"
-            #output with timestamp at high level of precision
-            trace_file.write("json-0 [000] .... {0:.12f}: tracing_mark_write: {1}|0|{2}\n".format(
-                             marker.timestamp,
-                             start_or_end,
-                             marker.name))
-
-main()
@@ -1,10 +0,0 @@
-BEGIN {
-  FS = ":"
-  RS = ","
-}
-
-/"Version"/ {
-  version = substr($2, 2, length($2) - 2)
-  print int(version)
-  exit 0
-}
@@ -1,343 +0,0 @@
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-
-"""
- adapted from https://github.com/martine/python-sourcemap into a reuasable module
-"""
-
-"""
-
-                                 Apache License
-                           Version 2.0, January 2010
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-   """
-
-"""A module for parsing source maps, as output by the Closure and
-CoffeeScript compilers and consumed by browsers.  See
-  http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/
-"""
-
-import collections
-import json
-import sys
-import bisect
-
-class entry(object):
-  def __init__(self, dst_line, dst_col, src, src_line, src_col):
-    self.dst_line = dst_line
-    self.dst_col = dst_col
-    self.src = src
-    self.src_line = src_line
-    self.src_col = src_col
-
-  def __cmp__(self, other):
-    #print(self)
-    #print(other)
-    if self.dst_line < other.dst_line:
-      return -1
-    if self.dst_line > other.dst_line:
-      return 1
-    if self.dst_col < other.dst_col:
-      return -1
-    if self.dst_col > other.dst_col:
-      return 1
-    return 0
-
-SmapState = collections.namedtuple(
-    'SmapState', ['dst_line', 'dst_col',
-                  'src', 'src_line', 'src_col',
-                  'name'])
-
-# Mapping of base64 letter -> integer value.
-B64 = dict((c, i) for i, c in
-           enumerate('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
-                     '0123456789+/'))
-
-
-def _parse_vlq(segment):
-  """Parse a string of VLQ-encoded data.
-
-  Returns:
-    a list of integers.
-  """
-
-  values = []
-
-  cur, shift = 0, 0
-  for c in segment:
-    val = B64[c]
-    # Each character is 6 bits:
-    # 5 of value and the high bit is the continuation.
-    val, cont = val & 0b11111, val >> 5
-    cur += val << shift
-    shift += 5
-
-    if not cont:
-      # The low bit of the unpacked value is the sign.
-      cur, sign = cur >> 1, cur & 1
-      if sign:
-        cur = -cur
-      values.append(cur)
-      cur, shift = 0, 0
-
-  if cur or shift:
-      raise Exception('leftover cur/shift in vlq decode')
-
-  return values
-
-
-def _parse_smap(file):
-  """Given a file-like object, yield SmapState()s as they are read from it."""
-
-  smap = json.load(file)
-  sources = smap['sources']
-  names = smap['names']
-  mappings = smap['mappings']
-  lines = mappings.split(';')
-
-  dst_col, src_id, src_line, src_col, name_id = 0, 0, 0, 0, 0
-  for dst_line, line in enumerate(lines):
-    segments = line.split(',')
-    dst_col = 0
-    for segment in segments:
-      if not segment:
-        continue
-      parsed = _parse_vlq(segment)
-      dst_col += parsed[0]
-
-      src = None
-      name = None
-      if len(parsed) > 1:
-        src_id += parsed[1]
-        src = sources[src_id]
-        src_line += parsed[2]
-        src_col += parsed[3]
-
-        if len(parsed) > 4:
-          name_id += parsed[4]
-          name = names[name_id]
-
-      assert dst_line >= 0
-      assert dst_col >= 0
-      assert src_line >= 0
-      assert src_col >= 0
-
-      yield SmapState(dst_line, dst_col, src, src_line, src_col, name)
-
-def find(entries, line, col):
-  test = entry(line, col, '', 0, 0)
-  index = bisect.bisect_right(entries, test)
-  if index == 0:
-    return None
-  return entries[index - 1]
-
-def parse(file):
-  # Simple demo that shows files that most contribute to total size.
-  lookup = []
-  for state in _parse_smap(file):
-    lookup.append(entry(state.dst_line, state.dst_col, state.src, state.src_line, state.src_col))
-
-  sorted_lookup = list(sorted(lookup))
-  return sorted_lookup
@@ -1,244 +0,0 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import re
-import unittest
-
-"""
-#                              _-----=> irqs-off
-#                             / _----=> need-resched
-#                            | / _---=> hardirq/softirq
-#                            || / _--=> preempt-depth
-#                            ||| /     delay
-#           TASK-PID   CPU#  ||||    TIMESTAMP  FUNCTION
-#              | |       |   ||||       |         |
-          <idle>-0     [001] ...2  3269.291072: sched_switch: prev_comm=swapper/1 prev_pid=0 prev_prio=120 prev_state=R ==> next_comm=mmcqd/0 next_pid=120 next_prio=120
-"""
-TRACE_LINE_PATTERN = re.compile(
-    r'^\s*(?P<task>.+)-(?P<pid>\d+)\s+(?:\((?P<tgid>.+)\)\s+)?\[(?P<cpu>\d+)\]\s+(?:(?P<flags>\S{4})\s+)?(?P<timestamp>[0-9.]+):\s+(?P<function>.+)$')
-
-"""
-Example lines from custom app traces:
-0: B|27295|providerRemove
-0: E
-tracing_mark_write: S|27311|NNFColdStart<D-7744962>|1112249168
-"""
-APP_TRACE_LINE_PATTERN = re.compile(
-    r'^(?P<type>.+?): (?P<args>.+)$')
-
-"""
-Example section names:
-NNFColdStart
-NNFColdStart<0><T7744962>
-NNFColdStart<X>
-NNFColdStart<T7744962>
-"""
-DECORATED_SECTION_NAME_PATTERN = re.compile(r'^(?P<section_name>.*?)(?:<0>)?(?:<(?P<command>.)(?P<argument>.*?)>)?$')
-
-SYSTRACE_LINE_TYPES = set(['0', 'tracing_mark_write'])
-
-class TraceLine(object):
-    def __init__(self, task, pid, tgid, cpu, flags, timestamp, function):
-        self.task = task
-        self.pid = pid
-        self.tgid = tgid
-        self.cpu = cpu
-        self.flags = flags
-        self.timestamp = timestamp
-        self.function = function
-        self.canceled = False
-
-    @property
-    def is_app_trace_line(self):
-        return isinstance(self.function, AppTraceFunction)
-
-    def cancel(self):
-        self.canceled = True
-
-    def __str__(self):
-        if self.canceled:
-            return ""
-        elif self.tgid:
-            return "{task:>16s}-{pid:<5d} ({tgid:5s}) [{cpu:03d}] {flags:4s} {timestamp:12f}: {function}\n".format(**vars(self))
-        elif self.flags:
-            return "{task:>16s}-{pid:<5d} [{cpu:03d}] {flags:4s} {timestamp:12f}: {function}\n".format(**vars(self))
-        else:
-            return "{task:>16s}-{pid:<5d} [{cpu:03d}] {timestamp:12.6f}: {function}\n".format(**vars(self))
-
-
-class AppTraceFunction(object):
-    def __init__(self, type, args):
-        self.type = type
-        self.args = args
-        self.operation = args[0]
-
-        if len(args) >= 2 and args[1]:
-            self.pid = int(args[1])
-        if len(args) >= 3:
-            self._section_name, self.command, self.argument = _parse_section_name(args[2])
-            args[2] = self._section_name
-        else:
-            self._section_name = None
-            self.command = None
-            self.argument = None
-        self.cookie = None
-
-    @property
-    def section_name(self):
-        return self._section_name
-
-    @section_name.setter
-    def section_name(self, value):
-        self._section_name = value
-        self.args[2] = value
-
-    def __str__(self):
-        return "{type}: {args}".format(type=self.type, args='|'.join(self.args))
-
-
-class AsyncTraceFunction(AppTraceFunction):
-    def __init__(self, type, args):
-        super(AsyncTraceFunction, self).__init__(type, args)
-
-        self.cookie = int(args[3])
-
-
-TRACE_TYPE_MAP = {
-    'S': AsyncTraceFunction,
-    'T': AsyncTraceFunction,
-    'F': AsyncTraceFunction,
-}
-
-def parse_line(line):
-    match = TRACE_LINE_PATTERN.match(line.strip())
-    if not match:
-        return None
-
-    task = match.group("task")
-    pid = int(match.group("pid"))
-    tgid = match.group("tgid")
-    cpu = int(match.group("cpu"))
-    flags = match.group("flags")
-    timestamp = float(match.group("timestamp"))
-    function = match.group("function")
-
-    app_trace = _parse_function(function)
-    if app_trace:
-        function = app_trace
-
-    return TraceLine(task, pid, tgid, cpu, flags, timestamp, function)
-
-def parse_dextr_line(line):
-    task = line["name"]
-    pid = line["pid"]
-    tgid = line["tid"]
-    cpu = None
-    flags = None
-    timestamp = line["ts"]
-    function = AppTraceFunction("DextrTrace", [line["ph"], line["pid"], line["name"]])
-
-    return TraceLine(task, pid, tgid, cpu, flags, timestamp, function)
-
-
-def _parse_function(function):
-    line_match = APP_TRACE_LINE_PATTERN.match(function)
-    if not line_match:
-        return None
-
-    type = line_match.group("type")
-    if not type in SYSTRACE_LINE_TYPES:
-        return None
-
-    args = line_match.group("args").split('|')
-    if len(args) == 1 and len(args[0]) == 0:
-        args = None
-
-    constructor = TRACE_TYPE_MAP.get(args[0], AppTraceFunction)
-    return constructor(type, args)
-
-
-def _parse_section_name(section_name):
-    if section_name is None:
-        return section_name, None, None
-
-    section_name_match = DECORATED_SECTION_NAME_PATTERN.match(section_name)
-    section_name = section_name_match.group("section_name")
-    command = section_name_match.group("command")
-    argument = section_name_match.group("argument")
-    return section_name, command, argument
-
-
-def _format_section_name(section_name, command, argument):
-    if not command:
-        return section_name
-
-    return "{section_name}<{command}{argument}>".format(**vars())
-
-
-class RoundTripFormattingTests(unittest.TestCase):
-    def testPlainSectionName(self):
-        section_name = "SectionName12345-5562342fas"
-
-        self.assertEqual(section_name, _format_section_name(*_parse_section_name(section_name)))
-
-    def testDecoratedSectionName(self):
-        section_name = "SectionName12345-5562342fas<D-123456>"
-
-        self.assertEqual(section_name, _format_section_name(*_parse_section_name(section_name)))
-
-    def testSimpleFunction(self):
-        function = "0: E"
-
-        self.assertEqual(function, str(_parse_function(function)))
-
-    def testFunctionWithoutCookie(self):
-        function = "0: B|27295|providerRemove"
-
-        self.assertEqual(function, str(_parse_function(function)))
-
-    def testFunctionWithCookie(self):
-        function = "0: S|27311|NNFColdStart|1112249168"
-
-        self.assertEqual(function, str(_parse_function(function)))
-
-    def testFunctionWithCookieAndArgs(self):
-        function = "0: T|27311|NNFColdStart|1122|Start"
-
-        self.assertEqual(function, str(_parse_function(function)))
-
-    def testFunctionWithArgsButNoPid(self):
-        function = "0: E|||foo=bar"
-
-        self.assertEqual(function, str(_parse_function(function)))
-
-    def testKitKatFunction(self):
-        function = "tracing_mark_write: B|14127|Looper.dispatchMessage|arg=>>>>> Dispatching to Handler (android.os.Handler) {422ae980} null: 0|Java"
-
-        self.assertEqual(function, str(_parse_function(function)))
-
-    def testNonSysTraceFunctionIgnored(self):
-        function = "sched_switch: prev_comm=swapper/1 prev_pid=0 prev_prio=120 prev_state=R ==> next_comm=mmcqd/0 next_pid=120 next_prio=120"
-
-        self.assertEqual(None, _parse_function(function))
-
-    def testLineWithFlagsAndTGID(self):
-        line = "          <idle>-0     (  550) [000] d..2  7953.258473: cpu_idle: state=1 cpu_id=0\n"
-
-        self.assertEqual(line, str(parse_line(line)))
-
-    def testLineWithFlagsAndNoTGID(self):
-        line = "          <idle>-0     (-----) [000] d..2  7953.258473: cpu_idle: state=1 cpu_id=0\n"
-
-        self.assertEqual(line, str(parse_line(line)))
-
-    def testLineWithFlags(self):
-        line = "          <idle>-0     [001] ...2  3269.291072: sched_switch: prev_comm=swapper/1 prev_pid=0 prev_prio=120 prev_state=R ==> next_comm=mmcqd/0 next_pid=120 next_prio=120\n"
-
-        self.assertEqual(line, str(parse_line(line)))
-
-    def testLineWithoutFlags(self):
-        line = "          <idle>-0     [001]  3269.291072: sched_switch: prev_comm=swapper/1 prev_pid=0 prev_prio=120 prev_state=R ==> next_comm=mmcqd/0 next_pid=120 next_prio=120\n"
-
-        self.assertEqual(line, str(parse_line(line)))
@@ -0,0 +1,7 @@
+{
+  "rules": {
+    // This folder currently runs through babel and doesn't need to be
+    // compatible with node 4
+    "comma-dangle": 0
+  }
+}
@@ -152,7 +152,10 @@
 				0CF68AF71AF0549300FF9E5C /* RCTConvert+ART.m */,
 				0CF68AC21AF0540F00FF9E5C /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
+			usesTabs = 0;
 		};
 		0CF68AC21AF0540F00FF9E5C /* Products */ = {
 			isa = PBXGroup;
@@ -35,6 +35,7 @@
 			indentWidth = 2;
 			sourceTree = "<group>";
 			tabWidth = 2;
+			usesTabs = 0;
 		};
 /* End PBXGroup section */

@@ -1,38 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule AdSupportIOS
- * @flow
- */
-'use strict';
-
-var AdSupport = require('NativeModules').AdSupport;
-
-/**
- * `AdSupport` provides access to the "advertising identifier". If you link this library
- * in your project, you may need to justify your use for this identifier when submitting
- * your application to the App Store.
- *
- * In order to use `AdSupport` in your project, you must link the `RCTAdSupport` library.
- * In Xcode, you can manually add the `RCTAdSupport.m` and `RCTAdSupport.h` files from
- * `node_modules/react-native/Libraries/AdSupport/` to the `Libraries/React/Base/` folder
- * of your current project.
- *
- * You can refer to [Linking](docs/linking-libraries-ios.html) for help.
- *
- */
-
-module.exports = {
-  getAdvertisingId: function(onSuccess: Function, onFailure: Function) {
-    AdSupport.getAdvertisingId(onSuccess, onFailure);
-  },
-
-  getAdvertisingTrackingEnabled: function(onSuccess: Function, onFailure: Function) {
-    AdSupport.getAdvertisingTrackingEnabled(onSuccess, onFailure);
-  },
-};
@@ -1,37 +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.
- */
-
-#import "RCTAdSupport.h"
-
-#import <AdSupport/ASIdentifierManager.h>
-
-#import <React/RCTUtils.h>
-
-@implementation RCTAdSupport
-
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_METHOD(getAdvertisingId:(RCTResponseSenderBlock)callback
-                  withErrorCallback:(RCTResponseErrorBlock)errorCallback)
-{
-  NSUUID *advertisingIdentifier = [ASIdentifierManager sharedManager].advertisingIdentifier;
-  if (advertisingIdentifier) {
-    callback(@[advertisingIdentifier.UUIDString]);
-  } else {
-    errorCallback(RCTErrorWithMessage(@"Advertising identifier is unavailable."));
-  }
-}
-
-RCT_EXPORT_METHOD(getAdvertisingTrackingEnabled:(RCTResponseSenderBlock)callback
-                  withErrorCallback:(__unused RCTResponseSenderBlock)errorCallback)
-{
-  callback(@[@([ASIdentifierManager sharedManager].advertisingTrackingEnabled)]);
-}
-
-@end
@@ -1,257 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		832C819C1AAF6E1A007FA2F7 /* RCTAdSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 832C819B1AAF6E1A007FA2F7 /* RCTAdSupport.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		832C817E1AAF6DEF007FA2F7 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "include/$(PRODUCT_NAME)";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		832C81801AAF6DEF007FA2F7 /* libRCTAdSupport.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAdSupport.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		832C819A1AAF6E1A007FA2F7 /* RCTAdSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAdSupport.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		832C819B1AAF6E1A007FA2F7 /* RCTAdSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAdSupport.m; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		832C817D1AAF6DEF007FA2F7 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		832C81771AAF6DEF007FA2F7 = {
-			isa = PBXGroup;
-			children = (
-				832C819A1AAF6E1A007FA2F7 /* RCTAdSupport.h */,
-				832C819B1AAF6E1A007FA2F7 /* RCTAdSupport.m */,
-				832C81811AAF6DEF007FA2F7 /* Products */,
-			);
-			indentWidth = 2;
-			sourceTree = "<group>";
-			tabWidth = 2;
-		};
-		832C81811AAF6DEF007FA2F7 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				832C81801AAF6DEF007FA2F7 /* libRCTAdSupport.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		832C817F1AAF6DEF007FA2F7 /* RCTAdSupport */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 832C81941AAF6DF0007FA2F7 /* Build configuration list for PBXNativeTarget "RCTAdSupport" */;
-			buildPhases = (
-				832C817C1AAF6DEF007FA2F7 /* Sources */,
-				832C817D1AAF6DEF007FA2F7 /* Frameworks */,
-				832C817E1AAF6DEF007FA2F7 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = RCTAdSupport;
-			productName = RCTAdSupport;
-			productReference = 832C81801AAF6DEF007FA2F7 /* libRCTAdSupport.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		832C81781AAF6DEF007FA2F7 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0620;
-				ORGANIZATIONNAME = Facebook;
-				TargetAttributes = {
-					832C817F1AAF6DEF007FA2F7 = {
-						CreatedOnToolsVersion = 6.2;
-					};
-				};
-			};
-			buildConfigurationList = 832C817B1AAF6DEF007FA2F7 /* Build configuration list for PBXProject "RCTAdSupport" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 832C81771AAF6DEF007FA2F7;
-			productRefGroup = 832C81811AAF6DEF007FA2F7 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				832C817F1AAF6DEF007FA2F7 /* RCTAdSupport */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		832C817C1AAF6DEF007FA2F7 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				832C819C1AAF6E1A007FA2F7 /* RCTAdSupport.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		832C81921AAF6DF0007FA2F7 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				WARNING_CFLAGS = (
-					"-Werror",
-					"-Wall",
-				);
-			};
-			name = Debug;
-		};
-		832C81931AAF6DF0007FA2F7 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				VALIDATE_PRODUCT = YES;
-				WARNING_CFLAGS = (
-					"-Werror",
-					"-Wall",
-				);
-			};
-			name = Release;
-		};
-		832C81951AAF6DF0007FA2F7 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				RUN_CLANG_STATIC_ANALYZER = YES;
-			};
-			name = Debug;
-		};
-		832C81961AAF6DF0007FA2F7 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		832C817B1AAF6DEF007FA2F7 /* Build configuration list for PBXProject "RCTAdSupport" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				832C81921AAF6DF0007FA2F7 /* Debug */,
-				832C81931AAF6DF0007FA2F7 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		832C81941AAF6DF0007FA2F7 /* Build configuration list for PBXNativeTarget "RCTAdSupport" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				832C81951AAF6DF0007FA2F7 /* Debug */,
-				832C81961AAF6DF0007FA2F7 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 832C81781AAF6DEF007FA2F7 /* Project object */;
-}
@@ -110,6 +110,8 @@ class AlertIOS {
   * @static
   * @method alert
   * @param title The dialog's title.
+   *
+   *    An empty string hides the title.
   * @param message An optional message that appears below
   *     the dialog's title.
   * @param callbackOrButtons This optional argument should
@@ -209,7 +211,7 @@ class AlertIOS {
      var callback = type;
      var defaultValue = message;
      RCTAlertManager.alertWithArgs({
-        title: title || undefined,
+        title: title,
        type: 'plain-text',
        defaultValue,
      }, (id, value) => {
@@ -242,7 +244,7 @@ class AlertIOS {
    }

    RCTAlertManager.alertWithArgs({
-      title: title || undefined,
+      title: title,
      message: message || undefined,
      buttons,
      type: type || undefined,
@@ -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.
+ *
+ * @providesModule AnimatedEvent
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedValue = require('./nodes/AnimatedValue');
+const NativeAnimatedHelper = require('./NativeAnimatedHelper');
+const ReactNative = require('ReactNative');
+
+const invariant = require('fbjs/lib/invariant');
+const {shouldUseNativeDriver} = require('./NativeAnimatedHelper');
+
+export type Mapping = {[key: string]: Mapping} | AnimatedValue;
+export type EventConfig = {
+  listener?: ?Function,
+  useNativeDriver?: boolean,
+};
+
+function attachNativeEvent(
+  viewRef: any,
+  eventName: string,
+  argMapping: Array<?Mapping>,
+) {
+  // Find animated values in `argMapping` and create an array representing their
+  // key path inside the `nativeEvent` object. Ex.: ['contentOffset', 'x'].
+  const eventMappings = [];
+
+  const traverse = (value, path) => {
+    if (value instanceof AnimatedValue) {
+      value.__makeNative();
+
+      eventMappings.push({
+        nativeEventPath: path,
+        animatedValueTag: value.__getNativeTag(),
+      });
+    } else if (typeof value === 'object') {
+      for (const key in value) {
+        traverse(value[key], path.concat(key));
+      }
+    }
+  };
+
+  invariant(
+    argMapping[0] && argMapping[0].nativeEvent,
+    'Native driven events only support animated values contained inside `nativeEvent`.',
+  );
+
+  // Assume that the event containing `nativeEvent` is always the first argument.
+  traverse(argMapping[0].nativeEvent, []);
+
+  const viewTag = ReactNative.findNodeHandle(viewRef);
+
+  eventMappings.forEach(mapping => {
+    NativeAnimatedHelper.API.addAnimatedEventToView(
+      viewTag,
+      eventName,
+      mapping,
+    );
+  });
+
+  return {
+    detach() {
+      eventMappings.forEach(mapping => {
+        NativeAnimatedHelper.API.removeAnimatedEventFromView(
+          viewTag,
+          eventName,
+          mapping.animatedValueTag,
+        );
+      });
+    },
+  };
+}
+
+class AnimatedEvent {
+  _argMapping: Array<?Mapping>;
+  _listeners: Array<Function> = [];
+  _callListeners: Function;
+  _attachedEvent: ?{
+    detach: () => void,
+  };
+  __isNative: boolean;
+
+  constructor(argMapping: Array<?Mapping>, config?: EventConfig = {}) {
+    this._argMapping = argMapping;
+    if (config.listener) {
+      this.__addListener(config.listener);
+    }
+    this._callListeners = this._callListeners.bind(this);
+    this._attachedEvent = null;
+    this.__isNative = shouldUseNativeDriver(config);
+
+    if (__DEV__) {
+      this._validateMapping();
+    }
+  }
+
+  __addListener(callback: Function): void {
+    this._listeners.push(callback);
+  }
+
+  __removeListener(callback: Function): void {
+    this._listeners = this._listeners.filter(listener => listener !== callback);
+  }
+
+  __attach(viewRef: any, eventName: string) {
+    invariant(
+      this.__isNative,
+      'Only native driven events need to be attached.',
+    );
+
+    this._attachedEvent = attachNativeEvent(
+      viewRef,
+      eventName,
+      this._argMapping,
+    );
+  }
+
+  __detach(viewTag: any, eventName: string) {
+    invariant(
+      this.__isNative,
+      'Only native driven events need to be detached.',
+    );
+
+    this._attachedEvent && this._attachedEvent.detach();
+  }
+
+  __getHandler() {
+    if (this.__isNative) {
+      return this._callListeners;
+    }
+
+    return (...args: any) => {
+      const traverse = (recMapping, recEvt, key) => {
+        if (typeof recEvt === 'number' && recMapping instanceof AnimatedValue) {
+          recMapping.setValue(recEvt);
+        } else if (typeof recMapping === 'object') {
+          for (const mappingKey in recMapping) {
+            /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+             * comment suppresses an error when upgrading Flow's support for
+             * React. To see the error delete this comment and run Flow. */
+            traverse(recMapping[mappingKey], recEvt[mappingKey], mappingKey);
+          }
+        }
+      };
+
+      if (!this.__isNative) {
+        this._argMapping.forEach((mapping, idx) => {
+          traverse(mapping, args[idx], 'arg' + idx);
+        });
+      }
+      this._callListeners(...args);
+    };
+  }
+
+  _callListeners(...args) {
+    this._listeners.forEach(listener => listener(...args));
+  }
+
+  _validateMapping() {
+    const traverse = (recMapping, recEvt, key) => {
+      if (typeof recEvt === 'number') {
+        invariant(
+          recMapping instanceof AnimatedValue,
+          'Bad mapping of type ' +
+            typeof recMapping +
+            ' for key ' +
+            key +
+            ', event value must map to AnimatedValue',
+        );
+        return;
+      }
+      invariant(
+        typeof recMapping === 'object',
+        'Bad mapping of type ' + typeof recMapping + ' for key ' + key,
+      );
+      invariant(
+        typeof recEvt === 'object',
+        'Bad event of type ' + typeof recEvt + ' for key ' + key,
+      );
+      for (const mappingKey in recMapping) {
+        traverse(recMapping[mappingKey], recEvt[mappingKey], mappingKey);
+      }
+    };
+  }
+}
+
+module.exports = {AnimatedEvent, attachNativeEvent};
@@ -8,6 +8,7 @@
 *
 * @providesModule NativeAnimatedHelper
 * @flow
+ * @format
 */
 'use strict';

@@ -16,6 +17,9 @@ const NativeEventEmitter = require('NativeEventEmitter');

 const invariant = require('fbjs/lib/invariant');

+import type {AnimationConfig} from './animations/Animation';
+import type {EventConfig} from './AnimatedEvent';
+
 let __nativeAnimatedNodeTagCount = 1; /* used for animated nodes */
 let __nativeAnimationIdCount = 1; /* used for started animations */

@@ -49,13 +53,26 @@ const API = {
    assertNativeAnimatedModule();
    NativeAnimatedModule.connectAnimatedNodes(parentTag, childTag);
  },
-  disconnectAnimatedNodes: function(parentTag: ?number, childTag: ?number): void {
+  disconnectAnimatedNodes: function(
+    parentTag: ?number,
+    childTag: ?number,
+  ): void {
    assertNativeAnimatedModule();
    NativeAnimatedModule.disconnectAnimatedNodes(parentTag, childTag);
  },
-  startAnimatingNode: function(animationId: ?number, nodeTag: ?number, config: Object, endCallback: EndCallback): void {
+  startAnimatingNode: function(
+    animationId: ?number,
+    nodeTag: ?number,
+    config: Object,
+    endCallback: EndCallback,
+  ): void {
    assertNativeAnimatedModule();
-    NativeAnimatedModule.startAnimatingNode(animationId, nodeTag, config, endCallback);
+    NativeAnimatedModule.startAnimatingNode(
+      animationId,
+      nodeTag,
+      config,
+      endCallback,
+    );
  },
  stopAnimation: function(animationId: ?number) {
    assertNativeAnimatedModule();
@@ -77,11 +94,17 @@ const API = {
    assertNativeAnimatedModule();
    NativeAnimatedModule.extractAnimatedNodeOffset(nodeTag);
  },
-  connectAnimatedNodeToView: function(nodeTag: ?number, viewTag: ?number): void {
+  connectAnimatedNodeToView: function(
+    nodeTag: ?number,
+    viewTag: ?number,
+  ): void {
    assertNativeAnimatedModule();
    NativeAnimatedModule.connectAnimatedNodeToView(nodeTag, viewTag);
  },
-  disconnectAnimatedNodeFromView: function(nodeTag: ?number, viewTag: ?number): void {
+  disconnectAnimatedNodeFromView: function(
+    nodeTag: ?number,
+    viewTag: ?number,
+  ): void {
    assertNativeAnimatedModule();
    NativeAnimatedModule.disconnectAnimatedNodeFromView(nodeTag, viewTag);
  },
@@ -89,14 +112,30 @@ const API = {
    assertNativeAnimatedModule();
    NativeAnimatedModule.dropAnimatedNode(tag);
  },
-  addAnimatedEventToView: function(viewTag: ?number, eventName: string, eventMapping: EventMapping) {
+  addAnimatedEventToView: function(
+    viewTag: ?number,
+    eventName: string,
+    eventMapping: EventMapping,
+  ) {
    assertNativeAnimatedModule();
-    NativeAnimatedModule.addAnimatedEventToView(viewTag, eventName, eventMapping);
+    NativeAnimatedModule.addAnimatedEventToView(
+      viewTag,
+      eventName,
+      eventMapping,
+    );
  },
-  removeAnimatedEventFromView(viewTag: ?number, eventName: string, animatedNodeTag: ?number) {
+  removeAnimatedEventFromView(
+    viewTag: ?number,
+    eventName: string,
+    animatedNodeTag: ?number,
+  ) {
    assertNativeAnimatedModule();
-    NativeAnimatedModule.removeAnimatedEventFromView(viewTag, eventName, animatedNodeTag);
-  }
+    NativeAnimatedModule.removeAnimatedEventFromView(
+      viewTag,
+      eventName,
+      animatedNodeTag,
+    );
+  },
 };

 /**
@@ -128,9 +167,11 @@ const TRANSFORM_WHITELIST = {
 };

 function validateTransform(configs: Array<Object>): void {
-  configs.forEach((config) => {
+  configs.forEach(config => {
    if (!TRANSFORM_WHITELIST.hasOwnProperty(config.property)) {
-      throw new Error(`Property '${config.property}' is not supported by native animated module`);
+      throw new Error(
+        `Property '${config.property}' is not supported by native animated module`,
+      );
    }
  });
 }
@@ -138,7 +179,9 @@ function validateTransform(configs: Array<Object>): void {
 function validateStyles(styles: Object): void {
  for (var key in styles) {
    if (!STYLES_WHITELIST.hasOwnProperty(key)) {
-      throw new Error(`Style property '${key}' is not supported by native animated module`);
+      throw new Error(
+        `Style property '${key}' is not supported by native animated module`,
+      );
    }
  }
 }
@@ -153,7 +196,9 @@ function validateInterpolation(config: Object): void {
  };
  for (var key in config) {
    if (!SUPPORTED_INTERPOLATION_PARAMS.hasOwnProperty(key)) {
-      throw new Error(`Interpolation property '${key}' is not supported by native animated module`);
+      throw new Error(
+        `Interpolation property '${key}' is not supported by native animated module`,
+      );
    }
  }
 }
@@ -170,8 +215,24 @@ function assertNativeAnimatedModule(): void {
  invariant(NativeAnimatedModule, 'Native animated module is not available');
 }

-function isNativeAnimatedAvailable(): boolean {
-  return !!NativeAnimatedModule;
+let _warnedMissingNativeAnimated = false;
+
+function shouldUseNativeDriver(config: AnimationConfig | EventConfig): boolean {
+  if (config.useNativeDriver && !NativeAnimatedModule) {
+    if (!_warnedMissingNativeAnimated) {
+      console.warn(
+        'Animated: `useNativeDriver` is not supported because the native ' +
+          'animated module is missing. Falling back to JS-based animation. To ' +
+          'resolve this, add `RCTAnimation` module to this app, or remove ' +
+          '`useNativeDriver`. ' +
+          'More info: https://github.com/facebook/react-native/issues/11094#issuecomment-263240420',
+      );
+      _warnedMissingNativeAnimated = true;
+    }
+    return false;
+  }
+
+  return config.useNativeDriver || false;
 }

 module.exports = {
@@ -182,7 +243,7 @@ module.exports = {
  generateNewNodeTag,
  generateNewAnimationId,
  assertNativeAnimatedModule,
-  isNativeAnimatedAvailable,
+  shouldUseNativeDriver,
  get nativeEventEmitter() {
    if (!nativeEventEmitter) {
      nativeEventEmitter = new NativeEventEmitter(NativeAnimatedModule);
@@ -8,12 +8,12 @@
 */
 'use strict';

-var Interpolation = require('Interpolation');
+var AnimatedInterpolation = require('../nodes/AnimatedInterpolation');
 var Easing = require('Easing');

 describe('Interpolation', () => {
  it('should work with defaults', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: [0, 1],
    });
@@ -25,7 +25,7 @@ describe('Interpolation', () => {
  });

  it('should work with output range', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: [100, 200],
    });
@@ -37,7 +37,7 @@ describe('Interpolation', () => {
  });

  it('should work with input range', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [100, 200],
      outputRange: [0, 1],
    });
@@ -49,19 +49,23 @@ describe('Interpolation', () => {
  });

  it('should throw for non monotonic input ranges', () => {
-    expect(() => Interpolation.create({
-      inputRange: [0, 2, 1],
-      outputRange: [0, 1, 2],
-    })).toThrow();
+    expect(() =>
+      AnimatedInterpolation.__createInterpolation({
+        inputRange: [0, 2, 1],
+        outputRange: [0, 1, 2],
+      }),
+    ).toThrow();

-    expect(() => Interpolation.create({
-      inputRange: [0, 1, 2],
-      outputRange: [0, 3, 1],
-    })).not.toThrow();
+    expect(() =>
+      AnimatedInterpolation.__createInterpolation({
+        inputRange: [0, 1, 2],
+        outputRange: [0, 3, 1],
+      }),
+    ).not.toThrow();
  });

  it('should work with empty input range', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 10, 10],
      outputRange: [1, 2, 3],
      extrapolate: 'extend',
@@ -75,7 +79,7 @@ describe('Interpolation', () => {
  });

  it('should work with empty output range', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [1, 2, 3],
      outputRange: [0, 10, 10],
      extrapolate: 'extend',
@@ -90,7 +94,7 @@ describe('Interpolation', () => {
  });

  it('should work with easing', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: [0, 1],
      easing: Easing.quad,
@@ -103,7 +107,7 @@ describe('Interpolation', () => {
  });

  it('should work with extrapolate', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: [0, 1],
      extrapolate: 'extend',
@@ -113,7 +117,7 @@ describe('Interpolation', () => {
    expect(interpolation(-2)).toBe(4);
    expect(interpolation(2)).toBe(4);

-    interpolation = Interpolation.create({
+    interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: [0, 1],
      extrapolate: 'clamp',
@@ -123,7 +127,7 @@ describe('Interpolation', () => {
    expect(interpolation(-2)).toBe(0);
    expect(interpolation(2)).toBe(1);

-    interpolation = Interpolation.create({
+    interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: [0, 1],
      extrapolate: 'identity',
@@ -135,7 +139,7 @@ describe('Interpolation', () => {
  });

  it('should work with keyframes with extrapolate', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 10, 100, 1000],
      outputRange: [0, 5, 50, 500],
      extrapolate: true,
@@ -153,7 +157,7 @@ describe('Interpolation', () => {
  });

  it('should work with keyframes without extrapolate', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1, 2],
      outputRange: [0.2, 1, 0.2],
      extrapolate: 'clamp',
@@ -163,19 +167,23 @@ describe('Interpolation', () => {
  });

  it('should throw for an infinite input range', () => {
-    expect(() => Interpolation.create({
-      inputRange: [-Infinity, Infinity],
-      outputRange: [0, 1],
-    })).toThrow();
+    expect(() =>
+      AnimatedInterpolation.__createInterpolation({
+        inputRange: [-Infinity, Infinity],
+        outputRange: [0, 1],
+      }),
+    ).toThrow();

-    expect(() => Interpolation.create({
-      inputRange: [-Infinity, 0, Infinity],
-      outputRange: [1, 2, 3],
-    })).not.toThrow();
+    expect(() =>
+      AnimatedInterpolation.__createInterpolation({
+        inputRange: [-Infinity, 0, Infinity],
+        outputRange: [1, 2, 3],
+      }),
+    ).not.toThrow();
  });

  it('should work with negative infinite', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [-Infinity, 0],
      outputRange: [-Infinity, 0],
      easing: Easing.quad,
@@ -191,7 +199,7 @@ describe('Interpolation', () => {
  });

  it('should work with positive infinite', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [5, Infinity],
      outputRange: [5, Infinity],
      easing: Easing.quad,
@@ -204,12 +212,12 @@ describe('Interpolation', () => {
    expect(interpolation(5)).toBeCloseTo(5);
    expect(interpolation(6)).toBeCloseTo(5 + 1);
    expect(interpolation(10)).toBeCloseTo(5 + 25);
-    expect(interpolation(100)).toBeCloseTo(5 + (95 * 95));
+    expect(interpolation(100)).toBeCloseTo(5 + 95 * 95);
    expect(interpolation(Infinity)).toBe(Infinity);
  });

  it('should work with output ranges as string', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: ['rgba(0, 100, 200, 0)', 'rgba(50, 150, 250, 0.4)'],
    });
@@ -220,7 +228,7 @@ describe('Interpolation', () => {
  });

  it('should work with output ranges as short hex string', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: ['#024', '#9BF'],
    });
@@ -231,7 +239,7 @@ describe('Interpolation', () => {
  });

  it('should work with output ranges as long hex string', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: ['#FF9500', '#87FC70'],
    });
@@ -242,7 +250,7 @@ describe('Interpolation', () => {
  });

  it('should work with output ranges with mixed hex and rgba strings', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: ['rgba(100, 120, 140, .4)', '#87FC70'],
    });
@@ -253,7 +261,7 @@ describe('Interpolation', () => {
  });

  it('should work with negative and decimal values in string ranges', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: ['-100.5deg', '100deg'],
    });
@@ -264,15 +272,17 @@ describe('Interpolation', () => {
  });

  it('should crash when chaining an interpolation that returns a string', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: [0, 1],
    });
-    expect(() => { interpolation('45rad'); }).toThrow();
+    expect(() => {
+      interpolation('45rad');
+    }).toThrow();
  });

  it('should support a mix of color patterns', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1, 2],
      outputRange: ['rgba(0, 100, 200, 0)', 'rgb(50, 150, 250)', 'red'],
    });
@@ -284,14 +294,16 @@ describe('Interpolation', () => {
  });

  it('should crash when defining output range with different pattern', () => {
-    expect(() => Interpolation.create({
-      inputRange: [0, 1],
-      outputRange: ['20deg', '30rad'],
-    })).toThrow();
+    expect(() =>
+      AnimatedInterpolation.__createInterpolation({
+        inputRange: [0, 1],
+        outputRange: ['20deg', '30rad'],
+      }),
+    ).toThrow();
  });

  it('should round the alpha channel of a color to the nearest thousandth', () => {
-    var interpolation = Interpolation.create({
+    var interpolation = AnimatedInterpolation.__createInterpolation({
      inputRange: [0, 1],
      outputRange: ['rgba(0, 0, 0, 0)', 'rgba(0, 0, 0, 1)'],
    });
@@ -0,0 +1,73 @@
+/**
+ * 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 Animation
+ * @flow
+ * @format
+ */
+'use strict';
+
+const NativeAnimatedHelper = require('NativeAnimatedHelper');
+
+import type AnimatedValue from '../nodes/AnimatedValue';
+
+export type EndResult = {finished: boolean};
+export type EndCallback = (result: EndResult) => void;
+
+export type AnimationConfig = {
+  isInteraction?: boolean,
+  useNativeDriver?: boolean,
+  onComplete?: ?EndCallback,
+  iterations?: number,
+};
+
+// Important note: start() and stop() will only be called at most once.
+// Once an animation has been stopped or finished its course, it will
+// not be reused.
+class Animation {
+  __active: boolean;
+  __isInteraction: boolean;
+  __nativeId: number;
+  __onEnd: ?EndCallback;
+  __iterations: number;
+  start(
+    fromValue: number,
+    onUpdate: (value: number) => void,
+    onEnd: ?EndCallback,
+    previousAnimation: ?Animation,
+    animatedValue: AnimatedValue,
+  ): void {}
+  stop(): void {
+    if (this.__nativeId) {
+      NativeAnimatedHelper.API.stopAnimation(this.__nativeId);
+    }
+  }
+  __getNativeAnimationConfig(): any {
+    // Subclasses that have corresponding animation implementation done in native
+    // should override this method
+    throw new Error('This animation type cannot be offloaded to native');
+  }
+  // Helper function for subclasses to make sure onEnd is only called once.
+  __debouncedOnEnd(result: EndResult): void {
+    const onEnd = this.__onEnd;
+    this.__onEnd = null;
+    onEnd && onEnd(result);
+  }
+  __startNativeAnimation(animatedValue: AnimatedValue): void {
+    animatedValue.__makeNative();
+    this.__nativeId = NativeAnimatedHelper.generateNewAnimationId();
+    NativeAnimatedHelper.API.startAnimatingNode(
+      this.__nativeId,
+      animatedValue.__getNativeTag(),
+      this.__getNativeAnimationConfig(),
+      this.__debouncedOnEnd.bind(this),
+    );
+  }
+}
+
+module.exports = Animation;
@@ -0,0 +1,112 @@
+/**
+ * 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 DecayAnimation
+ * @flow
+ * @format
+ */
+'use strict';
+
+const Animation = require('./Animation');
+
+const {shouldUseNativeDriver} = require('../NativeAnimatedHelper');
+
+import type {AnimationConfig, EndCallback} from './Animation';
+import type AnimatedValue from '../nodes/AnimatedValue';
+
+export type DecayAnimationConfig = AnimationConfig & {
+  velocity: number | {x: number, y: number},
+  deceleration?: number,
+};
+
+export type DecayAnimationConfigSingle = AnimationConfig & {
+  velocity: number,
+  deceleration?: number,
+};
+
+class DecayAnimation extends Animation {
+  _startTime: number;
+  _lastValue: number;
+  _fromValue: number;
+  _deceleration: number;
+  _velocity: number;
+  _onUpdate: (value: number) => void;
+  _animationFrame: any;
+  _useNativeDriver: boolean;
+
+  constructor(config: DecayAnimationConfigSingle) {
+    super();
+    this._deceleration =
+      config.deceleration !== undefined ? config.deceleration : 0.998;
+    this._velocity = config.velocity;
+    this._useNativeDriver = shouldUseNativeDriver(config);
+    this.__isInteraction =
+      config.isInteraction !== undefined ? config.isInteraction : true;
+    this.__iterations = config.iterations !== undefined ? config.iterations : 1;
+  }
+
+  __getNativeAnimationConfig() {
+    return {
+      type: 'decay',
+      deceleration: this._deceleration,
+      velocity: this._velocity,
+      iterations: this.__iterations,
+    };
+  }
+
+  start(
+    fromValue: number,
+    onUpdate: (value: number) => void,
+    onEnd: ?EndCallback,
+    previousAnimation: ?Animation,
+    animatedValue: AnimatedValue,
+  ): void {
+    this.__active = true;
+    this._lastValue = fromValue;
+    this._fromValue = fromValue;
+    this._onUpdate = onUpdate;
+    this.__onEnd = onEnd;
+    this._startTime = Date.now();
+    if (this._useNativeDriver) {
+      this.__startNativeAnimation(animatedValue);
+    } else {
+      this._animationFrame = requestAnimationFrame(this.onUpdate.bind(this));
+    }
+  }
+
+  onUpdate(): void {
+    const now = Date.now();
+
+    const value =
+      this._fromValue +
+      this._velocity /
+        (1 - this._deceleration) *
+        (1 - Math.exp(-(1 - this._deceleration) * (now - this._startTime)));
+
+    this._onUpdate(value);
+
+    if (Math.abs(this._lastValue - value) < 0.1) {
+      this.__debouncedOnEnd({finished: true});
+      return;
+    }
+
+    this._lastValue = value;
+    if (this.__active) {
+      this._animationFrame = requestAnimationFrame(this.onUpdate.bind(this));
+    }
+  }
+
+  stop(): void {
+    super.stop();
+    this.__active = false;
+    global.cancelAnimationFrame(this._animationFrame);
+    this.__debouncedOnEnd({finished: false});
+  }
+}
+
+module.exports = DecayAnimation;
@@ -0,0 +1,291 @@
+/**
+ * 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 SpringAnimation
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedValue = require('../nodes/AnimatedValue');
+const AnimatedValueXY = require('../nodes/AnimatedValueXY');
+const Animation = require('./Animation');
+const SpringConfig = require('../SpringConfig');
+
+const invariant = require('fbjs/lib/invariant');
+const {shouldUseNativeDriver} = require('../NativeAnimatedHelper');
+
+import type {AnimationConfig, EndCallback} from './Animation';
+
+export type SpringAnimationConfig = AnimationConfig & {
+  toValue: number | AnimatedValue | {x: number, y: number} | AnimatedValueXY,
+  overshootClamping?: boolean,
+  restDisplacementThreshold?: number,
+  restSpeedThreshold?: number,
+  velocity?: number | {x: number, y: number},
+  bounciness?: number,
+  speed?: number,
+  tension?: number,
+  friction?: number,
+  delay?: number,
+};
+
+export type SpringAnimationConfigSingle = AnimationConfig & {
+  toValue: number | AnimatedValue,
+  overshootClamping?: boolean,
+  restDisplacementThreshold?: number,
+  restSpeedThreshold?: number,
+  velocity?: number,
+  bounciness?: number,
+  speed?: number,
+  tension?: number,
+  friction?: number,
+  delay?: number,
+};
+
+function withDefault<T>(value: ?T, defaultValue: T): T {
+  if (value === undefined || value === null) {
+    return defaultValue;
+  }
+  return value;
+}
+
+class SpringAnimation extends Animation {
+  _overshootClamping: boolean;
+  _restDisplacementThreshold: number;
+  _restSpeedThreshold: number;
+  _initialVelocity: ?number;
+  _lastVelocity: number;
+  _startPosition: number;
+  _lastPosition: number;
+  _fromValue: number;
+  _toValue: any;
+  _tension: number;
+  _friction: number;
+  _delay: number;
+  _timeout: any;
+  _lastTime: number;
+  _onUpdate: (value: number) => void;
+  _animationFrame: any;
+  _useNativeDriver: boolean;
+
+  constructor(config: SpringAnimationConfigSingle) {
+    super();
+
+    this._overshootClamping = withDefault(config.overshootClamping, false);
+    this._restDisplacementThreshold = withDefault(
+      config.restDisplacementThreshold,
+      0.001,
+    );
+    this._restSpeedThreshold = withDefault(config.restSpeedThreshold, 0.001);
+    this._initialVelocity = config.velocity;
+    this._lastVelocity = withDefault(config.velocity, 0);
+    this._toValue = config.toValue;
+    this._delay = withDefault(config.delay, 0);
+    this._useNativeDriver = shouldUseNativeDriver(config);
+    this.__isInteraction =
+      config.isInteraction !== undefined ? config.isInteraction : true;
+    this.__iterations = config.iterations !== undefined ? config.iterations : 1;
+
+    let springConfig;
+    if (config.bounciness !== undefined || config.speed !== undefined) {
+      invariant(
+        config.tension === undefined && config.friction === undefined,
+        'You can only define bounciness/speed or tension/friction but not both',
+      );
+      springConfig = SpringConfig.fromBouncinessAndSpeed(
+        withDefault(config.bounciness, 8),
+        withDefault(config.speed, 12),
+      );
+    } else {
+      springConfig = SpringConfig.fromOrigamiTensionAndFriction(
+        withDefault(config.tension, 40),
+        withDefault(config.friction, 7),
+      );
+    }
+    this._tension = springConfig.tension;
+    this._friction = springConfig.friction;
+  }
+
+  __getNativeAnimationConfig() {
+    return {
+      type: 'spring',
+      overshootClamping: this._overshootClamping,
+      restDisplacementThreshold: this._restDisplacementThreshold,
+      restSpeedThreshold: this._restSpeedThreshold,
+      tension: this._tension,
+      friction: this._friction,
+      initialVelocity: withDefault(this._initialVelocity, this._lastVelocity),
+      toValue: this._toValue,
+      iterations: this.__iterations,
+    };
+  }
+
+  start(
+    fromValue: number,
+    onUpdate: (value: number) => void,
+    onEnd: ?EndCallback,
+    previousAnimation: ?Animation,
+    animatedValue: AnimatedValue,
+  ): void {
+    this.__active = true;
+    this._startPosition = fromValue;
+    this._lastPosition = this._startPosition;
+
+    this._onUpdate = onUpdate;
+    this.__onEnd = onEnd;
+    this._lastTime = Date.now();
+
+    if (previousAnimation instanceof SpringAnimation) {
+      const internalState = previousAnimation.getInternalState();
+      this._lastPosition = internalState.lastPosition;
+      this._lastVelocity = internalState.lastVelocity;
+      this._lastTime = internalState.lastTime;
+    }
+    if (this._initialVelocity !== undefined && this._initialVelocity !== null) {
+      this._lastVelocity = this._initialVelocity;
+    }
+
+    const start = () => {
+      if (this._useNativeDriver) {
+        this.__startNativeAnimation(animatedValue);
+      } else {
+        this.onUpdate();
+      }
+    };
+
+    //  If this._delay is more than 0, we start after the timeout.
+    if (this._delay) {
+      this._timeout = setTimeout(start, this._delay);
+    } else {
+      start();
+    }
+  }
+
+  getInternalState(): Object {
+    return {
+      lastPosition: this._lastPosition,
+      lastVelocity: this._lastVelocity,
+      lastTime: this._lastTime,
+    };
+  }
+
+  onUpdate(): void {
+    let position = this._lastPosition;
+    let velocity = this._lastVelocity;
+
+    let tempPosition = this._lastPosition;
+    let tempVelocity = this._lastVelocity;
+
+    // If for some reason we lost a lot of frames (e.g. process large payload or
+    // stopped in the debugger), we only advance by 4 frames worth of
+    // computation and will continue on the next frame. It's better to have it
+    // running at faster speed than jumping to the end.
+    const MAX_STEPS = 64;
+    let now = Date.now();
+    if (now > this._lastTime + MAX_STEPS) {
+      now = this._lastTime + MAX_STEPS;
+    }
+
+    // We are using a fixed time step and a maximum number of iterations.
+    // The following post provides a lot of thoughts into how to build this
+    // loop: http://gafferongames.com/game-physics/fix-your-timestep/
+    const TIMESTEP_MSEC = 1;
+    const numSteps = Math.floor((now - this._lastTime) / TIMESTEP_MSEC);
+
+    for (let i = 0; i < numSteps; ++i) {
+      // Velocity is based on seconds instead of milliseconds
+      const step = TIMESTEP_MSEC / 1000;
+
+      // This is using RK4. A good blog post to understand how it works:
+      // http://gafferongames.com/game-physics/integration-basics/
+      const aVelocity = velocity;
+      const aAcceleration =
+        this._tension * (this._toValue - tempPosition) -
+        this._friction * tempVelocity;
+      tempPosition = position + aVelocity * step / 2;
+      tempVelocity = velocity + aAcceleration * step / 2;
+
+      const bVelocity = tempVelocity;
+      const bAcceleration =
+        this._tension * (this._toValue - tempPosition) -
+        this._friction * tempVelocity;
+      tempPosition = position + bVelocity * step / 2;
+      tempVelocity = velocity + bAcceleration * step / 2;
+
+      const cVelocity = tempVelocity;
+      const cAcceleration =
+        this._tension * (this._toValue - tempPosition) -
+        this._friction * tempVelocity;
+      tempPosition = position + cVelocity * step / 2;
+      tempVelocity = velocity + cAcceleration * step / 2;
+
+      const dVelocity = tempVelocity;
+      const dAcceleration =
+        this._tension * (this._toValue - tempPosition) -
+        this._friction * tempVelocity;
+      tempPosition = position + cVelocity * step / 2;
+      tempVelocity = velocity + cAcceleration * step / 2;
+
+      const dxdt = (aVelocity + 2 * (bVelocity + cVelocity) + dVelocity) / 6;
+      const dvdt =
+        (aAcceleration + 2 * (bAcceleration + cAcceleration) + dAcceleration) /
+        6;
+
+      position += dxdt * step;
+      velocity += dvdt * step;
+    }
+
+    this._lastTime = now;
+    this._lastPosition = position;
+    this._lastVelocity = velocity;
+
+    this._onUpdate(position);
+    if (!this.__active) {
+      // a listener might have stopped us in _onUpdate
+      return;
+    }
+
+    // Conditions for stopping the spring animation
+    let isOvershooting = false;
+    if (this._overshootClamping && this._tension !== 0) {
+      if (this._startPosition < this._toValue) {
+        isOvershooting = position > this._toValue;
+      } else {
+        isOvershooting = position < this._toValue;
+      }
+    }
+    const isVelocity = Math.abs(velocity) <= this._restSpeedThreshold;
+    let isDisplacement = true;
+    if (this._tension !== 0) {
+      isDisplacement =
+        Math.abs(this._toValue - position) <= this._restDisplacementThreshold;
+    }
+
+    if (isOvershooting || (isVelocity && isDisplacement)) {
+      if (this._tension !== 0) {
+        // Ensure that we end up with a round value
+        this._onUpdate(this._toValue);
+      }
+
+      this.__debouncedOnEnd({finished: true});
+      return;
+    }
+    this._animationFrame = requestAnimationFrame(this.onUpdate.bind(this));
+  }
+
+  stop(): void {
+    super.stop();
+    this.__active = false;
+    clearTimeout(this._timeout);
+    global.cancelAnimationFrame(this._animationFrame);
+    this.__debouncedOnEnd({finished: false});
+  }
+}
+
+module.exports = SpringAnimation;
@@ -0,0 +1,155 @@
+/**
+ * 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 TimingAnimation
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedValue = require('../nodes/AnimatedValue');
+const AnimatedValueXY = require('../nodes/AnimatedValueXY');
+const Animation = require('./Animation');
+
+const {shouldUseNativeDriver} = require('../NativeAnimatedHelper');
+
+import type {AnimationConfig, EndCallback} from './Animation';
+
+export type TimingAnimationConfig = AnimationConfig & {
+  toValue: number | AnimatedValue | {x: number, y: number} | AnimatedValueXY,
+  easing?: (value: number) => number,
+  duration?: number,
+  delay?: number,
+};
+
+export type TimingAnimationConfigSingle = AnimationConfig & {
+  toValue: number | AnimatedValue,
+  easing?: (value: number) => number,
+  duration?: number,
+  delay?: number,
+};
+
+let _easeInOut;
+function easeInOut() {
+  if (!_easeInOut) {
+    const Easing = require('Easing');
+    _easeInOut = Easing.inOut(Easing.ease);
+  }
+  return _easeInOut;
+}
+
+class TimingAnimation extends Animation {
+  _startTime: number;
+  _fromValue: number;
+  _toValue: any;
+  _duration: number;
+  _delay: number;
+  _easing: (value: number) => number;
+  _onUpdate: (value: number) => void;
+  _animationFrame: any;
+  _timeout: any;
+  _useNativeDriver: boolean;
+
+  constructor(config: TimingAnimationConfigSingle) {
+    super();
+    this._toValue = config.toValue;
+    this._easing = config.easing !== undefined ? config.easing : easeInOut();
+    this._duration = config.duration !== undefined ? config.duration : 500;
+    this._delay = config.delay !== undefined ? config.delay : 0;
+    this.__iterations = config.iterations !== undefined ? config.iterations : 1;
+    this.__isInteraction =
+      config.isInteraction !== undefined ? config.isInteraction : true;
+    this._useNativeDriver = shouldUseNativeDriver(config);
+  }
+
+  __getNativeAnimationConfig(): any {
+    const frameDuration = 1000.0 / 60.0;
+    const frames = [];
+    for (let dt = 0.0; dt < this._duration; dt += frameDuration) {
+      frames.push(this._easing(dt / this._duration));
+    }
+    frames.push(this._easing(1));
+    return {
+      type: 'frames',
+      frames,
+      toValue: this._toValue,
+      iterations: this.__iterations,
+    };
+  }
+
+  start(
+    fromValue: number,
+    onUpdate: (value: number) => void,
+    onEnd: ?EndCallback,
+    previousAnimation: ?Animation,
+    animatedValue: AnimatedValue,
+  ): void {
+    this.__active = true;
+    this._fromValue = fromValue;
+    this._onUpdate = onUpdate;
+    this.__onEnd = onEnd;
+
+    const start = () => {
+      // Animations that sometimes have 0 duration and sometimes do not
+      // still need to use the native driver when duration is 0 so as to
+      // not cause intermixed JS and native animations.
+      if (this._duration === 0 && !this._useNativeDriver) {
+        this._onUpdate(this._toValue);
+        this.__debouncedOnEnd({finished: true});
+      } else {
+        this._startTime = Date.now();
+        if (this._useNativeDriver) {
+          this.__startNativeAnimation(animatedValue);
+        } else {
+          this._animationFrame = requestAnimationFrame(
+            this.onUpdate.bind(this),
+          );
+        }
+      }
+    };
+    if (this._delay) {
+      this._timeout = setTimeout(start, this._delay);
+    } else {
+      start();
+    }
+  }
+
+  onUpdate(): void {
+    const now = Date.now();
+    if (now >= this._startTime + this._duration) {
+      if (this._duration === 0) {
+        this._onUpdate(this._toValue);
+      } else {
+        this._onUpdate(
+          this._fromValue + this._easing(1) * (this._toValue - this._fromValue),
+        );
+      }
+      this.__debouncedOnEnd({finished: true});
+      return;
+    }
+
+    this._onUpdate(
+      this._fromValue +
+        this._easing((now - this._startTime) / this._duration) *
+          (this._toValue - this._fromValue),
+    );
+    if (this.__active) {
+      this._animationFrame = requestAnimationFrame(this.onUpdate.bind(this));
+    }
+  }
+
+  stop(): void {
+    super.stop();
+    this.__active = false;
+    clearTimeout(this._timeout);
+    global.cancelAnimationFrame(this._animationFrame);
+    this.__debouncedOnEnd({finished: false});
+  }
+}
+
+module.exports = TimingAnimation;
@@ -0,0 +1,193 @@
+/**
+ * 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 createAnimatedComponent
+ * @flow
+ * @format
+ */
+'use strict';
+
+const {AnimatedEvent} = require('./AnimatedEvent');
+const AnimatedProps = require('./nodes/AnimatedProps');
+const React = require('React');
+const ViewStylePropTypes = require('ViewStylePropTypes');
+
+function createAnimatedComponent(Component: any): any {
+  class AnimatedComponent extends React.Component<Object> {
+    _component: any;
+    _prevComponent: any;
+    _propsAnimated: AnimatedProps;
+    _eventDetachers: Array<Function> = [];
+    _setComponentRef: Function;
+
+    static __skipSetNativeProps_FOR_TESTS_ONLY = false;
+
+    constructor(props: Object) {
+      super(props);
+      this._setComponentRef = this._setComponentRef.bind(this);
+    }
+
+    componentWillUnmount() {
+      this._propsAnimated && this._propsAnimated.__detach();
+      this._detachNativeEvents();
+    }
+
+    setNativeProps(props) {
+      this._component.setNativeProps(props);
+    }
+
+    componentWillMount() {
+      this._attachProps(this.props);
+    }
+
+    componentDidMount() {
+      this._propsAnimated.setNativeView(this._component);
+      this._attachNativeEvents();
+    }
+
+    _attachNativeEvents() {
+      // Make sure to get the scrollable node for components that implement
+      // `ScrollResponder.Mixin`.
+      const scrollableNode = this._component.getScrollableNode
+        ? this._component.getScrollableNode()
+        : this._component;
+
+      for (const key in this.props) {
+        const prop = this.props[key];
+        if (prop instanceof AnimatedEvent && prop.__isNative) {
+          prop.__attach(scrollableNode, key);
+          this._eventDetachers.push(() => prop.__detach(scrollableNode, key));
+        }
+      }
+    }
+
+    _detachNativeEvents() {
+      this._eventDetachers.forEach(remove => remove());
+      this._eventDetachers = [];
+    }
+
+    _attachProps(nextProps) {
+      const oldPropsAnimated = this._propsAnimated;
+
+      // The system is best designed when setNativeProps is implemented. It is
+      // able to avoid re-rendering and directly set the attributes that
+      // changed. However, setNativeProps can only be implemented on leaf
+      // native components. If you want to animate a composite component, you
+      // need to re-render it. In this case, we have a fallback that uses
+      // forceUpdate.
+      const callback = () => {
+        if (
+          !AnimatedComponent.__skipSetNativeProps_FOR_TESTS_ONLY &&
+          this._component.setNativeProps
+        ) {
+          if (!this._propsAnimated.__isNative) {
+            this._component.setNativeProps(
+              this._propsAnimated.__getAnimatedValue(),
+            );
+          } else {
+            throw new Error(
+              'Attempting to run JS driven animation on animated ' +
+                'node that has been moved to "native" earlier by starting an ' +
+                'animation with `useNativeDriver: true`',
+            );
+          }
+        } else {
+          this.forceUpdate();
+        }
+      };
+
+      this._propsAnimated = new AnimatedProps(nextProps, callback);
+
+      // When you call detach, it removes the element from the parent list
+      // of children. If it goes to 0, then the parent also detaches itself
+      // and so on.
+      // An optimization is to attach the new elements and THEN detach the old
+      // ones instead of detaching and THEN attaching.
+      // This way the intermediate state isn't to go to 0 and trigger
+      // this expensive recursive detaching to then re-attach everything on
+      // the very next operation.
+      oldPropsAnimated && oldPropsAnimated.__detach();
+    }
+
+    componentWillReceiveProps(newProps) {
+      this._attachProps(newProps);
+    }
+
+    componentDidUpdate(prevProps) {
+      if (this._component !== this._prevComponent) {
+        this._propsAnimated.setNativeView(this._component);
+      }
+      if (this._component !== this._prevComponent || prevProps !== this.props) {
+        this._detachNativeEvents();
+        this._attachNativeEvents();
+      }
+    }
+
+    render() {
+      const props = this._propsAnimated.__getValue();
+      return (
+        <Component
+          {...props}
+          ref={this._setComponentRef}
+          // The native driver updates views directly through the UI thread so we
+          // have to make sure the view doesn't get optimized away because it cannot
+          // go through the NativeViewHierachyManager since it operates on the shadow
+          // thread.
+          collapsable={
+            this._propsAnimated.__isNative ? false : props.collapsable
+          }
+        />
+      );
+    }
+
+    _setComponentRef(c) {
+      this._prevComponent = this._component;
+      this._component = c;
+    }
+
+    // A third party library can use getNode()
+    // to get the node reference of the decorated component
+    getNode() {
+      return this._component;
+    }
+  }
+
+  // ReactNative `View.propTypes` have been deprecated in favor of
+  // `ViewPropTypes`. In their place a temporary getter has been added with a
+  // deprecated warning message. Avoid triggering that warning here by using
+  // temporary workaround, __propTypesSecretDontUseThesePlease.
+  // TODO (bvaughn) Revert this particular change any time after April 1
+  const propTypes =
+    Component.__propTypesSecretDontUseThesePlease || Component.propTypes;
+
+  AnimatedComponent.propTypes = {
+    style: function(props, propName, componentName) {
+      if (!propTypes) {
+        return;
+      }
+
+      for (const key in ViewStylePropTypes) {
+        if (!propTypes[key] && props[key] !== undefined) {
+          console.warn(
+            'You are setting the style `{ ' +
+              key +
+              ': ... }` as a prop. You ' +
+              'should nest it in a style object. ' +
+              'E.g. `{ style: { ' +
+              key +
+              ': ... } }`',
+          );
+        }
+      }
+    },
+  };
+
+  return AnimatedComponent;
+}
+
+module.exports = createAnimatedComponent;
@@ -0,0 +1,65 @@
+/**
+ * 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 AnimatedAddition
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedInterpolation = require('./AnimatedInterpolation');
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedValue = require('./AnimatedValue');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+
+class AnimatedAddition extends AnimatedWithChildren {
+  _a: AnimatedNode;
+  _b: AnimatedNode;
+
+  constructor(a: AnimatedNode | number, b: AnimatedNode | number) {
+    super();
+    this._a = typeof a === 'number' ? new AnimatedValue(a) : a;
+    this._b = typeof b === 'number' ? new AnimatedValue(b) : b;
+  }
+
+  __makeNative() {
+    this._a.__makeNative();
+    this._b.__makeNative();
+    super.__makeNative();
+  }
+
+  __getValue(): number {
+    return this._a.__getValue() + this._b.__getValue();
+  }
+
+  interpolate(config: InterpolationConfigType): AnimatedInterpolation {
+    return new AnimatedInterpolation(this, config);
+  }
+
+  __attach(): void {
+    this._a.__addChild(this);
+    this._b.__addChild(this);
+  }
+
+  __detach(): void {
+    this._a.__removeChild(this);
+    this._b.__removeChild(this);
+    super.__detach();
+  }
+
+  __getNativeConfig(): any {
+    return {
+      type: 'addition',
+      input: [this._a.__getNativeTag(), this._b.__getNativeTag()],
+    };
+  }
+}
+
+module.exports = AnimatedAddition;
@@ -0,0 +1,73 @@
+/**
+ * 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 AnimatedDiffClamp
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedInterpolation = require('./AnimatedInterpolation');
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+
+class AnimatedDiffClamp extends AnimatedWithChildren {
+  _a: AnimatedNode;
+  _min: number;
+  _max: number;
+  _value: number;
+  _lastValue: number;
+
+  constructor(a: AnimatedNode, min: number, max: number) {
+    super();
+
+    this._a = a;
+    this._min = min;
+    this._max = max;
+    this._value = this._lastValue = this._a.__getValue();
+  }
+
+  __makeNative() {
+    this._a.__makeNative();
+    super.__makeNative();
+  }
+
+  interpolate(config: InterpolationConfigType): AnimatedInterpolation {
+    return new AnimatedInterpolation(this, config);
+  }
+
+  __getValue(): number {
+    const value = this._a.__getValue();
+    const diff = value - this._lastValue;
+    this._lastValue = value;
+    this._value = Math.min(Math.max(this._value + diff, this._min), this._max);
+    return this._value;
+  }
+
+  __attach(): void {
+    this._a.__addChild(this);
+  }
+
+  __detach(): void {
+    this._a.__removeChild(this);
+    super.__detach();
+  }
+
+  __getNativeConfig(): any {
+    return {
+      type: 'diffclamp',
+      input: this._a.__getNativeTag(),
+      min: this._min,
+      max: this._max,
+    };
+  }
+}
+
+module.exports = AnimatedDiffClamp;
@@ -0,0 +1,70 @@
+/**
+ * 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 AnimatedDivision
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedInterpolation = require('./AnimatedInterpolation');
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedValue = require('./AnimatedValue');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+
+class AnimatedDivision extends AnimatedWithChildren {
+  _a: AnimatedNode;
+  _b: AnimatedNode;
+
+  constructor(a: AnimatedNode | number, b: AnimatedNode | number) {
+    super();
+    this._a = typeof a === 'number' ? new AnimatedValue(a) : a;
+    this._b = typeof b === 'number' ? new AnimatedValue(b) : b;
+  }
+
+  __makeNative() {
+    this._a.__makeNative();
+    this._b.__makeNative();
+    super.__makeNative();
+  }
+
+  __getValue(): number {
+    const a = this._a.__getValue();
+    const b = this._b.__getValue();
+    if (b === 0) {
+      console.error('Detected division by zero in AnimatedDivision');
+    }
+    return a / b;
+  }
+
+  interpolate(config: InterpolationConfigType): AnimatedInterpolation {
+    return new AnimatedInterpolation(this, config);
+  }
+
+  __attach(): void {
+    this._a.__addChild(this);
+    this._b.__addChild(this);
+  }
+
+  __detach(): void {
+    this._a.__removeChild(this);
+    this._b.__removeChild(this);
+    super.__detach();
+  }
+
+  __getNativeConfig(): any {
+    return {
+      type: 'division',
+      input: [this._a.__getNativeTag(), this._b.__getNativeTag()],
+    };
+  }
+}
+
+module.exports = AnimatedDivision;
@@ -6,14 +6,19 @@
 * 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 Interpolation
+ * @providesModule AnimatedInterpolation
 * @flow
+ * @format
 */
 /* eslint no-bitwise: 0 */
 'use strict';

-var invariant = require('fbjs/lib/invariant');
-var normalizeColor = require('normalizeColor');
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+const NativeAnimatedHelper = require('../NativeAnimatedHelper');
+
+const invariant = require('fbjs/lib/invariant');
+const normalizeColor = require('normalizeColor');

 type ExtrapolateType = 'extend' | 'identity' | 'clamp';

@@ -23,74 +28,76 @@ export type InterpolationConfigType = {
   * detected during the deployment of v0.38.0. To see the error, remove this
   * comment and run flow
   */
-  outputRange: (Array<number> | Array<string>),
-  easing?: ((input: number) => number),
+  outputRange: Array<number> | Array<string>,
+  easing?: (input: number) => number,
  extrapolate?: ExtrapolateType,
  extrapolateLeft?: ExtrapolateType,
  extrapolateRight?: ExtrapolateType,
 };

-var linear = (t) => t;
+const linear = t => t;

 /**
 * Very handy helper to map input ranges to output ranges with an easing
 * function and custom behavior outside of the ranges.
 */
-class Interpolation {
-  static create(config: InterpolationConfigType): (input: number) => number | string {
+function createInterpolation(
+  config: InterpolationConfigType,
+): (input: number) => number | string {
+  if (config.outputRange && typeof config.outputRange[0] === 'string') {
+    return createInterpolationFromStringOutputRange(config);
+  }

-    if (config.outputRange && typeof config.outputRange[0] === 'string') {
-      return createInterpolationFromStringOutputRange(config);
-    }
+  const outputRange: Array<number> = (config.outputRange: any);
+  checkInfiniteRange('outputRange', outputRange);

-    var outputRange: Array<number> = (config.outputRange: any);
-    checkInfiniteRange('outputRange', outputRange);
+  const inputRange = config.inputRange;
+  checkInfiniteRange('inputRange', inputRange);
+  checkValidInputRange(inputRange);

-    var inputRange = config.inputRange;
-    checkInfiniteRange('inputRange', inputRange);
-    checkValidInputRange(inputRange);
+  invariant(
+    inputRange.length === outputRange.length,
+    'inputRange (' +
+      inputRange.length +
+      ') and outputRange (' +
+      outputRange.length +
+      ') must have the same length',
+  );

+  const easing = config.easing || linear;
+
+  let extrapolateLeft: ExtrapolateType = 'extend';
+  if (config.extrapolateLeft !== undefined) {
+    extrapolateLeft = config.extrapolateLeft;
+  } else if (config.extrapolate !== undefined) {
+    extrapolateLeft = config.extrapolate;
+  }
+
+  let extrapolateRight: ExtrapolateType = 'extend';
+  if (config.extrapolateRight !== undefined) {
+    extrapolateRight = config.extrapolateRight;
+  } else if (config.extrapolate !== undefined) {
+    extrapolateRight = config.extrapolate;
+  }
+
+  return input => {
    invariant(
-      inputRange.length === outputRange.length,
-      'inputRange (' + inputRange.length + ') and outputRange (' +
-      outputRange.length + ') must have the same length'
+      typeof input === 'number',
+      'Cannot interpolation an input which is not a number',
    );

-    var easing = config.easing || linear;
-
-    var extrapolateLeft: ExtrapolateType = 'extend';
-    if (config.extrapolateLeft !== undefined) {
-      extrapolateLeft = config.extrapolateLeft;
-    } else if (config.extrapolate !== undefined) {
-      extrapolateLeft = config.extrapolate;
-    }
-
-    var extrapolateRight: ExtrapolateType = 'extend';
-    if (config.extrapolateRight !== undefined) {
-      extrapolateRight = config.extrapolateRight;
-    } else if (config.extrapolate !== undefined) {
-      extrapolateRight = config.extrapolate;
-    }
-
-    return (input) => {
-      invariant(
-        typeof input === 'number',
-        'Cannot interpolation an input which is not a number'
-      );
-
-      var range = findRange(input, inputRange);
-      return interpolate(
-        input,
-        inputRange[range],
-        inputRange[range + 1],
-        outputRange[range],
-        outputRange[range + 1],
-        easing,
-        extrapolateLeft,
-        extrapolateRight,
-      );
-    };
-  }
+    const range = findRange(input, inputRange);
+    return interpolate(
+      input,
+      inputRange[range],
+      inputRange[range + 1],
+      outputRange[range],
+      outputRange[range + 1],
+      easing,
+      extrapolateLeft,
+      extrapolateRight,
+    );
+  };
 }

 function interpolate(
@@ -99,11 +106,11 @@ function interpolate(
  inputMax: number,
  outputMin: number,
  outputMax: number,
-  easing: ((input: number) => number),
+  easing: (input: number) => number,
  extrapolateLeft: ExtrapolateType,
  extrapolateRight: ExtrapolateType,
 ) {
-  var result = input;
+  let result = input;

  // Extrapolate
  if (result < inputMin) {
@@ -162,22 +169,22 @@ function interpolate(
 }

 function colorToRgba(input: string): string {
-  var int32Color = normalizeColor(input);
+  let int32Color = normalizeColor(input);
  if (int32Color === null) {
    return input;
  }

  int32Color = int32Color || 0;

-  var r = (int32Color & 0xff000000) >>> 24;
-  var g = (int32Color & 0x00ff0000) >>> 16;
-  var b = (int32Color & 0x0000ff00) >>> 8;
-  var a = (int32Color & 0x000000ff) / 255;
+  const r = (int32Color & 0xff000000) >>> 24;
+  const g = (int32Color & 0x00ff0000) >>> 16;
+  const b = (int32Color & 0x0000ff00) >>> 8;
+  const a = (int32Color & 0x000000ff) / 255;

  return `rgba(${r}, ${g}, ${b}, ${a})`;
 }

-var stringShapeRegex = /[0-9\.-]+/g;
+const stringShapeRegex = /[0-9\.-]+/g;

 /**
 * Supports string shapes by extracting numbers so new values can be computed,
@@ -190,7 +197,7 @@ var stringShapeRegex = /[0-9\.-]+/g;
 function createInterpolationFromStringOutputRange(
  config: InterpolationConfigType,
 ): (input: number) => string {
-  var outputRange: Array<string> = (config.outputRange: any);
+  let outputRange: Array<string> = (config.outputRange: any);
  invariant(outputRange.length >= 2, 'Bad output range');
  outputRange = outputRange.map(colorToRgba);
  checkPattern(outputRange);
@@ -206,7 +213,7 @@ function createInterpolationFromStringOutputRange(
  /* $FlowFixMe(>=0.18.0): `outputRange[0].match()` can return `null`. Need to
   * guard against this possibility.
   */
-  var outputRanges = outputRange[0].match(stringShapeRegex).map(() => []);
+  const outputRanges = outputRange[0].match(stringShapeRegex).map(() => []);
  outputRange.forEach(value => {
    /* $FlowFixMe(>=0.18.0): `value.match()` can return `null`. Need to guard
     * against this possibility.
@@ -219,25 +226,28 @@ function createInterpolationFromStringOutputRange(
  /* $FlowFixMe(>=0.18.0): `outputRange[0].match()` can return `null`. Need to
   * guard against this possibility.
   */
-  var interpolations = outputRange[0].match(stringShapeRegex).map((value, i) => {
-    return Interpolation.create({
-      ...config,
-      outputRange: outputRanges[i],
+  const interpolations = outputRange[0]
+    .match(stringShapeRegex)
+    .map((value, i) => {
+      return createInterpolation({
+        ...config,
+        outputRange: outputRanges[i],
+      });
    });
-  });

  // rgba requires that the r,g,b are integers.... so we want to round them, but we *dont* want to
  // round the opacity (4th column).
  const shouldRound = isRgbOrRgba(outputRange[0]);

-  return (input) => {
-    var i = 0;
+  return input => {
+    let i = 0;
    // 'rgba(0, 100, 200, 0)'
    // ->
    // 'rgba(${interpolations[0](input)}, ${interpolations[1](input)}, ...'
    return outputRange[0].replace(stringShapeRegex, () => {
      const val = +interpolations[i++](input);
-      const rounded = shouldRound && i < 4 ? Math.round(val) : Math.round(val * 1000) / 1000;
+      const rounded =
+        shouldRound && i < 4 ? Math.round(val) : Math.round(val * 1000) / 1000;
      return String(rounded);
    });
  };
@@ -248,8 +258,8 @@ function isRgbOrRgba(range) {
 }

 function checkPattern(arr: Array<string>) {
-  var pattern = arr[0].replace(stringShapeRegex, '');
-  for (var i = 1; i < arr.length; ++i) {
+  const pattern = arr[0].replace(stringShapeRegex, '');
+  for (let i = 1; i < arr.length; ++i) {
    invariant(
      pattern === arr[i].replace(stringShapeRegex, ''),
      'invalid pattern ' + arr[0] + ' and ' + arr[i],
@@ -258,7 +268,8 @@ function checkPattern(arr: Array<string>) {
 }

 function findRange(input: number, inputRange: Array<number>) {
-  for (var i = 1; i < inputRange.length - 1; ++i) {
+  let i;
+  for (i = 1; i < inputRange.length - 1; ++i) {
    if (inputRange[i] >= input) {
      break;
    }
@@ -268,7 +279,7 @@ function findRange(input: number, inputRange: Array<number>) {

 function checkValidInputRange(arr: Array<number>) {
  invariant(arr.length >= 2, 'inputRange must have at least 2 elements');
-  for (var i = 1; i < arr.length; ++i) {
+  for (let i = 1; i < arr.length; ++i) {
    invariant(
      arr[i] >= arr[i - 1],
      /* $FlowFixMe(>=0.13.0) - In the addition expression below this comment,
@@ -277,7 +288,7 @@ function checkValidInputRange(arr: Array<number>) {
       * mean this implicit string conversion, you can do something like
       * String(myThing)
       */
-      'inputRange must be monotonically increasing ' + arr
+      'inputRange must be monotonically increasing ' + arr,
    );
  }
 }
@@ -292,8 +303,86 @@ function checkInfiniteRange(name: string, arr: Array<number>) {
     * this implicit string conversion, you can do something like
     * String(myThing)
     */
-    name + 'cannot be ]-infinity;+infinity[ ' + arr
+    name + 'cannot be ]-infinity;+infinity[ ' + arr,
  );
 }

-module.exports = Interpolation;
+class AnimatedInterpolation extends AnimatedWithChildren {
+  // Export for testing.
+  static __createInterpolation = createInterpolation;
+
+  _parent: AnimatedNode;
+  _config: InterpolationConfigType;
+  _interpolation: (input: number) => number | string;
+
+  constructor(parent: AnimatedNode, config: InterpolationConfigType) {
+    super();
+    this._parent = parent;
+    this._config = config;
+    this._interpolation = createInterpolation(config);
+  }
+
+  __makeNative() {
+    this._parent.__makeNative();
+    super.__makeNative();
+  }
+
+  __getValue(): number | string {
+    const parentValue: number = this._parent.__getValue();
+    invariant(
+      typeof parentValue === 'number',
+      'Cannot interpolate an input which is not a number.',
+    );
+    return this._interpolation(parentValue);
+  }
+
+  interpolate(config: InterpolationConfigType): AnimatedInterpolation {
+    return new AnimatedInterpolation(this, config);
+  }
+
+  __attach(): void {
+    this._parent.__addChild(this);
+  }
+
+  __detach(): void {
+    this._parent.__removeChild(this);
+    super.__detach();
+  }
+
+  __transformDataType(range: Array<any>) {
+    // Change the string array type to number array
+    // So we can reuse the same logic in iOS and Android platform
+    return range.map(function(value) {
+      if (typeof value !== 'string') {
+        return value;
+      }
+      if (/deg$/.test(value)) {
+        const degrees = parseFloat(value) || 0;
+        const radians = degrees * Math.PI / 180.0;
+        return radians;
+      } else {
+        // Assume radians
+        return parseFloat(value) || 0;
+      }
+    });
+  }
+
+  __getNativeConfig(): any {
+    if (__DEV__) {
+      NativeAnimatedHelper.validateInterpolation(this._config);
+    }
+
+    return {
+      inputRange: this._config.inputRange,
+      // Only the `outputRange` can contain strings so we don't need to tranform `inputRange` here
+      outputRange: this.__transformDataType(this._config.outputRange),
+      extrapolateLeft:
+        this._config.extrapolateLeft || this._config.extrapolate || 'extend',
+      extrapolateRight:
+        this._config.extrapolateRight || this._config.extrapolate || 'extend',
+      type: 'interpolation',
+    };
+  }
+}
+
+module.exports = AnimatedInterpolation;
@@ -0,0 +1,64 @@
+/**
+ * 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 AnimatedModulo
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedInterpolation = require('./AnimatedInterpolation');
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+
+class AnimatedModulo extends AnimatedWithChildren {
+  _a: AnimatedNode;
+  _modulus: number;
+
+  constructor(a: AnimatedNode, modulus: number) {
+    super();
+    this._a = a;
+    this._modulus = modulus;
+  }
+
+  __makeNative() {
+    this._a.__makeNative();
+    super.__makeNative();
+  }
+
+  __getValue(): number {
+    return (
+      (this._a.__getValue() % this._modulus + this._modulus) % this._modulus
+    );
+  }
+
+  interpolate(config: InterpolationConfigType): AnimatedInterpolation {
+    return new AnimatedInterpolation(this, config);
+  }
+
+  __attach(): void {
+    this._a.__addChild(this);
+  }
+
+  __detach(): void {
+    this._a.__removeChild(this);
+    super.__detach();
+  }
+
+  __getNativeConfig(): any {
+    return {
+      type: 'modulus',
+      input: this._a.__getNativeTag(),
+      modulus: this._modulus,
+    };
+  }
+}
+
+module.exports = AnimatedModulo;
@@ -0,0 +1,65 @@
+/**
+ * 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 AnimatedMultiplication
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedInterpolation = require('./AnimatedInterpolation');
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedValue = require('./AnimatedValue');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+
+class AnimatedMultiplication extends AnimatedWithChildren {
+  _a: AnimatedNode;
+  _b: AnimatedNode;
+
+  constructor(a: AnimatedNode | number, b: AnimatedNode | number) {
+    super();
+    this._a = typeof a === 'number' ? new AnimatedValue(a) : a;
+    this._b = typeof b === 'number' ? new AnimatedValue(b) : b;
+  }
+
+  __makeNative() {
+    this._a.__makeNative();
+    this._b.__makeNative();
+    super.__makeNative();
+  }
+
+  __getValue(): number {
+    return this._a.__getValue() * this._b.__getValue();
+  }
+
+  interpolate(config: InterpolationConfigType): AnimatedInterpolation {
+    return new AnimatedInterpolation(this, config);
+  }
+
+  __attach(): void {
+    this._a.__addChild(this);
+    this._b.__addChild(this);
+  }
+
+  __detach(): void {
+    this._a.__removeChild(this);
+    this._b.__removeChild(this);
+    super.__detach();
+  }
+
+  __getNativeConfig(): any {
+    return {
+      type: 'multiplication',
+      input: [this._a.__getNativeTag(), this._b.__getNativeTag()],
+    };
+  }
+}
+
+module.exports = AnimatedMultiplication;
@@ -0,0 +1,73 @@
+/**
+ * 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 AnimatedNode
+ * @flow
+ * @format
+ */
+'use strict';
+
+const NativeAnimatedHelper = require('../NativeAnimatedHelper');
+
+const invariant = require('fbjs/lib/invariant');
+
+// Note(vjeux): this would be better as an interface but flow doesn't
+// support them yet
+class AnimatedNode {
+  __attach(): void {}
+  __detach(): void {
+    if (this.__isNative && this.__nativeTag != null) {
+      NativeAnimatedHelper.API.dropAnimatedNode(this.__nativeTag);
+      this.__nativeTag = undefined;
+    }
+  }
+  __getValue(): any {}
+  __getAnimatedValue(): any {
+    return this.__getValue();
+  }
+  __addChild(child: AnimatedNode) {}
+  __removeChild(child: AnimatedNode) {}
+  __getChildren(): Array<AnimatedNode> {
+    return [];
+  }
+
+  /* Methods and props used by native Animated impl */
+  __isNative: boolean;
+  __nativeTag: ?number;
+  __makeNative() {
+    if (!this.__isNative) {
+      throw new Error('This node cannot be made a "native" animated node');
+    }
+  }
+  __getNativeTag(): ?number {
+    NativeAnimatedHelper.assertNativeAnimatedModule();
+    invariant(
+      this.__isNative,
+      'Attempt to get native tag from node not marked as "native"',
+    );
+    if (this.__nativeTag == null) {
+      const nativeTag: ?number = NativeAnimatedHelper.generateNewNodeTag();
+      NativeAnimatedHelper.API.createAnimatedNode(
+        nativeTag,
+        this.__getNativeConfig(),
+      );
+      this.__nativeTag = nativeTag;
+    }
+    return this.__nativeTag;
+  }
+  __getNativeConfig(): Object {
+    throw new Error(
+      'This JS animated node type cannot be used as native animated node',
+    );
+  }
+  toJSON(): any {
+    return this.__getValue();
+  }
+}
+
+module.exports = AnimatedNode;
@@ -0,0 +1,167 @@
+/**
+ * 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 AnimatedProps
+ * @flow
+ * @format
+ */
+'use strict';
+
+const {AnimatedEvent} = require('../AnimatedEvent');
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedStyle = require('./AnimatedStyle');
+const NativeAnimatedHelper = require('../NativeAnimatedHelper');
+const ReactNative = require('ReactNative');
+
+const invariant = require('fbjs/lib/invariant');
+
+class AnimatedProps extends AnimatedNode {
+  _props: Object;
+  _animatedView: any;
+  _callback: () => void;
+
+  constructor(props: Object, callback: () => void) {
+    super();
+    if (props.style) {
+      props = {
+        ...props,
+        style: new AnimatedStyle(props.style),
+      };
+    }
+    this._props = props;
+    this._callback = callback;
+    this.__attach();
+  }
+
+  __getValue(): Object {
+    const props = {};
+    for (const key in this._props) {
+      const value = this._props[key];
+      if (value instanceof AnimatedNode) {
+        if (!value.__isNative || value instanceof AnimatedStyle) {
+          // We cannot use value of natively driven nodes this way as the value we have access from
+          // JS may not be up to date.
+          props[key] = value.__getValue();
+        }
+      } else if (value instanceof AnimatedEvent) {
+        props[key] = value.__getHandler();
+      } else {
+        props[key] = value;
+      }
+    }
+    return props;
+  }
+
+  __getAnimatedValue(): Object {
+    const props = {};
+    for (const key in this._props) {
+      const value = this._props[key];
+      if (value instanceof AnimatedNode) {
+        props[key] = value.__getAnimatedValue();
+      }
+    }
+    return props;
+  }
+
+  __attach(): void {
+    for (const key in this._props) {
+      const value = this._props[key];
+      if (value instanceof AnimatedNode) {
+        value.__addChild(this);
+      }
+    }
+  }
+
+  __detach(): void {
+    if (this.__isNative && this._animatedView) {
+      this.__disconnectAnimatedView();
+    }
+    for (const key in this._props) {
+      const value = this._props[key];
+      if (value instanceof AnimatedNode) {
+        value.__removeChild(this);
+      }
+    }
+    super.__detach();
+  }
+
+  update(): void {
+    this._callback();
+  }
+
+  __makeNative(): void {
+    if (!this.__isNative) {
+      this.__isNative = true;
+      for (const key in this._props) {
+        const value = this._props[key];
+        if (value instanceof AnimatedNode) {
+          value.__makeNative();
+        }
+      }
+      if (this._animatedView) {
+        this.__connectAnimatedView();
+      }
+    }
+  }
+
+  setNativeView(animatedView: any): void {
+    if (this._animatedView === animatedView) {
+      return;
+    }
+    this._animatedView = animatedView;
+    if (this.__isNative) {
+      this.__connectAnimatedView();
+    }
+  }
+
+  __connectAnimatedView(): void {
+    invariant(this.__isNative, 'Expected node to be marked as "native"');
+    const nativeViewTag: ?number = ReactNative.findNodeHandle(
+      this._animatedView,
+    );
+    invariant(
+      nativeViewTag != null,
+      'Unable to locate attached view in the native tree',
+    );
+    NativeAnimatedHelper.API.connectAnimatedNodeToView(
+      this.__getNativeTag(),
+      nativeViewTag,
+    );
+  }
+
+  __disconnectAnimatedView(): void {
+    invariant(this.__isNative, 'Expected node to be marked as "native"');
+    const nativeViewTag: ?number = ReactNative.findNodeHandle(
+      this._animatedView,
+    );
+    invariant(
+      nativeViewTag != null,
+      'Unable to locate attached view in the native tree',
+    );
+    NativeAnimatedHelper.API.disconnectAnimatedNodeFromView(
+      this.__getNativeTag(),
+      nativeViewTag,
+    );
+  }
+
+  __getNativeConfig(): Object {
+    const propsConfig = {};
+    for (const propKey in this._props) {
+      const value = this._props[propKey];
+      if (value instanceof AnimatedNode) {
+        propsConfig[propKey] = value.__getNativeTag();
+      }
+    }
+    return {
+      type: 'props',
+      props: propsConfig,
+    };
+  }
+}
+
+module.exports = AnimatedProps;
@@ -0,0 +1,127 @@
+/**
+ * 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 AnimatedStyle
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedTransform = require('./AnimatedTransform');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+const NativeAnimatedHelper = require('../NativeAnimatedHelper');
+
+const flattenStyle = require('flattenStyle');
+
+class AnimatedStyle extends AnimatedWithChildren {
+  _style: Object;
+
+  constructor(style: any) {
+    super();
+    style = flattenStyle(style) || {};
+    if (style.transform) {
+      style = {
+        ...style,
+        transform: new AnimatedTransform(style.transform),
+      };
+    }
+    this._style = style;
+  }
+
+  // Recursively get values for nested styles (like iOS's shadowOffset)
+  _walkStyleAndGetValues(style) {
+    const updatedStyle = {};
+    for (const key in style) {
+      const value = style[key];
+      if (value instanceof AnimatedNode) {
+        if (!value.__isNative) {
+          // We cannot use value of natively driven nodes this way as the value we have access from
+          // JS may not be up to date.
+          updatedStyle[key] = value.__getValue();
+        }
+      } else if (value && !Array.isArray(value) && typeof value === 'object') {
+        // Support animating nested values (for example: shadowOffset.height)
+        updatedStyle[key] = this._walkStyleAndGetValues(value);
+      } else {
+        updatedStyle[key] = value;
+      }
+    }
+    return updatedStyle;
+  }
+
+  __getValue(): Object {
+    return this._walkStyleAndGetValues(this._style);
+  }
+
+  // Recursively get animated values for nested styles (like iOS's shadowOffset)
+  _walkStyleAndGetAnimatedValues(style) {
+    const updatedStyle = {};
+    for (const key in style) {
+      const value = style[key];
+      if (value instanceof AnimatedNode) {
+        updatedStyle[key] = value.__getAnimatedValue();
+      } else if (value && !Array.isArray(value) && typeof value === 'object') {
+        // Support animating nested values (for example: shadowOffset.height)
+        updatedStyle[key] = this._walkStyleAndGetAnimatedValues(value);
+      }
+    }
+    return updatedStyle;
+  }
+
+  __getAnimatedValue(): Object {
+    return this._walkStyleAndGetAnimatedValues(this._style);
+  }
+
+  __attach(): void {
+    for (const key in this._style) {
+      const value = this._style[key];
+      if (value instanceof AnimatedNode) {
+        value.__addChild(this);
+      }
+    }
+  }
+
+  __detach(): void {
+    for (const key in this._style) {
+      const value = this._style[key];
+      if (value instanceof AnimatedNode) {
+        value.__removeChild(this);
+      }
+    }
+    super.__detach();
+  }
+
+  __makeNative() {
+    super.__makeNative();
+    for (const key in this._style) {
+      const value = this._style[key];
+      if (value instanceof AnimatedNode) {
+        value.__makeNative();
+      }
+    }
+  }
+
+  __getNativeConfig(): Object {
+    const styleConfig = {};
+    for (const styleKey in this._style) {
+      if (this._style[styleKey] instanceof AnimatedNode) {
+        styleConfig[styleKey] = this._style[styleKey].__getNativeTag();
+      }
+      // Non-animated styles are set using `setNativeProps`, no need
+      // to pass those as a part of the node config
+    }
+    NativeAnimatedHelper.validateStyles(styleConfig);
+    return {
+      type: 'style',
+      style: styleConfig,
+    };
+  }
+}
+
+module.exports = AnimatedStyle;
@@ -0,0 +1,67 @@
+/**
+ * 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 AnimatedTracking
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedValue = require('./AnimatedValue');
+const AnimatedNode = require('./AnimatedNode');
+
+import type {EndCallback} from '../animations/Animation';
+
+class AnimatedTracking extends AnimatedNode {
+  _value: AnimatedValue;
+  _parent: AnimatedNode;
+  _callback: ?EndCallback;
+  _animationConfig: Object;
+  _animationClass: any;
+
+  constructor(
+    value: AnimatedValue,
+    parent: AnimatedNode,
+    animationClass: any,
+    animationConfig: Object,
+    callback?: ?EndCallback,
+  ) {
+    super();
+    this._value = value;
+    this._parent = parent;
+    this._animationClass = animationClass;
+    this._animationConfig = animationConfig;
+    this._callback = callback;
+    this.__attach();
+  }
+
+  __getValue(): Object {
+    return this._parent.__getValue();
+  }
+
+  __attach(): void {
+    this._parent.__addChild(this);
+  }
+
+  __detach(): void {
+    this._parent.__removeChild(this);
+    super.__detach();
+  }
+
+  update(): void {
+    this._value.animate(
+      new this._animationClass({
+        ...this._animationConfig,
+        toValue: (this._animationConfig.toValue: any).__getValue(),
+      }),
+      this._callback,
+    );
+  }
+}
+
+module.exports = AnimatedTracking;
@@ -0,0 +1,123 @@
+/**
+ * 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 AnimatedTransform
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+const NativeAnimatedHelper = require('../NativeAnimatedHelper');
+
+class AnimatedTransform extends AnimatedWithChildren {
+  _transforms: Array<Object>;
+
+  constructor(transforms: Array<Object>) {
+    super();
+    this._transforms = transforms;
+  }
+
+  __makeNative() {
+    super.__makeNative();
+    this._transforms.forEach(transform => {
+      for (const key in transform) {
+        const value = transform[key];
+        if (value instanceof AnimatedNode) {
+          value.__makeNative();
+        }
+      }
+    });
+  }
+
+  __getValue(): Array<Object> {
+    return this._transforms.map(transform => {
+      const result = {};
+      for (const key in transform) {
+        const value = transform[key];
+        if (value instanceof AnimatedNode) {
+          result[key] = value.__getValue();
+        } else {
+          result[key] = value;
+        }
+      }
+      return result;
+    });
+  }
+
+  __getAnimatedValue(): Array<Object> {
+    return this._transforms.map(transform => {
+      const result = {};
+      for (const key in transform) {
+        const value = transform[key];
+        if (value instanceof AnimatedNode) {
+          result[key] = value.__getAnimatedValue();
+        } else {
+          // All transform components needed to recompose matrix
+          result[key] = value;
+        }
+      }
+      return result;
+    });
+  }
+
+  __attach(): void {
+    this._transforms.forEach(transform => {
+      for (const key in transform) {
+        const value = transform[key];
+        if (value instanceof AnimatedNode) {
+          value.__addChild(this);
+        }
+      }
+    });
+  }
+
+  __detach(): void {
+    this._transforms.forEach(transform => {
+      for (const key in transform) {
+        const value = transform[key];
+        if (value instanceof AnimatedNode) {
+          value.__removeChild(this);
+        }
+      }
+    });
+    super.__detach();
+  }
+
+  __getNativeConfig(): any {
+    const transConfigs = [];
+
+    this._transforms.forEach(transform => {
+      for (const key in transform) {
+        const value = transform[key];
+        if (value instanceof AnimatedNode) {
+          transConfigs.push({
+            type: 'animated',
+            property: key,
+            nodeTag: value.__getNativeTag(),
+          });
+        } else {
+          transConfigs.push({
+            type: 'static',
+            property: key,
+            value,
+          });
+        }
+      }
+    });
+
+    NativeAnimatedHelper.validateTransform(transConfigs);
+    return {
+      type: 'transform',
+      transforms: transConfigs,
+    };
+  }
+}
+
+module.exports = AnimatedTransform;
@@ -0,0 +1,309 @@
+/**
+ * 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 AnimatedValue
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedInterpolation = require('./AnimatedInterpolation');
+const AnimatedNode = require('./AnimatedNode');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+const InteractionManager = require('InteractionManager');
+const NativeAnimatedHelper = require('../NativeAnimatedHelper');
+
+import type Animation, {EndCallback} from '../animations/Animation';
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+
+const NativeAnimatedAPI = NativeAnimatedHelper.API;
+
+type ValueListenerCallback = (state: {value: number}) => void;
+
+let _uniqueId = 1;
+
+/**
+ * Animated works by building a directed acyclic graph of dependencies
+ * transparently when you render your Animated components.
+ *
+ *               new Animated.Value(0)
+ *     .interpolate()        .interpolate()    new Animated.Value(1)
+ *         opacity               translateY      scale
+ *          style                         transform
+ *         View#234                         style
+ *                                         View#123
+ *
+ * A) Top Down phase
+ * When an Animated.Value is updated, we recursively go down through this
+ * graph in order to find leaf nodes: the views that we flag as needing
+ * an update.
+ *
+ * B) Bottom Up phase
+ * When a view is flagged as needing an update, we recursively go back up
+ * in order to build the new value that it needs. The reason why we need
+ * this two-phases process is to deal with composite props such as
+ * transform which can receive values from multiple parents.
+ */
+function _flush(rootNode: AnimatedValue): void {
+  const animatedStyles = new Set();
+  function findAnimatedStyles(node) {
+    if (typeof node.update === 'function') {
+      animatedStyles.add(node);
+    } else {
+      node.__getChildren().forEach(findAnimatedStyles);
+    }
+  }
+  findAnimatedStyles(rootNode);
+  /* $FlowFixMe */
+  animatedStyles.forEach(animatedStyle => animatedStyle.update());
+}
+
+/**
+ * Standard value for driving animations.  One `Animated.Value` can drive
+ * multiple properties in a synchronized fashion, but can only be driven by one
+ * mechanism at a time.  Using a new mechanism (e.g. starting a new animation,
+ * or calling `setValue`) will stop any previous ones.
+ */
+class AnimatedValue extends AnimatedWithChildren {
+  _value: number;
+  _startingValue: number;
+  _offset: number;
+  _animation: ?Animation;
+  _tracking: ?AnimatedNode;
+  _listeners: {[key: string]: ValueListenerCallback};
+  __nativeAnimatedValueListener: ?any;
+
+  constructor(value: number) {
+    super();
+    this._startingValue = this._value = value;
+    this._offset = 0;
+    this._animation = null;
+    this._listeners = {};
+  }
+
+  __detach() {
+    this.stopAnimation();
+    super.__detach();
+  }
+
+  __getValue(): number {
+    return this._value + this._offset;
+  }
+
+  __makeNative() {
+    super.__makeNative();
+
+    if (Object.keys(this._listeners).length) {
+      this._startListeningToNativeValueUpdates();
+    }
+  }
+
+  /**
+   * Directly set the value.  This will stop any animations running on the value
+   * and update all the bound properties.
+   */
+  setValue(value: number): void {
+    if (this._animation) {
+      this._animation.stop();
+      this._animation = null;
+    }
+    this._updateValue(
+      value,
+      !this.__isNative /* don't perform a flush for natively driven values */,
+    );
+    if (this.__isNative) {
+      NativeAnimatedAPI.setAnimatedNodeValue(this.__getNativeTag(), value);
+    }
+  }
+
+  /**
+   * Sets an offset that is applied on top of whatever value is set, whether via
+   * `setValue`, an animation, or `Animated.event`.  Useful for compensating
+   * things like the start of a pan gesture.
+   */
+  setOffset(offset: number): void {
+    this._offset = offset;
+    if (this.__isNative) {
+      NativeAnimatedAPI.setAnimatedNodeOffset(this.__getNativeTag(), offset);
+    }
+  }
+
+  /**
+   * Merges the offset value into the base value and resets the offset to zero.
+   * The final output of the value is unchanged.
+   */
+  flattenOffset(): void {
+    this._value += this._offset;
+    this._offset = 0;
+    if (this.__isNative) {
+      NativeAnimatedAPI.flattenAnimatedNodeOffset(this.__getNativeTag());
+    }
+  }
+
+  /**
+   * Sets the offset value to the base value, and resets the base value to zero.
+   * The final output of the value is unchanged.
+   */
+  extractOffset(): void {
+    this._offset += this._value;
+    this._value = 0;
+    if (this.__isNative) {
+      NativeAnimatedAPI.extractAnimatedNodeOffset(this.__getNativeTag());
+    }
+  }
+
+  /**
+   * Adds an asynchronous listener to the value so you can observe updates from
+   * animations.  This is useful because there is no way to
+   * synchronously read the value because it might be driven natively.
+   */
+  addListener(callback: ValueListenerCallback): string {
+    const id = String(_uniqueId++);
+    this._listeners[id] = callback;
+    if (this.__isNative) {
+      this._startListeningToNativeValueUpdates();
+    }
+    return id;
+  }
+
+  removeListener(id: string): void {
+    delete this._listeners[id];
+    if (this.__isNative && Object.keys(this._listeners).length === 0) {
+      this._stopListeningForNativeValueUpdates();
+    }
+  }
+
+  removeAllListeners(): void {
+    this._listeners = {};
+    if (this.__isNative) {
+      this._stopListeningForNativeValueUpdates();
+    }
+  }
+
+  _startListeningToNativeValueUpdates() {
+    if (this.__nativeAnimatedValueListener) {
+      return;
+    }
+
+    NativeAnimatedAPI.startListeningToAnimatedNodeValue(this.__getNativeTag());
+    this.__nativeAnimatedValueListener = NativeAnimatedHelper.nativeEventEmitter.addListener(
+      'onAnimatedValueUpdate',
+      data => {
+        if (data.tag !== this.__getNativeTag()) {
+          return;
+        }
+        this._updateValue(data.value, false /* flush */);
+      },
+    );
+  }
+
+  _stopListeningForNativeValueUpdates() {
+    if (!this.__nativeAnimatedValueListener) {
+      return;
+    }
+
+    this.__nativeAnimatedValueListener.remove();
+    this.__nativeAnimatedValueListener = null;
+    NativeAnimatedAPI.stopListeningToAnimatedNodeValue(this.__getNativeTag());
+  }
+
+  /**
+   * Stops any running animation or tracking.  `callback` is invoked with the
+   * final value after stopping the animation, which is useful for updating
+   * state to match the animation position with layout.
+   */
+  stopAnimation(callback?: ?(value: number) => void): void {
+    this.stopTracking();
+    this._animation && this._animation.stop();
+    this._animation = null;
+    callback && callback(this.__getValue());
+  }
+
+  /**
+  * Stops any animation and resets the value to its original
+  */
+  resetAnimation(callback?: ?(value: number) => void): void {
+    this.stopAnimation(callback);
+    this._value = this._startingValue;
+  }
+
+  /**
+   * Interpolates the value before updating the property, e.g. mapping 0-1 to
+   * 0-10.
+   */
+  interpolate(config: InterpolationConfigType): AnimatedInterpolation {
+    return new AnimatedInterpolation(this, config);
+  }
+
+  /**
+   * Typically only used internally, but could be used by a custom Animation
+   * class.
+   */
+  animate(animation: Animation, callback: ?EndCallback): void {
+    let handle = null;
+    if (animation.__isInteraction) {
+      handle = InteractionManager.createInteractionHandle();
+    }
+    const previousAnimation = this._animation;
+    this._animation && this._animation.stop();
+    this._animation = animation;
+    animation.start(
+      this._value,
+      value => {
+        // Natively driven animations will never call into that callback, therefore we can always
+        // pass flush = true to allow the updated value to propagate to native with setNativeProps
+        this._updateValue(value, true /* flush */);
+      },
+      result => {
+        this._animation = null;
+        if (handle !== null) {
+          InteractionManager.clearInteractionHandle(handle);
+        }
+        callback && callback(result);
+      },
+      previousAnimation,
+      this,
+    );
+  }
+
+  /**
+   * Typically only used internally.
+   */
+  stopTracking(): void {
+    this._tracking && this._tracking.__detach();
+    this._tracking = null;
+  }
+
+  /**
+   * Typically only used internally.
+   */
+  track(tracking: AnimatedNode): void {
+    this.stopTracking();
+    this._tracking = tracking;
+  }
+
+  _updateValue(value: number, flush: boolean): void {
+    this._value = value;
+    if (flush) {
+      _flush(this);
+    }
+    for (const key in this._listeners) {
+      this._listeners[key]({value: this.__getValue()});
+    }
+  }
+
+  __getNativeConfig(): Object {
+    return {
+      type: 'value',
+      value: this._value,
+      offset: this._offset,
+    };
+  }
+}
+
+module.exports = AnimatedValue;
@@ -0,0 +1,180 @@
+/**
+ * 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 AnimatedValueXY
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedValue = require('./AnimatedValue');
+const AnimatedWithChildren = require('./AnimatedWithChildren');
+
+const invariant = require('fbjs/lib/invariant');
+
+type ValueXYListenerCallback = (value: {x: number, y: number}) => void;
+
+let _uniqueId = 1;
+
+/**
+ * 2D Value for driving 2D animations, such as pan gestures.  Almost identical
+ * API to normal `Animated.Value`, but multiplexed.  Contains two regular
+ * `Animated.Value`s under the hood.
+ *
+ * #### Example
+ *
+ *```javascript
+ *  class DraggableView extends React.Component {
+ *    constructor(props) {
+ *      super(props);
+ *      this.state = {
+ *        pan: new Animated.ValueXY(), // inits to zero
+ *      };
+ *      this.state.panResponder = PanResponder.create({
+ *        onStartShouldSetPanResponder: () => true,
+ *        onPanResponderMove: Animated.event([null, {
+ *          dx: this.state.pan.x, // x,y are Animated.Value
+ *          dy: this.state.pan.y,
+ *        }]),
+ *        onPanResponderRelease: () => {
+ *          Animated.spring(
+ *            this.state.pan,         // Auto-multiplexed
+ *            {toValue: {x: 0, y: 0}} // Back to zero
+ *          ).start();
+ *        },
+ *      });
+ *    }
+ *    render() {
+ *      return (
+ *        <Animated.View
+ *          {...this.state.panResponder.panHandlers}
+ *          style={this.state.pan.getLayout()}>
+ *          {this.props.children}
+ *        </Animated.View>
+ *      );
+ *    }
+ *  }
+ *```
+ */
+class AnimatedValueXY extends AnimatedWithChildren {
+  x: AnimatedValue;
+  y: AnimatedValue;
+  _listeners: {[key: string]: {x: string, y: string}};
+
+  constructor(
+    valueIn?: ?{x: number | AnimatedValue, y: number | AnimatedValue},
+  ) {
+    super();
+    const value: any = valueIn || {x: 0, y: 0}; // @flowfixme: shouldn't need `: any`
+    if (typeof value.x === 'number' && typeof value.y === 'number') {
+      this.x = new AnimatedValue(value.x);
+      this.y = new AnimatedValue(value.y);
+    } else {
+      invariant(
+        value.x instanceof AnimatedValue && value.y instanceof AnimatedValue,
+        'AnimatedValueXY must be initalized with an object of numbers or ' +
+          'AnimatedValues.',
+      );
+      this.x = value.x;
+      this.y = value.y;
+    }
+    this._listeners = {};
+  }
+
+  setValue(value: {x: number, y: number}) {
+    this.x.setValue(value.x);
+    this.y.setValue(value.y);
+  }
+
+  setOffset(offset: {x: number, y: number}) {
+    this.x.setOffset(offset.x);
+    this.y.setOffset(offset.y);
+  }
+
+  flattenOffset(): void {
+    this.x.flattenOffset();
+    this.y.flattenOffset();
+  }
+
+  extractOffset(): void {
+    this.x.extractOffset();
+    this.y.extractOffset();
+  }
+
+  __getValue(): {x: number, y: number} {
+    return {
+      x: this.x.__getValue(),
+      y: this.y.__getValue(),
+    };
+  }
+
+  resetAnimation(callback?: (value: {x: number, y: number}) => void): void {
+    this.x.resetAnimation();
+    this.y.resetAnimation();
+    callback && callback(this.__getValue());
+  }
+
+  stopAnimation(callback?: (value: {x: number, y: number}) => void): void {
+    this.x.stopAnimation();
+    this.y.stopAnimation();
+    callback && callback(this.__getValue());
+  }
+
+  addListener(callback: ValueXYListenerCallback): string {
+    const id = String(_uniqueId++);
+    const jointCallback = ({value: number}) => {
+      callback(this.__getValue());
+    };
+    this._listeners[id] = {
+      x: this.x.addListener(jointCallback),
+      y: this.y.addListener(jointCallback),
+    };
+    return id;
+  }
+
+  removeListener(id: string): void {
+    this.x.removeListener(this._listeners[id].x);
+    this.y.removeListener(this._listeners[id].y);
+    delete this._listeners[id];
+  }
+
+  removeAllListeners(): void {
+    this.x.removeAllListeners();
+    this.y.removeAllListeners();
+    this._listeners = {};
+  }
+
+  /**
+   * Converts `{x, y}` into `{left, top}` for use in style, e.g.
+   *
+   *```javascript
+   *  style={this.state.anim.getLayout()}
+   *```
+   */
+  getLayout(): {[key: string]: AnimatedValue} {
+    return {
+      left: this.x,
+      top: this.y,
+    };
+  }
+
+  /**
+   * Converts `{x, y}` into a useable translation transform, e.g.
+   *
+   *```javascript
+   *  style={{
+   *    transform: this.state.anim.getTranslateTransform()
+   *  }}
+   *```
+   */
+  getTranslateTransform(): Array<{[key: string]: AnimatedValue}> {
+    return [{translateX: this.x}, {translateY: this.y}];
+  }
+}
+
+module.exports = AnimatedValueXY;
@@ -0,0 +1,77 @@
+/**
+ * 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 AnimatedWithChildren
+ * @flow
+ * @format
+ */
+'use strict';
+
+const AnimatedNode = require('./AnimatedNode');
+const NativeAnimatedHelper = require('../NativeAnimatedHelper');
+
+class AnimatedWithChildren extends AnimatedNode {
+  _children: Array<AnimatedNode>;
+
+  constructor() {
+    super();
+    this._children = [];
+  }
+
+  __makeNative() {
+    if (!this.__isNative) {
+      this.__isNative = true;
+      for (const child of this._children) {
+        child.__makeNative();
+        NativeAnimatedHelper.API.connectAnimatedNodes(
+          this.__getNativeTag(),
+          child.__getNativeTag(),
+        );
+      }
+    }
+  }
+
+  __addChild(child: AnimatedNode): void {
+    if (this._children.length === 0) {
+      this.__attach();
+    }
+    this._children.push(child);
+    if (this.__isNative) {
+      // Only accept "native" animated nodes as children
+      child.__makeNative();
+      NativeAnimatedHelper.API.connectAnimatedNodes(
+        this.__getNativeTag(),
+        child.__getNativeTag(),
+      );
+    }
+  }
+
+  __removeChild(child: AnimatedNode): void {
+    const index = this._children.indexOf(child);
+    if (index === -1) {
+      console.warn("Trying to remove a child that doesn't exist");
+      return;
+    }
+    if (this.__isNative && child.__isNative) {
+      NativeAnimatedHelper.API.disconnectAnimatedNodes(
+        this.__getNativeTag(),
+        child.__getNativeTag(),
+      );
+    }
+    this._children.splice(index, 1);
+    if (this._children.length === 0) {
+      this.__detach();
+    }
+  }
+
+  __getChildren(): Array<AnimatedNode> {
+    return this._children;
+  }
+}
+
+module.exports = AnimatedWithChildren;
@@ -102,6 +102,8 @@ class AppState extends NativeEventEmitter {
    // the Android implementation.
    this.currentState = RCTAppState.initialAppState || 'active';

+    let eventUpdated = false;
+
    // TODO: this is a terrible solution - in order to ensure `currentState` prop
    // is up to date, we have to register an observer that updates it whenever
    // the state changes, even if nobody cares. We should just deprecate the
@@ -109,6 +111,7 @@ class AppState extends NativeEventEmitter {
    this.addListener(
      'appStateDidChange',
      (appStateData) => {
+        eventUpdated = true;
        this.currentState = appStateData.app_state;
      }
    );
@@ -118,7 +121,9 @@ class AppState extends NativeEventEmitter {
    // and expose `getCurrentAppState` method directly.
    RCTAppState.getCurrentAppState(
      (appStateData) => {
-        this.currentState = appStateData.app_state;
+        if (!eventUpdated) {
+          this.currentState = appStateData.app_state;
+        }
      },
      logError
    );
@@ -8,10 +8,12 @@
 *
 * @providesModule BatchedBridge
 * @flow
+ * @format
 */
 'use strict';

 const MessageQueue = require('MessageQueue');
+
 const BatchedBridge = new MessageQueue();

 // Wire up the batched bridge on the global object so that we can call into it.
@@ -8,6 +8,7 @@
 *
 * @providesModule MessageQueue
 * @flow
+ * @format
 */

 /*eslint no-bitwise: 0*/
@@ -24,9 +25,13 @@ const stringifySafe = require('stringifySafe');
 export type SpyData = {
  type: number,
  module: ?string,
-  method: string|number,
-  args: any
-}
+  method: string | number,
+  isSync: boolean,
+  successCbId: number,
+  failCbId: number,
+  args: Array<any>,
+  returnValue?: any,
+};

 const TO_JS = 0;
 const TO_NATIVE = 1;
@@ -38,13 +43,13 @@ const MIN_TIME_BETWEEN_FLUSHES_MS = 5;

 const TRACE_TAG_REACT_APPS = 1 << 17;

-const DEBUG_INFO_LIMIT = 32;
+const DEBUG_INFO_LIMIT = 64;

 // Work around an initialization order issue
 let JSTimers = null;

 class MessageQueue {
-  _lazyCallableModules: {[key: string]: void => Object};
+  _lazyCallableModules: {[key: string]: (void) => Object};
  _queue: [Array<number>, Array<number>, Array<any>, number];
  _successCallbacks: Array<?Function>;
  _failureCallbacks: Array<?Function>;
@@ -73,23 +78,19 @@ class MessageQueue {
      this._remoteModuleTable = {};
      this._remoteMethodTable = {};
    }
-
-    (this:any).callFunctionReturnFlushedQueue = this.callFunctionReturnFlushedQueue.bind(this);
-    (this:any).callFunctionReturnResultAndFlushedQueue = this.callFunctionReturnResultAndFlushedQueue.bind(this);
-    (this:any).flushedQueue = this.flushedQueue.bind(this);
-    (this:any).invokeCallbackAndReturnFlushedQueue = this.invokeCallbackAndReturnFlushedQueue.bind(this);
  }

  /**
   * Public APIs
   */
-
-  static spy(spyOrToggle: boolean|(data: SpyData) => void){
-    if (spyOrToggle === true){
+  static spy(spyOrToggle: boolean | ((data: SpyData) => void)) {
+    if (spyOrToggle === true) {
      MessageQueue.prototype.__spy = info => {
-        console.log(`${info.type === TO_JS ? 'N->JS' : 'JS->N'} : ` +
-                    `${info.module ? (info.module + '.') : ''}${info.method}` +
-                    `(${JSON.stringify(info.args)})`);
+        console.log(
+          `${info.type === TO_JS ? 'N->JS' : 'JS->N'} : ` +
+            `${info.module ? info.module + '.' : ''}${info.method}` +
+            `(${JSON.stringify(info.args)})`,
+        );
      };
    } else if (spyOrToggle === false) {
      MessageQueue.prototype.__spy = null;
@@ -98,32 +99,40 @@ class MessageQueue {
    }
  }

-  callFunctionReturnFlushedQueue(module: string, method: string, args: Array<any>) {
+  callFunctionReturnFlushedQueue = (
+    module: string,
+    method: string,
+    args: Array<any>,
+  ) => {
    this.__guard(() => {
      this.__callFunction(module, method, args);
    });

    return this.flushedQueue();
-  }
+  };

-  callFunctionReturnResultAndFlushedQueue(module: string, method: string, args: Array<any>) {
+  callFunctionReturnResultAndFlushedQueue = (
+    module: string,
+    method: string,
+    args: Array<any>,
+  ) => {
    let result;
    this.__guard(() => {
      result = this.__callFunction(module, method, args);
    });

    return [result, this.flushedQueue()];
-  }
+  };

-  invokeCallbackAndReturnFlushedQueue(cbID: number, args: Array<any>) {
+  invokeCallbackAndReturnFlushedQueue = (cbID: number, args: Array<any>) => {
    this.__guard(() => {
      this.__invokeCallback(cbID, args);
    });

    return this.flushedQueue();
-  }
+  };

-  flushedQueue() {
+  flushedQueue = () => {
    this.__guard(() => {
      this.__callImmediates();
    });
@@ -131,7 +140,7 @@ class MessageQueue {
    const queue = this._queue;
    this._queue = [[], [], [], this._callID];
    return queue[0].length ? queue : null;
-  }
+  };

  getEventLoopRunningTime() {
    return new Date().getTime() - this._eventLoopStartTime;
@@ -143,7 +152,7 @@ class MessageQueue {

  registerLazyCallableModule(name: string, factory: void => Object) {
    let module: Object;
-    let getValue: ?(void => Object) = factory;
+    let getValue: ?(void) => Object = factory;
    this._lazyCallableModules[name] = () => {
      if (getValue) {
        module = getValue();
@@ -158,7 +167,13 @@ class MessageQueue {
    return getValue ? getValue() : null;
  }

-  enqueueNativeCall(moduleID: number, methodID: number, params: Array<any>, onFail: ?Function, onSucc: ?Function) {
+  enqueueNativeCall(
+    moduleID: number,
+    methodID: number,
+    params: Array<any>,
+    onFail: ?Function,
+    onSucc: ?Function,
+  ) {
    if (onFail || onSucc) {
      if (__DEV__) {
        this._debugInfo[this._callID] = [moduleID, methodID];
@@ -176,7 +191,11 @@ class MessageQueue {

    if (__DEV__) {
      global.nativeTraceBeginAsyncFlow &&
-        global.nativeTraceBeginAsyncFlow(TRACE_TAG_REACT_APPS, 'native', this._callID);
+        global.nativeTraceBeginAsyncFlow(
+          TRACE_TAG_REACT_APPS,
+          'native',
+          this._callID,
+        );
    }
    this._callID++;

@@ -188,32 +207,51 @@ class MessageQueue {
      JSON.stringify(params);

      // The params object should not be mutated after being queued
-      deepFreezeAndThrowOnMutationInDev((params:any));
+      deepFreezeAndThrowOnMutationInDev((params: any));
    }
    this._queue[PARAMS].push(params);

    const now = new Date().getTime();
-    if (global.nativeFlushQueueImmediate &&
-        (now - this._lastFlush >= MIN_TIME_BETWEEN_FLUSHES_MS ||
-         this._inCall === 0)) {
+    if (
+      global.nativeFlushQueueImmediate &&
+      (now - this._lastFlush >= MIN_TIME_BETWEEN_FLUSHES_MS ||
+        this._inCall === 0)
+    ) {
      var queue = this._queue;
      this._queue = [[], [], [], this._callID];
      this._lastFlush = now;
      global.nativeFlushQueueImmediate(queue);
    }
    Systrace.counterEvent('pending_js_to_native_queue', this._queue[0].length);
-    if (__DEV__ && this.__spy && isFinite(moduleID)) {
-      this.__spy(
-        { type: TO_NATIVE,
-          module: this._remoteModuleTable[moduleID],
-          method: this._remoteMethodTable[moduleID][methodID],
-          args: params }
-      );
-    } else if (this.__spy) {
-      this.__spy({type: TO_NATIVE, module: moduleID + '', method: methodID, args: params});
+
+    if (this.__spy) {
+      this.__spyNativeCall(moduleID, methodID, params, {
+        failCbId: onFail ? params[params.length - 2] : -1,
+        successCbId: onSucc ? params[params.length - 1] : -1,
+      });
    }
  }

+  callSyncHook(moduleID: number, methodID: number, args: Array<any>) {
+    if (__DEV__) {
+      invariant(
+        global.nativeCallSyncHook,
+        'Calling synchronous methods on native ' +
+          'modules is not supported in Chrome.\n\n Consider providing alternative ' +
+          'methods to expose this method in debug mode, e.g. by exposing constants ' +
+          'ahead-of-time.',
+      );
+    }
+    const returnValue = global.nativeCallSyncHook(moduleID, methodID, args);
+    if (this.__spy) {
+      this.__spyNativeCall(moduleID, methodID, args, {
+        isSync: true,
+        returnValue,
+      });
+    }
+    return returnValue;
+  }
+
  createDebugLookup(moduleID: number, name: string, methods: Array<string>) {
    if (__DEV__) {
      this._remoteModuleTable[moduleID] = name;
@@ -250,18 +288,20 @@ class MessageQueue {
    this._eventLoopStartTime = this._lastFlush;
    Systrace.beginEvent(`${module}.${method}()`);
    if (this.__spy) {
-      this.__spy({ type: TO_JS, module, method, args});
+      this.__spyJSCall(module, method, args);
    }
    const moduleMethods = this.getCallableModule(module);
    invariant(
      !!moduleMethods,
      'Module %s is not a registered callable module (calling %s)',
-      module, method
+      module,
+      method,
    );
    invariant(
      !!moduleMethods[method],
      'Method %s does not exist on module %s',
-      method, module
+      method,
+      module,
    );
    const result = moduleMethods[method].apply(moduleMethods, args);
    Systrace.endEvent();
@@ -274,7 +314,10 @@ class MessageQueue {

    // The rightmost bit of cbID indicates fail (0) or success (1), the other bits are the callID shifted left.
    const callID = cbID >>> 1;
-    const callback = (cbID & 1) ? this._successCallbacks[callID] : this._failureCallbacks[callID];
+    const isSuccess = cbID & 1;
+    const callback = isSuccess
+      ? this._successCallbacks[callID]
+      : this._failureCallbacks[callID];

    if (__DEV__) {
      const debug = this._debugInfo[callID];
@@ -283,20 +326,24 @@ class MessageQueue {
      if (!callback) {
        let errorMessage = `Callback with id ${cbID}: ${module}.${method}() not found`;
        if (method) {
-          errorMessage = `The callback ${method}() exists in module ${module}, `
-          + 'but only one callback may be registered to a function in a native module.';
+          errorMessage =
+            `The callback ${method}() exists in module ${module}, ` +
+            'but only one callback may be registered to a function in a native module.';
        }
-        invariant(
-          callback,
-          errorMessage
-        );
+        invariant(callback, errorMessage);
      }
-      const profileName = debug ? '<callback for ' + module + '.' + method + '>' : cbID;
-      if (callback && this.__spy) {
-        this.__spy({ type: TO_JS, module:null, method:profileName, args });
+      const profileName = debug
+        ? '<callback for ' + module + '.' + method + '>'
+        : cbID + '';
+      if (this.__spy) {
+        this.__spyJSCall(null, profileName, args, {
+          failCbId: isSuccess ? -1 : cbID,
+          successCbId: isSuccess ? cbID : -1,
+        });
      }
      Systrace.beginEvent(
-        `MessageQueue.invokeCallback(${profileName}, ${stringifySafe(args)})`);
+        `MessageQueue.invokeCallback(${profileName}, ${stringifySafe(args)})`,
+      );
    }

    if (!callback) {
@@ -310,6 +357,57 @@ class MessageQueue {
      Systrace.endEvent();
    }
  }
+
+  __spyJSCall(
+    module: ?string,
+    method: string,
+    methodArgs: Array<any>,
+    params: any,
+  ) {
+    if (!this.__spy) {
+      return;
+    }
+    this.__spy({
+      type: TO_JS,
+      isSync: false,
+      module,
+      method,
+      failCbId: -1,
+      successCbId: -1,
+      args: methodArgs,
+      ...params,
+    });
+  }
+
+  __spyNativeCall(
+    moduleID: number,
+    methodID: number,
+    methodArgs: Array<any>,
+    params: any,
+  ) {
+    const spy = this.__spy;
+    if (!spy) {
+      return;
+    }
+
+    let moduleName = moduleID + '';
+    let methodName = methodID;
+    if (__DEV__ && isFinite(moduleID)) {
+      moduleName = this._remoteModuleTable[moduleID];
+      methodName = this._remoteMethodTable[moduleID][methodID];
+    }
+
+    spy({
+      type: TO_NATIVE,
+      isSync: false,
+      module: moduleName,
+      method: methodName,
+      failCbId: -1,
+      successCbId: -1,
+      args: methodArgs,
+      ...params,
+    });
+  }
 }

 module.exports = MessageQueue;
@@ -82,13 +82,7 @@ function genMethod(moduleID: number, methodID: number, type: MethodType) {
    };
  } else if (type === 'sync') {
    fn = function(...args: Array<any>) {
-      if (__DEV__) {
-        invariant(global.nativeCallSyncHook, 'Calling synchronous methods on native ' +
-          'modules is not supported in Chrome.\n\n Consider providing alternative ' +
-          'methods to expose this method in debug mode, e.g. by exposing constants ' +
-          'ahead-of-time.');
-      }
-      return global.nativeCallSyncHook(moduleID, methodID, args);
+      return BatchedBridge.callSyncHook(moduleID, methodID, args);
    };
  } else {
    fn = function(...args: Array<any>) {
@@ -0,0 +1,153 @@
+/**
+ * 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.
+ *
+ * @providesModule Blob
+ * @flow
+ */
+
+'use strict';
+
+const invariant = require('fbjs/lib/invariant');
+const uuid = require('uuid');
+
+const { BlobModule } = require('NativeModules');
+
+import type { BlobProps } from 'BlobTypes';
+
+/**
+ * Opaque JS representation of some binary data in native.
+ *
+ * The API is modeled after the W3C Blob API, with one caveat
+ * regarding explicit deallocation. Refer to the `close()`
+ * method for further details.
+ *
+ * Example usage in a React component:
+ *
+ *   class WebSocketImage extends React.Component {
+ *      state = {blob: null};
+ *      componentDidMount() {
+ *        let ws = this.ws = new WebSocket(...);
+ *        ws.binaryType = 'blob';
+ *        ws.onmessage = (event) => {
+ *          if (this.state.blob) {
+ *            this.state.blob.close();
+ *          }
+ *          this.setState({blob: event.data});
+ *        };
+ *      }
+ *      componentUnmount() {
+ *        if (this.state.blob) {
+ *          this.state.blob.close();
+ *        }
+ *        this.ws.close();
+ *      }
+ *      render() {
+ *        if (!this.state.blob) {
+ *          return <View />;
+ *        }
+ *        return <Image source={{uri: URL.createObjectURL(this.state.blob)}} />;
+ *      }
+ *   }
+ *
+ * Reference: https://developer.mozilla.org/en-US/docs/Web/API/Blob
+ */
+class Blob {
+  /**
+   * Size of the data contained in the Blob object, in bytes.
+   */
+  size: number;
+  /*
+   * String indicating the MIME type of the data contained in the Blob.
+   * If the type is unknown, this string is empty.
+   */
+  type: string;
+
+  /*
+   * Unique id to identify the blob on native side (non-standard)
+   */
+  blobId: string;
+  /*
+   * Offset to indicate part of blob, used when sliced (non-standard)
+   */
+  offset: number;
+
+  /**
+   * Construct blob instance from blob data from native.
+   * Used internally by modules like XHR, WebSocket, etc.
+   */
+  static create(props: BlobProps): Blob {
+    return Object.assign(Object.create(Blob.prototype), props);
+  }
+
+  /**
+   * Constructor for JS consumers.
+   * Currently we only support creating Blobs from other Blobs.
+   * Reference: https://developer.mozilla.org/en-US/docs/Web/API/Blob/Blob
+   */
+  constructor(parts: Array<Blob>, options: any) {
+    const blobId = uuid();
+    let size = 0;
+    parts.forEach((part) => {
+      invariant(part instanceof Blob, 'Can currently only create a Blob from other Blobs');
+      size += part.size;
+    });
+    BlobModule.createFromParts(parts, blobId);
+    return Blob.create({
+      blobId,
+      offset: 0,
+      size,
+    });
+  }
+
+  /*
+   * This method is used to create a new Blob object containing
+   * the data in the specified range of bytes of the source Blob.
+   * Reference: https://developer.mozilla.org/en-US/docs/Web/API/Blob/slice
+   */
+  slice(start?: number, end?: number): Blob {
+    let offset = this.offset;
+    let size = this.size;
+    if (typeof start === 'number') {
+      if (start > size) {
+        start = size;
+      }
+      offset += start;
+      size -= start;
+
+      if (typeof end === 'number') {
+        if (end < 0) {
+          end = this.size + end;
+        }
+        size = end - start;
+      }
+    }
+    return Blob.create({
+      blobId: this.blobId,
+      offset,
+      size,
+    });
+  }
+
+  /**
+   * This method is in the standard, but not actually implemented by
+   * any browsers at this point. It's important for how Blobs work in
+   * React Native, however, since we cannot de-allocate resources automatically,
+   * so consumers need to explicitly de-allocate them.
+   *
+   * Note that the semantics around Blobs created via `blob.slice()`
+   * and `new Blob([blob])` are different. `blob.slice()` creates a
+   * new *view* onto the same binary data, so calling `close()` on any
+   * of those views is enough to deallocate the data, whereas
+   * `new Blob([blob, ...])` actually copies the data in memory.
+   */
+  close() {
+    BlobModule.release(this.blobId);
+  }
+}
+
+module.exports = Blob;
@@ -0,0 +1,25 @@
+/**
+ * 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.
+ *
+ * @providesModule BlobTypes
+ * @flow
+ */
+
+'use strict';
+
+export type BlobProps = {
+  blobId: string,
+  offset: number,
+  size: number,
+  type?: string,
+};
+
+export type FileProps = BlobProps & {
+  name: string,
+  lastModified: number,
+};
@@ -0,0 +1,347 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		AD0871131E215B28007D136D /* RCTBlobManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = AD9A43C11DFC7126008DC588 /* RCTBlobManager.h */; };
+		AD0871161E215EC9007D136D /* RCTBlobManager.h in Headers */ = {isa = PBXBuildFile; fileRef = AD9A43C11DFC7126008DC588 /* RCTBlobManager.h */; };
+		AD0871181E215ED1007D136D /* RCTBlobManager.h in Headers */ = {isa = PBXBuildFile; fileRef = AD9A43C11DFC7126008DC588 /* RCTBlobManager.h */; };
+		AD08711A1E2162C8007D136D /* RCTBlobManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = AD9A43C11DFC7126008DC588 /* RCTBlobManager.h */; };
+		AD9A43C31DFC7126008DC588 /* RCTBlobManager.m in Sources */ = {isa = PBXBuildFile; fileRef = AD9A43C21DFC7126008DC588 /* RCTBlobManager.m */; };
+		ADD01A711E09404A00F6D226 /* RCTBlobManager.m in Sources */ = {isa = PBXBuildFile; fileRef = AD9A43C21DFC7126008DC588 /* RCTBlobManager.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		358F4ED51D1E81A9004DF814 /* Copy Headers */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = include/RCTBlob;
+			dstSubfolderSpec = 16;
+			files = (
+				AD08711A1E2162C8007D136D /* RCTBlobManager.h in Copy Headers */,
+			);
+			name = "Copy Headers";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		AD0871121E215B16007D136D /* Copy Headers */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = include/RCTBlob;
+			dstSubfolderSpec = 16;
+			files = (
+				AD0871131E215B28007D136D /* RCTBlobManager.h in Copy Headers */,
+			);
+			name = "Copy Headers";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		358F4ED71D1E81A9004DF814 /* libRCTBlob.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTBlob.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		AD9A43C11DFC7126008DC588 /* RCTBlobManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBlobManager.h; sourceTree = "<group>"; };
+		AD9A43C21DFC7126008DC588 /* RCTBlobManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBlobManager.m; sourceTree = "<group>"; };
+		ADD01A681E09402E00F6D226 /* libRCTBlob-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTBlob-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXGroup section */
+		358F4ECE1D1E81A9004DF814 = {
+			isa = PBXGroup;
+			children = (
+				AD9A43C11DFC7126008DC588 /* RCTBlobManager.h */,
+				AD9A43C21DFC7126008DC588 /* RCTBlobManager.m */,
+				358F4ED81D1E81A9004DF814 /* Products */,
+			);
+			indentWidth = 2;
+			sourceTree = "<group>";
+			tabWidth = 2;
+			usesTabs = 0;
+		};
+		358F4ED81D1E81A9004DF814 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				358F4ED71D1E81A9004DF814 /* libRCTBlob.a */,
+				ADD01A681E09402E00F6D226 /* libRCTBlob-tvOS.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		AD0871151E215EB7007D136D /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				AD0871161E215EC9007D136D /* RCTBlobManager.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		AD0871171E215ECC007D136D /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				AD0871181E215ED1007D136D /* RCTBlobManager.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		358F4ED61D1E81A9004DF814 /* RCTBlob */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 358F4EE01D1E81A9004DF814 /* Build configuration list for PBXNativeTarget "RCTBlob" */;
+			buildPhases = (
+				AD0871151E215EB7007D136D /* Headers */,
+				358F4ED51D1E81A9004DF814 /* Copy Headers */,
+				358F4ED31D1E81A9004DF814 /* Sources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = RCTBlob;
+			productName = SLKBlobs;
+			productReference = 358F4ED71D1E81A9004DF814 /* libRCTBlob.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		ADD01A671E09402E00F6D226 /* RCTBlob-tvOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = ADD01A6E1E09402E00F6D226 /* Build configuration list for PBXNativeTarget "RCTBlob-tvOS" */;
+			buildPhases = (
+				AD0871171E215ECC007D136D /* Headers */,
+				AD0871121E215B16007D136D /* Copy Headers */,
+				ADD01A641E09402E00F6D226 /* Sources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "RCTBlob-tvOS";
+			productName = "RCTBlob-tvOS";
+			productReference = ADD01A681E09402E00F6D226 /* libRCTBlob-tvOS.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		358F4ECF1D1E81A9004DF814 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0730;
+				ORGANIZATIONNAME = "Silk Labs";
+				TargetAttributes = {
+					358F4ED61D1E81A9004DF814 = {
+						CreatedOnToolsVersion = 7.3;
+					};
+					ADD01A671E09402E00F6D226 = {
+						CreatedOnToolsVersion = 8.2;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 358F4ED21D1E81A9004DF814 /* Build configuration list for PBXProject "RCTBlob" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 358F4ECE1D1E81A9004DF814;
+			productRefGroup = 358F4ED81D1E81A9004DF814 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				358F4ED61D1E81A9004DF814 /* RCTBlob */,
+				ADD01A671E09402E00F6D226 /* RCTBlob-tvOS */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		358F4ED31D1E81A9004DF814 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				AD9A43C31DFC7126008DC588 /* RCTBlobManager.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		ADD01A641E09402E00F6D226 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				ADD01A711E09404A00F6D226 /* RCTBlobManager.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		358F4EDE1D1E81A9004DF814 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		358F4EDF1D1E81A9004DF814 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		358F4EE11D1E81A9004DF814 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		358F4EE21D1E81A9004DF814 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		ADD01A6F1E09402E00F6D226 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = appletvos;
+				SKIP_INSTALL = YES;
+				TVOS_DEPLOYMENT_TARGET = 10.1;
+			};
+			name = Debug;
+		};
+		ADD01A701E09402E00F6D226 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = appletvos;
+				SKIP_INSTALL = YES;
+				TVOS_DEPLOYMENT_TARGET = 10.1;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		358F4ED21D1E81A9004DF814 /* Build configuration list for PBXProject "RCTBlob" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				358F4EDE1D1E81A9004DF814 /* Debug */,
+				358F4EDF1D1E81A9004DF814 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		358F4EE01D1E81A9004DF814 /* Build configuration list for PBXNativeTarget "RCTBlob" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				358F4EE11D1E81A9004DF814 /* Debug */,
+				358F4EE21D1E81A9004DF814 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		ADD01A6E1E09402E00F6D226 /* Build configuration list for PBXNativeTarget "RCTBlob-tvOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				ADD01A6F1E09402E00F6D226 /* Debug */,
+				ADD01A701E09402E00F6D226 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 358F4ECF1D1E81A9004DF814 /* Project object */;
+}
@@ -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 <React/RCTBridge.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTURLRequestHandler.h>
+
+@interface RCTBlobManager : NSObject <RCTBridgeModule, RCTURLRequestHandler>
+
+@end
@@ -0,0 +1,218 @@
+/**
+ * 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 "RCTBlobManager.h"
+
+#import <React/RCTConvert.h>
+#import <React/RCTWebSocketModule.h>
+
+static NSString *const kBlobUriScheme = @"blob";
+
+@interface _RCTBlobContentHandler : NSObject <RCTWebSocketContentHandler>
+
+- (instancetype)initWithBlobManager:(RCTBlobManager *)blobManager;
+
+@end
+
+
+@implementation RCTBlobManager
+{
+  NSMutableDictionary<NSString *, NSData *> *_blobs;
+  _RCTBlobContentHandler *_contentHandler;
+  NSOperationQueue *_queue;
+}
+
+RCT_EXPORT_MODULE(BlobModule)
+
+@synthesize bridge = _bridge;
+
+ (BOOL)requiresMainQueueSetup
+{
+  return NO;
+}
+
+- (NSDictionary<NSString *, id> *)constantsToExport
+{
+  return @{
+    @"BLOB_URI_SCHEME": kBlobUriScheme,
+    @"BLOB_URI_HOST": [NSNull null],
+  };
+}
+
+- (dispatch_queue_t)methodQueue
+{
+  return [[_bridge webSocketModule] methodQueue];
+}
+
+- (NSString *)store:(NSData *)data
+{
+  NSString *blobId = [NSUUID UUID].UUIDString;
+  [self store:data withId:blobId];
+  return blobId;
+}
+
+- (void)store:(NSData *)data withId:(NSString *)blobId
+{
+  if (!_blobs) {
+    _blobs = [NSMutableDictionary new];
+  }
+
+  _blobs[blobId] = data;
+}
+
+- (NSData *)resolve:(NSDictionary<NSString *, id> *)blob
+{
+  NSString *blobId = [RCTConvert NSString:blob[@"blobId"]];
+  NSNumber *offset = [RCTConvert NSNumber:blob[@"offset"]];
+  NSNumber *size = [RCTConvert NSNumber:blob[@"size"]];
+
+  return [self resolve:blobId
+                offset:offset ? [offset integerValue] : 0
+                  size:size ? [size integerValue] : -1];
+}
+
+- (NSData *)resolve:(NSString *)blobId offset:(NSInteger)offset size:(NSInteger)size
+{
+  NSData *data = _blobs[blobId];
+  if (!data) {
+    return nil;
+  }
+  if (offset != 0 || (size != -1 && size != data.length)) {
+    data = [data subdataWithRange:NSMakeRange(offset, size)];
+  }
+  return data;
+}
+
+RCT_EXPORT_METHOD(enableBlobSupport:(nonnull NSNumber *)socketID)
+{
+  if (!_contentHandler) {
+    _contentHandler = [[_RCTBlobContentHandler alloc] initWithBlobManager:self];
+  }
+  [[_bridge webSocketModule] setContentHandler:_contentHandler forSocketID:socketID];
+}
+
+RCT_EXPORT_METHOD(disableBlobSupport:(nonnull NSNumber *)socketID)
+{
+  [[_bridge webSocketModule] setContentHandler:nil forSocketID:socketID];
+}
+
+RCT_EXPORT_METHOD(sendBlob:(NSDictionary *)blob socketID:(nonnull NSNumber *)socketID)
+{
+  [[_bridge webSocketModule] sendData:[self resolve:blob] forSocketID:socketID];
+}
+
+RCT_EXPORT_METHOD(createFromParts:(NSArray<NSDictionary<NSString *, id> *> *)parts withId:(NSString *)blobId)
+{
+  NSMutableData *data = [NSMutableData new];
+  for (NSDictionary<NSString *, id> *part in parts) {
+    NSData *partData = [self resolve:part];
+    [data appendData:partData];
+  }
+  [self store:data withId:blobId];
+}
+
+RCT_EXPORT_METHOD(release:(NSString *)blobId)
+{
+  [_blobs removeObjectForKey:blobId];
+}
+
+#pragma mark - RCTURLRequestHandler methods
+
+- (BOOL)canHandleRequest:(NSURLRequest *)request
+{
+  return [request.URL.scheme caseInsensitiveCompare:kBlobUriScheme] == NSOrderedSame;
+}
+
+- (id)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate>)delegate
+{
+  // Lazy setup
+  if (!_queue) {
+    _queue = [NSOperationQueue new];
+    _queue.maxConcurrentOperationCount = 2;
+  }
+
+  __weak __block NSBlockOperation *weakOp;
+  __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
+    NSURLResponse *response = [[NSURLResponse alloc] initWithURL:request.URL
+                                                        MIMEType:nil
+                                           expectedContentLength:-1
+                                                textEncodingName:nil];
+
+    [delegate URLRequest:weakOp didReceiveResponse:response];
+
+    NSURLComponents *components = [[NSURLComponents alloc] initWithURL:request.URL resolvingAgainstBaseURL:NO];
+
+    NSString *blobId = components.path;
+    NSInteger offset = 0;
+    NSInteger size = -1;
+
+    if (components.queryItems) {
+      for (NSURLQueryItem *queryItem in components.queryItems) {
+        if ([queryItem.name isEqualToString:@"offset"]) {
+          offset = [queryItem.value integerValue];
+        }
+        if ([queryItem.name isEqualToString:@"size"]) {
+          size = [queryItem.value integerValue];
+        }
+      }
+    }
+
+    NSData *data;
+    if (blobId) {
+      data = [self resolve:blobId offset:offset size:size];
+    }
+    NSError *error;
+    if (data) {
+      [delegate URLRequest:weakOp didReceiveData:data];
+    } else {
+      error = [[NSError alloc] initWithDomain:NSURLErrorDomain code:NSURLErrorBadURL userInfo:nil];
+    }
+    [delegate URLRequest:weakOp didCompleteWithError:error];
+  }];
+
+  weakOp = op;
+  [_queue addOperation:op];
+  return op;
+}
+
+- (void)cancelRequest:(NSOperation *)op
+{
+  [op cancel];
+}
+
+@end
+
+@implementation _RCTBlobContentHandler {
+  __weak RCTBlobManager *_blobManager;
+}
+
+- (instancetype)initWithBlobManager:(RCTBlobManager *)blobManager
+{
+  if (self = [super init]) {
+    _blobManager = blobManager;
+  }
+  return self;
+}
+
+- (id)processMessage:(id)message forSocketID:(NSNumber *)socketID withType:(NSString *__autoreleasing _Nonnull *)type
+{
+  if (![message isKindOfClass:[NSData class]]) {
+    *type = @"text";
+    return message;
+  }
+
+  *type = @"blob";
+  return @{
+     @"blobId": [_blobManager store:message],
+     @"offset": @0,
+     @"size": @(((NSData *)message).length),
+   };
+}
+
+@end
@@ -0,0 +1,70 @@
+/**
+ * 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.
+ *
+ * @providesModule URL
+ * @format
+ * @flow
+ */
+
+'use strict';
+
+const Blob = require('Blob');
+
+const {BlobModule} = require('NativeModules');
+
+let BLOB_URL_PREFIX = null;
+
+if (BlobModule && typeof BlobModule.BLOB_URI_SCHEME === 'string') {
+  BLOB_URL_PREFIX = BlobModule.BLOB_URI_SCHEME + ':';
+  if (typeof BlobModule.BLOB_URI_HOST === 'string') {
+    BLOB_URL_PREFIX += `//${BlobModule.BLOB_URI_HOST}/`;
+  }
+}
+
+/**
+ * To allow Blobs be accessed via `content://` URIs,
+ * you need to register `BlobProvider` as a ContentProvider in your app's `AndroidManifest.xml`:
+ *
+ * ```xml
+ * <manifest>
+ *   <application>
+ *     <provider
+ *       android:name="com.facebook.react.modules.blob.BlobProvider"
+ *       android:authorities="@string/blob_provider_authority"
+ *       android:exported="false"
+ *     />
+ *   </application>
+ * </manifest>
+ * ```
+ * And then define the `blob_provider_authority` string in `res/values/strings.xml`.
+ * Use a dotted name that's entirely unique to your app:
+ *
+ * ```xml
+ * <resources>
+ *   <string name="blob_provider_authority">your.app.package.blobs</string>
+ * </resources>
+ * ```
+ */
+class URL {
+  constructor() {
+    throw new Error('Creating BlobURL objects is not supported yet.');
+  }
+
+  static createObjectURL(blob: Blob) {
+    if (BLOB_URL_PREFIX === null) {
+      throw new Error('Cannot create URL for blob!');
+    }
+    return `${BLOB_URL_PREFIX}${blob.blobId}?offset=${blob.offset}&size=${blob.size}`;
+  }
+
+  static revokeObjectURL(url: string) {
+    // Do nothing.
+  }
+}
+
+module.exports = URL;
@@ -88,6 +88,7 @@ const getPhotosReturnChecker = createStrictShapeTypeChecker({
          height: PropTypes.number.isRequired,
          width: PropTypes.number.isRequired,
          isStored: PropTypes.bool,
+          playableDuration: PropTypes.number.isRequired,
        }).isRequired,
        timestamp: PropTypes.number.isRequired,
        location: createStrictShapeTypeChecker({
@@ -9,7 +9,7 @@

 #import "RCTAssetsLibraryRequestHandler.h"

-#import <libkern/OSAtomic.h>
+#import <stdatomic.h>

 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
@@ -41,13 +41,13 @@ RCT_EXPORT_MODULE()
 - (id)sendRequest:(NSURLRequest *)request
     withDelegate:(id<RCTURLRequestDelegate>)delegate
 {
-  __block volatile uint32_t cancelled = 0;
+  __block atomic_bool cancelled = ATOMIC_VAR_INIT(NO);
  void (^cancellationBlock)(void) = ^{
-    OSAtomicOr32Barrier(1, &cancelled);
+    atomic_store(&cancelled, YES);
  };

  [[self assetsLibrary] assetForURL:request.URL resultBlock:^(ALAsset *asset) {
-    if (cancelled) {
+    if (atomic_load(&cancelled)) {
      return;
    }

@@ -91,7 +91,7 @@ RCT_EXPORT_MODULE()
      [delegate URLRequest:cancellationBlock didCompleteWithError:error];
    }
  } failureBlock:^(NSError *loadError) {
-    if (cancelled) {
+    if (atomic_load(&cancelled)) {
      return;
    }
    [delegate URLRequest:cancellationBlock didCompleteWithError:loadError];
@@ -64,6 +64,7 @@
 			indentWidth = 2;
 			sourceTree = "<group>";
 			tabWidth = 2;
+			usesTabs = 0;
 		};
 		58B5115E1A9E6B3D00147676 /* Products */ = {
 			isa = PBXGroup;
@@ -80,8 +80,8 @@ RCT_EXPORT_MODULE()

@synthesize bridge = _bridge;

-NSString *const RCTErrorUnableToLoad = @"E_UNABLE_TO_LOAD";
-NSString *const RCTErrorUnableToSave = @"E_UNABLE_TO_SAVE";
+static NSString *const kErrorUnableToLoad = @"E_UNABLE_TO_LOAD";
+static NSString *const kErrorUnableToSave = @"E_UNABLE_TO_SAVE";

 RCT_EXPORT_METHOD(saveToCameraRoll:(NSURLRequest *)request
                  type:(NSString *)type
@@ -93,7 +93,7 @@ RCT_EXPORT_METHOD(saveToCameraRoll:(NSURLRequest *)request
    dispatch_async(dispatch_get_main_queue(), ^{
      [self->_bridge.assetsLibrary writeVideoAtPathToSavedPhotosAlbum:request.URL completionBlock:^(NSURL *assetURL, NSError *saveError) {
        if (saveError) {
-          reject(RCTErrorUnableToSave, nil, saveError);
+          reject(kErrorUnableToSave, nil, saveError);
        } else {
          resolve(assetURL.absoluteString);
        }
@@ -103,7 +103,7 @@ RCT_EXPORT_METHOD(saveToCameraRoll:(NSURLRequest *)request
    [_bridge.imageLoader loadImageWithURLRequest:request
                                        callback:^(NSError *loadError, UIImage *loadedImage) {
      if (loadError) {
-        reject(RCTErrorUnableToLoad, nil, loadError);
+        reject(kErrorUnableToLoad, nil, loadError);
        return;
      }
      // It's unclear if writeImageToSavedPhotosAlbum is thread-safe
@@ -111,7 +111,7 @@ RCT_EXPORT_METHOD(saveToCameraRoll:(NSURLRequest *)request
        [self->_bridge.assetsLibrary writeImageToSavedPhotosAlbum:loadedImage.CGImage metadata:nil completionBlock:^(NSURL *assetURL, NSError *saveError) {
          if (saveError) {
            RCTLogWarn(@"Error saving cropped image: %@", saveError);
-            reject(RCTErrorUnableToSave, nil, saveError);
+            reject(kErrorUnableToSave, nil, saveError);
          } else {
            resolve(assetURL.absoluteString);
          }
@@ -187,6 +187,11 @@ RCT_EXPORT_METHOD(getPhotos:(NSDictionary *)params
          CLLocation *loc = [result valueForProperty:ALAssetPropertyLocation];
          NSDate *date = [result valueForProperty:ALAssetPropertyDate];
          NSString *filename = [result defaultRepresentation].filename;
+          int64_t duration = 0;
+          if ([[result valueForProperty:ALAssetPropertyType] isEqualToString:ALAssetTypeVideo]) {
+            duration = [[result valueForProperty:ALAssetPropertyDuration] intValue];
+          }
+
          [assets addObject:@{
            @"node": @{
              @"type": [result valueForProperty:ALAssetPropertyType],
@@ -197,6 +202,7 @@ RCT_EXPORT_METHOD(getPhotos:(NSDictionary *)params
                @"height": @(dimensions.height),
                @"width": @(dimensions.width),
                @"isStored": @YES,
+                @"playableDuration": @(duration),
              },
              @"timestamp": @(date.timeIntervalSince1970),
              @"location": loc ? @{
@@ -224,7 +230,7 @@ RCT_EXPORT_METHOD(getPhotos:(NSDictionary *)params
    if (error.code != ALAssetsLibraryAccessUserDeniedError) {
      RCTLogError(@"Failure while iterating through asset groups %@", error);
    }
-    reject(RCTErrorUnableToLoad, nil, error);
+    reject(kErrorUnableToLoad, nil, error);
  }];
 }

@@ -44,7 +44,10 @@ RCT_EXPORT_MODULE()
  // form of an, NSURL which is what assets-library uses.
  NSString *assetID = @"";
  PHFetchResult *results;
-  if ([imageURL.scheme caseInsensitiveCompare:@"assets-library"] == NSOrderedSame) {
+  if (!imageURL) {
+    completionHandler(RCTErrorWithMessage(@"Cannot load a photo library asset with no URL"), nil);
+    return ^{};
+  } else if ([imageURL.scheme caseInsensitiveCompare:@"assets-library"] == NSOrderedSame) {
    assetID = [imageURL absoluteString];
    results = [PHAsset fetchAssetsWithALAssetURLs:@[imageURL] options:nil];
  } else {
@@ -37,6 +37,9 @@ type DefaultProps = {
 /**
 * Displays a circular loading indicator.
 */
+/* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+ * suppresses an error when upgrading Flow's support for React. To see the
+ * error delete this comment and run Flow. */
 const ActivityIndicator = createReactClass({
  displayName: 'ActivityIndicator',
  mixins: [NativeMethodsMixin],
@@ -48,17 +48,14 @@ const invariant = require('fbjs/lib/invariant');
 *
 */

-class Button extends React.Component {
-
-  props: {
-    title: string,
-    onPress: () => any,
-    color?: ?string,
-    accessibilityLabel?: ?string,
-    disabled?: ?boolean,
-    testID?: ?string,
-  };
-
+class Button extends React.Component<{
+  title: string,
+  onPress: () => any,
+  color?: ?string,
+  accessibilityLabel?: ?string,
+  disabled?: ?boolean,
+  testID?: ?string,
+}> {
  static propTypes = {
    /**
     * Text to display inside the button
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2017-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 CheckBox
+ * @flow
+ * @format
+ */
+'use strict';
+
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const PropTypes = require('prop-types');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const ViewPropTypes = require('ViewPropTypes');
+
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
+
+type DefaultProps = {
+  value: boolean,
+  disabled: boolean,
+};
+
+/**
+ * Renders a boolean input.
+ *
+ * This is a controlled component that requires an `onValueChange` callback that
+ * updates the `value` prop in order for the component to reflect user actions.
+ * If the `value` prop is not updated, the component will continue to render
+ * the supplied `value` prop instead of the expected result of any user actions.
+ *
+ * @keyword checkbox
+ * @keyword toggle
+ */
+// $FlowFixMe(>=0.41.0)
+let CheckBox = createReactClass({
+  displayName: 'CheckBox',
+  propTypes: {
+    ...ViewPropTypes,
+    /**
+     * The value of the checkbox.  If true the checkbox will be turned on.
+     * Default value is false.
+     */
+    value: PropTypes.bool,
+    /**
+     * If true the user won't be able to toggle the checkbox.
+     * Default value is false.
+     */
+    disabled: PropTypes.bool,
+    /**
+     * Used in case the props change removes the component.
+     */
+    onChange: PropTypes.func,
+    /**
+     * Invoked with the new value when the value changes.
+     */
+    onValueChange: PropTypes.func,
+    /**
+     * Used to locate this view in end-to-end tests.
+     */
+    testID: PropTypes.string,
+  },
+
+  getDefaultProps: function(): DefaultProps {
+    return {
+      value: false,
+      disabled: false,
+    };
+  },
+
+  mixins: [NativeMethodsMixin],
+
+  _rctCheckBox: {},
+  _onChange: function(event: Object) {
+    this._rctCheckBox.setNativeProps({value: this.props.value});
+    // Change the props after the native props are set in case the props
+    // change removes the component
+    this.props.onChange && this.props.onChange(event);
+    this.props.onValueChange &&
+      this.props.onValueChange(event.nativeEvent.value);
+  },
+
+  render: function() {
+    let props = {...this.props};
+    props.onStartShouldSetResponder = () => true;
+    props.onResponderTerminationRequest = () => false;
+    props.enabled = !this.props.disabled;
+    props.on = this.props.value;
+    props.style = [styles.rctCheckBox, this.props.style];
+
+    return (
+      <RCTCheckBox
+        {...props}
+        ref={ref => {
+          /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+           * comment suppresses an error when upgrading Flow's support for
+           * React. To see the error delete this comment and run Flow. */
+          this._rctCheckBox = ref;
+        }}
+        onChange={this._onChange}
+      />
+    );
+  },
+});
+
+let styles = StyleSheet.create({
+  rctCheckBox: {
+    height: 32,
+    width: 32,
+  },
+});
+
+let RCTCheckBox = requireNativeComponent('AndroidCheckBox', CheckBox, {
+  nativeOnly: {
+    onChange: true,
+    on: true,
+    enabled: true,
+  },
+});
+
+module.exports = CheckBox;
@@ -170,14 +170,6 @@ var DrawerLayoutAndroid = createReactClass({
    return this.refs[INNERVIEW_REF].getInnerViewNode();
  },

-  componentDidMount: function() {
-    this._updateStatusBarBackground();
-  },
-
-  componentDidReceiveProps: function() {
-    this._updateStatusBarBackground();
-  },
-
  render: function() {
    var drawStatusBar = Platform.Version >= 21 && this.props.statusBarBackgroundColor;
    var drawerViewWrapper =
@@ -195,7 +187,7 @@ var DrawerLayoutAndroid = createReactClass({
        {drawStatusBar &&
        <StatusBar
          translucent
-          backgroundColor={this.state.statusBarBackgroundColor}
+          backgroundColor={this.props.statusBarBackgroundColor}
        />}
        {drawStatusBar &&
        <View style={[
@@ -270,27 +262,26 @@ var DrawerLayoutAndroid = createReactClass({
      null
    );
  },
-
+  /**
+  * Closing and opening example
+  * Note: To access the drawer you have to give it a ref. Refs do not work on stateless components
+  * render () {
+  *   this.openDrawer = () => {
+  *     this.refs.DRAWER.openDrawer()
+  *   }
+  *   this.closeDrawer = () => {
+  *     this.refs.DRAWER.closeDrawer()
+  *   }
+  *   return (
+  *     <DrawerLayoutAndroid ref={'DRAWER'}>
+  *     </DrawerLayoutAndroid>
+  *   )
+  * }
+  */
  _getDrawerLayoutHandle: function() {
    return ReactNative.findNodeHandle(this.refs[RK_DRAWER_REF]);
  },

-  // Update the StatusBar component background color one frame after creating the
-  // status bar background View to avoid a white flicker that happens because
-  // the StatusBar background becomes transparent before the status bar View
-  // from this component has rendered.
-  _updateStatusBarBackground: function() {
-    if (Platform.Version >= 21 && this.props.statusBarBackgroundColor) {
-      // Check if the value is not already transparent to avoid an extra render.
-      if (this.state.statusBarBackgroundColor !== 'transparent') {
-        requestAnimationFrame(() => {
-          this.setState({statusBarBackgroundColor: 'transparent'});
-        });
-      }
-    } else {
-      this.setState({statusBarBackgroundColor: undefined});
-    }
-  },
 });

 var styles = StyleSheet.create({
@@ -38,7 +38,7 @@ type KeyboardEventListener = (e: KeyboardEventData) => void;

 // The following object exists for documentation purposes
 // Actual work happens in
-// https://github.com/facebook/react-native/blob/master/Libraries/EventEmitter/NativeEventEmitter.js
+// https://github.com/facebook/react-native/blob/master/Libraries/vendor/emitter/NativeEventEmitter.js

 /**
 * `Keyboard` module to control keyboard events.
@@ -142,4 +142,3 @@ Keyboard = KeyboardEventEmitter;
 Keyboard.dismiss = dismissKeyboard;

 module.exports = Keyboard;
-
@@ -10,12 +10,12 @@
 * @flow
 */

+const PropTypes = require('prop-types');
 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';

@@ -25,7 +25,7 @@ type Props = ViewProps & {
   * Should be a React element to be rendered and applied as the
   * mask for the child element.
   */
-  maskElement: React.Element<*>,
+  maskElement: React.Element<any>,
 };

 /**
@@ -64,12 +64,10 @@ type Props = ViewProps & {
 * transparent pixels block that content.
 *
 */
-class MaskedViewIOS extends React.Component {
-  props: Props;
-
+class MaskedViewIOS extends React.Component<Props> {
  static propTypes = {
    ...ViewPropTypes,
-    maskElement: ReactPropTypes.element.isRequired,
+    maskElement: PropTypes.element.isRequired,
  };

  _hasWarnedInvalidRenderMask = false;
@@ -25,7 +25,6 @@ var ViewPropTypes = require('ViewPropTypes');

 var createReactClass = require('create-react-class');
 var invariant = require('fbjs/lib/invariant');
-var logError = require('logError');
 var requireNativeComponent = require('requireNativeComponent');

 const keyMirror = require('fbjs/lib/keyMirror');
@@ -37,11 +36,10 @@ function getuid() {
  return __uid++;
 }

-class NavigatorTransitionerIOS extends React.Component {
+class NavigatorTransitionerIOS extends React.Component<$FlowFixMeProps> {
  requestSchedulingNavigation(cb) {
    RCTNavigatorManager.requestSchedulingJavaScriptNavigation(
      ReactNative.findNodeHandle(this),
-      logError,
      cb
    );
  }
@@ -130,7 +128,7 @@ type Event = Object;
 * [`UINavigationController`](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UINavigationController_Class/),
 * enabling you to implement a navigation stack. It works exactly the same as it
 * would on a native app using `UINavigationController`, providing the same
- * animations and behavior from UIKIt.
+ * animations and behavior from UIKit.
 *
 * As the name implies, it is only available on iOS. Take a look at
 * [`React Navigation`](https://reactnavigation.org/) for a cross-platform
@@ -143,7 +141,8 @@ type Event = Object;
 * navigates to. `initialRoute` represents the first route in your navigator.
 *
 * ```
- * import React, { Component, PropTypes } from 'react';
+ * import PropTypes from 'prop-types';
+ * import React, { Component } from 'react';
 * import { NavigatorIOS, Text } from 'react-native';
 *
 * export default class NavigatorIOSApp extends Component {
@@ -430,6 +429,13 @@ var NavigatorIOS = createReactClass({
       */
      barTintColor: PropTypes.string,

+      /**
+       * The style of the navigation bar. Supported values are 'default', 'black'.
+       * Use 'black' instead of setting `barTintColor` to black. This produces
+       * a navigation bar with the native iOS style with higher translucency.
+       */
+      barStyle: PropTypes.oneOf(['default', 'black']),
+
       /**
       * The text color of the navigation bar title.
       */
@@ -471,6 +477,13 @@ var NavigatorIOS = createReactClass({
     */
    barTintColor: PropTypes.string,

+    /**
+     * The style of the navigation bar. Supported values are 'default', 'black'.
+     * Use 'black' instead of setting `barTintColor` to black. This produces
+     * a navigation bar with the native iOS style with higher translucency.
+     */
+    barStyle: PropTypes.oneOf(['default', 'black']),
+
    /**
     * The default text color of the navigation bar title.
     */
@@ -37,14 +37,12 @@ var MODE_DROPDOWN = 'dropdown';
 /**
 * Individual selectable item in a Picker.
 */
-class PickerItem extends React.Component {
- props: {
-  label: string,
-  value?: any,
-  color?: ColorPropType,
-  testID?: string,
- };
-
+class PickerItem extends React.Component<{
+ label: string,
+ value?: any,
+ color?: ColorPropType,
+ testID?: string,
+}> {
 static propTypes = {
   /**
    * Text to display for this item.
@@ -82,18 +80,16 @@ class PickerItem extends React.Component {
 *       <Picker.Item label="JavaScript" value="js" />
 *     </Picker>
 */
-class Picker extends React.Component {
- props: {
-  style?: $FlowFixMe,
-  selectedValue?: any,
-  onValueChange?: Function,
-  enabled?: boolean,
-  mode?: 'dialog' | 'dropdown',
-  itemStyle?: $FlowFixMe,
-  prompt?: string,
-  testID?: string,
- };
-
+class Picker extends React.Component<{
+ style?: $FlowFixMe,
+ selectedValue?: any,
+ onValueChange?: Function,
+ enabled?: boolean,
+ mode?: 'dialog' | 'dropdown',
+ itemStyle?: $FlowFixMe,
+ prompt?: string,
+ testID?: string,
+}> {
 /**
  * On Android, display the options in a dialog.
  */
@@ -36,19 +36,15 @@ type Event = Object;
 /**
 * Not exposed as a public API - use <Picker> instead.
 */
-class PickerAndroid extends React.Component {
-  props: {
-    style?: $FlowFixMe,
-    selectedValue?: any,
-    enabled?: boolean,
-    mode?: 'dialog' | 'dropdown',
-    onValueChange?: Function,
-    prompt?: string,
-    testID?: string,
-  };
-
-  state: *;
-
+class PickerAndroid extends React.Component<{
+  style?: $FlowFixMe,
+  selectedValue?: any,
+  enabled?: boolean,
+  mode?: 'dialog' | 'dropdown',
+  onValueChange?: Function,
+  prompt?: string,
+  testID?: string,
+}, *> {
  static propTypes = {
    ...ViewPropTypes,
    style: pickerStyleType,
@@ -10,16 +10,14 @@
 */
 'use strict';

-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ViewPropTypes = require('ViewPropTypes');
-var ColorPropType = require('ColorPropType');
+const ActivityIndicator = require('ActivityIndicator');
+const ColorPropType = require('ColorPropType');
+const PropTypes = require('prop-types');
+const React = require('React');
+const ReactNative = require('ReactNative');
+const ViewPropTypes = require('ViewPropTypes');

-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
-
-var STYLE_ATTRIBUTES = [
+const STYLE_ATTRIBUTES = [
  'Horizontal',
  'Normal',
  'Small',
@@ -29,10 +27,10 @@ var STYLE_ATTRIBUTES = [
  'LargeInverse',
 ];

-var indeterminateType = function(props, propName, componentName, ...rest) {
-  var checker = function() {
-    var indeterminate = props[propName];
-    var styleAttr = props.styleAttr;
+const indeterminateType = function(props, propName, componentName, ...rest) {
+  const checker = function() {
+    const indeterminate = props[propName];
+    const styleAttr = props.styleAttr;
    if (!indeterminate && styleAttr !== 'Horizontal') {
      return new Error('indeterminate=false is only valid for styleAttr=Horizontal');
    }
@@ -64,10 +62,10 @@ var indeterminateType = function(props, propName, componentName, ...rest) {
 * },
 * ```
 */
-var ProgressBarAndroid = createReactClass({
-  displayName: 'ProgressBarAndroid',
-  propTypes: {
+class ProgressBarAndroid extends ReactNative.NativeComponent {
+  static propTypes = {
    ...ViewPropTypes,
+
    /**
     * Style of the ProgressBar. One of:
     *
@@ -97,35 +95,25 @@ var ProgressBarAndroid = createReactClass({
     * Used to locate this view in end-to-end tests.
     */
    testID: PropTypes.string,
-  },
+  };

-  getDefaultProps: function() {
-    return {
-      styleAttr: 'Normal',
-      indeterminate: true
-    };
-  },
+  static defaultProps = {
+    styleAttr: 'Normal',
+    indeterminate: true
+  };

-  mixins: [NativeMethodsMixin],
-
-  componentDidMount: function() {
+  componentDidMount() {
    if (this.props.indeterminate && this.props.styleAttr !== 'Horizontal') {
      console.warn(
        'Circular indeterminate `ProgressBarAndroid`' +
        'is deprecated. Use `ActivityIndicator` instead.'
      );
    }
-  },
+  }

-  render: function() {
-    return <AndroidProgressBar {...this.props} />;
-  },
-});
-
-var AndroidProgressBar = requireNativeComponent(
-  'AndroidProgressBar',
-  ProgressBarAndroid,
-  {nativeOnly: {animating: true}},
-);
+  render() {
+    return <ActivityIndicator {...this.props} animating={true} />;
+  }
+}

 module.exports = ProgressBarAndroid;
@@ -16,7 +16,7 @@ const requireNativeComponent = require('requireNativeComponent');

 const RCTRefreshControl = requireNativeComponent('RCTRefreshControl');

-class RefreshControlMock extends React.Component {
+class RefreshControlMock extends React.Component<{}> {
  static latestRef: ?RefreshControlMock;
  componentDidMount() {
    RefreshControlMock.latestRef = this;
@@ -467,12 +467,13 @@ var ScrollResponderMixin = {

  /**
   * Displays the scroll indicators momentarily.
-   *
-   * @platform ios
   */
  scrollResponderFlashScrollIndicators: function() {
-    invariant(ScrollViewManager && ScrollViewManager.flashScrollIndicators, 'flashScrollIndicators is not implemented');
-    ScrollViewManager.flashScrollIndicators(this.scrollResponderGetScrollableNode());
+    UIManager.dispatchViewManagerCommand(
+      this.scrollResponderGetScrollableNode(),
+      UIManager.RCTScrollView.Commands.flashScrollIndicators,
+      []
+    );
  },

  /**
@@ -201,16 +201,21 @@ const ScrollView = createReactClass({
    /**
     * Determines whether the keyboard gets dismissed in response to a drag.
     *
+     * *Cross platform*
+     *
     *   - `'none'` (the default), drags do not dismiss the keyboard.
     *   - `'on-drag'`, the keyboard is dismissed when a drag begins.
+     *
+     * *iOS Only*
+     *
     *   - `'interactive'`, the keyboard is dismissed interactively with the drag and moves in
     *     synchrony with the touch; dragging upwards cancels the dismissal.
     *     On android this is not supported and it will have the same behavior as 'none'.
     */
    keyboardDismissMode: PropTypes.oneOf([
      'none', // default
-      'interactive',
-      'on-drag',
+      'on-drag', // Cross-platform
+      'interactive', // iOS-only
    ]),
    /**
     * Determines when the keyboard should stay visible after a tap.
@@ -235,16 +240,19 @@ const ScrollView = createReactClass({
     * @platform ios
     */
    minimumZoomScale: PropTypes.number,
+    /**
+     * Called when the momentum scroll starts (scroll which occurs as the ScrollView glides to a stop).
+     */
+    onMomentumScrollBegin: PropTypes.func,
+    /**
+     * Called when the momentum scroll ends (scroll which occurs as the ScrollView glides to a stop).
+     */
+    onMomentumScrollEnd: PropTypes.func,
    /**
     * Fires at most once per frame during scrolling. The frequency of the
     * events can be controlled using the `scrollEventThrottle` prop.
     */
    onScroll: PropTypes.func,
-    /**
-     * Called when a scrolling animation ends.
-     * @platform ios
-     */
-    onScrollAnimationEnd: PropTypes.func,
    /**
     * Called when scrollable content view of the ScrollView changes.
     *
@@ -263,6 +271,12 @@ const ScrollView = createReactClass({
     * Note: Vertical pagination is not supported on Android.
     */
    pagingEnabled: PropTypes.bool,
+    /**
+    * When true, ScrollView allows use of pinch gestures to zoom in and out.
+    * The default value is true.
+    * @platform ios
+    */
+    pinchGestureEnabled: PropTypes.bool,
    /**
     * When false, the view cannot be scrolled via touch interaction.
     * The default value is true.
@@ -352,7 +366,18 @@ const ScrollView = createReactClass({
     * @platform ios
     */
    zoomScale: PropTypes.number,
-
+    /**
+     * This property specifies how the safe area insets are used to modify the
+     * content area of the scroll view. The default value of this property is
+     * "never". Available on iOS 11 and later.
+     * @platform ios
+     */
+    contentInsetAdjustmentBehavior: PropTypes.oneOf([
+      'automatic',
+      'scrollableAxes',
+      'never', // default
+      'always',
+    ]),
    /**
     * A RefreshControl component, used to provide pull-to-refresh
     * functionality for the ScrollView. Only works for vertical ScrollViews
@@ -523,6 +548,9 @@ const ScrollView = createReactClass({
  },

  _getKeyForIndex: function(index, childArray) {
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    const child = childArray[index];
    return child && child.key;
  },
@@ -552,6 +580,9 @@ const ScrollView = createReactClass({
    if (!this.props.stickyHeaderIndices) {
      return;
    }
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    const childArray = React.Children.toArray(this.props.children);
    if (key !== this._getKeyForIndex(index, childArray)) {
      // ignore stale layout update
@@ -561,7 +592,13 @@ const ScrollView = createReactClass({
    const layoutY = event.nativeEvent.layout.y;
    this._headerLayoutYs.set(key, layoutY);

+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    const indexOfIndex = this.props.stickyHeaderIndices.indexOf(index);
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    const previousHeaderIndex = this.props.stickyHeaderIndices[indexOfIndex - 1];
    if (previousHeaderIndex != null) {
      const previousHeader = this._stickyHeaderRefs.get(
@@ -660,18 +697,34 @@ const ScrollView = createReactClass({

    const {stickyHeaderIndices} = this.props;
    const hasStickyHeaders = stickyHeaderIndices && stickyHeaderIndices.length > 0;
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    const childArray = hasStickyHeaders && React.Children.toArray(this.props.children);
    const children = hasStickyHeaders ?
+      /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+       * comment suppresses an error when upgrading Flow's support for React.
+       * To see the error delete this comment and run Flow. */
      childArray.map((child, index) => {
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        const indexOfIndex = child ? stickyHeaderIndices.indexOf(index) : -1;
        if (indexOfIndex > -1) {
          const key = child.key;
+          /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+           * comment suppresses an error when upgrading Flow's support for
+           * React. To see the error delete this comment and run Flow. */
          const nextIndex = stickyHeaderIndices[indexOfIndex + 1];
          return (
            <ScrollViewStickyHeader
              key={key}
              ref={(ref) => this._setStickyHeaderRef(key, ref)}
              nextHeaderLayoutY={
+                /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss)
+                 * This comment suppresses an error when upgrading Flow's
+                 * support for React. To see the error delete this comment and
+                 * run Flow. */
                this._headerLayoutYs.get(this._getKeyForIndex(nextIndex, childArray))
              }
              onLayout={(event) => this._onStickyHeaderLayout(index, event, key)}
@@ -683,10 +736,16 @@ const ScrollView = createReactClass({
          return child;
        }
      }) :
+      /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+       * comment suppresses an error when upgrading Flow's support for React.
+       * To see the error delete this comment and run Flow. */
      this.props.children;
    const contentContainer =
      <ScrollContentContainerViewClass
        {...contentSizeChangeProps}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        ref={this._setInnerViewRef}
        style={contentContainerStyle}
        removeClippedSubviews={
@@ -727,6 +786,9 @@ const ScrollView = createReactClass({
      onResponderGrant: this.scrollResponderHandleResponderGrant,
      onResponderReject: this.scrollResponderHandleResponderReject,
      onResponderRelease: this.scrollResponderHandleResponderRelease,
+      /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+       * comment suppresses an error when upgrading Flow's support for React.
+       * To see the error delete this comment and run Flow. */
      onResponderTerminate: this.scrollResponderHandleTerminate,
      onResponderTerminationRequest: this.scrollResponderHandleTerminationRequest,
      onScroll: this._handleScroll,
@@ -756,6 +818,9 @@ const ScrollView = createReactClass({
        // On iOS the RefreshControl is a child of the ScrollView.
        // tvOS lacks native support for RefreshControl, so don't include it in that case
        return (
+          /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+           * comment suppresses an error when upgrading Flow's support for
+           * React. To see the error delete this comment and run Flow. */
          <ScrollViewClass {...props} ref={this._setScrollViewRef}>
            {Platform.isTVOS ? null : refreshControl}
            {contentContainer}
@@ -771,6 +836,9 @@ const ScrollView = createReactClass({
        return React.cloneElement(
          refreshControl,
          {style: props.style},
+          /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+           * comment suppresses an error when upgrading Flow's support for
+           * React. To see the error delete this comment and run Flow. */
          <ScrollViewClass {...props} style={baseStyle} ref={this._setScrollViewRef}>
            {contentContainer}
          </ScrollViewClass>
@@ -778,6 +846,9 @@ const ScrollView = createReactClass({
      }
    }
    return (
+      /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+       * comment suppresses an error when upgrading Flow's support for React.
+       * To see the error delete this comment and run Flow. */
      <ScrollViewClass {...props} ref={this._setScrollViewRef}>
        {contentContainer}
      </ScrollViewClass>
@@ -816,12 +887,12 @@ if (Platform.OS === 'android') {
  };
  AndroidScrollView = requireNativeComponent(
    'RCTScrollView',
-    (ScrollView: ReactClass<any>),
+    (ScrollView: React.ComponentType<any>),
    nativeOnlyProps
  );
  AndroidHorizontalScrollView = requireNativeComponent(
    'AndroidHorizontalScrollView',
-    (ScrollView: ReactClass<any>),
+    (ScrollView: React.ComponentType<any>),
    nativeOnlyProps
  );
 } else if (Platform.OS === 'ios') {
@@ -835,7 +906,7 @@ if (Platform.OS === 'android') {
  };
  RCTScrollView = requireNativeComponent(
    'RCTScrollView',
-    (ScrollView: ReactClass<any>),
+    (ScrollView: React.ComponentType<any>),
    nativeOnlyProps,
  );
  // $FlowFixMe (bvaughn) Update ComponentInterface in ViewPropTypes to include a string type (for Fiber host components) in a follow-up.
@@ -16,21 +16,18 @@ const React = require('React');
 const StyleSheet = require('StyleSheet');

 type Props = {
-  children?: React.Element<*>,
+  children?: React.Element<any>,
  nextHeaderLayoutY: ?number,
  onLayout: (event: Object) => void,
  scrollAnimatedValue: Animated.Value,
 };

-class ScrollViewStickyHeader extends React.Component {
-  props: Props;
-  state: {
-    measured: boolean,
-    layoutY: number,
-    layoutHeight: number,
-    nextHeaderLayoutY: ?number,
-  };
-
+class ScrollViewStickyHeader extends React.Component<Props, {
+  measured: boolean,
+  layoutY: number,
+  layoutHeight: number,
+  nextHeaderLayoutY: ?number,
+}> {
  constructor(props: Props, context: Object) {
    super(props, context);
    this.state = {
@@ -17,7 +17,7 @@ const requireNativeComponent = require('requireNativeComponent');

 const RCTScrollView = requireNativeComponent('RCTScrollView');

-class ScrollViewMock extends React.Component {
+class ScrollViewMock extends React.Component<$FlowFixMeProps> {
  render() {
    return (
      <RCTScrollView {...this.props}>
@@ -28,7 +28,7 @@ const React = require('React');
 * Typically, you will not need to use this component and should opt for normal
 * React reconciliation.
 */
-class StaticContainer extends React.Component {
+class StaticContainer extends React.Component<Object> {

  shouldComponentUpdate(nextProps: Object): boolean {
    return !!nextProps.shouldUpdate;
@@ -15,12 +15,10 @@ var React = require('React');

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

-class StaticRenderer extends React.Component {
-  props: {
-    shouldUpdate: boolean,
-    render: Function,
-  };
-
+class StaticRenderer extends React.Component<{
+  shouldUpdate: boolean,
+  render: Function,
+}> {
  static propTypes = {
    shouldUpdate: PropTypes.bool.isRequired,
    render: PropTypes.func.isRequired,
@@ -30,7 +28,7 @@ class StaticRenderer extends React.Component {
    return nextProps.shouldUpdate;
  }

-  render(): React.Element<any> {
+  render(): React.Node {
    return this.props.render();
  }
 }
@@ -145,21 +145,19 @@ function createStackEntry(props: any): any {
 * set by the static API will get overriden by the one set by the component in
 * the next render.
 *
- * ### Constants
+ * ### Constants
 *
 * `currentHeight` (Android only) The height of the status bar.
 */
-class StatusBar extends React.Component {
-  props: {
-    hidden?: boolean,
-    animated?: boolean,
-    backgroundColor?: string,
-    translucent?: boolean,
-    barStyle?: 'default' | 'light-content' | 'dark-content',
-    networkActivityIndicatorVisible?: boolean,
-    showHideTransition?: 'fade' | 'slide',
-  };
-
+class StatusBar extends React.Component<{
+  hidden?: boolean,
+  animated?: boolean,
+  backgroundColor?: string,
+  translucent?: boolean,
+  barStyle?: 'default' | 'light-content' | 'dark-content',
+  networkActivityIndicatorVisible?: boolean,
+  showHideTransition?: 'fade' | 'slide',
+}> {
  static _propsStack = [];

  static _defaultProps = createStackEntry({
@@ -410,7 +408,7 @@ class StatusBar extends React.Component {
    });
  };

-  render(): ?React.Element<any> {
+  render(): React.Node {
    return null;
  }
 }
@@ -93,6 +93,9 @@ var Switch = createReactClass({
      this._rctSwitch.setNativeProps({value: this.props.value});
    }
    //Change the props after the native props are set in case the props change removes the component
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    this.props.onChange && this.props.onChange(event);
    this.props.onValueChange && this.props.onValueChange(event.nativeEvent.value);
  },
@@ -112,6 +115,9 @@ var Switch = createReactClass({
    return (
      <RCTSwitch
        {...props}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        ref={(ref) => { this._rctSwitch = ref; }}
        onChange={this._onChange}
      />
@@ -17,7 +17,7 @@ const StyleSheet = require('StyleSheet');
 const TabBarItemIOS = require('TabBarItemIOS');
 const View = require('View');

-class DummyTabBarIOS extends React.Component {
+class DummyTabBarIOS extends React.Component<$FlowFixMeProps> {
  static Item = TabBarItemIOS;

  render() {
@@ -20,17 +20,16 @@ const ViewPropTypes = require('ViewPropTypes');

 var requireNativeComponent = require('requireNativeComponent');

-class TabBarIOS extends React.Component {
-  props: {
-    style?: $FlowFixMe,
-    unselectedTintColor?: $FlowFixMe,
-    tintColor?: $FlowFixMe,
-    unselectedItemTintColor?: $FlowFixMe,
-    barTintColor?: $FlowFixMe,
-    translucent?: boolean,
-    itemPositioning?: 'fill' | 'center' | 'auto',
-  };
-
+class TabBarIOS extends React.Component<{
+  style?: $FlowFixMe,
+  unselectedTintColor?: $FlowFixMe,
+  tintColor?: $FlowFixMe,
+  unselectedItemTintColor?: $FlowFixMe,
+  barTintColor?: $FlowFixMe,
+  barStyle?: 'default' | 'black',
+  translucent?: boolean,
+  itemPositioning?: 'fill' | 'center' | 'auto',
+}> {
  static Item = TabBarItemIOS;

  // $FlowFixMe(>=0.41.0)
@@ -53,6 +52,12 @@ class TabBarIOS extends React.Component {
     * Background color of the tab bar
     */
    barTintColor: ColorPropType,
+    /**
+     * The style of the tab bar. Supported values are 'default', 'black'.
+     * Use 'black' instead of setting `barTintColor` to black. This produces
+     * a tab bar with the native iOS style with higher translucency.
+     */
+    barStyle: PropTypes.oneOf(['default', 'black']),
    /**
     * A Boolean value that indicates whether the tab bar is translucent
     */
@@ -77,6 +82,7 @@ class TabBarIOS extends React.Component {
        unselectedItemTintColor={this.props.unselectedItemTintColor}
        tintColor={this.props.tintColor}
        barTintColor={this.props.barTintColor}
+        barStyle={this.props.barStyle}
        itemPositioning={this.props.itemPositioning}
        translucent={this.props.translucent !== false}>
        {
@@ -96,6 +96,9 @@ const DataDetectorTypes = [
 * AppRegistry.registerComponent('AwesomeProject', () => UselessTextInput);
 * ```
 *
+ * Two methods exposed via the native element are .focus() and .blur() that
+ * will focus or blur the TextInput programmatically.
+ *
 * Note that some props are only available with `multiline={true/false}`.
 * Additionally, border styles that apply to only one side of the element
 * (e.g., `borderBottomColor`, `borderLeftWidth`, etc.) will not be applied if
@@ -168,6 +171,7 @@ const DataDetectorTypes = [
 * or control this param programmatically with native code.
 *
 */
+
 // $FlowFixMe(>=0.41.0)
 const TextInput = createReactClass({
  displayName: 'TextInput',
@@ -207,6 +211,13 @@ const TextInput = createReactClass({
     * The default value is `false`.
     */
    autoFocus: PropTypes.bool,
+    /**
+     * If true, will increase the height of the textbox if need be. If false,
+     * the textbox will become scrollable once the height is reached. The
+     * default value is false.
+     * @platform android
+     */
+    autoGrow: PropTypes.bool,
    /**
     * If `false`, text is not editable. The default value is `true`.
     */
@@ -306,6 +317,11 @@ const TextInput = createReactClass({
     * instead of implementing the logic in JS to avoid flicker.
     */
    maxLength: PropTypes.number,
+    /**
+     * If autogrow is `true`, limits the height that the TextInput box can grow
+     * to. Once it reaches this height, the TextInput becomes scrollable.
+     */
+    maxHeight: PropTypes.number,
    /**
     * Sets the number of lines for a `TextInput`. Use it with multiline set to
     * `true` to be able to fill the lines.
@@ -497,6 +513,13 @@ const TextInput = createReactClass({

    /**
     * If defined, the provided image resource will be rendered on the left.
+     * The image resource must be inside `/android/app/src/main/res/drawable` and referenced
+     * like
+     * ```
+     * <TextInput
+     *  inlineImageLeft='search_icon'
+     * />
+     * ```
     * @platform android
     */
    inlineImageLeft: PropTypes.string,
@@ -541,6 +564,10 @@ const TextInput = createReactClass({
   */
  mixins: [NativeMethodsMixin, TimerMixin],

+  getInitialState: function() {
+    return {layoutHeight: this._layoutHeight};
+  },
+
  /**
   * Returns `true` if the input is currently focused; `false` otherwise.
   */
@@ -558,6 +585,7 @@ const TextInput = createReactClass({
  _focusSubscription: (undefined: ?Function),
  _lastNativeText: (undefined: ?string),
  _lastNativeSelection: (undefined: ?Selection),
+  _layoutHeight: (-1: number),

  componentDidMount: function() {
    this._lastNativeText = this.props.value;
@@ -690,7 +718,6 @@ const TextInput = createReactClass({
          onScroll={this._onScroll}
        />;
    }
-
    return (
      <TouchableWithoutFeedback
        onLayout={props.onLayout}
@@ -708,9 +735,15 @@ const TextInput = createReactClass({

  _renderAndroid: function() {
    const props = Object.assign({}, this.props);
-    props.style = [this.props.style];
+    props.style = this.props.style;
+    if (this.state.layoutHeight >= 0) {
+      props.style = [props.style, {height: this.state.layoutHeight}];
+    }
    props.autoCapitalize =
      UIManager.AndroidTextInput.Constants.AutoCapitalizationType[this.props.autoCapitalize];
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    var children = this.props.children;
    var childCount = 0;
    React.Children.forEach(children, () => ++childCount);
@@ -721,11 +754,9 @@ const TextInput = createReactClass({
    if (childCount > 1) {
      children = <Text>{children}</Text>;
    }
-
    if (props.selection && props.selection.end == null) {
      props.selection = {start: props.selection.start, end: props.selection.start};
    }
-
    const textContainer =
      <AndroidTextInput
        ref={this._setNativeRef}
@@ -734,6 +765,7 @@ const TextInput = createReactClass({
        onFocus={this._onFocus}
        onBlur={this._onBlur}
        onChange={this._onChange}
+        onContentSizeChange={this._onContentSizeChange}
        onSelectionChange={this._onSelectionChange}
        onTextInput={this._onTextInput}
        text={this._getText()}
@@ -745,7 +777,7 @@ const TextInput = createReactClass({

    return (
      <TouchableWithoutFeedback
-        onLayout={this.props.onLayout}
+        onLayout={this._onLayout}
        onPress={this._onPress}
        accessible={this.props.accessible}
        accessibilityLabel={this.props.accessibilityLabel}
@@ -796,6 +828,26 @@ const TextInput = createReactClass({
    this.forceUpdate();
  },

+  _onContentSizeChange: function(event: Event) {
+    let contentHeight = event.nativeEvent.contentSize.height;
+    if (this.props.autoGrow) {
+      if (this.props.maxHeight) {
+        contentHeight = Math.min(this.props.maxHeight, contentHeight);
+      }
+      this.setState({layoutHeight: Math.max(this._layoutHeight, contentHeight)});
+    }
+
+    this.props.onContentSizeChange && this.props.onContentSizeChange(event);
+  },
+
+  _onLayout: function(event: Event) {
+    const height = event.nativeEvent.layout.height;
+    if (height) {
+      this._layoutHeight = event.nativeEvent.layout.height;
+    }
+    this.props.onLayout && this.props.onLayout(event);
+  },
+
  _onSelectionChange: function(event: Event) {
    this.props.onSelectionChange && this.props.onSelectionChange(event);

@@ -852,6 +904,9 @@ const TextInput = createReactClass({
  },

  _onTextInput: function(event: Event) {
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    this.props.onTextInput && this.props.onTextInput(event);
  },

@@ -7,6 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 *
 * @providesModule ToastAndroid
+ * @flow
 */

 'use strict';
@@ -23,10 +24,14 @@ var RCTToastAndroid = require('NativeModules').ToastAndroid;
 * There is also a function `showWithGravity` to specify the layout gravity. May be
 * ToastAndroid.TOP, ToastAndroid.BOTTOM, ToastAndroid.CENTER.
 *
+ * The 'showWithGravityWithOffset' function adds on the ability to specify offset
+ * These offset values will translate to pixels.
+ *
 * Basic usage:
 * ```javascript
 * ToastAndroid.show('A pikachu appeared nearby !', ToastAndroid.SHORT);
 * ToastAndroid.showWithGravity('All Your Base Are Belong To Us', ToastAndroid.SHORT, ToastAndroid.CENTER);
+ * ToastAndroid.showWithGravityAndOffset('A wild toast appeared!', ToastAndroid.LONG, ToastAndroid.BOTTOM, 25, 50);
 * ```
 */

@@ -55,6 +60,16 @@ var ToastAndroid = {
  ): void {
    RCTToastAndroid.showWithGravity(message, duration, gravity);
  },
+
+  showWithGravityAndOffset: function (
+    message: string,
+    duration: number,
+    gravity: number,
+    xOffset: number,
+    yOffset: number,
+  ): void {
+    RCTToastAndroid.showWithGravityAndOffset(message, duration, gravity, xOffset, yOffset);
+  },
 };

 module.exports = ToastAndroid;
@@ -139,12 +139,30 @@ var TouchableBounce = createReactClass({
  render: function(): React.Element<any> {
    return (
      <Animated.View
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        style={[{transform: [{scale: this.state.scale}]}, this.props.style]}
        accessible={this.props.accessible !== false}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        accessibilityLabel={this.props.accessibilityLabel}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        accessibilityComponentType={this.props.accessibilityComponentType}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        accessibilityTraits={this.props.accessibilityTraits}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        nativeID={this.props.nativeID}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        testID={this.props.testID}
        hitSlop={this.props.hitSlop}
        onStartShouldSetResponder={this.touchableHandleStartShouldSetResponder}
@@ -136,6 +136,9 @@ var TouchableHighlight = createReactClass({
  },

  getInitialState: function() {
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    this._isMounted = false;
    return merge(
      this.touchableGetInitialState(), this._computeSyntheticState(this.props)
@@ -143,12 +146,18 @@ var TouchableHighlight = createReactClass({
  },

  componentDidMount: function() {
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    this._isMounted = true;
    ensurePositiveDelayProps(this.props);
    ensureComponentIsNative(this.refs[CHILD_REF]);
  },

  componentWillUnmount: function() {
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    this._isMounted = false;
  },

@@ -176,6 +185,9 @@ var TouchableHighlight = createReactClass({
   */
  touchableHandleActivePressIn: function(e: Event) {
    this.clearTimeout(this._hideTimeout);
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    this._hideTimeout = null;
    this._showUnderlay();
    this.props.onPressIn && this.props.onPressIn(e);
@@ -191,6 +203,9 @@ var TouchableHighlight = createReactClass({
  touchableHandlePress: function(e: Event) {
    this.clearTimeout(this._hideTimeout);
    this._showUnderlay();
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    this._hideTimeout = this.setTimeout(this._hideUnderlay,
      this.props.delayPressOut || 100);
    this.props.onPress && this.props.onPress(e);
@@ -232,6 +247,9 @@ var TouchableHighlight = createReactClass({

  _hideUnderlay: function() {
    this.clearTimeout(this._hideTimeout);
+    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
+     * suppresses an error when upgrading Flow's support for React. To see the
+     * error delete this comment and run Flow. */
    this._hideTimeout = null;
    if (this._hasPressHandler() && this.refs[UNDERLAY_REF]) {
      this.refs[CHILD_REF].setNativeProps(INACTIVE_CHILD_PROPS);
@@ -256,6 +274,9 @@ var TouchableHighlight = createReactClass({
    return (
      <View
        accessible={this.props.accessible !== false}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        accessibilityLabel={this.props.accessibilityLabel}
        accessibilityComponentType={this.props.accessibilityComponentType}
        accessibilityTraits={this.props.accessibilityTraits}
@@ -272,9 +293,18 @@ var TouchableHighlight = createReactClass({
        onResponderMove={this.touchableHandleResponderMove}
        onResponderRelease={this.touchableHandleResponderRelease}
        onResponderTerminate={this.touchableHandleResponderTerminate}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        nativeID={this.props.nativeID}
+        /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+         * comment suppresses an error when upgrading Flow's support for React.
+         * To see the error delete this comment and run Flow. */
        testID={this.props.testID}>
        {React.cloneElement(
+          /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+           * comment suppresses an error when upgrading Flow's support for
+           * React. To see the error delete this comment and run Flow. */
          React.Children.only(this.props.children),
          {
            ref: CHILD_REF,
--- a/Show More
+++ b/Show More